No more ItemFragment

This commit is contained in:
PikalaxALT
2015-12-15 10:55:56 -05:00
parent 6e257bc7cd
commit bb2aba7da1
95 changed files with 882 additions and 884 deletions

View File

@@ -11,7 +11,7 @@ OaksLab_MapScriptHeader:
.MapCallbacks:
db 0
UnknownScript_0x19b3c7:
.DummyTrigger:
end
Oak:
@@ -27,7 +27,7 @@ Oak:
.CheckBadges
checkcode VAR_BADGES
if_equal 16, .OpenMtSilver
if_equal 8, .Complain
if_equal 8, .Complain
jump .AhGood
.CheckPokedex
@@ -55,14 +55,14 @@ Oak:
buttonsound
jump .CheckPokedex
ScientistScript_0x19b40f:
jumptextfaceplayer UnknownText_0x19b7fb
OaksAssistant1Script:
jumptextfaceplayer OaksAssistant1Text
ScientistScript_0x19b412:
jumptextfaceplayer UnknownText_0x19b859
OaksAssistant2Script:
jumptextfaceplayer OaksAssistant2Text
ScientistScript_0x19b415:
jumptextfaceplayer UnknownText_0x19b8a7
OaksAssistant3Script:
jumptextfaceplayer OaksAssistant3Text
OaksLabBookshelf:
jumpstd difficultbookshelf
@@ -184,7 +184,7 @@ OakYesKantoBadgesText:
line "<PLAY_G>!"
done
UnknownText_0x19b7fb:
OaksAssistant1Text:
text "The PROF's #MON"
line "TALK radio program"
@@ -195,7 +195,7 @@ UnknownText_0x19b7fb:
line "like to hear it."
done
UnknownText_0x19b859:
OaksAssistant2Text:
text "Thanks to your"
line "work on the #-"
cont "DEX, the PROF's"
@@ -204,7 +204,7 @@ UnknownText_0x19b859:
line "along great."
done
UnknownText_0x19b8a7:
OaksAssistant3Text:
text "Don't tell anyone,"
line "but PROF.OAK'S"
@@ -290,6 +290,6 @@ OaksLab_MapEventHeader:
.PersonEvents:
db 4
person_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Oak, -1
person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b40f, -1
person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b412, -1
person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b415, -1
person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant1Script, -1
person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant2Script, -1
person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant3Script, -1