diff options
Diffstat (limited to 'maps')
214 files changed, 2077 insertions, 1971 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 9238d5dbd..c6b188b8d 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -60,7 +60,7 @@ ReceptionistScript_0x9e3e2: opentext writetext Text_BattleTowerWelcomesYou buttonsound - writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [s1_be4f] + writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -85,7 +85,7 @@ Script_ChooseChallenge: ; 0x9e40f special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [s1_be4f] + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] special BattleTowerAction special BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 1126e1d2d..7217e1050 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -9,24 +9,26 @@ BlackthornDragonSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrannyScript_0x195949: - jumptextfaceplayer UnknownText_0x19595c +BlackthornDragonSpeechHouseGrannyScript: + jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText -Dratini: +BlackthornDragonSpeechHouseDratiniScript: opentext - writetext DratiniText + writetext BlackthornDragonSpeechHouseDratiniText cry DRATINI waitbutton closetext end ; unused +BlackthornDragonSpeechHousePictureBookshelf: jumpstd picturebookshelf ; unused +BlackthornDragonSpeechHouseMagazineBookshelf: jumpstd magazinebookshelf -UnknownText_0x19595c: +BlackthornDragonSpeechHouseGrannyText: text "A clan of trainers" line "who can freely" @@ -41,7 +43,7 @@ UnknownText_0x19595c: line "this town." done -DratiniText: +BlackthornDragonSpeechHouseDratiniText: text "DRATINI: Draa!" done @@ -62,5 +64,5 @@ BlackthornDragonSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x195949, -1 - person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Dratini, -1 + person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 + person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index baae2fe8e..651d7e7ec 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -93,9 +93,9 @@ BlackthornGymClairScript: end TrainerCooltrainermPaul: - trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript + trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script -CooltrainermPaulScript: +.Script: end_if_just_battled opentext writetext CooltrainermPaulAfterBattleText @@ -104,9 +104,9 @@ CooltrainermPaulScript: end TrainerCooltrainermMike: - trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript + trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script -CooltrainermMikeScript: +.Script: end_if_just_battled opentext writetext CooltrainermMikeAfterBattleText @@ -115,9 +115,9 @@ CooltrainermMikeScript: end TrainerCooltrainerfLola: - trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript + trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script -CooltrainerfLolaScript: +.Script: end_if_just_battled opentext writetext CooltrainerfLolaAfterBattleText diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 92b623b2a..3dd4a4d45 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -61,9 +61,9 @@ BlackthornGymBoulder: jumpstd strengthboulder TrainerCooltrainermCody: - trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript + trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script -CooltrainermCodyScript: +.Script: end_if_just_battled opentext writetext CooltrainermCodyAfterBattleText @@ -72,9 +72,9 @@ CooltrainermCodyScript: end TrainerCooltrainerfFran: - trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript + trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script -CooltrainerfFranScript: +.Script: end_if_just_battled opentext writetext CooltrainerfFranAfterBattleText diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 972ae6f64..be7987a76 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -10,19 +10,19 @@ BlackthornMart_MapScriptHeader: .MapCallbacks: db 0 -ClerkScript_0x195a5d: +BlackthornMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_BLACKTHORN closetext end -CooltrainerMScript_0x195a64: - jumptextfaceplayer UnknownText_0x195a6a +BlackthornMartCooltrainerMScript: + jumptextfaceplayer BlackthornMartCooltrainerMText -BlackBeltScript_0x195a67: - jumptextfaceplayer UnknownText_0x195ae9 +BlackthornMartBlackBeltScript: + jumptextfaceplayer BlackthornMartBlackBeltText -UnknownText_0x195a6a: +BlackthornMartCooltrainerMText: text "You can't buy MAX" line "REVIVE, but it" @@ -36,7 +36,7 @@ UnknownText_0x195a6a: line "needed for moves." done -UnknownText_0x195ae9: +BlackthornMartBlackBeltText: text "MAX REPEL keeps" line "weak #MON away" cont "from you." @@ -63,6 +63,6 @@ BlackthornMart_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195a5d, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195a64, -1 - person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x195a67, -1 + person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 + person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 + person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 6da357319..b235d6143 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -11,19 +11,19 @@ BlackthornPokecenter1F_MapScriptHeader: .MapCallbacks: db 0 -NurseScript_0x195b79: +BlackthornPokecenter1FNurseScript: jumpstd pokecenternurse -GentlemanScript_0x195b7c: - jumptextfaceplayer UnknownText_0x195b85 +BlackthornPokecenter1FGentlemanScript: + jumptextfaceplayer BlackthornPokecenter1FGentlemanText -TwinScript_0x195b7f: - jumptextfaceplayer UnknownText_0x195bfd +BlackthornPokecenter1FTwinScript: + jumptextfaceplayer BlackthornPokecenter1FTwinText -CooltrainerMScript_0x195b82: +BlackthornPokecenter1FCooltrainerMScript: jumpstd happinesschecknpc -UnknownText_0x195b85: +BlackthornPokecenter1FGentlemanText: text "Deep inside far-" line "off INDIGO PLATEAU" @@ -37,7 +37,7 @@ UnknownText_0x195b85: line "the country." done -UnknownText_0x195bfd: +BlackthornPokecenter1FTwinText: text "There was this" line "move I just had" @@ -67,7 +67,7 @@ BlackthornPokecenter1F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x195b79, -1 - person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x195b7c, -1 - person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x195b7f, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195b82, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 + person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 + person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 + person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 72cd935fc..58bc77983 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -8,29 +8,29 @@ BluesHouse_MapScriptHeader: .MapCallbacks: db 0 -DaisyScript_0x19b0d0: +DaisyScript: faceplayer opentext checkcode VAR_HOUR - if_equal $f, UnknownScript_0x19b0de - writetext UnknownText_0x19b130 + if_equal 15, .ThreePM + writetext DaisyHelloText waitbutton closetext end -UnknownScript_0x19b0de: +.ThreePM: checkflag ENGINE_TEA_IN_BLUES_HOUSE - iftrue UnknownScript_0x19b11e - writetext UnknownText_0x19b1b6 + iftrue .AlreadyGroomedMon + writetext DaisyOfferGroomingText yesorno - iffalse UnknownScript_0x19b124 - writetext UnknownText_0x19b244 + iffalse .Refused + writetext DaisyWhichMonText waitbutton special Special_DaisyMassage - if_equal 0, UnknownScript_0x19b124 - if_equal 1, UnknownScript_0x19b12a + if_equal 0, .Refused + if_equal 1, .CantGroomEgg setflag ENGINE_TEA_IN_BLUES_HOUSE - writetext UnknownText_0x19b266 + writetext DaisyAlrightText waitbutton closetext special FadeOutPalettes @@ -39,33 +39,33 @@ UnknownScript_0x19b0de: special FadeInPalettes special RestartMapMusic opentext - writetext UnknownText_0x19b296 + writetext GroomedMonLooksContentText special PlayCurMonCry buttonsound - writetext UnknownText_0x19b2aa + writetext DaisyAllDoneText waitbutton closetext end -UnknownScript_0x19b11e: - writetext UnknownText_0x19b2fa +.AlreadyGroomedMon: + writetext DaisyAlreadyGroomedText waitbutton closetext end -UnknownScript_0x19b124: - writetext UnknownText_0x19b334 +.Refused: + writetext DaisyRefusedText waitbutton closetext end -UnknownScript_0x19b12a: - writetext UnknownText_0x19b377 +.CantGroomEgg: + writetext DaisyCantGroomEggText waitbutton closetext end -UnknownText_0x19b130: +DaisyHelloText: text "DAISY: Hi! My kid" line "brother is the GYM" @@ -79,7 +79,7 @@ UnknownText_0x19b130: line "for the trainers." done -UnknownText_0x19b1b6: +DaisyOfferGroomingText: text "DAISY: Hi! Good" line "timing. I'm about" cont "to have some tea." @@ -94,24 +94,24 @@ UnknownText_0x19b1b6: line "to groom one?" done -UnknownText_0x19b244: +DaisyWhichMonText: text "DAISY: Which one" line "should I groom?" done -UnknownText_0x19b266: +DaisyAlrightText: text "DAISY: OK, I'll" line "get it looking" cont "nice in no time." done -UnknownText_0x19b296: +GroomedMonLooksContentText: text_from_ram StringBuffer3 text " looks" line "content." done -UnknownText_0x19b2aa: +DaisyAllDoneText: text "DAISY: There you" line "go! All done." @@ -122,7 +122,7 @@ UnknownText_0x19b2aa: line "#MON." done -UnknownText_0x19b2fa: +DaisyAlreadyGroomedText: text "DAISY: I always" line "have tea around" @@ -130,7 +130,7 @@ UnknownText_0x19b2fa: line "join me." done -UnknownText_0x19b334: +DaisyRefusedText: text "DAISY: You don't" line "want to have one" @@ -138,7 +138,7 @@ UnknownText_0x19b334: line "just have tea." done -UnknownText_0x19b377: +DaisyCantGroomEggText: text "DAISY: Oh, sorry." line "I honestly can't" cont "groom an EGG." @@ -161,4 +161,4 @@ BluesHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaisyScript_0x19b0d0, -1 + person_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaisyScript, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index a46e01da5..14b1a2d70 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -21,8 +21,8 @@ CeladonCity_MapScriptHeader: setflag ENGINE_FLYPOINT_CELADON return -FisherScript_0x1a9f43: - jumptextfaceplayer UnknownText_0x1a9f7d +CeladonCityFisherScript: + jumptextfaceplayer CeladonCityFisherText CeladonCityPoliwrath: opentext @@ -32,26 +32,26 @@ CeladonCityPoliwrath: closetext end -TeacherScript_0x1a9f50: - jumptextfaceplayer UnknownText_0x1a9fde +CeladonCityTeacher1Script: + jumptextfaceplayer CeladonCityTeacher1Text -GrampsScript_0x1a9f53: - jumptextfaceplayer UnknownText_0x1aa043 +CeladonCityGramps1Script: + jumptextfaceplayer CeladonCityGramps1Text -GrampsScript_0x1a9f56: - jumptextfaceplayer UnknownText_0x1aa0dc +CeladonCityGramps2Script: + jumptextfaceplayer CeladonCityGramps2Text -YoungsterScript_0x1a9f59: - jumptextfaceplayer UnknownText_0x1aa115 +CeladonCityYoungster1Script: + jumptextfaceplayer CeladonCityYoungster1Text -YoungsterScript_0x1a9f5c: - jumptextfaceplayer UnknownText_0x1aa155 +CeladonCityYoungster2Script: + jumptextfaceplayer CeladonCityYoungster2Text -TeacherScript_0x1a9f5f: - jumptextfaceplayer UnknownText_0x1aa1bd +CeladonCityTeacher2Script: + jumptextfaceplayer CeladonCityTeacher2Text -LassScript_0x1a9f62: - jumptextfaceplayer UnknownText_0x1aa306 +CeladonCityLassScript: + jumptextfaceplayer CeladonCityLassText CeladonCitySign: jumptext CeladonCitySignText @@ -77,7 +77,7 @@ CeladonCityPokecenterSign: CeladonCityHiddenPpUp: dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP -UnknownText_0x1a9f7d: +CeladonCityFisherText: text "This POLIWRATH is" line "my partner." @@ -90,7 +90,7 @@ CeladonCityPoliwrathText: text "POLIWRATH: Croak!" done -UnknownText_0x1a9fde: +CeladonCityTeacher1Text: text "I lost at the slot" line "machines again…" @@ -101,7 +101,7 @@ UnknownText_0x1a9fde: line "them out too." done -UnknownText_0x1aa043: +CeladonCityGramps1Text: text "GRIMER have been" line "appearing lately." @@ -116,7 +116,7 @@ UnknownText_0x1aa043: cont "a serious problem…" done -UnknownText_0x1aa0dc: +CeladonCityGramps2Text: text "Nihihi! This GYM" line "is great! Only" @@ -124,7 +124,7 @@ UnknownText_0x1aa0dc: line "here!" done -UnknownText_0x1aa115: +CeladonCityYoungster1Text: text "Want to know a" line "secret?" @@ -133,7 +133,7 @@ UnknownText_0x1aa115: cont "door." done -UnknownText_0x1aa155: +CeladonCityYoungster2Text: text "They're holding an" line "eating contest at" cont "the restaurant." @@ -143,7 +143,7 @@ UnknownText_0x1aa155: cont "feel bloated…" done -UnknownText_0x1aa1bd: +CeladonCityTeacher2Text: text "CELADON DEPT.STORE" line "has the biggest" @@ -160,8 +160,8 @@ UnknownText_0x1aa1bd: line "a sales clerk." done -; possibly unused -UnknownText_0x1aa25b: +; unused +CeladonCityUnusedPokeComCenterText: text "I love being" line "surrounded by tall" cont "buildings!" @@ -179,7 +179,7 @@ UnknownText_0x1aa25b: line "KANTO…" done -UnknownText_0x1aa306: +CeladonCityLassText: text "Looking at the" line "ground while I was" @@ -266,12 +266,12 @@ CeladonCity_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9f43, -1 + person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 - person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f50, -1 - person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f53, -1 - person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f56, -1 - person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f59, -1 - person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f5c, -1 - person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f5f, -1 - person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x1a9f62, -1 + person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 + person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1 + person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 + person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1 + person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1 + person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 + person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityLassScript, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 60fc6064f..d8d1a1411 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -10,14 +10,14 @@ CeladonDeptStore1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x709e0: - jumptextfaceplayer UnknownText_0x709ef +CeladonDeptStore1FReceptionistScript: + jumptextfaceplayer CeladonDeptStore1FReceptionistText -GentlemanScript_0x709e3: - jumptextfaceplayer UnknownText_0x70a35 +CeladonDeptStore1FGentlemanScript: + jumptextfaceplayer CeladonDeptStore1FGentlemanText -TeacherScript_0x709e6: - jumptextfaceplayer UnknownText_0x70aa9 +CeladonDeptStore1FTeacherScript: + jumptextfaceplayer CeladonDeptStore1FTeacherText CeladonDeptStore1FDirectory: jumptext CeladonDeptStore1FDirectoryText @@ -25,7 +25,7 @@ CeladonDeptStore1FDirectory: CeladonDeptStore1FElevatorButton: jumpstd elevatorbutton -UnknownText_0x709ef: +CeladonDeptStore1FReceptionistText: text "Hello! Welcome to" line "CELADON DEPT." cont "STORE!" @@ -34,7 +34,7 @@ UnknownText_0x709ef: line "on the wall." done -UnknownText_0x70a35: +CeladonDeptStore1FGentlemanText: text "This DEPT.STORE is" line "part of the same" @@ -46,7 +46,7 @@ UnknownText_0x70a35: cont "same time." done -UnknownText_0x70aa9: +CeladonDeptStore1FTeacherText: text "This is my first" line "time here." @@ -94,6 +94,6 @@ CeladonDeptStore1F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x709e0, -1 - person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x709e3, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x709e6, -1 + person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 + person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index f77747aea..c056a7143 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -25,11 +25,11 @@ ClerkScript_0x70bb5: closetext end -PokefanMScript_0x70bbd: - jumptextfaceplayer UnknownText_0x70bc9 +CeladonDeptStore2FPokefanMScript: + jumptextfaceplayer CeladonDeptStore2FPokefanMText -YoungsterScript_0x70bc0: - jumptextfaceplayer UnknownText_0x70c3e +CeladonDeptStore2FYoungsterScript: + jumptextfaceplayer CeladonDeptStore2FYoungsterText CeladonDeptStore2FDirectory: jumptext CeladonDeptStore2FDirectoryText @@ -37,7 +37,7 @@ CeladonDeptStore2FDirectory: CeladonDeptStore2FElevatorButton: jumpstd elevatorbutton -UnknownText_0x70bc9: +CeladonDeptStore2FPokefanMText: text "I just recently" line "became a trainer." @@ -49,7 +49,7 @@ UnknownText_0x70bc9: cont "convenient items." done -UnknownText_0x70c3e: +CeladonDeptStore2FYoungsterText: text "My dad's having a" line "hard time learning" @@ -90,5 +90,5 @@ CeladonDeptStore2F_MapEventHeader: db 4 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 person_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 - person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x70bbd, -1 - person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70bc0, -1 + person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 + person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index a4ff77955..72f4f26ea 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -19,29 +19,29 @@ ClerkScript_0x70d29: closetext end -YoungsterScript_0x70d31: - jumptextfaceplayer UnknownText_0x70d53 +CeladonDeptStore3FYoungsterScript: + jumptextfaceplayer CeladonDeptStore3FYoungsterText -GameboyKidScript_0x70d34: +CeladonDeptStore3FGameboyKid1Script: faceplayer opentext - writetext UnknownText_0x70d86 + writetext CeladonDeptStore3FGameboyKid1Text waitbutton closetext spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN end -GameboyKidScript_0x70d3f: +CeladonDeptStore3FGameboyKid2Script: faceplayer opentext - writetext UnknownText_0x70dc7 + writetext CeladonDeptStore3FGameboyKid2Text waitbutton closetext spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN end -SuperNerdScript_0x70d4a: - jumptextfaceplayer UnknownText_0x70e61 +CeladonDeptStore3FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore3FSuperNerdText CeladonDeptStore3FElevatorButton: jumpstd elevatorbutton @@ -49,7 +49,7 @@ CeladonDeptStore3FElevatorButton: CeladonDeptStore3FDirectory: jumptext CeladonDeptStore3FDirectoryText -UnknownText_0x70d53: +CeladonDeptStore3FYoungsterText: text "I can't decide" line "which #MON I" @@ -57,7 +57,7 @@ UnknownText_0x70d53: line "on…" done -UnknownText_0x70d86: +CeladonDeptStore3FGameboyKid1Text: text "Uh-oh! I traded my" line "#MON without" @@ -65,7 +65,7 @@ UnknownText_0x70d86: line "GRADE from it." done -UnknownText_0x70dc7: +CeladonDeptStore3FGameboyKid2Text: text "Yeah! I'm finally" line "getting a PORYGON!" @@ -82,7 +82,7 @@ UnknownText_0x70dc7: cont "ferent #MON!" done -UnknownText_0x70e61: +CeladonDeptStore3FSuperNerdText: text "The TM SHOP sells" line "some rare moves." done @@ -115,7 +115,7 @@ CeladonDeptStore3F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70d31, -1 - person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d34, -1 - person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d3f, -1 - person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70d4a, -1 + person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 + person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 + person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 + person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 7acaa69db..a31c98015 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -17,11 +17,11 @@ ClerkScript_0x70f0d: closetext end -SuperNerdScript_0x70f15: - jumptextfaceplayer UnknownText_0x70f21 +CeladonDeptStore4FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore4FSuperNerdText -YoungsterScript_0x70f18: - jumptextfaceplayer UnknownText_0x70f55 +CeladonDeptStore4FYoungsterScript: + jumptextfaceplayer CeladonDeptStore4FYoungsterText CeladonDeptStore4FDirectory: jumptext CeladonDeptStore4FDirectoryText @@ -29,13 +29,13 @@ CeladonDeptStore4FDirectory: CeladonDeptStore4FElevatorButton: jumpstd elevatorbutton -UnknownText_0x70f21: +CeladonDeptStore4FSuperNerdText: text "I'm here to buy" line "SURF MAIL to send" cont "to my girlfriend." done -UnknownText_0x70f55: +CeladonDeptStore4FYoungsterText: text "This is the only" line "place where you" @@ -71,5 +71,5 @@ CeladonDeptStore4F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 - person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70f15, -1 - person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70f18, -1 + person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 + person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 6ee0fce13..d111c0c2c 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -26,14 +26,14 @@ ClerkScript_0x7100c: closetext end -GentlemanScript_0x71014: - jumptextfaceplayer UnknownText_0x71023 +CeladonDeptStore5FGentlemanScript: + jumptextfaceplayer CeladonDeptStore5FGentlemanText -SailorScript_0x71017: - jumptextfaceplayer UnknownText_0x71072 +CeladonDeptStore5FSailorScript: + jumptextfaceplayer CeladonDeptStore5FSailorText -TeacherScript_0x7101a: - jumptextfaceplayer UnknownText_0x710b6 +CeladonDeptStore5FTeacherScript: + jumptextfaceplayer CeladonDeptStore5FTeacherText CeladonDeptStore5FDirectory: jumptext CeladonDeptStore5FDirectoryText @@ -41,7 +41,7 @@ CeladonDeptStore5FDirectory: CeladonDeptStore5FElevatorButton: jumpstd elevatorbutton -UnknownText_0x71023: +CeladonDeptStore5FGentlemanText: text "I want to buy some" line "items that raise" @@ -50,7 +50,7 @@ UnknownText_0x71023: cont "enough money…" done -UnknownText_0x71072: +CeladonDeptStore5FSailorText: text "I want PP UP, so I" line "can raise the PP" @@ -58,7 +58,7 @@ UnknownText_0x71072: line "can't buy it…" done -UnknownText_0x710b6: +CeladonDeptStore5FTeacherText: text "Using items on" line "them makes #-" cont "MON happy." @@ -93,6 +93,6 @@ CeladonDeptStore5F_MapEventHeader: db 5 person_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 - person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71014, -1 - person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x71017, -1 - person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7101a, -1 + person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 + person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 + person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index a25b5e591..88f6b756e 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -14,13 +14,13 @@ CeladonDeptStore6F_MapScriptHeader: changeblock $c, $0, $3 return -SuperNerdScript_0x7117a: - jumptextfaceplayer UnknownText_0x712c7 +CeladonDeptStore6FSuperNerdScript: + jumptextfaceplayer CeladonDeptStore6FSuperNerdText -YoungsterScript_0x7117d: - jumptextfaceplayer UnknownText_0x71310 +CeladonDeptStore6FYoungsterScript: + jumptextfaceplayer CeladonDeptStore6FYoungsterText -CeladonVendingMachine: +CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: @@ -98,7 +98,8 @@ CeladonVendingMachine: CeladonDeptStore6FDirectory: jumptext CeladonDeptStore6FDirectoryText -UnknownScript_0x7124d: +; unused +CeladonDeptStore6FElevatorButton: jumpstd elevatorbutton CeladonVendingText: @@ -125,7 +126,7 @@ CeladonVendingNoSpaceText: line "room for stuff…" done -UnknownText_0x712c7: +CeladonDeptStore6FSuperNerdText: text "A vending machine" line "with a prize rou-" cont "lette…" @@ -134,7 +135,7 @@ UnknownText_0x712c7: line "those anymore." done -UnknownText_0x71310: +CeladonDeptStore6FYoungsterText: text "Aww! There's no" line "games here!" @@ -162,12 +163,12 @@ CeladonDeptStore6F_MapEventHeader: db 6 signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton - signpost 1, 8, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 9, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 10, SIGNPOST_UP, CeladonVendingMachine - signpost 1, 11, SIGNPOST_UP, CeladonVendingMachine + signpost 1, 8, SIGNPOST_UP, CeladonDeptStore6FVendingMachine + signpost 1, 9, SIGNPOST_UP, CeladonDeptStore6FVendingMachine + signpost 1, 10, SIGNPOST_UP, CeladonDeptStore6FVendingMachine + signpost 1, 11, SIGNPOST_UP, CeladonDeptStore6FVendingMachine .PersonEvents: db 2 - person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7117a, -1 - person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7117d, -1 + person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 + person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 2f3be1a3d..5af977699 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -5,20 +5,19 @@ CeladonDeptStoreElevator_MapScriptHeader: .MapCallbacks: db 0 -MapCeladonDeptStoreElevatorSignpost0Script: +CeladonDeptStoreElevatorScript: opentext - elevator Elevator_0x713be + elevator CeladonDeptStoreElevatorData closetext - iffalse UnknownScript_0x713bd + iffalse .Done pause 5 playsound SFX_ELEVATOR earthquake 60 waitsfx -UnknownScript_0x713bd: +.Done: end - -Elevator_0x713be: +CeladonDeptStoreElevatorData: db 6 ; floors elevfloor FLOOR_1F, 4, CELADON_DEPT_STORE_1F elevfloor FLOOR_2F, 3, CELADON_DEPT_STORE_2F @@ -28,22 +27,21 @@ Elevator_0x713be: elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F db $ff ; end - CeladonDeptStoreElevator_MapEventHeader: ; filler db 0, 0 .Warps: db 2 - warp_def $3, $1, 255, CELADON_DEPT_STORE_1F - warp_def $3, $2, 255, CELADON_DEPT_STORE_1F + warp_def $3, $1, -1, CELADON_DEPT_STORE_1F + warp_def $3, $2, -1, CELADON_DEPT_STORE_1F .XYTriggers: db 0 .Signposts: db 1 - signpost 0, 3, SIGNPOST_READ, MapCeladonDeptStoreElevatorSignpost0Script + signpost 0, 3, SIGNPOST_READ, CeladonDeptStoreElevatorScript .PersonEvents: db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index bd9b9b713..78e7c9e56 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -16,77 +16,77 @@ CeladonGameCorner_MapScriptHeader: .MapCallbacks: db 0 -ClerkScript_0x7211d: +CeladonGameCornerClerkScript: jumpstd gamecornercoinvendor -ReceptionistScript_0x72120: - jumptextfaceplayer UnknownText_0x721d0 +CeladonGameCornerReceptionistScript: + jumptextfaceplayer CeladonGameCornerReceptionistText -PokefanMScript_0x72123: +CeladonGameCornerPokefanMScript: faceplayer opentext - writetext UnknownText_0x72215 + writetext CeladonGameCornerPokefanMText waitbutton closetext spriteface CELADONGAMECORNER_POKEFAN_M, LEFT end -TeacherScript_0x7212e: +CeladonGameCornerTeacherScript: faceplayer opentext - writetext UnknownText_0x72242 + writetext CeladonGameCornerTeacherText waitbutton closetext spriteface CELADONGAMECORNER_TEACHER, RIGHT end -FishingGuruScript_0x72139: +CeladonGameCornerFishingGuruScript: faceplayer opentext - writetext UnknownText_0x72295 + writetext CeladonGameCornerFishingGuruText waitbutton closetext spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT end -FisherScript_0x72144: +CeladonGameCornerFisherScript: faceplayer opentext checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON - iftrue .UnknownScript_0x72169 - writetext UnknownText_0x722dc + iftrue .GotCoins + writetext CeladonGameCornerFisherText1 buttonsound checkitem COIN_CASE - iffalse UnknownScript_0x7217b + iffalse .NoCoinCase checkcoins 9998 - if_equal $0, UnknownScript_0x72184 + if_equal $0, .FullCoinCase stringtotext .coinname, $1 - scall .UnknownScript_0x72172 + scall .GiveCoins givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON -.UnknownScript_0x72169: - writetext UnknownText_0x72345 +.GotCoins: + writetext CeladonGameCornerFisherText2 waitbutton closetext spriteface LAST_TALKED, LEFT end -.UnknownScript_0x72172: +.GiveCoins: jumpstd receiveitem end .coinname db "COIN@" -UnknownScript_0x7217b: - writetext UnknownText_0x7238a +.NoCoinCase: + writetext CeladonGameCornerFisherNoCoinCaseText waitbutton closetext spriteface LAST_TALKED, LEFT end -UnknownScript_0x72184: - writetext UnknownText_0x723d9 +.FullCoinCase: + writetext CeladonGameCornerFisherFullCoinCaseText waitbutton closetext spriteface LAST_TALKED, LEFT @@ -95,45 +95,45 @@ UnknownScript_0x72184: CeladonGymGuyScript: jumptextfaceplayer CeladonGymGuyText -GrampsScript_0x72190: +CeladonGameCornerGrampsScript: faceplayer opentext - writetext UnknownText_0x724ad + writetext CeladonGameCornerGrampsText waitbutton closetext spriteface CELADONGAMECORNER_GRAMPS, LEFT end -MapCeladonGameCornerSignpost36Script: - jumptext UnknownText_0x724f3 +CeladonGameCornerPoster1Script: + jumptext CeladonGameCornerPoster1Text -MapCeladonGameCornerSignpost37Script: - jumptext UnknownText_0x72521 +CeladonGameCornerPoster2Script: + jumptext CeladonGameCornerPoster2Text -MapCeladonGameCornerSignpost35Script: +CeladonGameCornerLuckySlotMachineScript: random $6 - if_equal $0, MapCeladonGameCornerSignpost16Script + if_equal $0, CeladonGameCornerSlotMachineScript refreshscreen $0 writebyte $0 special Special_SlotMachine closetext end -MapCeladonGameCornerSignpost16Script: +CeladonGameCornerSlotMachineScript: refreshscreen $0 writebyte $1 special Special_SlotMachine closetext end -MapCeladonGameCornerSignpost11Script: +CeladonGameCornerCardFlipScript: refreshscreen $0 special Special_CardFlip closetext end -MapCeladonGameCornerSignpost32Script: - jumptext UnknownText_0x7254f +CeladonGameCornerLighterScript: + jumptext CeladonGameCornerLighterText MapCeladonGameCornerSignpost9Script: opentext @@ -149,7 +149,7 @@ MovementData_0x721cd: turn_head LEFT step_end -UnknownText_0x721d0: +CeladonGameCornerReceptionistText: text "Welcome!" para "You may exchange" @@ -159,13 +159,13 @@ UnknownText_0x721d0: line "next door." done -UnknownText_0x72215: +CeladonGameCornerPokefanMText: text "The slot machines" line "are all state of" cont "the art." done -UnknownText_0x72242: +CeladonGameCornerTeacherText: text "It's this machine" line "I want." @@ -176,7 +176,7 @@ UnknownText_0x72242: line "today." done -UnknownText_0x72295: +CeladonGameCornerFishingGuruText: text "I think this slot" line "machine will pay" cont "out…" @@ -185,7 +185,7 @@ UnknownText_0x72295: line "among machines." done -UnknownText_0x722dc: +CeladonGameCornerFisherText1: text "Gahahaha!" para "The coins just" @@ -198,7 +198,7 @@ UnknownText_0x722dc: line "with you!" done -UnknownText_0x72345: +CeladonGameCornerFisherText2: text "Gahahaha!" para "It makes me feel" @@ -208,7 +208,7 @@ UnknownText_0x72345: line "people!" done -UnknownText_0x7238a: +CeladonGameCornerFisherNoCoinCaseText: text "Hey, you don't" line "have a COIN CASE." @@ -217,7 +217,7 @@ UnknownText_0x7238a: cont "coins, kid?" done -UnknownText_0x723d9: +CeladonGameCornerFisherFullCoinCaseText: text "Hey, your COIN" line "CASE is full, kid." @@ -241,7 +241,7 @@ CeladonGymGuyText: line "enough coins yet…" done -UnknownText_0x724ad: +CeladonGameCornerGrampsText: text "Hmmm… The odds are" line "surely better for" @@ -249,7 +249,7 @@ UnknownText_0x724ad: line "but… What to do?" done -UnknownText_0x724f3: +CeladonGameCornerPoster1Text: text "Hey!" para "Underneath this" @@ -258,7 +258,7 @@ UnknownText_0x724f3: para "There's nothing!" done -UnknownText_0x72521: +CeladonGameCornerPoster2Text: text "Hey!" para "Underneath this" @@ -267,7 +267,7 @@ UnknownText_0x72521: para "There's nothing!" done -UnknownText_0x7254f: +CeladonGameCornerLighterText: text "There's a lighter" line "here." done @@ -295,53 +295,53 @@ CeladonGameCorner_MapEventHeader: .Signposts: db 38 - signpost 6, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 7, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 8, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 9, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 10, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 11, 1, SIGNPOST_LEFT, MapCeladonGameCornerSignpost11Script - signpost 6, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 7, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 8, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 6, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 7, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 8, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 9, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 10, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 11, 1, SIGNPOST_LEFT, CeladonGameCornerCardFlipScript + signpost 6, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 7, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 8, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script - signpost 10, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script - signpost 11, 6, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost11Script - signpost 6, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost16Script - signpost 11, 7, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script - signpost 6, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 12, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script - signpost 6, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 9, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 13, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script - signpost 6, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 7, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 8, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost32Script - signpost 9, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 10, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script - signpost 11, 18, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script - signpost 0, 15, SIGNPOST_READ, MapCeladonGameCornerSignpost36Script - signpost 0, 9, SIGNPOST_READ, MapCeladonGameCornerSignpost37Script + signpost 10, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript + signpost 11, 6, SIGNPOST_RIGHT, CeladonGameCornerCardFlipScript + signpost 6, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 7, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 8, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 9, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 10, 7, SIGNPOST_READ, CeladonGameCornerSlotMachineScript + signpost 11, 7, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript + signpost 6, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 7, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 8, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 9, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 10, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 11, 12, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript + signpost 6, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 7, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 8, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 9, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 10, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 11, 13, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript + signpost 6, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 7, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 8, 18, SIGNPOST_READ, CeladonGameCornerLighterScript + signpost 9, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 10, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript + signpost 11, 18, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript + signpost 0, 15, SIGNPOST_READ, CeladonGameCornerPoster1Script + signpost 0, 9, SIGNPOST_READ, CeladonGameCornerPoster2Script .PersonEvents: db 9 - person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7211d, -1 - person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x72120, -1 - person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1 - person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1 - person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 + person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 + person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 + person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 + person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 + person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 - person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1 + person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 67b8a86fc..88fe6d8e0 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -50,9 +50,9 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript + trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script -LassMichelleScript: +.Script: end_if_just_battled opentext writetext LassMichelleAfterBattleText @@ -61,9 +61,9 @@ LassMichelleScript: end TrainerPicnickerTanya: - trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript + trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script -PicnickerTanyaScript: +.Script: end_if_just_battled opentext writetext PicnickerTanyaAfterBattleText @@ -72,9 +72,9 @@ PicnickerTanyaScript: end TrainerBeautyJulia: - trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript + trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script -BeautyJuliaScript: +.Script: end_if_just_battled opentext writetext BeautyJuliaAfterBattleText @@ -83,9 +83,9 @@ BeautyJuliaScript: end TrainerTwinsJoandzoe1: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script -TwinsJoandzoe1Script: +.Script: end_if_just_battled opentext writetext TwinsJoandzoe1AfterBattleText @@ -94,9 +94,9 @@ TwinsJoandzoe1Script: end TrainerTwinsJoandzoe2: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script -TwinsJoandzoe2Script: +.Script: end_if_just_battled opentext writetext TwinsJoandzoe2AfterBattleText diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 95ede4ab7..60e636cae 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -65,11 +65,11 @@ UnknownScript_0x716b6: closetext end -SuperNerdScript_0x716bc: - jumptextfaceplayer UnknownText_0x71895 +CeladonMansion3FSuperNerdScript: + jumptextfaceplayer CeladonMansion3FSuperNerdText -FisherScript_0x716bf: - jumptextfaceplayer UnknownText_0x718ca +CeladonMansion3FFisherScript: + jumptextfaceplayer CeladonMansion3FFisherText MapCeladonMansion3FSignpost0Script: jumptext UnknownText_0x7190b @@ -145,7 +145,7 @@ UnknownText_0x71863: cont "cel printing." done -UnknownText_0x71895: +CeladonMansion3FSuperNerdText: text "Who, me? I'm the" line "PROGRAMMER." @@ -153,7 +153,7 @@ UnknownText_0x71895: line "machines!" done -UnknownText_0x718ca: +CeladonMansion3FFisherText: text "Aren't the TWINS" line "adorable?" @@ -214,5 +214,5 @@ CeladonMansion3F_MapEventHeader: db 4 person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 - person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x716bc, -1 - person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x716bf, -1 + person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 + person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 07ac72267..8857e93c9 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -8,13 +8,13 @@ CeladonMansionRoof_MapScriptHeader: .MapCallbacks: db 0 -FisherScript_0x71a39: - jumptextfaceplayer UnknownText_0x71a3f +CeladonMansionRoofFisherScript: + jumptextfaceplayer CeladonMansionRoofFisherText MapCeladonMansionRoofSignpost0Script: jumptext UnknownText_0x71aa1 -UnknownText_0x71a3f: +CeladonMansionRoofFisherText: text "High places--I do" line "love them so!" @@ -52,4 +52,4 @@ CeladonMansionRoof_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x71a39, -1 + person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 03912f623..086de9a86 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -18,11 +18,11 @@ NurseScript_0x71e22: GentlemanScript_0x71e25: jumpstd happinesschecknpc -CooltrainerFScript_0x71e28: - jumptextfaceplayer UnknownText_0x71e70 +CeladonPokecenter1FCooltrainerFScript: + jumptextfaceplayer CeladonPokecenter1FCooltrainerFText -PharmacistScript_0x71e2b: - jumptextfaceplayer UnknownText_0x71ec1 +CeladonPokecenter1FPharmacistScript: + jumptextfaceplayer CeladonPokecenter1FPharmacistText CeladonEusine: faceplayer @@ -72,7 +72,7 @@ CeladonEusine: step DOWN step_end -UnknownText_0x71e70: +CeladonPokecenter1FCooltrainerFText: text "ERIKA is a master" line "of grass #MON." @@ -81,7 +81,7 @@ UnknownText_0x71e70: cont "watch yourself." done -UnknownText_0x71ec1: +CeladonPokecenter1FPharmacistText: text "TEAM ROCKET's" line "hideout is in the" @@ -165,6 +165,6 @@ CeladonPokecenter1F_MapEventHeader: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 - person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71e2b, -1 - person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x71e28, -1 + person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 + person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 9c781cb43..55b3ff6d7 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -18,24 +18,24 @@ CeruleanCity_MapScriptHeader: setflag ENGINE_FLYPOINT_CERULEAN return -CooltrainerMScript_0x184009: +CeruleanCityCooltrainerMScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x184017 - writetext UnknownText_0x1840bc + iftrue .ReturnedMachinePart + writetext CeruleanCityCooltrainerMText1 waitbutton closetext end -UnknownScript_0x184017: - writetext UnknownText_0x184144 +.ReturnedMachinePart: + writetext CeruleanCityCooltrainerMText2 waitbutton closetext end -SuperNerdScript_0x18401d: - jumptextfaceplayer UnknownText_0x1841a8 +CeruleanCitySuperNerdScript: + jumptextfaceplayer CeruleanCitySuperNerdText CeruleanCitySlowbro: opentext @@ -45,15 +45,15 @@ CeruleanCitySlowbro: closetext end -CooltrainerFScript_0x18402a: +CeruleanCityCooltrainerFScript: faceplayer opentext - writetext UnknownText_0x1841fa + writetext CeruleanCityCooltrainerFText1 waitbutton closetext spriteface CERULEANCITY_COOLTRAINER_F, LEFT opentext - writetext UnknownText_0x184229 + writetext CeruleanCityCooltrainerFText2 waitbutton closetext opentext @@ -62,41 +62,41 @@ CooltrainerFScript_0x18402a: waitbutton closetext opentext - writetext UnknownText_0x18424b + writetext CeruleanCityCooltrainerFText3 waitbutton closetext end -FisherScript_0x18404a: +CeruleanCityFisherScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x184058 + iftrue .ReturnedMachinePart checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM - iftrue UnknownScript_0x18405e -UnknownScript_0x184058: - writetext UnknownText_0x18424e + iftrue .MetCeruleanRocket +.ReturnedMachinePart: + writetext CeruleanCityFisherText waitbutton closetext end -UnknownScript_0x18405e: - writetext UnknownText_0x184275 +.MetCeruleanRocket: + writetext CeruleanCityFisherRocketTipText waitbutton closetext end -YoungsterScript_0x184064: +CeruleanCityYoungsterScript: faceplayer opentext - writetext UnknownText_0x1842a9 + writetext CeruleanCityYoungsterText1 waitbutton closetext checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY - iffalse UnknownScript_0x184072 + iffalse .BerserkGenePingsItemfinder end -UnknownScript_0x184072: +.BerserkGenePingsItemfinder: waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER waitsfx @@ -117,7 +117,7 @@ UnknownScript_0x184072: showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15 spriteface CERULEANCITY_YOUNGSTER, LEFT opentext - writetext UnknownText_0x1842ee + writetext CeruleanCityYoungsterText2 waitbutton closetext end @@ -149,7 +149,7 @@ CeruleanCityMartSign: CeruleanCityHiddenBerserkGene: dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE -UnknownText_0x1840bc: +CeruleanCityCooltrainerMText1: text "KANTO's POWER" line "PLANT?" @@ -164,7 +164,7 @@ UnknownText_0x1840bc: cont "some sort there." done -UnknownText_0x184144: +CeruleanCityCooltrainerMText2: text "You're collecting" line "every single kind" cont "of #MON?" @@ -174,7 +174,7 @@ UnknownText_0x184144: cont "it sounds fun too." done -UnknownText_0x1841a8: +CeruleanCitySuperNerdText: text "The CAPE in the" line "north is a good" @@ -186,34 +186,34 @@ CeruleanCitySlowbroText: text "SLOWBRO: Yarah?" done -UnknownText_0x1841fa: +CeruleanCityCooltrainerFText1: text "My SLOWBRO and I" line "make an awesome" cont "combination!" done -UnknownText_0x184229: +CeruleanCityCooltrainerFText2: text "SLOWBRO, show me" line "your CONFUSION!" done -UnknownText_0x18424b: +CeruleanCityCooltrainerFText3: text "…" done -UnknownText_0x18424e: +CeruleanCityFisherText: text "I'm a huge fan of" line "CERULEAN GYM's" cont "MISTY." done -UnknownText_0x184275: +CeruleanCityFisherRocketTipText: text "I saw this shady" line "guy go off toward" cont "CERULEAN's CAPE." done -UnknownText_0x1842a9: +CeruleanCityYoungsterText1: text "There used to be a" line "cave here that had" @@ -221,7 +221,7 @@ UnknownText_0x1842a9: line "#MON in it." done -UnknownText_0x1842ee: +CeruleanCityYoungsterText2: text "Ayuh?" para "My ITEMFINDER is" @@ -305,9 +305,9 @@ CeruleanCity_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x184009, -1 - person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x18401d, -1 + person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 + person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1 person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 - person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18402a, -1 - person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18404a, -1 - person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x184064, -1 + person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1 + person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1 + person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 4ae52bfa6..e7f9e9a1f 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -86,9 +86,9 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript + trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script -SwimmerfDianaScript: +.Script: end_if_just_battled opentext writetext SwimmerfDianaAfterBattleText @@ -97,9 +97,9 @@ SwimmerfDianaScript: end TrainerSwimmerfBriana: - trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript + trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script -SwimmerfBrianaScript: +.Script: end_if_just_battled opentext writetext SwimmerfBrianaAfterBattleText @@ -108,9 +108,9 @@ SwimmerfBrianaScript: end TrainerSwimmermParker: - trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript + trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script -SwimmermParkerScript: +.Script: end_if_just_battled opentext writetext SwimmermParkerAfterBattleText diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index c6cdd60ac..2eae4d404 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -8,10 +8,10 @@ CeruleanGymBadgeSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x188002: - jumptextfaceplayer UnknownText_0x188005 +CeruleanGymBadgeSpeechHousePokefanMScript: + jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText -UnknownText_0x188005: +CeruleanGymBadgeSpeechHousePokefanMText: text "Are you collecting" line "KANTO GYM BADGES?" done @@ -33,4 +33,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x188002, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 7933c6386..75990c9c8 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -21,8 +21,8 @@ SuperNerdScript_0x188212: .mobile jumptextfaceplayer UnknownText_0x18828c -GymGuyScript_0x18821e: - jumptextfaceplayer UnknownText_0x1882ff +CeruleanPokecenter1FGymGuyScript: + jumptextfaceplayer CeruleanPokecenter1FGymGuyText UnknownText_0x188221: text "For battles, I'd" @@ -48,7 +48,7 @@ UnknownText_0x18828c: cont "nerve wracking." done -UnknownText_0x1882ff: +CeruleanPokecenter1FGymGuyText: text "The MAGNET TRAIN" line "travels at over" @@ -82,4 +82,4 @@ CeruleanPokecenter1F_MapEventHeader: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 - person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18821e, -1 + person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 452f35444..219efdca5 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -10,11 +10,11 @@ CeruleanPoliceStation_MapScriptHeader: .MapCallbacks: db 0 -FishingGuruScript_0x18804a: - jumptextfaceplayer UnknownText_0x18805a +CeruleanPoliceStationFishingGuruScript: + jumptextfaceplayer CeruleanPoliceStationFishingGuruText -PokefanFScript_0x18804d: - jumptextfaceplayer UnknownText_0x1880c3 +CeruleanPoliceStationPokefanFScript: + jumptextfaceplayer CeruleanPoliceStationPokefanFText CeruleanDiglett: opentext @@ -24,7 +24,7 @@ CeruleanDiglett: closetext end -UnknownText_0x18805a: +CeruleanPoliceStationFishingGuruText: text "I heard that some" line "shady character is" cont "skulking about." @@ -34,7 +34,7 @@ UnknownText_0x18805a: cont "to be a thief." done -UnknownText_0x1880c3: +CeruleanPoliceStationPokefanFText: text "We were held up by" line "robbers before." done @@ -60,6 +60,6 @@ CeruleanPoliceStation_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18804a, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18804d, -1 + person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 + person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 13c4b86ca..617f443e5 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -11,11 +11,11 @@ CeruleanTradeSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrannyScript_0x188133: - jumptextfaceplayer UnknownText_0x18814d +CeruleanTradeSpeechHouseGrannyScript: + jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText -GrampsScript_0x188136: - jumptextfaceplayer UnknownText_0x18818a +CeruleanTradeSpeechHouseGrampsScript: + jumptextfaceplayer CeruleanTradeSpeechHouseGrampsText RhydonScript_0x188139: opentext @@ -33,14 +33,14 @@ ZubatScript_0x188143: closetext end -UnknownText_0x18814d: +CeruleanTradeSpeechHouseGrannyText: text "My husband lives" line "happily with #-" cont "MON he got through" cont "trades." done -UnknownText_0x18818a: +CeruleanTradeSpeechHouseGrampsText: text "Ah… I'm so happy…" done @@ -70,7 +70,7 @@ CeruleanTradeSpeechHouse_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x188133, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x188136, -1 + person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 + person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index fdc765707..9b918fc92 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -9,16 +9,16 @@ CherrygroveGymSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x196ae1: - jumptextfaceplayer UnknownText_0x196aea +CherrygroveGymSpeechHousePokefanMScript: + jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText -BugCatcherScript_0x196ae4: - jumptextfaceplayer UnknownText_0x196b65 +CherrygroveGymSpeechHouseBugCatcherScript: + jumptextfaceplayer CherrygroveGymSpeechHouseBugCatcherText CherrygroveGymSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x196aea: +CherrygroveGymSpeechHousePokefanMText: text "You're trying to" line "see how good you" @@ -32,7 +32,7 @@ UnknownText_0x196aea: line "collect BADGES." done -UnknownText_0x196b65: +CherrygroveGymSpeechHouseBugCatcherText: text "When I get older," line "I'm going to be a" cont "GYM LEADER!" @@ -63,5 +63,5 @@ CherrygroveGymSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x196ae1, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x196ae4, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 + person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 99e15d905..34e5da5f1 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -39,8 +39,8 @@ UnknownScript_0x19682b: closetext end -YoungsterScript_0x196831: - jumptextfaceplayer UnknownText_0x1968a0 +CherrygroveMartYoungsterScript: + jumptextfaceplayer CherrygroveMartYoungsterText UnknownText_0x196834: text "They're fresh out" @@ -56,7 +56,7 @@ UnknownText_0x196873: cont "catch #MON!" done -UnknownText_0x1968a0: +CherrygroveMartYoungsterText: text "When I was walking" line "in the grass, a" @@ -90,4 +90,4 @@ CherrygroveMart_MapEventHeader: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196831, -1 + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index e3c9893fa..0a03ba707 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -14,11 +14,11 @@ CherrygrovePokecenter1F_MapScriptHeader: NurseScript_0x19696d: jumpstd pokecenternurse -FisherScript_0x196970: - jumptextfaceplayer UnknownText_0x19698a +CherrygrovePokecenter1FFisherScript: + jumptextfaceplayer CherrygrovePokecenter1FFisherText -GentlemanScript_0x196973: - jumptextfaceplayer UnknownText_0x1969c8 +CherrygrovePokecenter1FGentlemanScript: + jumptextfaceplayer CherrygrovePokecenter1FGentlemanText TeacherScript_0x196976: faceplayer @@ -36,7 +36,7 @@ UnknownScript_0x196984: closetext end -UnknownText_0x19698a: +CherrygrovePokecenter1FFisherText: text "It's great. I can" line "store any number" @@ -44,7 +44,7 @@ UnknownText_0x19698a: line "it's all free." done -UnknownText_0x1969c8: +CherrygrovePokecenter1FGentlemanText: text "That PC is free" line "for any trainer" cont "to use." @@ -87,6 +87,6 @@ CherrygrovePokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x196970, -1 - person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x196973, -1 + person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 + person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index eb2036ece..80aac3499 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -120,8 +120,8 @@ CianwoodCityPokefanM: CianwoodCityLass: jumptextfaceplayer CianwoodCityLassText -UnknownScript_0x1a00bc: - jumptextfaceplayer UnknownText_0x1a03cc +CianwoodCityUnknownScript: + jumptextfaceplayer CianwoodCityUnknownText CianwoodCitySign: jumptext CianwoodCitySignText @@ -267,7 +267,7 @@ CianwoodCityLassText: done ; possibly unused -UnknownText_0x1a03cc: +CianwoodCityUnknownText: text "There are several" line "islands between" cont "here and OLIVINE." diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 9faa5e897..5e136bf71 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -10,19 +10,19 @@ CianwoodLugiaSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x9e1b0: - jumptextfaceplayer UnknownText_0x9e1bc +CianwoodLugiaSpeechHouseTeacherScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText -LassScript_0x9e1b3: - jumptextfaceplayer UnknownText_0x9e23f +CianwoodLugiaSpeechHouseLassScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseLassText -TwinScript_0x9e1b6: - jumptextfaceplayer UnknownText_0x9e2a9 +CianwoodLugiaSpeechHouseTwinScript: + jumptextfaceplayer CianwoodLugiaSpeechHouseTwinText CianwoodLugiaSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x9e1bc: +CianwoodLugiaSpeechHouseTeacherText: text "You came from" line "OLIVINE?" @@ -36,7 +36,7 @@ UnknownText_0x9e1bc: cont "them." done -UnknownText_0x9e23f: +CianwoodLugiaSpeechHouseLassText: text "I heard that you" line "can only see it if" @@ -48,7 +48,7 @@ UnknownText_0x9e23f: cont "creature." done -UnknownText_0x9e2a9: +CianwoodLugiaSpeechHouseTwinText: text "I've heard that" line "the whirlpools" @@ -80,6 +80,6 @@ CianwoodLugiaSpeechHouse_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9e1b0, -1 - person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9e1b3, -1 - person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TwinScript_0x9e1b6, -1 + person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 + person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 + person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 4671836b7..bcc8e1256 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -14,8 +14,8 @@ CianwoodPokecenter1F_MapScriptHeader: NurseScript_0x9dbcf: jumpstd pokecenternurse -LassScript_0x9dbd2: - jumptextfaceplayer UnknownText_0x9dbed +CianwoodPokecenter1FLassScript: + jumptextfaceplayer CianwoodPokecenter1FLassText CianwoodGymGuyScript: faceplayer @@ -34,10 +34,10 @@ CianwoodGymGuyScript: closetext end -SuperNerdScript_0x9dbea: - jumptextfaceplayer UnknownText_0x9ded7 +CianwoodPokecenter1FSuperNerdScript: + jumptextfaceplayer CianwoodPokecenter1FSuperNerdText -UnknownText_0x9dbed: +CianwoodPokecenter1FLassText: text "Did you meet the" line "#MANIAC?" @@ -117,7 +117,7 @@ UnknownText_0x9de66: cont "gotta crank it up!" done -UnknownText_0x9ded7: +CianwoodPokecenter1FSuperNerdText: text "I love showing off" line "the #MON that" @@ -150,6 +150,6 @@ CianwoodPokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 - person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9dbd2, -1 + person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 - person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x9dbea, -1 + person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 97f240011..151b76b3e 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -13,13 +13,13 @@ CinnabarPokecenter1F_MapScriptHeader: NurseScript_0x1ab32c: jumpstd pokecenternurse -CooltrainerFScript_0x1ab32f: - jumptextfaceplayer UnknownText_0x1ab335 +CinnabarPokecenter1FCooltrainerFScript: + jumptextfaceplayer CinnabarPokecenter1FCooltrainerFText -FisherScript_0x1ab332: - jumptextfaceplayer UnknownText_0x1ab37f +CinnabarPokecenter1FFisherScript: + jumptextfaceplayer CinnabarPokecenter1FFisherText -UnknownText_0x1ab335: +CinnabarPokecenter1FCooltrainerFText: text "CINNABAR GYM's" line "BLAINE apparently" @@ -28,7 +28,7 @@ UnknownText_0x1ab335: cont "cave…" done -UnknownText_0x1ab37f: +CinnabarPokecenter1FFisherText: text "It's been a year" line "since the volcano" cont "erupted." @@ -53,5 +53,5 @@ CinnabarPokecenter1F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1ab32f, -1 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ab332, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 + person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index af89fb903..8449b41bb 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -10,8 +10,8 @@ CopycatsHouse1F_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x18ad13: - jumptextfaceplayer UnknownText_0x18ad34 +CopycatsHouse1FPokefanMScript: + jumptextfaceplayer CopycatsHouse1FPokefanMText PokefanFScript_0x18ad16: faceplayer @@ -37,7 +37,7 @@ ClefairyScript_0x18ad2a: closetext end -UnknownText_0x18ad34: +CopycatsHouse1FPokefanMText: text "My daughter likes" line "to mimic people." @@ -90,6 +90,6 @@ CopycatsHouse1F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x18ad13, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index f2e5aea81..96324b446 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -17,9 +17,9 @@ DanceTheatre_MapScriptHeader: db 0 TrainerKimono_girlNaoko2: - trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, Kimono_girlNaoko2Script + trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, .Script -Kimono_girlNaoko2Script: +.Script: end_if_just_battled opentext writetext Kimono_girlNaoko2AfterBattleText @@ -28,9 +28,9 @@ Kimono_girlNaoko2Script: end TrainerKimono_girlSayo: - trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, Kimono_girlSayoScript + trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, .Script -Kimono_girlSayoScript: +.Script: end_if_just_battled opentext writetext Kimono_girlSayoAfterBattleText @@ -39,9 +39,9 @@ Kimono_girlSayoScript: end TrainerKimono_girlZuki: - trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, Kimono_girlZukiScript + trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, .Script -Kimono_girlZukiScript: +.Script: end_if_just_battled opentext writetext Kimono_girlZukiAfterBattleText @@ -50,9 +50,9 @@ Kimono_girlZukiScript: end TrainerKimono_girlKuni: - trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, Kimono_girlKuniScript + trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, .Script -Kimono_girlKuniScript: +.Script: end_if_just_battled opentext writetext Kimono_girlKuniAfterBattleText @@ -61,9 +61,9 @@ Kimono_girlKuniScript: end TrainerKimono_girlMiki: - trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, Kimono_girlMikiScript + trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, .Script -Kimono_girlMikiScript: +.Script: end_if_just_battled opentext writetext Kimono_girlMikiAfterBattleText @@ -128,11 +128,11 @@ RhydonScript_0x9951b: closetext end -CooltrainerMScript_0x99525: - jumptextfaceplayer UnknownText_0x99a24 +DanceTheatreCooltrainerMScript: + jumptextfaceplayer DanceTheatreCooltrainerMText -GrannyScript_0x99528: - jumptextfaceplayer UnknownText_0x99aaa +DanceTheatreGrannyScript: + jumptextfaceplayer DanceTheatreGrannyText MapDanceTheatreSignpost1Script: jumptext UnknownText_0x99b79 @@ -298,7 +298,7 @@ UnknownText_0x99a0a: line "gugogooh!" done -UnknownText_0x99a24: +DanceTheatreCooltrainerMText: text "That man's always" line "with his RHYDON." @@ -312,7 +312,7 @@ UnknownText_0x99a24: cont "#MON?" done -UnknownText_0x99aaa: +DanceTheatreGrannyText: text "The KIMONO GIRLS" line "are so beautiful…" @@ -363,5 +363,5 @@ DanceTheatre_MapEventHeader: person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1 person_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x994c6, -1 person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1 - person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x99525, -1 - person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x99528, -1 + person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1 + person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index ead75b1d8..88b66a289 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -10,20 +10,20 @@ DarkCaveBlackthornEntrance_MapScriptHeader: .MapCallbacks: db 0 -PharmacistScript_0x18c720: +DarkCaveBlackthornEntrancePharmacistScript: faceplayer opentext checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE - iftrue UnknownScript_0x18c735 - writetext UnknownText_0x18c73f + iftrue .GotBlackglasses + writetext DarkCaveBlackthornEntrancePharmacistText1 buttonsound verbosegiveitem BLACKGLASSES - iffalse UnknownScript_0x18c739 + iffalse .PackFull setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE -UnknownScript_0x18c735: - writetext UnknownText_0x18c80c +.GotBlackglasses: + writetext DarkCaveBlackthornEntrancePharmacistText2 waitbutton -UnknownScript_0x18c739: +.PackFull: closetext end @@ -33,7 +33,7 @@ DarkCaveBlackthornEntranceRevive: DarkCaveBlackthornEntranceTMSnore: itemball TM_SNORE -UnknownText_0x18c73f: +DarkCaveBlackthornEntrancePharmacistText1: text "Whoa! You startled" line "me there!" @@ -55,7 +55,7 @@ UnknownText_0x18c73f: cont "you saw me, OK?" done -UnknownText_0x18c80c: +DarkCaveBlackthornEntrancePharmacistText2: text "BLACKGLASSES ups" line "the power of dark-" cont "type moves." @@ -78,6 +78,6 @@ DarkCaveBlackthornEntrance_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x18c720, -1 + person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 88aa1e90b..230610df5 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -8,14 +8,14 @@ DiglettsCave_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x74002: - jumptextfaceplayer UnknownText_0x74008 +DiglettsCavePokefanMScript: + jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE -UnknownText_0x74008: +DiglettsCavePokefanMText: text "A bunch of DIGLETT" line "popped out of the" @@ -45,4 +45,4 @@ DiglettsCave_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x74002, -1 + person_event SPRITE_POKEFAN_M, 31, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index d17c3c4a3..c41fb07ed 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -84,9 +84,9 @@ DragonsDenB1F_ClairTrigger: end TrainerCooltrainermDarin: - trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript + trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script -CooltrainermDarinScript: +.Script: end_if_just_battled opentext writetext CooltrainermDarinAfterBattleText @@ -95,9 +95,9 @@ CooltrainermDarinScript: end TrainerCooltrainerfCara: - trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript + trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script -CooltrainerfCaraScript: +.Script: end_if_just_battled opentext writetext CooltrainerfCaraAfterBattleText @@ -106,9 +106,9 @@ CooltrainerfCaraScript: end TrainerTwinsLeaandpia1: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script -TwinsLeaandpia1Script: +.Script: end_if_just_battled opentext writetext TwinsLeaandpia1AfterBattleText @@ -117,9 +117,9 @@ TwinsLeaandpia1Script: end TrainerTwinsLeaandpia2: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script -TwinsLeaandpia2Script: +.Script: end_if_just_battled opentext writetext TwinsLeaandpia2AfterBattleText diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 91d9689ef..f4df23dc1 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -38,29 +38,29 @@ AcademyEarl: closetext end -YoungsterScript_0x68a83: - jumptextfaceplayer UnknownText_0x68d80 +EarlsPokemonAcademyYoungster1Script: + jumptextfaceplayer EarlsPokemonAcademyYoungster1Text -GameboyKidScript_0x68a86: +EarlsPokemonAcademyGameboyKid1Script: faceplayer opentext - writetext UnknownText_0x68dda + writetext EarlsPokemonAcademyGameboyKid1Text waitbutton closetext spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN end -GameboyKidScript_0x68a91: +EarlsPokemonAcademyGameboyKid2Script: faceplayer opentext - writetext UnknownText_0x68e07 + writetext EarlsPokemonAcademyGameboyKid2Text waitbutton closetext spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN end -YoungsterScript_0x68a9c: - jumptextfaceplayer UnknownText_0x68e39 +EarlsPokemonAcademyYoungster2Script: + jumptextfaceplayer EarlsPokemonAcademyYoungster2Text AcademyBlackboard: opentext @@ -231,7 +231,7 @@ UnknownText_0x68d31: line "you must be!" done -UnknownText_0x68d80: +EarlsPokemonAcademyYoungster1Text: text "I'm taking notes" line "of the teacher's" cont "lecture." @@ -241,19 +241,19 @@ UnknownText_0x68d80: cont "blackboard too." done -UnknownText_0x68dda: +EarlsPokemonAcademyGameboyKid1Text: text "I traded my best" line "#MON to the" cont "guy beside me." done -UnknownText_0x68e07: +EarlsPokemonAcademyGameboyKid2Text: text "Huh? The #MON I" line "just got is hold-" cont "ing something!" done -UnknownText_0x68e39: +EarlsPokemonAcademyYoungster2Text: text "A #MON holding" line "a BERRY will heal" cont "itself in battle." @@ -434,8 +434,8 @@ EarlsPokemonAcademy_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a83, -1 - person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a86, -1 - person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a91, -1 - person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a9c, -1 + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 + person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 + person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 + person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 9e2c8fa08..8d742d07a 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -19,17 +19,17 @@ EcruteakCity_MapScriptHeader: setflag ENGINE_FLYPOINT_ECRUTEAK return -GrampsScript_0x1a4009: - jumptextfaceplayer UnknownText_0x1a4105 +EcruteakCityGramps1Script: + jumptextfaceplayer EcruteakCityGramps1Text -GrampsScript_0x1a400c: - jumptextfaceplayer UnknownText_0x1a4147 +EcruteakCityGramps2Script: + jumptextfaceplayer EcruteakCityGramps2Text -GrampsScript_0x1a400f: - jumptextfaceplayer UnknownText_0x1a43cb +EcruteakCityGramps3Script: + jumptextfaceplayer EcruteakCityGramps3Text -LassScript_0x1a4012: - jumptextfaceplayer UnknownText_0x1a41db +EcruteakCityLassScript: + jumptextfaceplayer EcruteakCityLassText LassScript_0x1a4015: faceplayer @@ -63,8 +63,8 @@ UnknownScript_0x1a4037: closetext end -YoungsterScript_0x1a403d: - jumptextfaceplayer UnknownText_0x1a4386 +EcruteakCityYoungsterScript: + jumptextfaceplayer EcruteakCityYoungsterText EcruteakCitySign: jumptext EcruteakCitySignText @@ -111,7 +111,7 @@ UnusedMissingDaughterText: line "do…?" done -UnknownText_0x1a4105: +EcruteakCityGramps1Text: text "ECRUTEAK used to" line "have two towers:" @@ -119,7 +119,7 @@ UnknownText_0x1a4105: line "east and west." done -UnknownText_0x1a4147: +EcruteakCityGramps2Text: text "Ah, child." line "Have you learned" @@ -134,7 +134,7 @@ UnknownText_0x1a4147: cont "nice, I hear." done -UnknownText_0x1a41db: +EcruteakCityLassText: text "I'm going to prac-" line "tice at the DANCE" @@ -181,7 +181,7 @@ UnknownText_0x1a4325: cont "night again." done -UnknownText_0x1a4386: +EcruteakCityYoungsterText: text "I hear #MON are" line "rampaging at the" @@ -189,7 +189,7 @@ UnknownText_0x1a4386: line "like to see that." done -UnknownText_0x1a43cb: +EcruteakCityGramps3Text: text "In the distant" line "past…" @@ -297,10 +297,10 @@ EcruteakCity_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a4009, -1 - person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400c, -1 - person_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4012, -1 + person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 + person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 + person_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 person_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 person_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 - person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a403d, -1 - person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS + person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 + person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index d2bdc64eb..1b61ecfb2 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -98,9 +98,9 @@ EcruteakGymClosed: end TrainerSageJeffrey: - trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, SageJeffreyScript + trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script -SageJeffreyScript: +.Script: end_if_just_battled opentext writetext SageJeffreyAfterBattleText @@ -109,9 +109,9 @@ SageJeffreyScript: end TrainerSagePing: - trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, SagePingScript + trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, .Script -SagePingScript: +.Script: end_if_just_battled opentext writetext SagePingAfterBattleText @@ -120,9 +120,9 @@ SagePingScript: end TrainerMediumMartha: - trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, MediumMarthaScript + trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script -MediumMarthaScript: +.Script: end_if_just_battled opentext writetext MediumMarthaAfterBattleText @@ -131,9 +131,9 @@ MediumMarthaScript: end TrainerMediumGrace: - trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, MediumGraceScript + trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script -MediumGraceScript: +.Script: end_if_just_battled opentext writetext MediumGraceAfterBattleText diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 4cfc70927..2959ad3cc 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -134,8 +134,8 @@ SageScript_0x980b0: closetext end -GrampsScript_0x980c4: - jumptextfaceplayer UnknownText_0x984ab +EcruteakHouseGrampsScript: + jumptextfaceplayer EcruteakHouseGrampsText MovementData_0x980c7: fix_facing @@ -266,7 +266,7 @@ UnknownText_0x9846f: line "to the top!" done -UnknownText_0x984ab: +EcruteakHouseGrampsText: text "Two towers…" line "Two #MON…" @@ -302,4 +302,4 @@ EcruteakHouse_MapEventHeader: person_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 person_event SPRITE_SAGE, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 person_event SPRITE_SAGE, 9, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - person_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + person_event SPRITE_GRAMPS, 11, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 4307a19c9..6ec0173ee 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -9,16 +9,16 @@ EcruteakLugiaSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrampsScript_0x99334: - jumptextfaceplayer UnknownText_0x9933d +EcruteakLugiaSpeechHouseGrampsScript: + jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText -YoungsterScript_0x99337: - jumptextfaceplayer UnknownText_0x993ec +EcruteakLugiaSpeechHouseYoungsterScript: + jumptextfaceplayer EcruteakLugiaSpeechHouseYoungsterText LugiaSpeechHouseRadio: jumpstd radio2 -UnknownText_0x9933d: +EcruteakLugiaSpeechHouseGrampsText: text "This happened when" line "I was young." @@ -36,7 +36,7 @@ UnknownText_0x9933d: line "and a dragon." done -UnknownText_0x993ec: +EcruteakLugiaSpeechHouseYoungsterText: text "Is there really a" line "#MON that big?" @@ -62,5 +62,5 @@ EcruteakLugiaSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x99334, -1 - person_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x99337, -1 + person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 + person_event SPRITE_YOUNGSTER, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index deb35aeef..1747c1d57 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x99c3b: closetext end -SuperNerdScript_0x99c42: - jumptextfaceplayer UnknownText_0x99c48 +EcruteakMartSuperNerdScript: + jumptextfaceplayer EcruteakMartSuperNerdText -GrannyScript_0x99c45: - jumptextfaceplayer UnknownText_0x99cd5 +EcruteakMartGrannyScript: + jumptextfaceplayer EcruteakMartGrannyText -UnknownText_0x99c48: +EcruteakMartSuperNerdText: text "My EEVEE evolved" line "into an ESPEON." @@ -37,7 +37,7 @@ UnknownText_0x99c48: line "same way…" done -UnknownText_0x99cd5: +EcruteakMartGrannyText: text "If you use REVIVE," line "a #MON that's" @@ -63,5 +63,5 @@ EcruteakMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x99c42, -1 - person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x99c45, -1 + person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 + person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 284fa374d..e54a9e3cd 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -116,8 +116,8 @@ SailorScript_0x751d0: closetext end -SailorScript_0x751e4: - jumptextfaceplayer UnknownText_0x753c0 +FastShip1FSailorScript: + jumptextfaceplayer FastShip1FSailorText WorriedGrandpaTriggerRight: moveperson FASTSHIP1F_GENTLEMAN, $14, $6 @@ -250,7 +250,7 @@ UnknownText_0x7534f: cont "you're sleeping." done -UnknownText_0x753c0: +FastShip1FSailorText: text "The passengers are" line "all trainers." @@ -316,5 +316,5 @@ FastShip1F_MapEventHeader: db 4 person_event SPRITE_SAILOR, 2, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x75160, -1 person_event SPRITE_SAILOR, 7, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 - person_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x751e4, -1 + person_event SPRITE_SAILOR, 17, 22, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 person_event SPRITE_GENTLEMAN, 6, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 951b1c737..0069b5a86 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -94,9 +94,9 @@ UnknownScript_0x767a0: end TrainerSailorJeff: - trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript + trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script -SailorJeffScript: +.Script: end_if_just_battled opentext writetext SailorJeffAfterBattleText @@ -105,9 +105,9 @@ SailorJeffScript: end TrainerPicnickerDebra: - trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript + trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script -PicnickerDebraScript: +.Script: end_if_just_battled opentext writetext PicnickerDebraAfterBattleText @@ -116,9 +116,9 @@ PicnickerDebraScript: end TrainerJugglerFritz: - trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript + trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script -JugglerFritzScript: +.Script: end_if_just_battled opentext writetext JugglerFritzAfterBattleText @@ -127,9 +127,9 @@ JugglerFritzScript: end TrainerSailorGarrett: - trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript + trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script -SailorGarrettScript: +.Script: end_if_just_battled opentext writetext SailorGarrettAfterBattleText @@ -138,9 +138,9 @@ SailorGarrettScript: end TrainerFisherJonah: - trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript + trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script -FisherJonahScript: +.Script: end_if_just_battled opentext writetext FisherJonahAfterBattleText @@ -149,9 +149,9 @@ FisherJonahScript: end TrainerBlackbeltWai: - trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript + trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script -BlackbeltWaiScript: +.Script: end_if_just_battled opentext writetext BlackbeltWaiAfterBattleText @@ -160,9 +160,9 @@ BlackbeltWaiScript: end TrainerSailorKenneth: - trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript + trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script -SailorKennethScript: +.Script: end_if_just_battled opentext writetext SailorKennethAfterBattleText @@ -171,9 +171,9 @@ SailorKennethScript: end TrainerTeacherShirley: - trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript + trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script -TeacherShirleyScript: +.Script: end_if_just_battled opentext writetext TeacherShirleyAfterBattleText @@ -182,9 +182,9 @@ TeacherShirleyScript: end TrainerSchoolboyNate: - trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript + trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script -SchoolboyNateScript: +.Script: end_if_just_battled opentext writetext SchoolboyNateAfterBattleText @@ -193,9 +193,9 @@ SchoolboyNateScript: end TrainerSchoolboyRicky: - trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript + trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script -SchoolboyRickyScript: +.Script: end_if_just_battled opentext writetext SchoolboyRickyAfterBattleText diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 682fe8596..2f141db45 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -15,9 +15,9 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader: db 0 TrainerCooltrainermSean: - trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, CooltrainermSeanScript + trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script -CooltrainermSeanScript: +.Script: end_if_just_battled opentext writetext CooltrainermSeanAfterBattleText @@ -26,9 +26,9 @@ CooltrainermSeanScript: end TrainerCooltrainerfCarol: - trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, CooltrainerfCarolScript + trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script -CooltrainerfCarolScript: +.Script: end_if_just_battled opentext writetext CooltrainerfCarolAfterBattleText @@ -37,9 +37,9 @@ CooltrainerfCarolScript: end TrainerPokemaniacEthan: - trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, PokemaniacEthanScript + trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script -PokemaniacEthanScript: +.Script: end_if_just_battled opentext writetext PokemaniacEthanAfterBattleText @@ -48,9 +48,9 @@ PokemaniacEthanScript: end TrainerHikerNoland: - trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, HikerNolandScript + trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script -HikerNolandScript: +.Script: end_if_just_battled opentext writetext HikerNolandAfterBattleText @@ -59,9 +59,9 @@ HikerNolandScript: end TrainerGentlemanEdward: - trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, GentlemanEdwardScript + trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script -GentlemanEdwardScript: +.Script: end_if_just_battled opentext writetext GentlemanEdwardAfterBattleText @@ -70,9 +70,9 @@ GentlemanEdwardScript: end TrainerBurglarCorey: - trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, BurglarCoreyScript + trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script -BurglarCoreyScript: +.Script: end_if_just_battled opentext writetext BurglarCoreyAfterBattleText diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index c8fa4300b..8e0575964 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -141,9 +141,9 @@ TwinScript_0x75f6d: end TrainerPokefanmColin: - trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript + trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script -PokefanmColinScript: +.Script: end_if_just_battled opentext writetext PokefanmColinAfterBattleText @@ -152,9 +152,9 @@ PokefanmColinScript: end TrainerTwinsMegandpeg1: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script -TwinsMegandpeg1Script: +.Script: end_if_just_battled opentext writetext TwinsMegandpeg1AfterBattleText @@ -163,9 +163,9 @@ TwinsMegandpeg1Script: end TrainerTwinsMegandpeg2: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script -TwinsMegandpeg2Script: +.Script: end_if_just_battled opentext writetext TwinsMegandpeg2AfterBattleText @@ -174,9 +174,9 @@ TwinsMegandpeg2Script: end TrainerPsychicRodney: - trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript + trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script -PsychicRodneyScript: +.Script: end_if_just_battled opentext writetext PsychicRodneyAfterBattleText @@ -185,9 +185,9 @@ PsychicRodneyScript: end TrainerPokefanmJeremy: - trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript + trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script -PokefanmJeremyScript: +.Script: end_if_just_battled opentext writetext PokefanmJeremyAfterBattleText @@ -196,9 +196,9 @@ PokefanmJeremyScript: end TrainerPokefanfGeorgia: - trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript + trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script -PokefanfGeorgiaScript: +.Script: end_if_just_battled opentext writetext PokefanfGeorgiaAfterBattleText @@ -207,9 +207,9 @@ PokefanfGeorgiaScript: end TrainerSupernerdShawn: - trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript + trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script -SupernerdShawnScript: +.Script: end_if_just_battled opentext writetext SupernerdShawnAfterBattleText diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 0cd7dbe90..b1430f1c4 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -12,9 +12,9 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader: db 0 TrainerFirebreatherLyle: - trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript + trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script -FirebreatherLyleScript: +.Script: end_if_just_battled opentext writetext FirebreatherLyleAfterBattleText @@ -23,9 +23,9 @@ FirebreatherLyleScript: end TrainerBug_catcherKen: - trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript + trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, .Script -Bug_catcherKenScript: +.Script: end_if_just_battled opentext writetext Bug_catcherKenAfterBattleText @@ -34,9 +34,9 @@ Bug_catcherKenScript: end TrainerBeautyCassie: - trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript + trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script -BeautyCassieScript: +.Script: end_if_just_battled opentext writetext BeautyCassieAfterBattleText @@ -45,9 +45,9 @@ BeautyCassieScript: end TrainerGuitaristClyde: - trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript + trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script -GuitaristClydeScript: +.Script: end_if_just_battled special Mobile_DummyReturnFalse iftrue .mobile diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 9d415f2f8..2b420775b 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -9,19 +9,19 @@ FuchsiaBillSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanFScript_0x1963bd: - jumptextfaceplayer UnknownText_0x1963c3 +FuchsiaBillSpeechHousePokefanFScript: + jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText -YoungsterScript_0x1963c0: - jumptextfaceplayer UnknownText_0x1963f9 +FuchsiaBillSpeechHouseYoungsterScript: + jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText -UnknownText_0x1963c3: +FuchsiaBillSpeechHousePokefanFText: text "My grandpa is at " line "my brother BILL's" cont "on CERULEAN CAPE." done -UnknownText_0x1963f9: +FuchsiaBillSpeechHouseYoungsterText: text "I saw these weird," line "slow #MON on" cont "CYCLING ROAD." @@ -44,5 +44,5 @@ FuchsiaBillSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1963bd, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1963c0, -1 + person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 + person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 423dfdc1a..7e123e721 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x195ce8: closetext end -FisherScript_0x195cef: - jumptextfaceplayer UnknownText_0x195cf5 +FuchsiaMartFisherScript: + jumptextfaceplayer FuchsiaMartFisherText -CooltrainerFScript_0x195cf2: - jumptextfaceplayer UnknownText_0x195d36 +FuchsiaMartCooltrainerFScript: + jumptextfaceplayer FuchsiaMartCooltrainerFText -UnknownText_0x195cf5: +FuchsiaMartFisherText: text "I was hoping to" line "buy some SAFARI" @@ -30,7 +30,7 @@ UnknownText_0x195cf5: line "but it's closed…" done -UnknownText_0x195d36: +FuchsiaMartCooltrainerFText: text "The SAFARI ZONE" line "WARDEN's grand-" cont "daughter lives in" @@ -55,5 +55,5 @@ FuchsiaMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x195cef, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x195cf2, -1 + person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 422661e0b..d275eaece 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -18,11 +18,11 @@ FuchsiaPokecenter1F_MapScriptHeader: NurseScript_0x196459: jumpstd pokecenternurse -CooltrainerMScript_0x19645c: - jumptextfaceplayer UnknownText_0x196494 +FuchsiaPokecenter1FCooltrainerMScript: + jumptextfaceplayer FuchsiaPokecenter1FCooltrainerMText -CooltrainerFScript_0x19645f: - jumptextfaceplayer UnknownText_0x1964dc +FuchsiaPokecenter1FCooltrainerFScript: + jumptextfaceplayer FuchsiaPokecenter1FCooltrainerFText JanineImpersonatorScript_0x196462: faceplayer @@ -60,7 +60,7 @@ MovementData_0x196486: turn_head DOWN step_end -UnknownText_0x196494: +FuchsiaPokecenter1FCooltrainerMText: text "Hey! You have a" line "brand new kind of" cont "#DEX." @@ -69,7 +69,7 @@ UnknownText_0x196494: line "that to you?" done -UnknownText_0x1964dc: +FuchsiaPokecenter1FCooltrainerFText: text "I got quite a" line "shock at the GYM." @@ -107,6 +107,6 @@ FuchsiaPokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NurseScript_0x196459, -1 - person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19645c, -1 - person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x19645f, -1 + person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 + person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 48959cac8..74aedf8a7 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -6,13 +6,13 @@ const_value set 2 const GOLDENRODCITY_YOUNGSTER2 const GOLDENRODCITY_LASS const GOLDENRODCITY_GRAMPS + const GOLDENRODCITY_ROCKETSCOUT const GOLDENRODCITY_ROCKET1 const GOLDENRODCITY_ROCKET2 const GOLDENRODCITY_ROCKET3 const GOLDENRODCITY_ROCKET4 const GOLDENRODCITY_ROCKET5 const GOLDENRODCITY_ROCKET6 - const GOLDENRODCITY_ROCKET7 const GOLDENRODCITY_POKEFAN_M2 GoldenrodCity_MapScriptHeader: @@ -160,11 +160,11 @@ MoveTutor: closetext end -PokefanMScript_0x1989e3: - jumptextfaceplayer UnknownText_0x198a69 +GoldenrodCityPokefanMScript: + jumptextfaceplayer GoldenrodCityPokefanMText -YoungsterScript_0x1989e6: - jumptextfaceplayer UnknownText_0x198aa9 +GoldenrodCityYoungster1Script: + jumptextfaceplayer GoldenrodCityYoungster1Text CooltrainerFScript_0x1989e9: faceplayer @@ -198,43 +198,43 @@ CooltrainerFScript_0x1989fd: closetext end -YoungsterScript_0x198a11: - jumptextfaceplayer UnknownText_0x198c36 +GoldenrodCityYoungster2Script: + jumptextfaceplayer GoldenrodCityYoungster2Text -LassScript_0x198a14: - jumptextfaceplayer UnknownText_0x198c83 +GoldenrodCityLassScript: + jumptextfaceplayer GoldenrodCityLassText -GrampsScript_0x198a17: - jumptextfaceplayer UnknownText_0x198ccf +GoldenrodCityGrampsScript: + jumptextfaceplayer GoldenrodCityGrampsText -RocketScript_0x198a1a: +GoldenrodCityRocketScoutScript: opentext - writetext UnknownText_0x198d0d + writetext GoldenrodCityRocketScoutText1 buttonsound faceplayer - writetext UnknownText_0x198d2a + writetext GoldenrodCityRocketScoutText2 waitbutton closetext - spriteface GOLDENRODCITY_ROCKET1, UP + spriteface GOLDENRODCITY_ROCKETSCOUT, UP end -RocketScript_0x198a29: - jumptextfaceplayer UnknownText_0x198d4e +GoldenrodCityRocket1Script: + jumptextfaceplayer GoldenrodCityRocket1Text -RocketScript_0x198a2c: - jumptextfaceplayer UnknownText_0x198d6d +GoldenrodCityRocket2Script: + jumptextfaceplayer GoldenrodCityRocket2Text -RocketScript_0x198a2f: - jumptextfaceplayer UnknownText_0x198daa +GoldenrodCityRocket3Script: + jumptextfaceplayer GoldenrodCityRocket3Text -RocketScript_0x198a32: - jumptextfaceplayer UnknownText_0x198de2 +GoldenrodCityRocket4Script: + jumptextfaceplayer GoldenrodCityRocket4Text -RocketScript_0x198a35: - jumptextfaceplayer UnknownText_0x198e1f +GoldenrodCityRocket5Script: + jumptextfaceplayer GoldenrodCityRocket5Text -RocketScript_0x198a38: - jumptextfaceplayer UnknownText_0x198e4b +GoldenrodCityRocket6Script: + jumptextfaceplayer GoldenrodCityRocket6Text GoldenrodCityStationSign: jumptext GoldenrodCityStationSignText @@ -286,7 +286,7 @@ MovementData_0x198a63: step UP step_end -UnknownText_0x198a69: +GoldenrodCityPokefanMText: text "They built the new" line "RADIO TOWER to" @@ -294,7 +294,7 @@ UnknownText_0x198a69: line "creaky one." done -UnknownText_0x198aa9: +GoldenrodCityYoungster1Text: text "I know there's a" line "new BIKE SHOP, but" @@ -339,7 +339,7 @@ UnknownText_0x198c14: line "works as a radio!" done -UnknownText_0x198c36: +GoldenrodCityYoungster2Text: text "E-he-he-he…" para "I got in trouble" @@ -349,7 +349,7 @@ UnknownText_0x198c36: line "DEPT.STORE." done -UnknownText_0x198c83: +GoldenrodCityLassText: text "The man at that" line "house rates your" cont "#MON names." @@ -358,7 +358,7 @@ UnknownText_0x198c83: line "your #MON." done -UnknownText_0x198ccf: +GoldenrodCityGrampsText: text "Whew! This is one" line "big town. I don't" @@ -366,22 +366,22 @@ UnknownText_0x198ccf: line "thing is." done -UnknownText_0x198d0d: +GoldenrodCityRocketScoutText1: text "So this is the" line "RADIO TOWER…" done -UnknownText_0x198d2a: +GoldenrodCityRocketScoutText2: text "What do you want," line "you pest? Scram!" done -UnknownText_0x198d4e: +GoldenrodCityRocket1Text: text "Stay out of the" line "way! Beat it!" done -UnknownText_0x198d6d: +GoldenrodCityRocket2Text: text "Take over the" line "RADIO TOWER…" @@ -389,7 +389,7 @@ UnknownText_0x198d6d: line "your business!" done -UnknownText_0x198daa: +GoldenrodCityRocket3Text: text "#MON? They're" line "nothing more than" @@ -397,7 +397,7 @@ UnknownText_0x198daa: line "money!" done -UnknownText_0x198de2: +GoldenrodCityRocket4Text: text "Our dream will" line "soon come true…" @@ -405,13 +405,13 @@ UnknownText_0x198de2: line "struggle…" done -UnknownText_0x198e1f: +GoldenrodCityRocket5Text: text "Hey, brat! You" line "don't belong here!" cont "Get lost!" done -UnknownText_0x198e4b: +GoldenrodCityRocket6Text: text "Come taste the" line "true terror of" cont "TEAM ROCKET!" @@ -596,18 +596,18 @@ GoldenrodCity_MapEventHeader: .PersonEvents: db 15 - person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT - person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 51c387d07..7b9671054 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -11,17 +11,17 @@ GoldenrodDeptStore1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x55981: - jumptextfaceplayer UnknownText_0x55993 +GoldenrodDeptStore1FReceptionistScript: + jumptextfaceplayer GoldenrodDeptStore1FReceptionistText -GentlemanScript_0x55984: - jumptextfaceplayer UnknownText_0x559b7 +GoldenrodDeptStore1FGentlemanScript: + jumptextfaceplayer GoldenrodDeptStore1FGentlemanText -PokefanFScript_0x55987: - jumptextfaceplayer UnknownText_0x55a1a +GoldenrodDeptStore1FPokefanFScript: + jumptextfaceplayer GoldenrodDeptStore1FPokefanFText -BugCatcherScript_0x5598a: - jumptextfaceplayer UnknownText_0x55a3a +GoldenrodDeptStore1FBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStore1FBugCatcherText GoldenrodDeptStore1FDirectory: jumptext GoldenrodDeptStore1FDirectoryText @@ -29,12 +29,12 @@ GoldenrodDeptStore1FDirectory: GoldenrodDeptStore1FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55993: +GoldenrodDeptStore1FReceptionistText: text "Welcome to GOLDEN-" line "ROD DEPT.STORE." done -UnknownText_0x559b7: +GoldenrodDeptStore1FGentlemanText: text "The DEPT.STORE" line "has a decent se-" cont "lection." @@ -46,12 +46,12 @@ UnknownText_0x559b7: line "prizes." done -UnknownText_0x55a1a: +GoldenrodDeptStore1FPokefanFText: text "I'm raring to shop" line "again today!" done -UnknownText_0x55a3a: +GoldenrodDeptStore1FBugCatcherText: text "Mom's good at" line "bargain hunting." @@ -99,7 +99,7 @@ GoldenrodDeptStore1F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x55981, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x55987, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x5598a, -1 - person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55984, -1 + person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 + person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 + person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 + person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index b6cda7cb1..41e929bda 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -26,14 +26,14 @@ ClerkScript_0x55b65: closetext end -YoungsterScript_0x55b6d: - jumptextfaceplayer UnknownText_0x55c25 +GoldenrodDeptStore2FYoungsterScript: + jumptextfaceplayer GoldenrodDeptStore2FYoungsterText -CooltrainerFScript_0x55b70: - jumptextfaceplayer UnknownText_0x55c7b +GoldenrodDeptStore2FCooltrainerFScript: + jumptextfaceplayer GoldenrodDeptStore2FCooltrainerFText -GentlemanScript_0x55b73: - jumptextfaceplayer UnknownText_0x55cb7 +GoldenrodDeptStore2FGentlemanScript: + jumptextfaceplayer GoldenrodDeptStore2FGentlemanText GoldenrodDeptStore2FDirectory: jumptext GoldenrodDeptStore2FDirectoryText @@ -62,7 +62,7 @@ UnknownText_0x55bd3: cont "techniques." done -UnknownText_0x55c25: +GoldenrodDeptStore2FYoungsterText: text "#GEAR can store" line "up to ten phone" cont "numbers." @@ -72,7 +72,7 @@ UnknownText_0x55c25: cont "to keep." done -UnknownText_0x55c7b: +GoldenrodDeptStore2FCooltrainerFText: text "I got my ABRA at" line "the GAME CORNER." @@ -80,7 +80,7 @@ UnknownText_0x55c7b: line "partner." done -UnknownText_0x55cb7: +GoldenrodDeptStore2FGentlemanText: text "This DEPT.STORE" line "makes me realize" @@ -122,6 +122,6 @@ GoldenrodDeptStore2F_MapEventHeader: db 5 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 person_event SPRITE_CLERK, 6, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 - person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x55b6d, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x55b70, -1 - person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55b73, -1 + person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 + person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index a9cd1dc15..ec07b0a72 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -17,11 +17,11 @@ ClerkScript_0x55db8: closetext end -SuperNerdScript_0x55dc0: - jumptextfaceplayer UnknownText_0x55dcc +GoldenrodDeptStore3FSuperNerdScript: + jumptextfaceplayer GoldenrodDeptStore3FSuperNerdText -RockerScript_0x55dc3: - jumptextfaceplayer UnknownText_0x55e15 +GoldenrodDeptStore3FRockerScript: + jumptextfaceplayer GoldenrodDeptStore3FRockerText GoldenrodDeptStore3FDirectory: jumptext GoldenrodDeptStore3FDirectoryText @@ -29,7 +29,7 @@ GoldenrodDeptStore3FDirectory: GoldenrodDeptStore3FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55dcc: +GoldenrodDeptStore3FSuperNerdText: text "I, I, I'm really" line "impatient!" @@ -38,7 +38,7 @@ UnknownText_0x55dcc: cont "my #MON." done -UnknownText_0x55e15: +GoldenrodDeptStore3FRockerText: text "Hey! When you bat-" line "tle, do you use X" cont "SPECIAL?" @@ -77,5 +77,5 @@ GoldenrodDeptStore3F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 - person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x55dc0, -1 - person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x55dc3, -1 + person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 + person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 61c5ff120..8e8fc4714 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -18,11 +18,11 @@ ClerkScript_0x55ee9: closetext end -CooltrainerMScript_0x55ef1: - jumptextfaceplayer UnknownText_0x55f08 +GoldenrodDeptStore4FCooltrainerMScript: + jumptextfaceplayer GoldenrodDeptStore4FCooltrainerMText -BugCatcherScript_0x55ef4: - jumptextfaceplayer UnknownText_0x55f52 +GoldenrodDeptStore4FBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStore4FBugCatcherText GameboyKidScript_0x55ef7: faceplayer @@ -39,7 +39,7 @@ GoldenrodDeptStore4FDirectory: GoldenrodDeptStore4FElevatorButton: jumpstd elevatorbutton -UnknownText_0x55f08: +GoldenrodDeptStore4FCooltrainerMText: text "Hey. I love strong" line "#MON." @@ -48,7 +48,7 @@ UnknownText_0x55f08: cont "their ATTACK." done -UnknownText_0x55f52: +GoldenrodDeptStore4FBugCatcherText: text "IRON adds to your" line "#MON's DEFENSE." done @@ -98,6 +98,6 @@ GoldenrodDeptStore4F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 - person_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x55ef1, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x55ef4, -1 + person_event SPRITE_COOLTRAINER_M, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 + person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 person_event SPRITE_GAMEBOY_KID, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 0c33b44a3..e4b99959e 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -120,8 +120,8 @@ Carrie: closetext end -LassScript_0x56130: - jumptextfaceplayer UnknownText_0x562ad +GoldenrodDeptStore5FLassScript: + jumptextfaceplayer GoldenrodDeptStore5FLassText Mike: faceplayer @@ -131,8 +131,8 @@ Mike: closetext end -PokefanMScript_0x5613a: - jumptextfaceplayer UnknownText_0x562f3 +GoldenrodDeptStore5FPokefanMScript: + jumptextfaceplayer GoldenrodDeptStore5FPokefanMText GoldenrodDeptStore5FDirectory: jumptext GoldenrodDeptStore5FDirectoryText @@ -189,7 +189,7 @@ UnknownText_0x56279: cont "Game Boy Color." done -UnknownText_0x562ad: +GoldenrodDeptStore5FLassText: text "On Sundays, a lady" line "comes to check out" cont "#MON." @@ -198,7 +198,7 @@ UnknownText_0x562ad: line "away TMs!" done -UnknownText_0x562f3: +GoldenrodDeptStore5FPokefanMText: text "You can't rename a" line "#MON you get in" cont "a trade." @@ -238,8 +238,8 @@ GoldenrodDeptStore5F_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 - person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x56130, -1 + person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Mike, -1 - person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5613a, -1 + person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 person_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Carrie, -1 person_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index b8b683561..18c936e81 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -84,11 +84,11 @@ GoldenrodVendingMachine: db "CANCEL@" -LassScript_0x564bf: - jumptextfaceplayer UnknownText_0x5654b +GoldenrodDeptStore6FLassScript: + jumptextfaceplayer GoldenrodDeptStore6FLassText -SuperNerdScript_0x564c2: - jumptextfaceplayer UnknownText_0x565ca +GoldenrodDeptStore6FSuperNerdScript: + jumptextfaceplayer GoldenrodDeptStore6FSuperNerdText GoldenrodDeptStore6FDirectory: jumptext GoldenrodDeptStore6FDirectoryText @@ -119,7 +119,7 @@ GoldenrodVendingNoSpaceText: line "room for stuff." done -UnknownText_0x5654b: +GoldenrodDeptStore6FLassText: text "Do you listen to" line "LUCKY CHANNEL?" @@ -133,7 +133,7 @@ UnknownText_0x5654b: line "numbers." done -UnknownText_0x565ca: +GoldenrodDeptStore6FSuperNerdText: text "If you're tired," line "try the vending" cont "machine's drinks." @@ -173,5 +173,5 @@ GoldenrodDeptStore6F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x564bf, -1 - person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x564c2, -1 + person_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 + person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 859e5e6dd..4e6a3b03e 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -46,14 +46,14 @@ UnknownScript_0x7d7ac: clearevent EVENT_WAREHOUSE_BLOCKED_OFF return -BlackBeltScript_0x7d7b0: - jumptextfaceplayer UnknownText_0x7d7cb +GoldenrodDeptStoreB1FBlackBelt1Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt1Text -BlackBeltScript_0x7d7b3: - jumptextfaceplayer UnknownText_0x7d82c +GoldenrodDeptStoreB1FBlackBelt2Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt2Text -BlackBeltScript_0x7d7b6: - jumptextfaceplayer UnknownText_0x7d875 +GoldenrodDeptStoreB1FBlackBelt3Script: + jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt3Text MachopScript_0x7d7b9: opentext @@ -75,7 +75,7 @@ GoldenrodDeptStoreB1FBurnHeal: GoldenrodDeptStoreB1FUltraBall: itemball ULTRA_BALL -UnknownText_0x7d7cb: +GoldenrodDeptStoreB1FBlackBelt1Text: text "Hey, kid! You're" line "holding us up!" @@ -86,7 +86,7 @@ UnknownText_0x7d7cb: line "one can see us!" done -UnknownText_0x7d82c: +GoldenrodDeptStoreB1FBlackBelt2Text: text "I lose my passion" line "for work if some-" cont "one's watching." @@ -95,7 +95,7 @@ UnknownText_0x7d82c: line "scoot!" done -UnknownText_0x7d875: +GoldenrodDeptStoreB1FBlackBelt3Text: text "Oohah! Oohah!" para "The stuff on the" @@ -131,7 +131,7 @@ GoldenrodDeptStoreB1F_MapEventHeader: person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL - person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1 - person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1 - person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1 + person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 + person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 + person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 person_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 3a12e7707..82f14b404 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -62,8 +62,8 @@ GoldenrodDeptStoreElevator_MapEventHeader: .Warps: db 2 - warp_def $3, $1, 255, GOLDENROD_DEPT_STORE_1F - warp_def $3, $2, 255, GOLDENROD_DEPT_STORE_1F + warp_def $3, $1, -1, GOLDENROD_DEPT_STORE_1F + warp_def $3, $2, -1, GOLDENROD_DEPT_STORE_1F .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index ed61d935f..bfdc3a527 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -45,8 +45,8 @@ ClerkScript_0x5673f: closetext end -PokefanFScript_0x56746: - jumptextfaceplayer UnknownText_0x5677f +GoldenrodDeptStoreRoofPokefanFScript: + jumptextfaceplayer GoldenrodDeptStoreRoofPokefanFText FisherScript_0x56749: faceplayer @@ -57,8 +57,8 @@ FisherScript_0x56749: spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP end -TwinScript_0x56754: - jumptextfaceplayer UnknownText_0x56839 +GoldenrodDeptStoreRoofTwinScript: + jumptextfaceplayer GoldenrodDeptStoreRoofTwinText SuperNerdScript_0x56757: opentext @@ -73,14 +73,14 @@ SuperNerdScript_0x56757: spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT end -PokefanMScript_0x5676a: - jumptextfaceplayer UnknownText_0x5688e +GoldenrodDeptStoreRoofPokefanMScript: + jumptextfaceplayer GoldenrodDeptStoreRoofPokefanMText -TeacherScript_0x5676d: - jumptextfaceplayer UnknownText_0x56901 +GoldenrodDeptStoreRoofTeacherScript: + jumptextfaceplayer GoldenrodDeptStoreRoofTeacherText -BugCatcherScript_0x56770: - jumptextfaceplayer UnknownText_0x56942 +GoldenrodDeptStoreRoofBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStoreRoofBugCatcherText Binoculars1: jumptext Binoculars1Text @@ -94,7 +94,7 @@ Binoculars3: PokeDollVendingMachine: jumptext PokeDollVendingMachineText -UnknownText_0x5677f: +GoldenrodDeptStoreRoofPokefanFText: text "Whew, I'm tired." para "I sometimes come" @@ -116,7 +116,7 @@ UnknownText_0x567d2: line "dolls!" done -UnknownText_0x56839: +GoldenrodDeptStoreRoofTwinText: text "They have bargain" line "sales here every" cont "so often." @@ -131,7 +131,7 @@ UnknownText_0x56871: line "bothering me?" done -UnknownText_0x5688e: +GoldenrodDeptStoreRoofPokefanMText: text "There's something" line "I really want, but" @@ -143,7 +143,7 @@ UnknownText_0x5688e: cont "I've collected…" done -UnknownText_0x56901: +GoldenrodDeptStoreRoofTeacherText: text "Oh, everything is" line "so cheap!" @@ -151,7 +151,7 @@ UnknownText_0x56901: line "my PACK's crammed!" done -UnknownText_0x56942: +GoldenrodDeptStoreRoofBugCatcherText: text "My #MON always" line "get paralyzed or" @@ -232,10 +232,10 @@ GoldenrodDeptStoreRoof_MapEventHeader: .PersonEvents: db 8 person_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x56746, -1 + person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 person_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON + person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index c8f47f6dc..3551b7ee7 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -93,9 +93,9 @@ GoldenrodGymTriggerRockets: jumpstd radiotowerrockets TrainerLassCarrie: - trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript + trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script -LassCarrieScript: +.Script: end_if_just_battled opentext writetext LassCarrieAfterBattleText @@ -117,9 +117,9 @@ WhitneyCriesScript: end TrainerLassBridget: - trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript + trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script -LassBridgetScript: +.Script: end_if_just_battled opentext writetext LassBridgetAfterBattleText @@ -128,9 +128,9 @@ LassBridgetScript: end TrainerBeautyVictoria: - trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript + trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script -BeautyVictoriaScript: +.Script: end_if_just_battled opentext writetext BeautyVictoriaAfterBattleText @@ -139,9 +139,9 @@ BeautyVictoriaScript: end TrainerBeautySamantha: - trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript + trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script -BeautySamanthaScript: +.Script: end_if_just_battled opentext writetext BeautySamanthaAfterBattleText diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 9b082c082..7455a1eb1 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -59,11 +59,11 @@ UnknownScript_0x54991: closetext end -PokefanMScript_0x54997: - jumptextfaceplayer UnknownText_0x54b04 +GoldenrodHappinessRaterPokefanMScript: + jumptextfaceplayer GoldenrodHappinessRaterPokefanMText -TwinScript_0x5499a: - jumptextfaceplayer UnknownText_0x54b67 +GoldenrodHappinessRaterTwinScript: + jumptextfaceplayer GoldenrodHappinessRaterTwinText HappinessRatersHouseBookshelf: jumpstd difficultbookshelf @@ -118,7 +118,7 @@ UnknownText_0x54ad1: cont "It looks mean." done -UnknownText_0x54b04: +GoldenrodHappinessRaterPokefanMText: text "I keep losing in" line "battles, and my" @@ -130,7 +130,7 @@ UnknownText_0x54b04: cont "like me much…" done -UnknownText_0x54b67: +GoldenrodHappinessRaterTwinText: text "When I use an item" line "on my #MON, it" cont "acts really glad!" @@ -157,5 +157,5 @@ GoldenrodHappinessRater_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 - person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x54997, -1 - person_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x5499a, -1 + person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 + person_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index d94c5a3bd..a00b47e11 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -68,8 +68,8 @@ Script_ArriveFromSaffron: closetext end -GentlemanScript_0x55143: - jumptextfaceplayer UnknownText_0x552a3 +GoldenrodMagnetTrainStationGentlemanScript: + jumptextfaceplayer GoldenrodMagnetTrainStationGentlemanText MovementData_0x55146: step UP @@ -150,7 +150,7 @@ UnknownText_0x5526a: line "again." done -UnknownText_0x552a3: +GoldenrodMagnetTrainStationGentlemanText: text "I'm the PRESIDENT." para "My dream was to" @@ -185,4 +185,4 @@ GoldenrodMagnetTrainStation_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 - person_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN + person_event SPRITE_GENTLEMAN, 14, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 216fba7c1..c785510ed 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "text/sweethoney.asm" +INCLUDE "text/unused_sweet_honey.asm" GoldenrodNameRater_MapEventHeader: ; filler diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 809970862..3eb250ff1 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -9,11 +9,11 @@ GoldenrodPPSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -FisherScript_0x5564a: - jumptextfaceplayer UnknownText_0x55659 +GoldenrodPPSpeechHouseFisherScript: + jumptextfaceplayer GoldenrodPPSpeechHouseFisherText -LassScript_0x5564d: - jumptextfaceplayer UnknownText_0x556ca +GoldenrodPPSpeechHouseLassScript: + jumptextfaceplayer GoldenrodPPSpeechHouseLassText GoldenrodPPSpeechHouseBookshelf2: jumpstd difficultbookshelf @@ -24,7 +24,7 @@ GoldenrodPPSpeechHouseBookshelf1: GoldenrodPPSpeechHouseRadio: jumpstd radio2 -UnknownText_0x55659: +GoldenrodPPSpeechHouseFisherText: text "Once while I was" line "battling, my" @@ -38,7 +38,7 @@ UnknownText_0x55659: line "gone." done -UnknownText_0x556ca: +GoldenrodPPSpeechHouseLassText: text "Sometimes, a" line "healthy #MON" @@ -71,5 +71,5 @@ GoldenrodPPSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x5564a, -1 - person_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x5564d, -1 + person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 + person_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 289284ee5..ec4bb3f28 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -10,14 +10,14 @@ GoldenrodPokeComCenter2FMobile_MapScriptHeader: .MapCallbacks: db 0 -ScientistScript_0x625d1: - jumptextfaceplayer UnknownText_0x62674 +GoldenrodPokeComCenter2FMobileScientist1Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text -ScientistScript_0x625d4: - jumptextfaceplayer UnknownText_0x626f9 +GoldenrodPokeComCenter2FMobileScientist2Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text -ScientistScript_0x625d7: - jumptextfaceplayer UnknownText_0x62795 +GoldenrodPokeComCenter2FMobileScientist3Script: + jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text MapGoldenrodPokeComCenter2FMobileSignpost0Script: opentext @@ -112,7 +112,7 @@ MenuDataHeader_0x6264c: MapGoldenrodPokeComCenter2FMobileSignpost2Script: jumptext UnknownText_0x62b26 -UnknownText_0x62674: +GoldenrodPokeComCenter2FMobileScientist1Text: text "#COM CENTER and" line "MOBILE CENTER were" @@ -126,7 +126,7 @@ UnknownText_0x62674: line "strangers." done -UnknownText_0x626f9: +GoldenrodPokeComCenter2FMobileScientist2Text: text "When you linked" line "with someone by" @@ -143,7 +143,7 @@ UnknownText_0x626f9: line "got the shakes!" done -UnknownText_0x62795: +GoldenrodPokeComCenter2FMobileScientist3Text: text "They were able to" line "build this huge" @@ -288,6 +288,6 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d1, -1 - person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d4, -1 - person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d7, -1 + person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 + person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 + person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index fc82c2549..e39832ab2 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -79,11 +79,11 @@ GoldenrodPokecenter1F_GSBallTriggerRight: .cancel end -GameboyKidScript_0x6101e: - jumptextfaceplayer UnknownText_0x62105 +GoldenrodPokecenter1FGameboyKidScript: + jumptextfaceplayer GoldenrodPokecenter1FGameboyKidText -LassScript_0x61021: - jumptextfaceplayer UnknownText_0x62260 +GoldenrodPokecenter1FLassScript: + jumptextfaceplayer GoldenrodPokecenter1FLassText PokefanFScript_0x61024: faceplayer @@ -663,7 +663,7 @@ UnknownText_0x620a1: cont "NEWS?" done -UnknownText_0x62105: +GoldenrodPokecenter1FGameboyKidText: text "The COLOSSEUM" line "upstairs is for" cont "link battles." @@ -701,7 +701,7 @@ UnknownText_0x62222: line "younger!" done -UnknownText_0x62260: +GoldenrodPokecenter1FLassText: text "A higher level" line "#MON doesn't" cont "always win." @@ -827,6 +827,6 @@ GoldenrodPokecenter1F_MapEventHeader: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 person_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 - person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x6101e, -1 - person_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x61021, -1 + person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 + person_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 person_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 95a8e8b66..5365e35d4 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -388,9 +388,9 @@ IlexForestHeadbuttGuyScript: end TrainerBug_catcherWayne: - trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, Bug_catcherWayneScript + trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, .Script -Bug_catcherWayneScript: +.Script: end_if_just_battled opentext writetext Bug_catcherWayneAfterBattleText diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 8105d6f32..b8d5b5481 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -9,19 +9,19 @@ IlexForestAzaleaGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x62c7a: - jumptextfaceplayer UnknownText_0x62c80 +IlexForestAzaleaGateOfficerScript: + jumptextfaceplayer IlexForestAzaleaGateOfficerText -GrannyScript_0x62c7d: - jumptextfaceplayer UnknownText_0x62cb0 +IlexForestAzaleaGateGrannyScript: + jumptextfaceplayer IlexForestAzaleaGateGrannyText -UnknownText_0x62c80: +IlexForestAzaleaGateOfficerText: text "ILEX FOREST is" line "big. Be careful!" cont "Don't get lost." done -UnknownText_0x62cb0: +IlexForestAzaleaGateGrannyText: text "The FOREST is" line "watched over by" cont "its protector." @@ -49,5 +49,5 @@ IlexForestAzaleaGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x62c7a, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x62c7d, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 + person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 080d319d6..5e3850a80 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -145,8 +145,8 @@ ClerkScript_0x18012f: closetext end -CooltrainerMScript_0x180136: - jumptextfaceplayer UnknownText_0x180178 +IndigoPlateauPokecenter1FCooltrainerMScript: + jumptextfaceplayer IndigoPlateauPokecenter1FCooltrainerMText TeleportGuyScript: faceplayer @@ -203,7 +203,7 @@ PlateauRivalLeavesMovement: step DOWN step_end -UnknownText_0x180178: +IndigoPlateauPokecenter1FCooltrainerMText: text "At the #MON" line "LEAGUE, you'll get" @@ -325,7 +325,7 @@ IndigoPlateauPokecenter1F_MapEventHeader: db 6 person_event SPRITE_NURSE, 7, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 person_event SPRITE_CLERK, 7, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 - person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x180136, -1 + person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 person_event SPRITE_SILVER, 9, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL person_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY person_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index c6d56a03b..426caacd4 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -121,11 +121,11 @@ UnknownScript_0x7009c: closetext end -SuperNerdScript_0x700a2: - jumptextfaceplayer UnknownText_0x70444 +LakeOfRageSuperNerdScript: + jumptextfaceplayer LakeOfRageSuperNerdText -CooltrainerFScript_0x700a5: - jumptextfaceplayer UnknownText_0x704bb +LakeOfRageCooltrainerFScript: + jumptextfaceplayer LakeOfRageCooltrainerFText MapLakeOfRageSignpost0Script: jumptext UnknownText_0x708d7 @@ -146,9 +146,9 @@ UnknownScript_0x700b8: end TrainerFisherAndre: - trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, FisherAndreScript + trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script -FisherAndreScript: +.Script: end_if_just_battled opentext writetext FisherAndreAfterBattleText @@ -157,9 +157,9 @@ FisherAndreScript: end TrainerFisherRaymond: - trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, FisherRaymondScript + trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script -FisherRaymondScript: +.Script: end_if_just_battled opentext writetext FisherRaymondAfterBattleText @@ -168,9 +168,9 @@ FisherRaymondScript: end TrainerCooltrainermAaron: - trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, CooltrainermAaronScript + trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script -CooltrainermAaronScript: +.Script: end_if_just_battled opentext writetext CooltrainermAaronAfterBattleText @@ -179,9 +179,9 @@ CooltrainermAaronScript: end TrainerCooltrainerfLois: - trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, CooltrainerfLoisScript + trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script -CooltrainerfLoisScript: +.Script: end_if_just_battled opentext writetext CooltrainerfLoisAfterBattleText @@ -336,7 +336,7 @@ UnknownText_0x70421: line "KARP are biting!" done -UnknownText_0x70444: +LakeOfRageSuperNerdText: text "I heard this lake" line "was made by ram-" cont "paging GYARADOS." @@ -348,7 +348,7 @@ UnknownText_0x70444: line "break now?" done -UnknownText_0x704bb: +LakeOfRageCooltrainerFText: text "Did my eyes de-" line "ceive me? I saw a" @@ -520,8 +520,8 @@ LakeOfRage_MapEventHeader: db 12 person_event SPRITE_LANCE, 28, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE person_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 - person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x700a2, -1 - person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x700a5, -1 + person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 + person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1 person_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 1ad1bd35e..29f1cfc91 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -12,14 +12,14 @@ LavRadioTower1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x7ee63: - jumptextfaceplayer UnknownText_0x7eebf +LavRadioTower1FReceptionistScript: + jumptextfaceplayer LavRadioTower1FReceptionistText -OfficerScript_0x7ee66: - jumptextfaceplayer UnknownText_0x7eefa +LavRadioTower1FOfficerScript: + jumptextfaceplayer LavRadioTower1FOfficerText -SuperNerdScript_0x7ee69: - jumptextfaceplayer UnknownText_0x7ef90 +LavRadioTower1FSuperNerdScript: + jumptextfaceplayer LavRadioTower1FSuperNerdText GentlemanScript_0x7ee6c: faceplayer @@ -77,7 +77,7 @@ MapLavRadioTower1FSignpost1Script: UnknownScript_0x7eebc: jumptext UnknownText_0x7f36b -UnknownText_0x7eebf: +LavRadioTower1FReceptionistText: text "Welcome!" line "Feel free to look" @@ -85,7 +85,7 @@ UnknownText_0x7eebf: line "this floor." done -UnknownText_0x7eefa: +LavRadioTower1FOfficerText: text "Sorry, but you can" line "only tour the" cont "ground floor." @@ -100,7 +100,7 @@ UnknownText_0x7eefa: line "up our security." done -UnknownText_0x7ef90: +LavRadioTower1FSuperNerdText: text "Many people are" line "hard at work here" @@ -240,8 +240,8 @@ LavRadioTower1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x7ee63, -1 - person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7ee66, -1 - person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ee69, -1 + person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 + person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 + person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 person_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 499e1187e..ba43dc2df 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x7eb1c: closetext end -PokefanMScript_0x7eb23: - jumptextfaceplayer UnknownText_0x7eb29 +LavenderMartPokefanMScript: + jumptextfaceplayer LavenderMartPokefanMText -RockerScript_0x7eb26: - jumptextfaceplayer UnknownText_0x7ebac +LavenderMartRockerScript: + jumptextfaceplayer LavenderMartRockerText -UnknownText_0x7eb29: +LavenderMartPokefanMText: text "REPEL is a neces-" line "sity if you are" @@ -36,7 +36,7 @@ UnknownText_0x7eb29: line "all the caves." done -UnknownText_0x7ebac: +LavenderMartRockerText: text "I heard about a" line "craftsman who" @@ -65,5 +65,5 @@ LavenderMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 - person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x7eb23, -1 - person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x7eb26, -1 + person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 + person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index c961364d5..5b740df4a 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -14,11 +14,11 @@ LavenderPokecenter1F_MapScriptHeader: NurseScript_0x7e6a0: jumpstd pokecenternurse -GentlemanScript_0x7e6a3: - jumptextfaceplayer UnknownText_0x7e6bd +LavenderPokecenter1FGentlemanScript: + jumptextfaceplayer LavenderPokecenter1FGentlemanText -TeacherScript_0x7e6a6: - jumptextfaceplayer UnknownText_0x7e710 +LavenderPokecenter1FTeacherScript: + jumptextfaceplayer LavenderPokecenter1FTeacherText YoungsterScript_0x7e6a9: faceplayer @@ -36,7 +36,7 @@ UnknownScript_0x7e6b7: closetext end -UnknownText_0x7e6bd: +LavenderPokecenter1FGentlemanText: text "To the north of" line "LAVENDER is ROCK" @@ -45,7 +45,7 @@ UnknownText_0x7e6bd: cont "POWER PLANT." done -UnknownText_0x7e710: +LavenderPokecenter1FTeacherText: text "There's a radio" line "program that plays" cont "# FLUTE music." @@ -99,6 +99,6 @@ LavenderPokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7e6a3, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7e6a6, -1 + person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 person_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 65bb780f2..9ed0c9c5a 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -16,17 +16,17 @@ LavenderTown_MapScriptHeader: setflag ENGINE_FLYPOINT_LAVENDER return -PokefanMScript_0x1ad6e4: - jumptextfaceplayer UnknownText_0x1ad702 +LavenderTownPokefanMScript: + jumptextfaceplayer LavenderTownPokefanMText -TeacherScript_0x1ad6e7: - jumptextfaceplayer UnknownText_0x1ad73a +LavenderTownTeacherScript: + jumptextfaceplayer LavenderTownTeacherText -GrampsScript_0x1ad6ea: - jumptextfaceplayer UnknownText_0x1ad75c +LavenderTownGrampsScript: + jumptextfaceplayer LavenderTownGrampsText -YoungsterScript_0x1ad6ed: - jumptextfaceplayer UnknownText_0x1ad7ac +LavenderTownYoungsterScript: + jumptextfaceplayer LavenderTownYoungsterText LavenderTownSign: jumptext LavenderTownSignText @@ -46,7 +46,7 @@ LavenderPokecenterSignText: LavenderMartSignText: jumpstd martsign -UnknownText_0x1ad702: +LavenderTownPokefanMText: text "That's quite some" line "building, eh?" @@ -54,12 +54,12 @@ UnknownText_0x1ad702: line "TOWER." done -UnknownText_0x1ad73a: +LavenderTownTeacherText: text "KANTO has many" line "good radio shows." done -UnknownText_0x1ad75c: +LavenderTownGrampsText: text "People come from" line "all over to pay" @@ -68,7 +68,7 @@ UnknownText_0x1ad75c: cont "of #MON." done -UnknownText_0x1ad7ac: +LavenderTownYoungsterText: text "You need a #" line "FLUTE to wake" cont "sleeping #MON." @@ -133,7 +133,7 @@ LavenderTown_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1ad6e4, -1 - person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ad6e7, -1 - person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1ad6ea, -1 - person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 1, YoungsterScript_0x1ad6ed, -1 + person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 + person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 + person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 + person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 7ba3064e2..d9432bcc5 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -8,13 +8,13 @@ LavenderTownSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanFScript_0x7ea47: - jumptextfaceplayer UnknownText_0x7ea4d +LavenderTownSpeechHousePokefanFScript: + jumptextfaceplayer LavenderTownSpeechHousePokefanFText LavenderTownSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x7ea4d: +LavenderTownSpeechHousePokefanFText: text "LAVENDER is a" line "tiny, quiet town" @@ -47,4 +47,4 @@ LavenderTownSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x7ea47, -1 + person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 67fb89372..acb68e46c 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -71,9 +71,9 @@ MahoganyGymTriggerRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: - trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, SkierRoxanneScript + trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script -SkierRoxanneScript: +.Script: end_if_just_battled opentext writetext SkierRoxanneAfterBattleText @@ -82,9 +82,9 @@ SkierRoxanneScript: end TrainerSkierClarissa: - trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, SkierClarissaScript + trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script -SkierClarissaScript: +.Script: end_if_just_battled opentext writetext SkierClarissaAfterBattleText @@ -93,9 +93,9 @@ SkierClarissaScript: end TrainerBoarderRonald: - trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, BoarderRonaldScript + trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script -BoarderRonaldScript: +.Script: end_if_just_battled opentext writetext BoarderRonaldAfterBattleText @@ -104,9 +104,9 @@ BoarderRonaldScript: end TrainerBoarderBrad: - trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, BoarderBradScript + trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script -BoarderBradScript: +.Script: end_if_just_battled opentext writetext BoarderBradAfterBattleText @@ -115,9 +115,9 @@ BoarderBradScript: end TrainerBoarderDouglas: - trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, BoarderDouglasScript + trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script -BoarderDouglasScript: +.Script: end_if_just_battled opentext writetext BoarderDouglasAfterBattleText diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 73c978836..7c98250f4 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -14,16 +14,16 @@ MahoganyPokecenter1F_MapScriptHeader: NurseScript_0x19a356: jumpstd pokecenternurse -PokefanMScript_0x19a359: - jumptextfaceplayer UnknownText_0x19a362 +MahoganyPokecenter1FPokefanMScript: + jumptextfaceplayer MahoganyPokecenter1FPokefanMText -YoungsterScript_0x19a35c: - jumptextfaceplayer UnknownText_0x19a3b3 +MahoganyPokecenter1FYoungsterScript: + jumptextfaceplayer MahoganyPokecenter1FYoungsterText -CooltrainerFScript_0x19a35f: - jumptextfaceplayer UnknownText_0x19a418 +MahoganyPokecenter1FCooltrainerFScript: + jumptextfaceplayer MahoganyPokecenter1FCooltrainerFText -UnknownText_0x19a362: +MahoganyPokecenter1FPokefanMText: text "What's this? TEAM" line "ROCKET has come" cont "back?" @@ -33,7 +33,7 @@ UnknownText_0x19a362: cont "RAGE…" done -UnknownText_0x19a3b3: +MahoganyPokecenter1FYoungsterText: text "I stop my #MON" line "from evolving too" cont "early." @@ -44,7 +44,7 @@ UnknownText_0x19a3b3: cont "evolve." done -UnknownText_0x19a418: +MahoganyPokecenter1FCooltrainerFText: text "#MON do become" line "stronger when they" @@ -72,6 +72,6 @@ MahoganyPokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19a359, -1 - person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19a35c, -1 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x19a35f, -1 + person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 + person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 + person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index c03e07361..0361f5195 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -9,8 +9,8 @@ MahoganyRedGyaradosSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -BlackBeltScript_0x19997f: - jumptextfaceplayer UnknownText_0x19999c +MahoganyRedGyaradosSpeechHouseBlackBeltScript: + jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText TeacherScript_0x199982: faceplayer @@ -34,7 +34,7 @@ UnknownScript_0x195996: UnknownScript_0x195999: jumpstd magazinebookshelf -UnknownText_0x19999c: +MahoganyRedGyaradosSpeechHouseBlackBeltText: text "I heard that a red" line "GYARADOS appeared" cont "at the LAKE." @@ -77,5 +77,5 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x19997f, -1 + person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 person_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 5439e065c..9655b7073 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -103,11 +103,11 @@ UnknownScript_0x19008c: closetext end -FisherScript_0x190092: - jumptextfaceplayer UnknownText_0x190276 +MahoganyTownFisherScript: + jumptextfaceplayer MahoganyTownFisherText -LassScript_0x190095: - jumptextfaceplayer UnknownText_0x1902f2 +MahoganyTownLassScript: + jumptextfaceplayer MahoganyTownLassText MahoganyTownSign: jumptext MahoganyTownSignText @@ -200,7 +200,7 @@ UnknownText_0x19021d: cont "anglers there." done -UnknownText_0x190276: +MahoganyTownFisherText: text "Since you came" line "this far, take the" @@ -214,7 +214,7 @@ UnknownText_0x190276: line "right now." done -UnknownText_0x1902f2: +MahoganyTownLassText: text "Visit Grandma's" line "shop. She sells" @@ -272,5 +272,5 @@ MahoganyTown_MapEventHeader: db 4 person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS + person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index aa0b97167..8dfe26579 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -18,10 +18,10 @@ GrampsScript_0x771a8: closetext end -LassScript_0x771b0: - jumptextfaceplayer UnknownText_0x771b3 +MountMoonGiftShopLassScript: + jumptextfaceplayer MountMoonGiftShopLassText -UnknownText_0x771b3: +MountMoonGiftShopLassText: text "When the sun goes" line "down, CLEFAIRY" cont "come out to play." @@ -46,5 +46,5 @@ MountMoonGiftShop_MapEventHeader: db 4 person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 + person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index d5c1fdf10..4708b7c60 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -18,9 +18,9 @@ MountMortar1FInside_MapScriptHeader: db 0 TrainerPokemaniacMiller: - trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript + trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script -PokemaniacMillerScript: +.Script: end_if_just_battled opentext writetext PokemaniacMillerAfterBattleText @@ -29,9 +29,9 @@ PokemaniacMillerScript: end TrainerSupernerdMarkus: - trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript + trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script -SupernerdMarkusScript: +.Script: end_if_just_battled opentext writetext SupernerdMarkusAfterBattleText diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 2c57b863a..a78d8453e 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -15,9 +15,9 @@ MountMortar2FInside_MapScriptHeader: db 0 TrainerSupernerdHugh: - trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, SupernerdHughScript + trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script -SupernerdHughScript: +.Script: end_if_just_battled opentext writetext SupernerdHughAfterBattleText diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index a439b7b54..35b7dbcf8 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -12,11 +12,11 @@ MrFujisHouse_MapScriptHeader: .MapCallbacks: db 0 -SuperNerdScript_0x7e8ca: - jumptextfaceplayer UnknownText_0x7e8f1 +MrFujisHouseSuperNerdScript: + jumptextfaceplayer MrFujisHouseSuperNerdText -LassScript_0x7e8cd: - jumptextfaceplayer UnknownText_0x7e940 +MrFujisHouseLassScript: + jumptextfaceplayer MrFujisHouseLassText MrFujisPsyduck: opentext @@ -45,7 +45,7 @@ MrFujisPidgey: MrFujisHouseBookshelf: jumpstd difficultbookshelf -UnknownText_0x7e8f1: +MrFujisHouseSuperNerdText: text "MR.FUJI does live" line "here, but he's not" @@ -55,7 +55,7 @@ UnknownText_0x7e8f1: line "the SOUL HOUSE." done -UnknownText_0x7e940: +MrFujisHouseLassText: text "Some cold-hearted" line "people stop caring" cont "for their #MON." @@ -98,8 +98,8 @@ MrFujisHouse_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7e8ca, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x7e8cd, -1 + person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 + person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 person_event SPRITE_RHYDON, 4, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrFujisPsyduck, -1 person_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MrFujisNidorino, -1 person_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, MrFujisPidgey, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 6298f3e34..e0a228bb2 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -21,11 +21,11 @@ NationalPark_MapScriptHeader: .MapCallbacks: db 0 -LassScript_0x5c002: - jumptextfaceplayer UnknownText_0x5c1d3 +NationalParkLassScript: + jumptextfaceplayer NationalParkLassText -PokefanFScript_0x5c005: - jumptextfaceplayer UnknownText_0x5c22e +NationalParkPokefanFScript: + jumptextfaceplayer NationalParkPokefanFText TeacherScript_0x5c008: faceplayer @@ -44,14 +44,14 @@ UnknownScript_0x5c021: closetext end -YoungsterScript_0x5c023: - jumptextfaceplayer UnknownText_0x5c35d +NationalParkYoungster1Script: + jumptextfaceplayer NationalParkYoungster1Text -YoungsterScript_0x5c026: - jumptextfaceplayer UnknownText_0x5c38f +NationalParkYoungster2Script: + jumptextfaceplayer NationalParkYoungster2Text -TeacherScript_0x5c029: - jumptextfaceplayer UnknownText_0x5c3bc +NationalParkTeacherScript: + jumptextfaceplayer NationalParkTeacherText NationalParkPersian: faceplayer @@ -72,9 +72,9 @@ GameboyKidScript_0x5c037: end TrainerSchoolboyJack1: - trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, SchoolboyJack1Script + trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script -SchoolboyJack1Script: +.Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK end_if_just_battled opentext @@ -189,9 +189,9 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript + trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script -PokefanmWilliamScript: +.Script: end_if_just_battled opentext writetext PokefanmWilliamAfterBattleText @@ -200,9 +200,9 @@ PokefanmWilliamScript: end TrainerPokefanfBeverly1: - trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, PokefanfBeverly1Script + trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script -PokefanfBeverly1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY end_if_just_battled opentext @@ -279,9 +279,9 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript + trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script -LassKriseScript: +.Script: end_if_just_battled opentext writetext LassKriseAfterBattleText @@ -308,7 +308,7 @@ NationalParkHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL -UnknownText_0x5c1d3: +NationalParkLassText: text "Look! Check out my" line "bag!" @@ -319,7 +319,7 @@ UnknownText_0x5c1d3: line "them on my bag." done -UnknownText_0x5c22e: +NationalParkPokefanFText: text "This is MAIL I got" line "from my daughter." cont "It cheers me up." @@ -354,19 +354,19 @@ UnknownText_0x5c30d: cont "during battle." done -UnknownText_0x5c35d: +NationalParkYoungster1Text: text "I'm playing with" line "stickers I printed" cont "from my #DEX." done -UnknownText_0x5c38f: +NationalParkYoungster2Text: text "I get the other" line "guy's #DEX" cont "sticker if I win." done -UnknownText_0x5c3bc: +NationalParkTeacherText: text "I take walks in" line "the PARK, but I" @@ -537,12 +537,12 @@ NationalPark_MapEventHeader: .PersonEvents: db 14 - person_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x5c002, -1 - person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x5c005, -1 + person_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NationalParkLassScript, -1 + person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 person_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 - person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c023, -1 - person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c026, -1 - person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c029, -1 + person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1 + person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1 + person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkTeacherScript, -1 person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPersian, -1 person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 9cf4e67f6..01216d0bb 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -25,11 +25,11 @@ UnknownScript_0x9c8d3: closetext end -FishingGuruScript_0x9c8d9: - jumptextfaceplayer UnknownText_0x9c9c5 +OlivineCafeFishingGuruScript: + jumptextfaceplayer OlivineCafeFishingGuruText -SailorScript_0x9c8dc: - jumptextfaceplayer UnknownText_0x9ca09 +OlivineCafeSailorScript: + jumptextfaceplayer OlivineCafeSailorText UnknownText_0x9c8df: text "Hah! Your #MON" @@ -56,7 +56,7 @@ UnknownText_0x9c965: line "buff bod!" done -UnknownText_0x9c9c5: +OlivineCafeFishingGuruText: text "OLIVINE CAFE's" line "menu is chock full" @@ -64,7 +64,7 @@ UnknownText_0x9c9c5: line "beefy SAILORS!" done -UnknownText_0x9ca09: +OlivineCafeSailorText: text "Whenever I roll" line "into this town, I" @@ -96,5 +96,5 @@ OlivineCafe_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_SAILOR, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 - person_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9c8d9, -1 - person_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9c8dc, -1 + person_event SPRITE_FISHING_GURU, 3, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 + person_event SPRITE_SAILOR, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 21b9943ec..e52dc54f6 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -72,8 +72,8 @@ UnknownScript_0x1a886b: special MapCallbackSprites_LoadUsedSpritesGFX end -SailorScript_0x1a88a3: - jumptextfaceplayer UnknownText_0x1a8a58 +OlivineCitySailor1Script: + jumptextfaceplayer OlivineCitySailor1Text StandingYoungsterScript_0x1a88a6: faceplayer @@ -91,8 +91,8 @@ UnknownScript_0x1a88b4: closetext end -SailorScript_0x1a88ba: - jumptextfaceplayer UnknownText_0x1a8b71 +OlivineCitySailor2Script: + jumptextfaceplayer OlivineCitySailor2Text OlivineCitySign: jumptext OlivineCitySignText @@ -207,7 +207,7 @@ UnknownText_0x1a88fa: cont "less weak!" done -UnknownText_0x1a8a58: +OlivineCitySailor1Text: text "Dark roads are" line "dangerous at" cont "night." @@ -240,7 +240,7 @@ UnknownText_0x1a8b41: line "awesome." done -UnknownText_0x1a8b71: +OlivineCitySailor2Text: text "The sea is sweet!" para "Sunsets on the sea" @@ -322,7 +322,7 @@ OlivineCity_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x1a88a3, -1 + person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 - person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x1a88ba, -1 + person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 person_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 06cffbe27..b3bc7e4d3 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -9,8 +9,8 @@ OlivineHouseBeta_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x9c58f: - jumptextfaceplayer UnknownText_0x9c5a2 +OlivineHouseBetaTeacherScript: + jumptextfaceplayer OlivineHouseBetaTeacherText RhydonScript_0x9c592: opentext @@ -26,7 +26,7 @@ OlivineHouseBetaBookshelf1: OlivineHouseBetaBookshelf2: jumpstd magazinebookshelf -UnknownText_0x9c5a2: +OlivineHouseBetaTeacherText: text "When my #MON" line "got sick, the" @@ -58,5 +58,5 @@ OlivineHouseBeta_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9c58f, -1 + person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 person_event SPRITE_RHYDON, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 422e86ad2..40dda9638 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -9,13 +9,13 @@ OlivineLighthouse1F_MapScriptHeader: .MapCallbacks: db 0 -SailorScript_0x5ae67: - jumptextfaceplayer UnknownText_0x5ae6d +OlivineLighthouse1FSailorScript: + jumptextfaceplayer OlivineLighthouse1FSailorText -PokefanFScript_0x5ae6a: - jumptextfaceplayer UnknownText_0x5aec2 +OlivineLighthouse1FPokefanFScript: + jumptextfaceplayer OlivineLighthouse1FPokefanFText -UnknownText_0x5ae6d: +OlivineLighthouse1FSailorText: text "People train at" line "this LIGHTHOUSE." @@ -24,7 +24,7 @@ UnknownText_0x5ae6d: cont "all the trainers." done -UnknownText_0x5aec2: +OlivineLighthouse1FPokefanFText: text "In the past, #-" line "MON used to light" @@ -56,5 +56,5 @@ OlivineLighthouse1F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x5ae67, -1 - person_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x5ae6a, -1 + person_event SPRITE_SAILOR, 2, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 + person_event SPRITE_POKEFAN_F, 9, 16, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 24cafdc2c..d55515fe3 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -10,9 +10,9 @@ OlivineLighthouse2F_MapScriptHeader: db 0 TrainerGentlemanAlfred: - trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, GentlemanAlfredScript + trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script -GentlemanAlfredScript: +.Script: end_if_just_battled opentext writetext GentlemanAlfredAfterBattleText @@ -21,9 +21,9 @@ GentlemanAlfredScript: end TrainerSailorHuey1: - trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, SailorHuey1Script + trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script -SailorHuey1Script: +.Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY end_if_just_battled opentext diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 7282c6e80..2b15d3487 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -12,9 +12,9 @@ OlivineLighthouse3F_MapScriptHeader: db 0 TrainerBird_keeperTheo: - trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript + trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, .Script -Bird_keeperTheoScript: +.Script: end_if_just_battled opentext writetext Bird_keeperTheoAfterBattleText @@ -23,9 +23,9 @@ Bird_keeperTheoScript: end TrainerGentlemanPreston: - trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript + trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script -GentlemanPrestonScript: +.Script: end_if_just_battled opentext writetext GentlemanPrestonAfterBattleText @@ -34,9 +34,9 @@ GentlemanPrestonScript: end TrainerSailorTerrell: - trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript + trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script -SailorTerrellScript: +.Script: end_if_just_battled opentext writetext SailorTerrellAfterBattleText diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index c1a3911e5..f9ff1d86c 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -10,9 +10,9 @@ OlivineLighthouse4F_MapScriptHeader: db 0 TrainerLassConnie: - trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, LassConnie1Script + trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script -LassConnie1Script: +.Script: end_if_just_battled opentext writetext LassConnie1AfterBattleText @@ -21,9 +21,9 @@ LassConnie1Script: end TrainerSailorKent: - trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, SailorKentScript + trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script -SailorKentScript: +.Script: end_if_just_battled opentext writetext SailorKentAfterBattleText diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 6dd14f384..08a9c4309 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -13,9 +13,9 @@ OlivineLighthouse5F_MapScriptHeader: db 0 TrainerBird_keeperDenis: - trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, Bird_keeperDenisScript + trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, .Script -Bird_keeperDenisScript: +.Script: end_if_just_battled opentext writetext Bird_keeperDenisAfterBattleText @@ -24,9 +24,9 @@ Bird_keeperDenisScript: end TrainerSailorErnest: - trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, SailorErnestScript + trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script -SailorErnestScript: +.Script: end_if_just_battled opentext writetext SailorErnestAfterBattleText diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index d54546111..e18ce3f91 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x9cac7: closetext end -CooltrainerFScript_0x9cace: - jumptextfaceplayer UnknownText_0x9cad4 +OlivineMartCooltrainerFScript: + jumptextfaceplayer OlivineMartCooltrainerFText -LassScript_0x9cad1: - jumptextfaceplayer UnknownText_0x9cb16 +OlivineMartLassScript: + jumptextfaceplayer OlivineMartLassText -UnknownText_0x9cad4: +OlivineMartCooltrainerFText: text "Do your #MON" line "already know the" @@ -30,7 +30,7 @@ UnknownText_0x9cad4: line "people on water?" done -UnknownText_0x9cb16: +OlivineMartLassText: text "My BUTTERFREE came" line "from my boyfriend" cont "overseas." @@ -63,5 +63,5 @@ OlivineMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9cace, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x9cad1, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 + person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index f331c95db..8454b786a 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -17,13 +17,13 @@ NurseScript_0x9c002: FishingGuruScript_0x9c005: jumpstd happinesschecknpc -FisherScript_0x9c008: - jumptextfaceplayer UnknownText_0x9c00e +OlivinePokecenter1FFisherScript: + jumptextfaceplayer OlivinePokecenter1FFisherText -TeacherScript_0x9c00b: - jumptextfaceplayer UnknownText_0x9c086 +OlivinePokecenter1FTeacherScript: + jumptextfaceplayer OlivinePokecenter1FTeacherText -UnknownText_0x9c00e: +OlivinePokecenter1FFisherText: text "The SAILOR in the" line "OLIVINE CAFE next" @@ -37,7 +37,7 @@ UnknownText_0x9c00e: line "big boulders." done -UnknownText_0x9c086: +OlivinePokecenter1FTeacherText: text "There's a person" line "in CIANWOOD CITY" cont "across the sea." @@ -67,5 +67,5 @@ OlivinePokecenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 person_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x9c008, -1 - person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9c00b, -1 + person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 + person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index f0137e294..60e5d4d04 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -194,8 +194,8 @@ UnknownScript_0x749f8: closetext end -SailorScript_0x749fe: - jumptextfaceplayer UnknownText_0x74cd7 +OlivinePortSailorScript: + jumptextfaceplayer OlivinePortSailorText FishingGuruScript_0x74a01: faceplayer @@ -377,7 +377,7 @@ UnknownText_0x74ca2: para "I wish I could go…" done -UnknownText_0x74cd7: +OlivinePortSailorText: text "We don't want you" line "to fall into the" @@ -405,7 +405,7 @@ OlivinePort_MapEventHeader: .PersonEvents: db 7 person_event SPRITE_SAILOR, 23, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - person_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_SAILOR, 15, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME person_event SPRITE_SAILOR, 15, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME person_event SPRITE_FISHING_GURU, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME person_event SPRITE_FISHING_GURU, 14, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 116a05dfd..2f7a145bc 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -8,10 +8,10 @@ OlivinePortPassage_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x76fac: - jumptextfaceplayer UnknownText_0x76faf +OlivinePortPassagePokefanMScript: + jumptextfaceplayer OlivinePortPassagePokefanMText -UnknownText_0x76faf: +OlivinePortPassagePokefanMText: text "FAST SHIP S.S.AQUA" line "sails to KANTO on" @@ -39,4 +39,4 @@ OlivinePortPassage_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + person_event SPRITE_POKEFAN_M, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 53dd04022..895e79e9c 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -14,11 +14,11 @@ PalletTown_MapScriptHeader: setflag ENGINE_FLYPOINT_PALLET return -TeacherScript_0x1ac6d5: - jumptextfaceplayer UnknownText_0x1ac6e7 +PalletTownTeacherScript: + jumptextfaceplayer PalletTownTeacherText -FisherScript_0x1ac6d8: - jumptextfaceplayer UnknownText_0x1ac720 +PalletTownFisherScript: + jumptextfaceplayer PalletTownFisherText PalletTownSign: jumptext PalletTownSignText @@ -32,7 +32,7 @@ OaksLabSign: BluesHouseSign: jumptext BluesHouseSignText -UnknownText_0x1ac6e7: +PalletTownTeacherText: text "I'm raising #-" line "MON too." @@ -40,7 +40,7 @@ UnknownText_0x1ac6e7: line "private guards." done -UnknownText_0x1ac720: +PalletTownFisherText: text "Technology is" line "incredible!" @@ -91,5 +91,5 @@ PalletTown_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ac6d5, -1 - person_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ac6d8, -1 + person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 + person_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PalletTownFisherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 9194cc4ec..6ea37bbf9 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -17,11 +17,11 @@ PewterCity_MapScriptHeader: setflag ENGINE_FLYPOINT_PEWTER return -CooltrainerFScript_0x18c009: - jumptextfaceplayer UnknownText_0x18c042 +PewterCityCooltrainerFScript: + jumptextfaceplayer PewterCityCooltrainerFText -BugCatcherScript_0x18c00c: - jumptextfaceplayer UnknownText_0x18c080 +PewterCityBugCatcherScript: + jumptextfaceplayer PewterCityBugCatcherText GrampsScript_0x18c00f: faceplayer @@ -68,7 +68,7 @@ FruitTreeScript_0x18c03e: FruitTreeScript_0x18c040: fruittree FRUITTREE_PEWTER_CITY_2 -UnknownText_0x18c042: +PewterCityCooltrainerFText: text "Have you visited" line "PEWTER GYM?" @@ -76,7 +76,7 @@ UnknownText_0x18c042: line "rock-type #MON." done -UnknownText_0x18c080: +PewterCityBugCatcherText: text "At night, CLEFAIRY" line "come out to play" cont "at MT.MOON." @@ -179,8 +179,8 @@ PewterCity_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18c009, -1 - person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18c00c, -1 + person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 + person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 person_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 person_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index d1549a7eb..8fe9b726d 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -41,9 +41,9 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript + trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script -CamperJerryScript: +.Script: end_if_just_battled opentext writetext CamperJerryAfterBattleText diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 553733889..9fb075ed9 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x1a2dcb: closetext end -YoungsterScript_0x1a2dd2: - jumptextfaceplayer UnknownText_0x1a2dd8 +PewterMartYoungsterScript: + jumptextfaceplayer PewterMartYoungsterText -SuperNerdScript_0x1a2dd5: - jumptextfaceplayer UnknownText_0x1a2e3a +PewterMartSuperNerdScript: + jumptextfaceplayer PewterMartSuperNerdText -UnknownText_0x1a2dd8: +PewterMartYoungsterText: text "Hi! Check out my" line "GYARADOS!" @@ -33,7 +33,7 @@ UnknownText_0x1a2dd8: line "it has become." done -UnknownText_0x1a2e3a: +PewterMartSuperNerdText: text "There once was a" line "weird old man who" cont "sold MAGIKARP." @@ -63,5 +63,5 @@ PewterMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 - person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a2dd2, -1 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2dd5, -1 + person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 + person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 394613336..07650d3e6 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -9,8 +9,8 @@ PewterNidoranSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -SuperNerdScript_0x1a2807: - jumptextfaceplayer UnknownText_0x1a2814 +PewterNidoranSpeechHouseSuperNerdScript: + jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText PewterNidoran: opentext @@ -20,7 +20,7 @@ PewterNidoran: closetext end -UnknownText_0x1a2814: +PewterNidoranSpeechHouseSuperNerdText: text "NIDORAN, shake!" done @@ -45,5 +45,5 @@ PewterNidoranSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2807, -1 + person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index e9ddbbd32..2eb12d641 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -15,8 +15,8 @@ PewterPokecenter1F_MapScriptHeader: NurseScript_0x1a2ee7: jumpstd pokecenternurse -TeacherScript_0x1a2eea: - jumptextfaceplayer UnknownText_0x1a2f01 +PewterPokecenter1FTeacherScript: + jumptextfaceplayer PewterPokecenter1FTeacherText PewterJigglypuff: opentext @@ -26,8 +26,8 @@ PewterJigglypuff: closetext end -BugCatcherScript_0x1a2ef7: - jumptextfaceplayer UnknownText_0x1a2f75 +PewterPokecenter1FBugCatcherScript: + jumptextfaceplayer PewterPokecenter1FBugCatcherText Chris: faceplayer @@ -37,7 +37,7 @@ Chris: closetext end -UnknownText_0x1a2f01: +PewterPokecenter1FTeacherText: text "…Yeah, and the" line "GYM in CINNABAR's" @@ -53,7 +53,7 @@ PewterJigglypuffText: line "pupuu." done -UnknownText_0x1a2f75: +PewterPokecenter1FBugCatcherText: text "Most #MON get" line "drowsy if they" @@ -86,7 +86,7 @@ PewterPokecenter1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 - person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a2eea, -1 + person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterJigglypuff, -1 - person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x1a2ef7, -1 + person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 49257b8c2..b8a83262b 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -8,13 +8,13 @@ PewterSnoozeSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrampsScript_0x1a3059: - jumptextfaceplayer UnknownText_0x1a305f +PewterSnoozeSpeechHouseGrampsScript: + jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText PewterSnoozeSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x1a305f: +PewterSnoozeSpeechHouseGrampsText: text "I like snoozing" line "with the radio on…" cont "…Zzzz…" @@ -39,4 +39,4 @@ PewterSnoozeSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a3059, -1 + person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 72215ae42..08ed2ade9 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -49,8 +49,8 @@ UnknownScript_0x19181f: closetext end -ReceptionistScript_0x191821: - jumptextfaceplayer UnknownText_0x191b6d +PokemonFanClubReceptionistScript: + jumptextfaceplayer PokemonFanClubReceptionistText FisherScript_0x191824: faceplayer @@ -100,8 +100,8 @@ UnknownScript_0x191865: closetext end -TeacherScript_0x19186b: - jumptextfaceplayer UnknownText_0x191d73 +PokemonFanClubTeacherScript: + jumptextfaceplayer PokemonFanClubTeacherText ClefairyDoll: jumptext ClefairyDollText @@ -199,7 +199,7 @@ UnknownText_0x191b38: line "want to listen." done -UnknownText_0x191b6d: +PokemonFanClubReceptionistText: text "Our CHAIRMAN is" line "very vocal when it" cont "comes to #MON…" @@ -264,7 +264,7 @@ UnknownText_0x191d58: line "jammed full." done -UnknownText_0x191d73: +PokemonFanClubTeacherText: text "Look at my darling" line "BAYLEEF!" @@ -316,8 +316,8 @@ PokemonFanClub_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 - person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x191821, -1 + person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x191824, -1 - person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x19186b, -1 + person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FanClubBayleef, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 2e9524b9c..283663e69 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -179,16 +179,16 @@ UnknownScript_0x5ce4b: closetext end -LassScript_0x5ce51: - jumptextfaceplayer UnknownText_0x5d476 +RadioTower1FLassScript: + jumptextfaceplayer RadioTower1FLassText -YoungsterScript_0x5ce54: - jumptextfaceplayer UnknownText_0x5d4ac +RadioTower1FYoungsterScript: + jumptextfaceplayer RadioTower1FYoungsterText TrainerGruntM3: - trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script + trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script -GruntM3Script: +.Script: end_if_just_battled opentext writetext GruntM3AfterBattleText @@ -405,7 +405,7 @@ UnknownText_0x5d443: cont "change your mind." done -UnknownText_0x5d476: +RadioTower1FLassText: text "BEN is a fabulous" line "DJ." @@ -413,7 +413,7 @@ UnknownText_0x5d476: line "makes me melt!" done -UnknownText_0x5d4ac: +RadioTower1FYoungsterText: text "I love MARY, from" line "#MON TALK." @@ -493,8 +493,8 @@ RadioTower1F_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 0df11fdce..31093f073 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -21,8 +21,8 @@ RadioTower2F_MapScriptHeader: UnknownScript_0x5d6fd: end -SuperNerdScript_0x5d6fe: - jumptextfaceplayer UnknownText_0x5d924 +RadioTower2FSuperNerdScript: + jumptextfaceplayer RadioTower2FSuperNerdText TeacherScript_0x5d701: faceplayer @@ -48,16 +48,16 @@ RadioTowerJigglypuff: closetext end -BlackBeltScript_0x5d71f: - jumptextfaceplayer UnknownText_0x5d9cb +RadioTower2FBlackBelt1Script: + jumptextfaceplayer RadioTower2FBlackBelt1Text -BlackBeltScript_0x5d722: - jumptextfaceplayer UnknownText_0x5da44 +RadioTower2FBlackBelt2Script: + jumptextfaceplayer RadioTower2FBlackBelt2Text TrainerGruntM4: - trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script + trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script -GruntM4Script: +.Script: end_if_just_battled opentext writetext GruntM4AfterBattleText @@ -66,9 +66,9 @@ GruntM4Script: end TrainerGruntM5: - trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script + trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script -GruntM5Script: +.Script: end_if_just_battled opentext writetext GruntM5AfterBattleText @@ -77,9 +77,9 @@ GruntM5Script: end TrainerGruntM6: - trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script + trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script -GruntM6Script: +.Script: end_if_just_battled opentext writetext GruntM6AfterBattleText @@ -88,9 +88,9 @@ GruntM6Script: end TrainerGruntF2: - trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script + trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script -GruntF2Script: +.Script: end_if_just_battled opentext writetext GruntF2AfterBattleText @@ -343,7 +343,7 @@ MovementData_0x5d921: slow_step RIGHT step_end -UnknownText_0x5d924: +RadioTower2FSuperNerdText: text "You can listen to" line "the radio any-" cont "where. Tune in!" @@ -366,7 +366,7 @@ RadioTowerJigglypuffText: line "Jiggly…" done -UnknownText_0x5d9cb: +RadioTower2FBlackBelt1Text: text "Sorry. Authorized" line "personnel only" cont "beyond this point." @@ -379,7 +379,7 @@ UnknownText_0x5d9cb: cont "DIRECTOR…" done -UnknownText_0x5da44: +RadioTower2FBlackBelt2Text: text "Feel free to look" line "around anywhere." @@ -733,14 +733,14 @@ RadioTower2F_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 person_event SPRITE_ROCKET, 4, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 4, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS - person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 person_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Buena, -1 person_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index ae2b1b1bf..ef15ce603 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -25,8 +25,8 @@ RadioTower3F_MapScriptHeader: changeblock $e, $4, $1 return -SuperNerdScript_0x5e553: - jumptextfaceplayer UnknownText_0x5e621 +RadioTower3FSuperNerdScript: + jumptextfaceplayer RadioTower3FSuperNerdText GymGuyScript_0x5e556: faceplayer @@ -83,9 +83,9 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script + trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script -GruntM7Script: +.Script: end_if_just_battled opentext writetext GruntM7AfterBattleText @@ -94,9 +94,9 @@ GruntM7Script: end TrainerGruntM8: - trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script + trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script -GruntM8Script: +.Script: end_if_just_battled opentext writetext GruntM8AfterBattleText @@ -105,9 +105,9 @@ GruntM8Script: end TrainerGruntM9: - trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script + trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script -GruntM9Script: +.Script: end_if_just_battled opentext writetext GruntM9AfterBattleText @@ -116,9 +116,9 @@ GruntM9Script: end TrainerScientistMarc: - trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, ScientistMarcScript + trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script -ScientistMarcScript: +.Script: end_if_just_battled opentext writetext ScientistMarcAfterBattleText @@ -156,7 +156,7 @@ MapRadioTower3FSignpost0Script: MapRadioTower3FSignpost1Script: jumptext UnknownText_0x5eae4 -UnknownText_0x5e621: +RadioTower3FSuperNerdText: text "We have recordings" line "of the cries of" @@ -349,7 +349,7 @@ RadioTower3F_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 person_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 person_event SPRITE_ROCKET, 1, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index f29ab1dac..38c802c85 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -14,8 +14,8 @@ RadioTower4F_MapScriptHeader: .MapCallbacks: db 0 -FisherScript_0x5eb82: - jumptextfaceplayer UnknownText_0x5ec12 +RadioTower4FFisherScript: + jumptextfaceplayer RadioTower4FFisherText TeacherScript_0x5eb85: faceplayer @@ -56,9 +56,9 @@ RadioTowerMeowth: end TrainerGruntM10: - trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script + trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script -GruntM10Script: +.Script: end_if_just_battled opentext writetext GruntM10AfterBattleText @@ -67,9 +67,9 @@ GruntM10Script: end TrainerExecutivem2: - trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, Executivem2Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script -Executivem2Script: +.Script: end_if_just_battled opentext writetext Executivem2AfterBattleText @@ -78,9 +78,9 @@ Executivem2Script: end TrainerGruntF4: - trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script + trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script -GruntF4Script: +.Script: end_if_just_battled opentext writetext GruntF4AfterBattleText @@ -89,9 +89,9 @@ GruntF4Script: end TrainerScientistRich: - trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, ScientistRichScript + trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script -ScientistRichScript: +.Script: end_if_just_battled opentext writetext ScientistRichAfterBattleText @@ -105,7 +105,7 @@ MapRadioTower4FSignpost0Script: MapRadioTower4FSignpost1Script: jumptext UnknownText_0x5f00d -UnknownText_0x5ec12: +RadioTower4FFisherText: text "I listened to the" line "radio while I was" cont "at the RUINS." @@ -266,7 +266,7 @@ RadioTower4F_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTowerMeowth, -1 person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index e8b70f7e1..020569db2 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -68,9 +68,9 @@ Director: end TrainerExecutivef1: - trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, Executivef1Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script -Executivef1Script: +.Script: end_if_just_battled opentext writetext Executivef1AfterBattleText diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 5704cdcaf..5934f2cf4 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -5,13 +5,13 @@ RedsHouse2F_MapScriptHeader: .MapCallbacks: db 0 -MapRedsHouse2FSignpost0Script: - jumptext UnknownText_0x19b050 +RedsHouse2FN64Script: + jumptext RedsHouse2FN64Text -MapRedsHouse2FSignpost1Script: - jumptext UnknownText_0x19b087 +RedsHouse2FPCScript: + jumptext RedsHouse2FPCText -UnknownText_0x19b050: +RedsHouse2FN64Text: text "<PLAYER> played the" line "N64." @@ -19,7 +19,7 @@ UnknownText_0x19b050: line "no time to lose!" done -UnknownText_0x19b087: +RedsHouse2FPCText: text "It looks like it" line "hasn't been used" cont "in a long time…" @@ -38,8 +38,8 @@ RedsHouse2F_MapEventHeader: .Signposts: db 2 - signpost 5, 3, SIGNPOST_READ, MapRedsHouse2FSignpost0Script - signpost 1, 0, SIGNPOST_READ, MapRedsHouse2FSignpost1Script + signpost 5, 3, SIGNPOST_READ, RedsHouse2FN64Script + signpost 1, 0, SIGNPOST_READ, RedsHouse2FPCScript .PersonEvents: db 0 diff --git a/maps/Route1.asm b/maps/Route1.asm index 3bda2934f..d083b2708 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -11,9 +11,9 @@ Route1_MapScriptHeader: db 0 TrainerSchoolboyDanny: - trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript + trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script -SchoolboyDannyScript: +.Script: end_if_just_battled opentext writetext SchoolboyDannyAfterBattleText @@ -22,9 +22,9 @@ SchoolboyDannyScript: end TrainerCooltrainerfQuinn: - trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript + trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script -CooltrainerfQuinnScript: +.Script: end_if_just_battled opentext writetext CooltrainerfQuinnAfterBattleText diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 18f1bd8ab..7fa695d0f 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -14,8 +14,8 @@ Route10Pokecenter1F_MapScriptHeader: NurseScript_0x188bd4: jumpstd pokecenternurse -GentlemanScript_0x188bd7: - jumptextfaceplayer UnknownText_0x188bf1 +Route10Pokecenter1FGentlemanScript: + jumptextfaceplayer Route10Pokecenter1FGentlemanText GymGuyScript_0x188bda: faceplayer @@ -33,10 +33,10 @@ UnknownScript_0x188be8: closetext end -CooltrainerFScript_0x188bee: - jumptextfaceplayer UnknownText_0x188d0c +Route10Pokecenter1FCooltrainerFScript: + jumptextfaceplayer Route10Pokecenter1FCooltrainerFText -UnknownText_0x188bf1: +Route10Pokecenter1FGentlemanText: text "A #MON CENTER" line "near a cave?" @@ -69,7 +69,7 @@ UnknownText_0x188c9e: line "thing about that." done -UnknownText_0x188d0c: +Route10Pokecenter1FCooltrainerFText: text "When you go out-" line "side, you can see" @@ -99,6 +99,6 @@ Route10Pokecenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x188bd7, -1 + person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 - person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x188bee, -1 + person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index db5c7c5e9..2c9a6fd7f 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -10,9 +10,9 @@ Route10South_MapScriptHeader: db 0 TrainerHikerJim: - trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript + trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script -HikerJimScript: +.Script: end_if_just_battled opentext writetext HikerJimAfterBattleText @@ -21,9 +21,9 @@ HikerJimScript: end TrainerPokefanmRobert: - trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript + trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script -PokefanmRobertScript: +.Script: end_if_just_battled opentext writetext PokefanmRobertAfterBattleText diff --git a/maps/Route11.asm b/maps/Route11.asm index ca6159c38..c01fefdb8 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -13,9 +13,9 @@ Route11_MapScriptHeader: db 0 TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, YoungsterOwenScript + trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script -YoungsterOwenScript: +.Script: end_if_just_battled opentext writetext YoungsterOwenAfterBattleText @@ -24,9 +24,9 @@ YoungsterOwenScript: end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, YoungsterJasonScript + trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script -YoungsterJasonScript: +.Script: end_if_just_battled opentext writetext YoungsterJasonAfterBattleText @@ -35,9 +35,9 @@ YoungsterJasonScript: end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, PsychicHermanScript + trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script -PsychicHermanScript: +.Script: end_if_just_battled opentext writetext PsychicHermanAfterBattleText @@ -46,9 +46,9 @@ PsychicHermanScript: end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, PsychicFidelScript + trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script -PsychicFidelScript: +.Script: end_if_just_battled opentext writetext PsychicFidelAfterBattleText diff --git a/maps/Route12.asm b/maps/Route12.asm index 00c00f15f..ea867c641 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -14,9 +14,9 @@ Route12_MapScriptHeader: db 0 TrainerFisherKyle: - trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript + trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script -FisherKyleScript: +.Script: end_if_just_battled opentext writetext FisherKyleAfterBattleText @@ -25,9 +25,9 @@ FisherKyleScript: end TrainerFisherMartin: - trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript + trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script -FisherMartinScript: +.Script: end_if_just_battled opentext writetext FisherMartinAfterBattleText @@ -36,9 +36,9 @@ FisherMartinScript: end TrainerFisherStephen: - trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript + trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script -FisherStephenScript: +.Script: end_if_just_battled opentext writetext FisherStephenAfterBattleText @@ -47,9 +47,9 @@ FisherStephenScript: end TrainerFisherBarney: - trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript + trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script -FisherBarneyScript: +.Script: end_if_just_battled opentext writetext FisherBarneyAfterBattleText diff --git a/maps/Route13.asm b/maps/Route13.asm index baa220c44..03490891b 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -13,9 +13,9 @@ Route13_MapScriptHeader: db 0 TrainerPokefanmAlex: - trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, PokefanmAlexScript + trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script -PokefanmAlexScript: +.Script: end_if_just_battled opentext writetext PokefanmAlexAfterBattleText @@ -24,9 +24,9 @@ PokefanmAlexScript: end TrainerPokefanmJoshua: - trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, PokefanmJoshuaScript + trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script -PokefanmJoshuaScript: +.Script: end_if_just_battled opentext writetext PokefanmJoshuaAfterBattleText @@ -35,9 +35,9 @@ PokefanmJoshuaScript: end TrainerBird_keeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, Bird_keeperPerryScript + trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, .Script -Bird_keeperPerryScript: +.Script: end_if_just_battled opentext writetext Bird_keeperPerryAfterBattleText @@ -46,9 +46,9 @@ Bird_keeperPerryScript: end TrainerBird_keeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, Bird_keeperBretScript + trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, .Script -Bird_keeperBretScript: +.Script: end_if_just_battled opentext writetext Bird_keeperBretAfterBattleText @@ -57,9 +57,9 @@ Bird_keeperBretScript: end TrainerHikerKenny: - trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, HikerKennyScript + trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script -HikerKennyScript: +.Script: end_if_just_battled opentext writetext HikerKennyAfterBattleText diff --git a/maps/Route14.asm b/maps/Route14.asm index 841ee2c97..e7a3c7f3f 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -20,9 +20,9 @@ Kim: end TrainerPokefanmCarter: - trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, PokefanmCarterScript + trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script -PokefanmCarterScript: +.Script: end_if_just_battled opentext writetext PokefanmCarterAfterBattleText @@ -31,9 +31,9 @@ PokefanmCarterScript: end TrainerBird_keeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, Bird_keeperRoyScript + trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, .Script -Bird_keeperRoyScript: +.Script: end_if_just_battled opentext writetext Bird_keeperRoyAfterBattleText @@ -42,9 +42,9 @@ Bird_keeperRoyScript: end TrainerPokefanmTrevor: - trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, PokefanmTrevorScript + trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script -PokefanmTrevorScript: +.Script: end_if_just_battled opentext writetext PokefanmTrevorAfterBattleText diff --git a/maps/Route15.asm b/maps/Route15.asm index 3d78e29a2..317c536fb 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -15,9 +15,9 @@ Route15_MapScriptHeader: db 0 TrainerTeacherColette: - trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, TeacherColetteScript + trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script -TeacherColetteScript: +.Script: end_if_just_battled opentext writetext TeacherColetteAfterBattleText @@ -26,9 +26,9 @@ TeacherColetteScript: end TrainerTeacherHillary: - trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, TeacherHillaryScript + trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script -TeacherHillaryScript: +.Script: end_if_just_battled opentext writetext TeacherHillaryAfterBattleText @@ -37,9 +37,9 @@ TeacherHillaryScript: end TrainerSchoolboyKipp: - trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, SchoolboyKippScript + trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script -SchoolboyKippScript: +.Script: end_if_just_battled opentext writetext SchoolboyKippAfterBattleText @@ -48,9 +48,9 @@ SchoolboyKippScript: end TrainerSchoolboyTommy: - trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, SchoolboyTommyScript + trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script -SchoolboyTommyScript: +.Script: end_if_just_battled opentext writetext SchoolboyTommyAfterBattleText @@ -59,9 +59,9 @@ SchoolboyTommyScript: end TrainerSchoolboyJohnny: - trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, SchoolboyJohnnyScript + trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script -SchoolboyJohnnyScript: +.Script: end_if_just_battled opentext writetext SchoolboyJohnnyAfterBattleText @@ -70,9 +70,9 @@ SchoolboyJohnnyScript: end TrainerSchoolboyBilly: - trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, SchoolboyBillyScript + trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script -SchoolboyBillyScript: +.Script: end_if_just_battled opentext writetext SchoolboyBillyAfterBattleText diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 920a07d97..855986895 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -8,10 +8,10 @@ Route15FuchsiaGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x19679e: - jumptextfaceplayer UnknownText_0x1967a1 +Route15FuchsiaGateOfficerScript: + jumptextfaceplayer Route15FuchsiaGateOfficerText -UnknownText_0x1967a1: +Route15FuchsiaGateOfficerText: text "You're working on" line "a #DEX? That's" @@ -38,4 +38,4 @@ Route15FuchsiaGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19679e, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 911cc1111..26f47f14a 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -8,13 +8,13 @@ Route16FuchsiaSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -SuperNerdScript_0x73373: - jumptextfaceplayer UnknownText_0x73379 +Route16FuchsiaSpeechHouseSuperNerdScript: + jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText Route16FuchsiaSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x73379: +Route16FuchsiaSpeechHouseSuperNerdText: text "If you cruise down" line "CYCLING ROAD, you" @@ -41,4 +41,4 @@ Route16FuchsiaSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x73373, -1 + person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 3da6f3458..d8bfdc0d3 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -12,8 +12,8 @@ Route16Gate_MapScriptHeader: .DummyTrigger: end -OfficerScript_0x733ea: - jumptextfaceplayer UnknownText_0x73408 +Route16GateOfficerScript: + jumptextfaceplayer Route16GateOfficerText UnknownScript_0x733ed: checkitem BICYCLE @@ -35,7 +35,7 @@ MovementData_0x73405: turn_head LEFT step_end -UnknownText_0x73408: +Route16GateOfficerText: text "CYCLING ROAD" line "starts here." @@ -81,4 +81,4 @@ Route16Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x733ea, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index 03cfd3e4b..89043b890 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -18,9 +18,9 @@ Route17_MapScriptHeader: return TrainerBikerCharles: - trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, BikerCharlesScript + trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script -BikerCharlesScript: +.Script: end_if_just_battled opentext writetext BikerCharlesAfterBattleText @@ -29,9 +29,9 @@ BikerCharlesScript: end TrainerBikerRiley: - trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, BikerRileyScript + trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script -BikerRileyScript: +.Script: end_if_just_battled opentext writetext BikerRileyAfterBattleText @@ -40,9 +40,9 @@ BikerRileyScript: end TrainerBikerJoel: - trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, BikerJoelScript + trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script -BikerJoelScript: +.Script: end_if_just_battled opentext writetext BikerJoelAfterBattleText @@ -51,9 +51,9 @@ BikerJoelScript: end TrainerBikerGlenn: - trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, BikerGlennScript + trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script -BikerGlennScript: +.Script: end_if_just_battled opentext writetext BikerGlennAfterBattleText diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index b93e7978f..c87d389aa 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -12,8 +12,8 @@ Route1718Gate_MapScriptHeader: .DummyTrigger: end -OfficerScript_0x7360e: - jumptextfaceplayer UnknownText_0x7362c +Route1718GateOfficerScript: + jumptextfaceplayer Route1718GateOfficerText UnknownScript_0x73611: checkitem BICYCLE @@ -35,7 +35,7 @@ MovementData_0x73629: turn_head LEFT step_end -UnknownText_0x7362c: +Route1718GateOfficerText: text "CYCLING ROAD" line "Uphill Starts Here" done @@ -72,4 +72,4 @@ Route1718Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7360e, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 8c02559f4..16f5c6920 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -10,9 +10,9 @@ Route18_MapScriptHeader: db 0 TrainerBird_keeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript + trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, .Script -Bird_keeperBorisScript: +.Script: end_if_just_battled opentext writetext Bird_keeperBorisAfterBattleText @@ -21,9 +21,9 @@ Bird_keeperBorisScript: end TrainerBird_keeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript + trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, .Script -Bird_keeperBobScript: +.Script: end_if_just_battled opentext writetext Bird_keeperBobAfterBattleText diff --git a/maps/Route19.asm b/maps/Route19.asm index 18bffe3e4..02e59165f 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -27,9 +27,9 @@ Route19_MapScriptHeader: return TrainerSwimmerfDawn: - trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, SwimmerfDawnScript + trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script -SwimmerfDawnScript: +.Script: end_if_just_battled opentext writetext SwimmerfDawnAfterBattleText @@ -38,9 +38,9 @@ SwimmerfDawnScript: end TrainerSwimmermHarold: - trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, SwimmermHaroldScript + trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script -SwimmermHaroldScript: +.Script: end_if_just_battled opentext writetext SwimmermHaroldAfterBattleText @@ -49,9 +49,9 @@ SwimmermHaroldScript: end TrainerSwimmermJerome: - trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, SwimmermJeromeScript + trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script -SwimmermJeromeScript: +.Script: end_if_just_battled opentext writetext SwimmermJeromeAfterBattleText @@ -60,9 +60,9 @@ SwimmermJeromeScript: end TrainerSwimmermTucker: - trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, SwimmermTuckerScript + trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script -SwimmermTuckerScript: +.Script: end_if_just_battled opentext writetext SwimmermTuckerAfterBattleText diff --git a/maps/Route2.asm b/maps/Route2.asm index be4069932..d33381b26 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -16,9 +16,9 @@ Route2_MapScriptHeader: db 0 TrainerBug_catcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, .Script -Bug_catcherRobScript: +.Script: end_if_just_battled opentext writetext Bug_catcherRobAfterBattleText @@ -27,9 +27,9 @@ Bug_catcherRobScript: end TrainerBug_catcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, .Script -Bug_catcherEdScript: +.Script: end_if_just_battled opentext writetext Bug_catcherEdAfterBattleText @@ -38,9 +38,9 @@ Bug_catcherEdScript: end TrainerBug_catcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, .Script -Bug_catcherDougScript: +.Script: end_if_just_battled opentext writetext Bug_catcherDougAfterBattleText diff --git a/maps/Route20.asm b/maps/Route20.asm index c849e516c..c0a05f7a4 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -16,9 +16,9 @@ Route20_MapScriptHeader: return TrainerSwimmerfNicole: - trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, SwimmerfNicoleScript + trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script -SwimmerfNicoleScript: +.Script: end_if_just_battled opentext writetext SwimmerfNicoleAfterBattleText @@ -27,9 +27,9 @@ SwimmerfNicoleScript: end TrainerSwimmerfLori: - trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, SwimmerfLoriScript + trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script -SwimmerfLoriScript: +.Script: end_if_just_battled opentext writetext SwimmerfLoriAfterBattleText @@ -38,9 +38,9 @@ SwimmerfLoriScript: end TrainerSwimmermCameron: - trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, SwimmermCameronScript + trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script -SwimmermCameronScript: +.Script: end_if_just_battled opentext writetext SwimmermCameronAfterBattleText diff --git a/maps/Route21.asm b/maps/Route21.asm index 28b17d11d..64bc65257 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -11,9 +11,9 @@ Route21_MapScriptHeader: db 0 TrainerSwimmermSeth: - trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, SwimmermSethScript + trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script -SwimmermSethScript: +.Script: end_if_just_battled opentext writetext SwimmermSethAfterBattleText @@ -22,9 +22,9 @@ SwimmermSethScript: end TrainerSwimmerfNikki: - trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, SwimmerfNikkiScript + trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script -SwimmerfNikkiScript: +.Script: end_if_just_battled opentext writetext SwimmerfNikkiAfterBattleText @@ -33,9 +33,9 @@ SwimmerfNikkiScript: end TrainerFisherArnold: - trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, FisherArnoldScript + trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script -FisherArnoldScript: +.Script: end_if_just_battled opentext writetext FisherArnoldAfterBattleText diff --git a/maps/Route25.asm b/maps/Route25.asm index 76b43b70f..44e854532 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -79,9 +79,9 @@ UnknownScript_0x19eee0: end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, SchoolboyDudleyScript + trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script -SchoolboyDudleyScript: +.Script: end_if_just_battled opentext writetext SchoolboyDudleyAfterBattleText @@ -90,9 +90,9 @@ SchoolboyDudleyScript: end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, LassEllenScript + trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script -LassEllenScript: +.Script: end_if_just_battled opentext writetext LassEllenAfterBattleText @@ -101,9 +101,9 @@ LassEllenScript: end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, SchoolboyJoeScript + trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script -SchoolboyJoeScript: +.Script: end_if_just_battled opentext writetext SchoolboyJoeAfterBattleText @@ -112,9 +112,9 @@ SchoolboyJoeScript: end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, LassLauraScript + trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script -LassLauraScript: +.Script: end_if_just_battled opentext writetext LassLauraAfterBattleText @@ -123,9 +123,9 @@ LassLauraScript: end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, CamperLloydScript + trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script -CamperLloydScript: +.Script: end_if_just_battled opentext writetext CamperLloydAfterBattleText @@ -134,9 +134,9 @@ CamperLloydScript: end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, LassShannonScript + trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script -LassShannonScript: +.Script: end_if_just_battled opentext writetext LassShannonAfterBattleText @@ -145,9 +145,9 @@ LassShannonScript: end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, SupernerdPatScript + trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script -SupernerdPatScript: +.Script: end_if_just_battled opentext writetext SupernerdPatAfterBattleText diff --git a/maps/Route26.asm b/maps/Route26.asm index 589ed25d0..f48f2b082 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -16,9 +16,9 @@ Route26_MapScriptHeader: db 0 TrainerCooltrainermJake: - trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, CooltrainermJakeScript + trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script -CooltrainermJakeScript: +.Script: end_if_just_battled opentext writetext CooltrainermJakeAfterBattleText @@ -27,9 +27,9 @@ CooltrainermJakeScript: end TrainerCooltrainermGaven3: - trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, CooltrainermGaven3Script + trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script -CooltrainermGaven3Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN end_if_just_battled opentext @@ -120,9 +120,9 @@ UnknownScript_0x1a4dd7: end TrainerCooltrainerfJoyce: - trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, CooltrainerfJoyceScript + trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script -CooltrainerfJoyceScript: +.Script: end_if_just_battled opentext writetext CooltrainerfJoyceAfterBattleText @@ -131,9 +131,9 @@ CooltrainerfJoyceScript: end TrainerCooltrainerfBeth1: - trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, CooltrainerfBeth1Script + trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script -CooltrainerfBeth1Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH end_if_just_battled opentext @@ -224,9 +224,9 @@ UnknownScript_0x1a4e93: end TrainerPsychicRichard: - trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, PsychicRichardScript + trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script -PsychicRichardScript: +.Script: end_if_just_battled opentext writetext PsychicRichardAfterBattleText @@ -235,9 +235,9 @@ PsychicRichardScript: end TrainerFisherScott: - trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, FisherScottScript + trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script -FisherScottScript: +.Script: end_if_just_battled opentext writetext FisherScottAfterBattleText diff --git a/maps/Route27.asm b/maps/Route27.asm index 9af0531cf..10716d9fb 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -39,19 +39,19 @@ UnknownScript_0x1a088c: opentext writetext UnknownText_0x1a0a6b buttonsound - writetext UnknownText_0x1a0a71 + writetext Route27FisherText waitbutton closetext dotrigger $1 end -FisherScript_0x1a089c: - jumptextfaceplayer UnknownText_0x1a0a71 +Route27FisherScript: + jumptextfaceplayer Route27FisherText TrainerPsychicGilbert: - trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, PsychicGilbertScript + trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script -PsychicGilbertScript: +.Script: end_if_just_battled opentext writetext PsychicGilbertAfterBattleText @@ -60,9 +60,9 @@ PsychicGilbertScript: end TrainerBird_keeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, Bird_keeperJose2Script + trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, .Script -Bird_keeperJose2Script: +.Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE end_if_just_battled opentext @@ -173,9 +173,9 @@ UnknownScript_0x1a0977: end TrainerCooltrainermBlake: - trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, CooltrainermBlakeScript + trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script -CooltrainermBlakeScript: +.Script: end_if_just_battled opentext writetext CooltrainermBlakeAfterBattleText @@ -184,9 +184,9 @@ CooltrainermBlakeScript: end TrainerCooltrainermBrian: - trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, CooltrainermBrianScript + trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script -CooltrainermBrianScript: +.Script: end_if_just_battled opentext writetext CooltrainermBrianAfterBattleText @@ -195,9 +195,9 @@ CooltrainermBrianScript: end TrainerCooltrainerfReena: - trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, CooltrainerfReena1Script + trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, .Script -CooltrainerfReena1Script: +.Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA end_if_just_battled opentext @@ -288,9 +288,9 @@ UnknownScript_0x1a0a47: end TrainerCooltrainerfMegan: - trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, CooltrainerfMeganScript + trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script -CooltrainerfMeganScript: +.Script: end_if_just_battled opentext writetext CooltrainerfMeganAfterBattleText @@ -320,7 +320,7 @@ UnknownText_0x1a0a6b: text "Hey!" done -UnknownText_0x1a0a71: +Route27FisherText: text "Do you know what" line "you just did?" @@ -496,4 +496,4 @@ Route27_MapEventHeader: person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY - person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, FisherScript_0x1a089c, -1 + person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, Route27FisherScript, -1 diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index be5068078..d2fa5d5dc 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -9,13 +9,13 @@ Route2946Gate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x7b5bb: - jumptextfaceplayer UnknownText_0x7b5c1 +Route2946GateOfficerScript: + jumptextfaceplayer Route2946GateOfficerText -YoungsterScript_0x7b5be: - jumptextfaceplayer UnknownText_0x7b60d +Route2946GateYoungsterScript: + jumptextfaceplayer Route2946GateYoungsterText -UnknownText_0x7b5c1: +Route2946GateOfficerText: text "You can't climb" line "ledges." @@ -24,7 +24,7 @@ UnknownText_0x7b5c1: cont "take a shortcut." done -UnknownText_0x7b60d: +Route2946GateYoungsterText: text "Different kinds of" line "#MON appear" cont "past here." @@ -55,5 +55,5 @@ Route2946Gate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7b5bb, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7b5be, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1 + person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index c3674b074..1647215b9 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -8,10 +8,10 @@ Route2Gate_MapScriptHeader: .MapCallbacks: db 0 -ScientistScript_0x9b952: - jumptextfaceplayer UnknownText_0x9b955 +Route2GateScientistScript: + jumptextfaceplayer Route2GateScientistText -UnknownText_0x9b955: +Route2GateScientistText: text "Are you <PLAY_G>?" para "I work as PROF." @@ -44,4 +44,4 @@ Route2Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x9b952, -1 + person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route2GateScientistScript, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index 96159e7e3..5b5d9a1d2 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -12,9 +12,9 @@ Route3_MapScriptHeader: db 0 TrainerFirebreatherOtis: - trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript + trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script -FirebreatherOtisScript: +.Script: end_if_just_battled opentext writetext FirebreatherOtisAfterBattleText @@ -23,9 +23,9 @@ FirebreatherOtisScript: end TrainerYoungsterWarren: - trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript + trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script -YoungsterWarrenScript: +.Script: end_if_just_battled opentext writetext YoungsterWarrenAfterBattleText @@ -34,9 +34,9 @@ YoungsterWarrenScript: end TrainerYoungsterJimmy: - trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript + trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script -YoungsterJimmyScript: +.Script: end_if_just_battled opentext writetext YoungsterJimmyAfterBattleText @@ -45,9 +45,9 @@ YoungsterJimmyScript: end TrainerFirebreatherBurt: - trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript + trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script -FirebreatherBurtScript: +.Script: end_if_just_battled opentext writetext FirebreatherBurtAfterBattleText diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 28b43d2d8..de72c9a51 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -9,19 +9,19 @@ Route31VioletGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x197634: - jumptextfaceplayer UnknownText_0x19763a +Route31VioletGateOfficerScript: + jumptextfaceplayer Route31VioletGateOfficerText -CooltrainerFScript_0x197637: - jumptextfaceplayer UnknownText_0x197661 +Route31VioletGateCooltrainerFScript: + jumptextfaceplayer Route31VioletGateCooltrainerFText -UnknownText_0x19763a: +Route31VioletGateOfficerText: text "Hi there!" line "Did you visit" cont "SPROUT TOWER?" done -UnknownText_0x197661: +Route31VioletGateCooltrainerFText: text "I came too far" line "out. I'd better" cont "phone home!" @@ -46,5 +46,5 @@ Route31VioletGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x197634, -1 - person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x197637, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 + person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 18c9622ee..bc9f4f0f8 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -42,8 +42,8 @@ UnknownScript_0x69b7a: closetext end -CooltrainerFScript_0x69b80: - jumptextfaceplayer UnknownText_0x69cac +Route32Pokecenter1FCooltrainerFScript: + jumptextfaceplayer Route32Pokecenter1FCooltrainerFText UnknownText_0x69b83: text "This is a great" @@ -85,7 +85,7 @@ UnknownText_0x69c8d: line "they biting?" done -UnknownText_0x69cac: +Route32Pokecenter1FCooltrainerFText: text "What should I make" line "my #MON hold?" @@ -114,4 +114,4 @@ Route32Pokecenter1F_MapEventHeader: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 person_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x69b80, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index b530cbf5f..523fee2e9 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -10,16 +10,16 @@ Route32RuinsOfAlphGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x69a2d: - jumptextfaceplayer UnknownText_0x69a36 +Route32RuinsOfAlphGateOfficerScript: + jumptextfaceplayer Route32RuinsOfAlphGateOfficerText -PokefanMScript_0x69a30: - jumptextfaceplayer UnknownText_0x69a81 +Route32RuinsOfAlphGatePokefanMScript: + jumptextfaceplayer Route32RuinsOfAlphGatePokefanMText -YoungsterScript_0x69a33: - jumptextfaceplayer UnknownText_0x69abd +Route32RuinsOfAlphGateYoungsterScript: + jumptextfaceplayer Route32RuinsOfAlphGateYoungsterText -UnknownText_0x69a36: +Route32RuinsOfAlphGateOfficerText: text "RUINS OF ALPH" para "A Look-and-Touch" @@ -29,7 +29,7 @@ UnknownText_0x69a36: line "stone panels!" done -UnknownText_0x69a81: +Route32RuinsOfAlphGatePokefanMText: text "You're studying" line "the RUINS?" @@ -37,7 +37,7 @@ UnknownText_0x69a81: line "in the making." done -UnknownText_0x69abd: +Route32RuinsOfAlphGateYoungsterText: text "There are drawings" line "on stone panels." @@ -65,6 +65,6 @@ Route32RuinsOfAlphGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69a33, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 + person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 + person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 143a1adc9..d629eecdd 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -75,8 +75,8 @@ IlexGateButterfree: closetext end -LassScript_0x62d94: - jumptextfaceplayer UnknownText_0x62e97 +Route34IlexForestGateLassScript: + jumptextfaceplayer Route34IlexForestGateLassText MovementData_0x62d97: step UP @@ -121,7 +121,7 @@ UnknownText_0x62e83: text "BUTTERFREE: Freeh!" done -UnknownText_0x62e97: +Route34IlexForestGateLassText: text "Did you see the" line "shrine honoring" cont "the protector?" @@ -157,5 +157,5 @@ Route34IlexForestGate_MapEventHeader: db 4 person_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, IlexGateButterfree, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS person_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index 8ce6adde7..7d5d2d48a 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -19,9 +19,9 @@ Route35_MapScriptHeader: db 0 TrainerBird_keeperBryan: - trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, Bird_keeperBryanScript + trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, .Script -Bird_keeperBryanScript: +.Script: end_if_just_battled opentext writetext Bird_keeperBryanAfterBattleText @@ -30,9 +30,9 @@ Bird_keeperBryanScript: end TrainerJugglerIrwin: - trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, JugglerIrwin1Script + trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script -JugglerIrwin1Script: +.Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN end_if_just_battled opentext @@ -85,9 +85,9 @@ UnknownScript_0x19c91b: end TrainerCamperIvan: - trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, CamperIvanScript + trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script -CamperIvanScript: +.Script: end_if_just_battled opentext writetext CamperIvanAfterBattleText @@ -96,9 +96,9 @@ CamperIvanScript: end TrainerCamperElliot: - trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, CamperElliotScript + trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script -CamperElliotScript: +.Script: end_if_just_battled opentext writetext CamperElliotAfterBattleText @@ -107,9 +107,9 @@ CamperElliotScript: end TrainerPicnickerBrooke: - trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, PicnickerBrookeScript + trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script -PicnickerBrookeScript: +.Script: end_if_just_battled opentext writetext PicnickerBrookeAfterBattleText @@ -118,9 +118,9 @@ PicnickerBrookeScript: end TrainerPicnickerKim: - trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, PicnickerKimScript + trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script -PicnickerKimScript: +.Script: end_if_just_battled opentext writetext PicnickerKimAfterBattleText @@ -129,9 +129,9 @@ PicnickerKimScript: end TrainerBug_catcherArnie1: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, Bug_catcherArnie1Script + trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, .Script -Bug_catcherArnie1Script: +.Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE end_if_just_battled opentext @@ -226,9 +226,9 @@ UnknownScript_0x19ca2f: end TrainerFirebreatherWalt: - trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, FirebreatherWaltScript + trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script -FirebreatherWaltScript: +.Script: end_if_just_battled opentext writetext FirebreatherWaltAfterBattleText diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index e68250183..4cdf461df 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -91,8 +91,8 @@ PokefanFScript_0x69dc6: closetext end -FisherScript_0x69dda: - jumptextfaceplayer UnknownText_0x6a0cb +Route35GoldenrodGateFisherScript: + jumptextfaceplayer Route35GoldenrodGateFisherText UnknownText_0x69ddd: text "Excuse me, kid!" @@ -181,7 +181,7 @@ UnknownText_0x6a09a: cont "on the radio." done -UnknownText_0x6a0cb: +Route35GoldenrodGateFisherText: text "I wonder how many" line "kinds of #MON" @@ -216,4 +216,4 @@ Route35GoldenrodGate_MapEventHeader: db 3 person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 person_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x69dda, -1 + person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 1214827f8..935a8e518 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -199,8 +199,8 @@ OfficerScript_0x6a2ca: closetext end -YoungsterScript_0x6a2d8: - jumptextfaceplayer UnknownText_0x6a8d8 +Route35NationalParkGateYoungsterScript: + jumptextfaceplayer Route35NationalParkGateYoungsterText MapRoute36NationalParkGateSignpost0Script: jumptext UnknownText_0x6a90e @@ -411,7 +411,7 @@ UnknownText_0x6a894: line "give it a shot." done -UnknownText_0x6a8d8: +Route35NationalParkGateYoungsterText: text "When is the next" line "Bug-Catching Con-" cont "test going to be?" @@ -458,5 +458,5 @@ Route35NationalParkGate_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index 5519a692b..d0accbaa7 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -310,7 +310,7 @@ TrainerPsychicMark: .Script: end_if_just_battled opentext - writetext UnknownText_0x19471e + writetext PsychicMarkAfterBattleText waitbutton closetext end @@ -553,7 +553,7 @@ PsychicMarkBeatenText: text "I misread you!" done -UnknownText_0x19471e: +PsychicMarkAfterBattleText: text "I'd be strong if" line "only I could tell" diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index e9fe6d2f5..95501862a 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -9,20 +9,20 @@ Route36RuinsOfAlphGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x6aa1a: - jumptextfaceplayer UnknownText_0x6aa20 +Route36RuinsOfAlphGateOfficerScript: + jumptextfaceplayer Route36RuinsOfAlphGateOfficerText -GrampsScript_0x6aa1d: - jumptextfaceplayer UnknownText_0x6aa5b +Route36RuinsOfAlphGateGrampsScript: + jumptextfaceplayer Route36RuinsOfAlphGateGrampsText -UnknownText_0x6aa20: +Route36RuinsOfAlphGateOfficerText: text "Don't you wonder" line "who'd make some-" cont "thing like this?" cont "And why?" done -UnknownText_0x6aa5b: +Route36RuinsOfAlphGateGrampsText: text "Did you see that" line "strange tree in" cont "the road?" @@ -53,5 +53,5 @@ Route36RuinsOfAlphGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6aa1a, -1 - person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x6aa1d, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 + person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 2b6ad223a..0c1c926b3 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -26,9 +26,9 @@ Route37_MapScriptHeader: return TrainerTwinsAnnandanne1: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, TwinsAnnandanne1Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script -TwinsAnnandanne1Script: +.Script: end_if_just_battled opentext writetext TwinsAnnandanne1AfterBattleText @@ -37,9 +37,9 @@ TwinsAnnandanne1Script: end TrainerTwinsAnnandanne2: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, TwinsAnnandanne2Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script -TwinsAnnandanne2Script: +.Script: end_if_just_battled opentext writetext TwinsAnnandanne2AfterBattleText @@ -48,9 +48,9 @@ TwinsAnnandanne2Script: end TrainerPsychicGreg: - trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, PsychicGregScript + trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script -PsychicGregScript: +.Script: end_if_just_battled opentext writetext PsychicGregAfterBattleText diff --git a/maps/Route38.asm b/maps/Route38.asm index a496ec99f..0f4227e8e 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -15,31 +15,31 @@ Route38_MapScriptHeader: db 0 TrainerBird_keeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script + trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a1f86 + writetext Bird_keeperTobyAfterBattleText waitbutton closetext end TrainerSailorHarry: - trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script + trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a220c + writetext SailorHarryAfterBattleText waitbutton closetext end TrainerLassDana1: - trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .script + trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script -.script +.Script writecode VAR_CALLERID, PHONE_LASS_DANA end_if_just_battled opentext @@ -175,9 +175,9 @@ TrainerLassDana1: end TrainerSchoolboyChad1: - trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .script + trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script -.script +.Script writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD end_if_just_battled opentext @@ -292,23 +292,23 @@ TrainerSchoolboyChad1: end TrainerBeautyValerie: - trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script + trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a2185 + writetext BeautyValerieAfterBattleText waitbutton closetext end TrainerBeautyOlivia: - trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script + trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script -.script +.Script end_if_just_battled opentext - writetext UnknownText_0x1a229a + writetext BeautyOliviaAfterBattleText waitbutton closetext end @@ -333,7 +333,7 @@ Bird_keeperTobyBeatenText: line "flying away now." done -UnknownText_0x1a1f86: +Bird_keeperTobyAfterBattleText: text "I plan to train in" line "CIANWOOD CITY to" @@ -400,7 +400,7 @@ BeautyValerieBeatenText: line "see your #MON!" done -UnknownText_0x1a2185: +BeautyValerieAfterBattleText: text "When I see #-" line "MON, it seems to" cont "soothe my nerves." @@ -419,7 +419,7 @@ SailorHarryBeatenText: line "world class!" done -UnknownText_0x1a220c: +SailorHarryAfterBattleText: text "All kinds of peo-" line "ple around the" @@ -438,7 +438,7 @@ BeautyOliviaBeatenText: line "MILK every day." done -UnknownText_0x1a229a: +BeautyOliviaAfterBattleText: text "MOOMOO MILK is" line "good for beauty" diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 3516c72c9..f61bcaaa4 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -8,10 +8,10 @@ Route38EcruteakGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x9cbd7: - jumptextfaceplayer UnknownText_0x9cbda +Route38EcruteakGateOfficerScript: + jumptextfaceplayer Route38EcruteakGateOfficerText -UnknownText_0x9cbda: +Route38EcruteakGateOfficerText: text "Where did you say" line "you're from?" @@ -43,4 +43,4 @@ Route38EcruteakGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x9cbd7, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 48690345e..54e1426a5 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -26,9 +26,9 @@ Route39Miltank: end TrainerPokefanmDerek1: - trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, PokefanmDerek1Script + trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script -PokefanmDerek1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK end_if_just_battled opentext @@ -105,9 +105,9 @@ PackIsFull: end TrainerPokefanfRuth: - trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, PokefanfRuthScript + trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script -PokefanfRuthScript: +.Script: end_if_just_battled opentext writetext PokefanfRuthAfterBattleText @@ -116,9 +116,9 @@ PokefanfRuthScript: end TrainerSailorEugene: - trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, SailorEugeneScript + trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script -SailorEugeneScript: +.Script: end_if_just_battled opentext writetext SailorEugeneAfterBattleText @@ -127,9 +127,9 @@ SailorEugeneScript: end TrainerPsychicNorman: - trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, PsychicNormanScript + trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script -PsychicNormanScript: +.Script: end_if_just_battled opentext writetext PsychicNormanAfterBattleText diff --git a/maps/Route4.asm b/maps/Route4.asm index b674afdad..4f6207cf3 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -12,9 +12,9 @@ Route4_MapScriptHeader: db 0 TrainerBird_keeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, Bird_keeperHankScript + trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, .Script -Bird_keeperHankScript: +.Script: end_if_just_battled opentext writetext Bird_keeperHankAfterBattleText @@ -23,9 +23,9 @@ Bird_keeperHankScript: end TrainerPicnickerHope: - trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, PicnickerHopeScript + trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script -PicnickerHopeScript: +.Script: end_if_just_battled opentext writetext PicnickerHopeAfterBattleText @@ -34,9 +34,9 @@ PicnickerHopeScript: end TrainerPicnickerSharon: - trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, PicnickerSharonScript + trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script -PicnickerSharonScript: +.Script: end_if_just_battled opentext writetext PicnickerSharonAfterBattleText diff --git a/maps/Route40.asm b/maps/Route40.asm index bbf90ab75..65f36135a 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -32,9 +32,9 @@ Route40_MapScriptHeader: return TrainerSwimmerfElaine: - trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, SwimmerfElaineScript + trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script -SwimmerfElaineScript: +.Script: end_if_just_battled opentext writetext SwimmerfElaineAfterBattleText @@ -43,9 +43,9 @@ SwimmerfElaineScript: end TrainerSwimmerfPaula: - trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, SwimmerfPaulaScript + trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script -SwimmerfPaulaScript: +.Script: end_if_just_battled opentext writetext SwimmerfPaulaAfterBattleText @@ -54,9 +54,9 @@ SwimmerfPaulaScript: end TrainerSwimmermSimon: - trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, SwimmermSimonScript + trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script -SwimmermSimonScript: +.Script: end_if_just_battled opentext writetext SwimmermSimonAfterBattleText @@ -65,9 +65,9 @@ SwimmermSimonScript: end TrainerSwimmermRandall: - trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, SwimmermRandallScript + trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script -SwimmermRandallScript: +.Script: end_if_just_battled opentext writetext SwimmermRandallAfterBattleText @@ -75,8 +75,8 @@ SwimmermRandallScript: closetext end -LassScript_0x1a61c4: - jumptextfaceplayer UnknownText_0x1a6429 +Route40Lass1Script: + jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: special Mobile_DummyReturnFalse @@ -86,11 +86,11 @@ PokefanMScript_0x1a61c7: .mobile jumptextfaceplayer UnknownText_0x1a649b -LassScript_0x1a61d3: - jumptextfaceplayer UnknownText_0x1a64e6 +Route40Lass2Script: + jumptextfaceplayer Route40Lass2Text -StandingYoungsterScript_0x1a61d6: - jumptextfaceplayer UnknownText_0x1a6564 +Route40StandingYoungsterScript: + jumptextfaceplayer Route40StandingYoungsterText MonicaScript: faceplayer @@ -235,7 +235,7 @@ SwimmerfPaulaAfterBattleText: cont "carry me along." done -UnknownText_0x1a6429: +Route40Lass1Text: text "Although you can't" line "see it from here," @@ -259,7 +259,7 @@ UnknownText_0x1a649b: para "What? What?" done -UnknownText_0x1a64e6: +Route40Lass2Text: text "I came to OLIVINE" line "by ship to see the" @@ -271,7 +271,7 @@ UnknownText_0x1a64e6: cont "from a big city." done -UnknownText_0x1a6564: +Route40StandingYoungsterText: text "Have you gone to" line "the BATTLE TOWER?" @@ -362,8 +362,8 @@ Route40_MapEventHeader: person_event SPRITE_ROCK, 11, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 person_event SPRITE_ROCK, 9, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 person_event SPRITE_ROCK, 8, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 - person_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61c4, -1 + person_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Lass1Script, -1 person_event SPRITE_BUENA, 10, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 - person_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61d3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route40Lass2Script, -1 + person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 0f8b139c7..238686d9d 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -14,11 +14,11 @@ Route40BattleTowerGate_MapScriptHeader: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return -RockerScript_0x9f669: - jumptextfaceplayer UnknownText_0x9f716 +Route40BattleTowerGateRockerScript: + jumptextfaceplayer Route40BattleTowerGateRockerText -TwinScript_0x9f66c: - jumptextfaceplayer UnknownText_0x9f7c8 +Route40BattleTowerGateTwinScript: + jumptextfaceplayer Route40BattleTowerGateTwinText UnknownText_0x9f66f: text "Did you come to" @@ -40,7 +40,7 @@ UnknownText_0x9f6ba: line "when I win." done -UnknownText_0x9f716: +Route40BattleTowerGateRockerText: text "Are you going to" line "the BATTLE TOWER?" @@ -59,7 +59,7 @@ UnknownText_0x9f783: line "the BATTLE TOWER." done -UnknownText_0x9f7c8: +Route40BattleTowerGateTwinText: text "The levels of the" line "#MON I want to" @@ -89,5 +89,5 @@ Route40BattleTowerGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TwinScript_0x9f66c, -1 + person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 174909216..3ff1bb587 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -18,9 +18,9 @@ Route41_MapScriptHeader: db 0 TrainerSwimmerfKaylee: - trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, SwimmerfKayleeScript + trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script -SwimmerfKayleeScript: +.Script: end_if_just_battled opentext writetext SwimmerfKayleeAfterBattleText @@ -29,9 +29,9 @@ SwimmerfKayleeScript: end TrainerSwimmerfSusie: - trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, SwimmerfSusieScript + trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script -SwimmerfSusieScript: +.Script: end_if_just_battled opentext writetext SwimmerfSusieAfterBattleText @@ -40,9 +40,9 @@ SwimmerfSusieScript: end TrainerSwimmerfDenise: - trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, SwimmerfDeniseScript + trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script -SwimmerfDeniseScript: +.Script: end_if_just_battled opentext writetext SwimmerfDeniseAfterBattleText @@ -51,9 +51,9 @@ SwimmerfDeniseScript: end TrainerSwimmerfKara: - trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, SwimmerfKaraScript + trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script -SwimmerfKaraScript: +.Script: end_if_just_battled opentext writetext SwimmerfKaraAfterBattleText @@ -62,9 +62,9 @@ SwimmerfKaraScript: end TrainerSwimmerfWendy: - trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, SwimmerfWendyScript + trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script -SwimmerfWendyScript: +.Script: end_if_just_battled opentext writetext SwimmerfWendyAfterBattleText @@ -73,9 +73,9 @@ SwimmerfWendyScript: end TrainerSwimmermCharlie: - trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, SwimmermCharlieScript + trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script -SwimmermCharlieScript: +.Script: end_if_just_battled opentext writetext SwimmermCharlieAfterBattleText @@ -84,9 +84,9 @@ SwimmermCharlieScript: end TrainerSwimmermGeorge: - trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, SwimmermGeorgeScript + trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script -SwimmermGeorgeScript: +.Script: end_if_just_battled opentext writetext SwimmermGeorgeAfterBattleText @@ -95,9 +95,9 @@ SwimmermGeorgeScript: end TrainerSwimmermBerke: - trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, SwimmermBerkeScript + trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script -SwimmermBerkeScript: +.Script: end_if_just_battled opentext writetext SwimmermBerkeAfterBattleText @@ -106,9 +106,9 @@ SwimmermBerkeScript: end TrainerSwimmermKirk: - trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, SwimmermKirkScript + trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script -SwimmermKirkScript: +.Script: end_if_just_battled opentext writetext SwimmermKirkAfterBattleText @@ -117,9 +117,9 @@ SwimmermKirkScript: end TrainerSwimmermMathew: - trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, SwimmermMathewScript + trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script -SwimmermMathewScript: +.Script: end_if_just_battled opentext writetext SwimmermMathewAfterBattleText diff --git a/maps/Route42.asm b/maps/Route42.asm index 99bb953cb..eab7e282c 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -37,9 +37,9 @@ Route42SuicuneScript: end TrainerFisherTully1: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, FisherTully1Script + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script -FisherTully1Script: +.Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY end_if_just_battled opentext @@ -163,9 +163,9 @@ UnknownScript_0x1a9311: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript + trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script -PokemaniacShaneScript: +.Script: end_if_just_battled opentext writetext PokemaniacShaneAfterBattleText @@ -174,9 +174,9 @@ PokemaniacShaneScript: end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript + trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script -HikerBenjaminScript: +.Script: end_if_just_battled opentext writetext HikerBenjaminAfterBattleText diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index e014340e4..ae13507e7 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -8,10 +8,10 @@ Route42EcruteakGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x19a4b5: - jumptextfaceplayer UnknownText_0x19a4b8 +Route42EcruteakGateOfficerScript: + jumptextfaceplayer Route42EcruteakGateOfficerText -UnknownText_0x19a4b8: +Route42EcruteakGateOfficerText: text "MT.MORTAR is like" line "a maze inside." @@ -38,4 +38,4 @@ Route42EcruteakGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19a4b5, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index dcb0d70be..d3e16b3df 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -27,9 +27,9 @@ Route43_MapScriptHeader: return TrainerCamperSpencer: - trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, CamperSpencerScript + trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script -CamperSpencerScript: +.Script: end_if_just_battled opentext writetext CamperSpencerAfterBattleText @@ -38,9 +38,9 @@ CamperSpencerScript: end TrainerPokemaniacBen: - trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, PokemaniacBenScript + trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script -PokemaniacBenScript: +.Script: end_if_just_battled opentext writetext PokemaniacBenAfterBattleText @@ -49,9 +49,9 @@ PokemaniacBenScript: end TrainerPokemaniacBrent1: - trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, PokemaniacBrent1Script + trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, .Script -PokemaniacBrent1Script: +.Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT end_if_just_battled opentext @@ -154,9 +154,9 @@ UnknownScript_0x19d144: end TrainerPokemaniacRon: - trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, PokemaniacRonScript + trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script -PokemaniacRonScript: +.Script: end_if_just_battled opentext writetext PokemaniacRonAfterBattleText @@ -165,9 +165,9 @@ PokemaniacRonScript: end TrainerFisherMarvin: - trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, FisherMarvinScript + trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script -FisherMarvinScript: +.Script: end_if_just_battled opentext writetext FisherMarvinAfterBattleText @@ -176,9 +176,9 @@ FisherMarvinScript: end TrainerPicnickerTiffany3: - trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, PicnickerTiffany3Script + trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, .Script -PicnickerTiffany3Script: +.Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY end_if_just_battled opentext diff --git a/maps/Route44.asm b/maps/Route44.asm index dc24e8ddb..31c8a9c92 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -19,9 +19,9 @@ Route44_MapScriptHeader: db 0 TrainerBird_keeperVance1: - trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, Bird_keeperVance1Script + trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, .Script -Bird_keeperVance1Script: +.Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE end_if_just_battled opentext @@ -150,9 +150,9 @@ UnknownScript_0x19d90a: end TrainerPsychicPhil: - trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, PsychicPhilScript + trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script -PsychicPhilScript: +.Script: end_if_just_battled opentext writetext PsychicPhilAfterBattleText @@ -161,9 +161,9 @@ PsychicPhilScript: end TrainerFisherWilton1: - trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, FisherWilton1Script + trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script -FisherWilton1Script: +.Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON end_if_just_battled opentext @@ -256,9 +256,9 @@ UnknownScript_0x19d9e7: jump UnknownScript_0x19d8ff TrainerFisherEdgar: - trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, FisherEdgarScript + trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script -FisherEdgarScript: +.Script: end_if_just_battled opentext writetext FisherEdgarAfterBattleText @@ -267,9 +267,9 @@ FisherEdgarScript: end TrainerCooltrainerfCybil: - trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, CooltrainerfCybilScript + trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script -CooltrainerfCybilScript: +.Script: end_if_just_battled opentext writetext CooltrainerfCybilAfterBattleText @@ -278,9 +278,9 @@ CooltrainerfCybilScript: end TrainerPokemaniacZach: - trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, PokemaniacZachScript + trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script -PokemaniacZachScript: +.Script: end_if_just_battled opentext writetext PokemaniacZachAfterBattleText @@ -289,9 +289,9 @@ PokemaniacZachScript: end TrainerCooltrainermAllen: - trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, CooltrainermAllenScript + trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script -CooltrainermAllenScript: +.Script: end_if_just_battled opentext writetext CooltrainermAllenAfterBattleText diff --git a/maps/Route45.asm b/maps/Route45.asm index 8caac5aa6..7232e3494 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -21,9 +21,9 @@ Route45_MapScriptHeader: db 0 TrainerBlackbeltKenji: - trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, BlackbeltKenji3Script + trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script -BlackbeltKenji3Script: +.Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI end_if_just_battled opentext @@ -125,9 +125,9 @@ UnknownScript_0x19e146: end TrainerHikerErik: - trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, HikerErikScript + trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script -HikerErikScript: +.Script: end_if_just_battled opentext writetext HikerErikAfterBattleText @@ -136,9 +136,9 @@ HikerErikScript: end TrainerHikerMichael: - trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, HikerMichaelScript + trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script -HikerMichaelScript: +.Script: end_if_just_battled opentext writetext HikerMichaelAfterBattleText @@ -147,9 +147,9 @@ HikerMichaelScript: end TrainerHikerParry: - trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, HikerParry3Script + trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script -HikerParry3Script: +.Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY end_if_just_battled opentext @@ -233,9 +233,9 @@ UnknownScript_0x19e219: jump UnknownScript_0x19e127 TrainerHikerTimothy: - trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, HikerTimothyScript + trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script -HikerTimothyScript: +.Script: end_if_just_battled opentext writetext HikerTimothyAfterBattleText @@ -244,9 +244,9 @@ HikerTimothyScript: end TrainerCooltrainermRyan: - trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, CooltrainermRyanScript + trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script -CooltrainermRyanScript: +.Script: end_if_just_battled opentext writetext CooltrainermRyanAfterBattleText @@ -255,9 +255,9 @@ CooltrainermRyanScript: end TrainerCooltrainerfKelly: - trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, CooltrainerfKellyScript + trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script -CooltrainerfKellyScript: +.Script: end_if_just_battled opentext writetext CooltrainerfKellyAfterBattleText diff --git a/maps/Route46.asm b/maps/Route46.asm index 0a1a52d9e..e6c8d2cf2 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -14,9 +14,9 @@ Route46_MapScriptHeader: db 0 TrainerCamperTed: - trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, CamperTedScript + trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script -CamperTedScript: +.Script: end_if_just_battled opentext writetext CamperTedAfterBattleText @@ -25,9 +25,9 @@ CamperTedScript: end TrainerPicnickerErin1: - trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, PicnickerErin1Script + trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script -PicnickerErin1Script: +.Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN end_if_just_battled opentext @@ -148,9 +148,9 @@ UnknownScript_0x1a9772: end TrainerHikerBailey: - trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, HikerBaileyScript + trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script -HikerBaileyScript: +.Script: end_if_just_battled opentext writetext HikerBaileyAfterBattleText diff --git a/maps/Route5.asm b/maps/Route5.asm index d534faefd..734748f19 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -8,8 +8,8 @@ Route5_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x1adb19: - jumptextfaceplayer UnknownText_0x1adb22 +Route5PokefanMScript: + jumptextfaceplayer Route5PokefanMText Route5UndergroundPathSign: jumptext Route5UndergroundPathSignText @@ -17,7 +17,7 @@ Route5UndergroundPathSign: HouseForSaleSign: jumptext HouseForSaleSignText -UnknownText_0x1adb22: +Route5PokefanMText: text "The road is closed" line "until the problem" @@ -60,4 +60,4 @@ Route5_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 9dec30107..9736deb70 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -26,8 +26,8 @@ UnknownScript_0x18b64d: closetext end -TeacherScript_0x18b64f: - jumptextfaceplayer UnknownText_0x18b6de +Route5CleanseTagSpeechHouseTeacherScript: + jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText HouseForSaleBookshelf: jumpstd difficultbookshelf @@ -49,7 +49,7 @@ UnknownText_0x18b6a7: cont "are protected now." done -UnknownText_0x18b6de: +Route5CleanseTagSpeechHouseTeacherText: text "My grandma is into" line "warding off what" @@ -80,4 +80,4 @@ Route5CleanseTagSpeechHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b64f, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index fd3707ff2..c57c9e59e 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -8,10 +8,10 @@ Route5SaffronCityGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x18b5b9: - jumptextfaceplayer UnknownText_0x18b5bc +Route5SaffronCityGateOfficerScript: + jumptextfaceplayer Route5SaffronCityGateOfficerText -UnknownText_0x18b5bc: +Route5SaffronCityGateOfficerText: text "You're from JOHTO," line "aren't you?" @@ -39,4 +39,4 @@ Route5SaffronCityGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18b5b9, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index b43587d4d..dbbe22ad0 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -8,10 +8,10 @@ Route5UndergroundEntrance_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x18b555: - jumptextfaceplayer UnknownText_0x18b558 +Route5UndergroundEntranceTeacherScript: + jumptextfaceplayer Route5UndergroundEntranceTeacherText -UnknownText_0x18b558: +Route5UndergroundEntranceTeacherText: text "Many cities in" line "JOHTO have long" @@ -37,4 +37,4 @@ Route5UndergroundEntrance_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b555, -1 + person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route5UndergroundEntranceTeacherScript, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 583398c9b..abf56e013 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -11,9 +11,9 @@ Route6_MapScriptHeader: db 0 TrainerPokefanmRex: - trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript + trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script -PokefanmRexScript: +.Script: end_if_just_battled opentext writetext PokefanmRexAfterBattleText @@ -22,9 +22,9 @@ PokefanmRexScript: end TrainerPokefanmAllan: - trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript + trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script -PokefanmAllanScript: +.Script: end_if_just_battled opentext writetext PokefanmAllanAfterBattleText @@ -32,13 +32,13 @@ PokefanmAllanScript: closetext end -PokefanMScript_0x1ad951: - jumptextfaceplayer UnknownText_0x1ad957 +Route6PokefanMScript: + jumptextfaceplayer Route6PokefanMText Route6UndergroundPathSign: jumptext Route6UndergroundPathSignText -UnknownText_0x1ad957: +Route6PokefanMText: text "The road is closed" line "until the problem" @@ -109,6 +109,6 @@ Route6_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmRex, -1 person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 840547185..33e97f0e7 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -14,9 +14,9 @@ Route8_MapScriptHeader: db 0 TrainerBikerDwayne: - trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, BikerDwayneScript + trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script -BikerDwayneScript: +.Script: end_if_just_battled opentext writetext BikerDwayneAfterBattleText @@ -25,9 +25,9 @@ BikerDwayneScript: end TrainerBikerHarris: - trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, BikerHarrisScript + trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script -BikerHarrisScript: +.Script: end_if_just_battled opentext writetext BikerHarrisAfterBattleText @@ -36,9 +36,9 @@ BikerHarrisScript: end TrainerBikerZeke: - trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, BikerZekeScript + trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script -BikerZekeScript: +.Script: end_if_just_battled opentext writetext BikerZekeAfterBattleText @@ -47,9 +47,9 @@ BikerZekeScript: end TrainerSupernerdSam: - trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, SupernerdSamScript + trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script -SupernerdSamScript: +.Script: end_if_just_battled opentext writetext SupernerdSamAfterBattleText @@ -58,9 +58,9 @@ SupernerdSamScript: end TrainerSupernerdTom: - trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, SupernerdTomScript + trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script -SupernerdTomScript: +.Script: end_if_just_battled opentext writetext SupernerdTomAfterBattleText diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index a7947b4de..44908079f 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -8,10 +8,10 @@ Route8SaffronGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x7f416: - jumptextfaceplayer UnknownText_0x7f419 +Route8SaffronGateOfficerScript: + jumptextfaceplayer Route8SaffronGateOfficerText -UnknownText_0x7f419: +Route8SaffronGateOfficerText: text "Have you been to" line "LAVENDER TOWN?" @@ -38,4 +38,4 @@ Route8SaffronGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7f416, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index e5c0df2db..e41f0efd6 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -14,9 +14,9 @@ Route9_MapScriptHeader: db 0 TrainerCamperDean: - trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, CamperDeanScript + trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script -CamperDeanScript: +.Script: end_if_just_battled opentext writetext CamperDeanAfterBattleText @@ -25,9 +25,9 @@ CamperDeanScript: end TrainerPicnickerHeidi: - trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, PicnickerHeidiScript + trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script -PicnickerHeidiScript: +.Script: end_if_just_battled opentext writetext PicnickerHeidiAfterBattleText @@ -36,9 +36,9 @@ PicnickerHeidiScript: end TrainerCamperSid: - trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, CamperSidScript + trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script -CamperSidScript: +.Script: end_if_just_battled opentext writetext CamperSidAfterBattleText @@ -47,9 +47,9 @@ CamperSidScript: end TrainerPicnickerEdna: - trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, PicnickerEdnaScript + trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script -PicnickerEdnaScript: +.Script: end_if_just_battled opentext writetext PicnickerEdnaAfterBattleText @@ -58,9 +58,9 @@ PicnickerEdnaScript: end TrainerHikerTim: - trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, HikerTimScript + trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script -HikerTimScript: +.Script: end_if_just_battled opentext writetext HikerTimAfterBattleText @@ -69,9 +69,9 @@ HikerTimScript: end TrainerHikerSidney: - trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, HikerSidneyScript + trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script -HikerSidneyScript: +.Script: end_if_just_battled opentext writetext HikerSidneyAfterBattleText diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index b91d46275..d70ce63b2 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -51,8 +51,8 @@ RuinsOfAlphKabutoChamber_MapScriptHeader: closetext end -ReceptionistScript_0x58769: - jumptextfaceplayer UnknownText_0x58800 +RuinsOfAlphKabutoChamberReceptionistScript: + jumptextfaceplayer RuinsOfAlphKabutoChamberReceptionistText MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen $0 @@ -147,7 +147,7 @@ MovementData_0x587fe: db $59 ; movement step_end -UnknownText_0x58800: +RuinsOfAlphKabutoChamberReceptionistText: text "Welcome to this" line "chamber." @@ -281,5 +281,5 @@ RuinsOfAlphKabutoChamber_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST + person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST person_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index f18e8d99b..687133219 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -102,9 +102,9 @@ YoungsterScript_0x5807e: end TrainerPsychicNathan: - trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, PsychicNathanScript + trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script -PsychicNathanScript: +.Script: end_if_just_battled opentext writetext PsychicNathanAfterBattleText @@ -114,12 +114,12 @@ PsychicNathanScript: TrainerSuperNerdStan: - trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, UnknownScript_0x580a9 + trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script -UnknownScript_0x580a9: +.Script: end_if_just_battled opentext - writetext UnknownText_0x58250 + writetext SuperNerdStanAfterBattleText waitbutton closetext end @@ -194,7 +194,7 @@ UnknownText_0x58217: line "understanding…" done -UnknownText_0x58250: +SuperNerdStanAfterBattleText: text "The RUINS are from" line "about 1500 years" cont "ago." diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 4b50f427c..7613c17a3 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -52,11 +52,11 @@ UnknownScript_0x19934c: closetext end -CooltrainerMScript_0x199352: - jumptextfaceplayer UnknownText_0x1994fe +SaffronCityCooltrainerMScript: + jumptextfaceplayer SaffronCityCooltrainerMText -CooltrainerFScript_0x199355: - jumptextfaceplayer UnknownText_0x19958e +SaffronCityCooltrainerFScript: + jumptextfaceplayer SaffronCityCooltrainerFText FisherScript_0x199358: faceplayer @@ -74,14 +74,14 @@ UnknownScript_0x199366: closetext end -YoungsterScript_0x19936c: - jumptextfaceplayer UnknownText_0x1996a5 +SaffronCityYoungster1Script: + jumptextfaceplayer SaffronCityYoungster1Text -YoungsterScript_0x19936f: - jumptextfaceplayer UnknownText_0x1996e5 +SaffronCityYoungster2Script: + jumptextfaceplayer SaffronCityYoungster2Text -LassScript_0x199372: - jumptextfaceplayer UnknownText_0x199745 +SaffronCityLassScript: + jumptextfaceplayer SaffronCityLassText SaffronCitySign: jumptext SaffronCitySignText @@ -148,7 +148,7 @@ UnknownText_0x1994ae: cont "the MAGNET TRAIN." done -UnknownText_0x1994fe: +SaffronCityCooltrainerMText: text "I went to the GYM," line "raring for battles" cont "against trainers…" @@ -163,7 +163,7 @@ UnknownText_0x1994fe: line "embarrassed." done -UnknownText_0x19958e: +SaffronCityCooltrainerFText: text "This is SILPH CO.," line "famous for #MON" cont "merchandise." @@ -196,7 +196,7 @@ UnknownText_0x19964b: line "Haaah, I'm full!" done -UnknownText_0x1996a5: +SaffronCityYoungster1Text: text "Going into an" line "alley for the" @@ -204,7 +204,7 @@ UnknownText_0x1996a5: line "me sorta anxious." done -UnknownText_0x1996e5: +SaffronCityYoungster2Text: text "There's a place" line "called TRAINER" @@ -215,7 +215,7 @@ UnknownText_0x1996e5: line "over the place." done -UnknownText_0x199745: +SaffronCityLassText: text "Our city was" line "featured on a" cont "radio program." @@ -305,9 +305,9 @@ SaffronCity_MapEventHeader: db 8 person_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x19932a, -1 person_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 - person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x199352, -1 - person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x199355, -1 + person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 + person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1 person_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x199358, -1 - person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936c, -1 - person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936f, -1 - person_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x199372, -1 + person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1 + person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1 + person_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronCityLassScript, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index b8c4932d7..0e4385b83 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -47,9 +47,9 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, MediumRebeccaScript + trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script -MediumRebeccaScript: +.Script: end_if_just_battled opentext writetext MediumRebeccaAfterBattleText @@ -58,9 +58,9 @@ MediumRebeccaScript: end TrainerPsychicFranklin: - trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, PsychicFranklinScript + trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script -PsychicFranklinScript: +.Script: end_if_just_battled opentext writetext PsychicFranklinAfterBattleText @@ -69,9 +69,9 @@ PsychicFranklinScript: end TrainerMediumDoris: - trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, MediumDorisScript + trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script -MediumDorisScript: +.Script: end_if_just_battled opentext writetext MediumDorisAfterBattleText @@ -80,9 +80,9 @@ MediumDorisScript: end TrainerPsychicJared: - trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, PsychicJaredScript + trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script -PsychicJaredScript: +.Script: end_if_just_battled opentext writetext PsychicJaredAfterBattleText diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 5d81bee19..edef6f75c 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -16,19 +16,19 @@ ClerkScript_0x18a3bf: closetext end -CooltrainerMScript_0x18a3c6: - jumptextfaceplayer UnknownText_0x18a3cc +SaffronMartCooltrainerMScript: + jumptextfaceplayer SaffronMartCooltrainerMText -CooltrainerFScript_0x18a3c9: - jumptextfaceplayer UnknownText_0x18a3f3 +SaffronMartCooltrainerFScript: + jumptextfaceplayer SaffronMartCooltrainerFText -UnknownText_0x18a3cc: +SaffronMartCooltrainerMText: text "There's a big" line "RADIO TOWER in" cont "LAVENDER." done -UnknownText_0x18a3f3: +SaffronMartCooltrainerFText: text "I want to become" line "stronger, but I'm" cont "not good yet…" @@ -55,5 +55,5 @@ SaffronMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 - person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18a3c6, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18a3c9, -1 + person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 975ea587c..dfa0494d7 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -38,8 +38,8 @@ FisherScript_0x18a48c: closetext end -YoungsterScript_0x18a4a0: - jumptextfaceplayer UnknownText_0x18a6c5 +SaffronPokecenter1FYoungsterScript: + jumptextfaceplayer SaffronPokecenter1FYoungsterText UnknownText_0x18a4a3: text "What are JOHTO's" @@ -100,7 +100,7 @@ UnknownText_0x18a62e: cont "knowledge." done -UnknownText_0x18a6c5: +SaffronPokecenter1FYoungsterText: text "SILPH CO.'s HEAD" line "OFFICE and the" @@ -132,4 +132,4 @@ SaffronPokecenter1F_MapEventHeader: person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 person_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 - person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x18a4a0, -1 + person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index f6599a6ed..bfe878439 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -86,11 +86,11 @@ UnknownScript_0x18a883: closetext end -TeacherScript_0x18a889: - jumptextfaceplayer UnknownText_0x18aaab +SaffronTrainStationTeacherScript: + jumptextfaceplayer SaffronTrainStationTeacherText -LassScript_0x18a88c: - jumptextfaceplayer UnknownText_0x18ab20 +SaffronTrainStationLassScript: + jumptextfaceplayer SaffronTrainStationLassText MovementData_0x18a88f: step UP @@ -192,7 +192,7 @@ UnknownText_0x18aa61: line "KANTO and JOHTO?" done -UnknownText_0x18aaab: +SaffronTrainStationTeacherText: text "Before the MAGNET" line "TRAIN STATION was" @@ -204,7 +204,7 @@ UnknownText_0x18aaab: cont "to live there." done -UnknownText_0x18ab20: +SaffronTrainStationLassText: text "Hi. Do you have a" line "rail PASS? I have" @@ -237,5 +237,5 @@ SaffronTrainStation_MapEventHeader: db 4 person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 person_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION - person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index ab6eab65a..dedcf8561 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -12,10 +12,10 @@ SilverCavePokecenter1F_MapScriptHeader: NurseScript_0x1ae59a: jumpstd pokecenternurse -GrannyScript_0x1ae59d: - jumptextfaceplayer UnknownText_0x1ae5a0 +SilverCavePokecenter1FGrannyScript: + jumptextfaceplayer SilverCavePokecenter1FGrannyText -UnknownText_0x1ae5a0: +SilverCavePokecenter1FGrannyText: text "Trainers who seek" line "power climb MT." @@ -48,4 +48,4 @@ SilverCavePokecenter1F_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 - person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x1ae59d, -1 + person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_STANDING_LEFT, 1, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index be5d0eace..e716d3574 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -16,13 +16,13 @@ SlowpokeWellB1F_MapScriptHeader: .MapCallbacks: db 0 -KurtScript_0x5a5d5: - jumptextfaceplayer UnknownText_0x5a6b5 +SlowpokeWellB1FKurtScript: + jumptextfaceplayer SlowpokeWellB1FKurtText TrainerGruntM29: - trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script + trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script -GruntM29Script: +.Script: end_if_just_battled opentext writetext GruntM29AfterBattleText @@ -31,9 +31,9 @@ GruntM29Script: end TrainerGruntM1: - trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script + trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script -GruntM1Script: +.Script: opentext writetext TrainerGruntM1WhenTalkText waitbutton @@ -74,9 +74,9 @@ GruntM1Script: end TrainerGruntM2: - trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script + trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script -GruntM2Script: +.Script: end_if_just_battled opentext writetext GruntM2AfterBattleText @@ -85,9 +85,9 @@ GruntM2Script: end TrainerGruntF1: - trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script + trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script -GruntF1Script: +.Script: end_if_just_battled opentext writetext GruntF1AfterBattleText @@ -144,7 +144,7 @@ KurtSlowpokeWellVictoryMovementData: turn_head LEFT step_end -UnknownText_0x5a6b5: +SlowpokeWellB1FKurtText: text "KURT: Hey there," line "<PLAYER>!" @@ -343,6 +343,6 @@ SlowpokeWellB1F_MapEventHeader: person_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES - person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT + person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 9b77f4306..ba46065a3 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -14,14 +14,14 @@ SoulHouse_MapScriptHeader: MrFuji: jumptextfaceplayer MrFujiText -TeacherScript_0x7ec4a: - jumptextfaceplayer UnknownText_0x7ed4d +SoulHouseTeacherScript: + jumptextfaceplayer SoulHouseTeacherText -LassScript_0x7ec4d: - jumptextfaceplayer UnknownText_0x7edb1 +SoulHouseLassScript: + jumptextfaceplayer SoulHouseLassText -GrannyScript_0x7ec50: - jumptextfaceplayer UnknownText_0x7eddb +SoulHouseGrannyScript: + jumptextfaceplayer SoulHouseGrannyText MrFujiText: text "MR.FUJI: Welcome." @@ -48,7 +48,7 @@ MrFujiText: line "make them happy." done -UnknownText_0x7ed4d: +SoulHouseTeacherText: text "There are other" line "graves of #MON" cont "here, I think." @@ -58,13 +58,13 @@ UnknownText_0x7ed4d: cont "MR.FUJI may enter." done -UnknownText_0x7edb1: +SoulHouseLassText: text "I came with my mom" line "to visit #MON" cont "graves…" done -UnknownText_0x7eddb: +SoulHouseGrannyText: text "The #MON that" line "lived with me…" @@ -90,6 +90,6 @@ SoulHouse_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MrFuji, -1 - person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ec4a, -1 - person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x7ec4d, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7ec50, -1 + person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 + person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseLassScript, -1 + person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 5287ef850..782031e97 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -13,22 +13,22 @@ SproutTower1F_MapScriptHeader: .MapCallbacks: db 0 -SageScript_0x1844fe: - jumptextfaceplayer UnknownText_0x1845d8 +SproutTower1FSage1Script: + jumptextfaceplayer SproutTower1FSage1Text -SageScript_0x184501: - jumptextfaceplayer UnknownText_0x18460a +SproutTower1FSage2Script: + jumptextfaceplayer SproutTower1FSage2Text -GrannyScript_0x184504: - jumptextfaceplayer UnknownText_0x184649 +SproutTower1FGrannyScript: + jumptextfaceplayer SproutTower1FGrannyText -TeacherScript_0x184507: - jumptextfaceplayer UnknownText_0x18469d +SproutTower1FTeacherScript: + jumptextfaceplayer SproutTower1FTeacherText TrainerSageChow: - trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, SageChowScript + trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script -SageChowScript: +.Script: end_if_just_battled opentext writetext SageChowAfterBattleText @@ -64,13 +64,13 @@ SageChowAfterBattleText: line "thankful for this." done -UnknownText_0x1845d8: +SproutTower1FSage1Text: text "Only if you reach" line "the top will you" cont "obtain an HM." done -UnknownText_0x18460a: +SproutTower1FSage2Text: text "SPROUT TOWER was" line "built long ago" @@ -78,7 +78,7 @@ UnknownText_0x18460a: line "#MON training." done -UnknownText_0x184649: +SproutTower1FGrannyText: text "A BELLSPROUT over" line "100 feet tall…" @@ -87,7 +87,7 @@ UnknownText_0x184649: cont "pillar here." done -UnknownText_0x18469d: +SproutTower1FTeacherText: text "See the pillar" line "shaking?" @@ -124,9 +124,9 @@ SproutTower1F_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x1844fe, -1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x184501, -1 - person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x184504, -1 - person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x184507, -1 + person_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 + person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 + person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 + person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1 person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 1833c1372..acd62a2cb 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -11,9 +11,9 @@ SproutTower2F_MapScriptHeader: db 0 TrainerSageNico: - trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, SageNicoScript + trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script -SageNicoScript: +.Script: end_if_just_battled opentext writetext SageNicoAfterBattleText @@ -22,9 +22,9 @@ SageNicoScript: end TrainerSageEdmond: - trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, SageEdmondScript + trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script -SageEdmondScript: +.Script: end_if_just_battled opentext writetext SageEdmondAfterBattleText diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 71188ee59..c882ac18e 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -93,9 +93,9 @@ UnknownScript_0x1849d1: end TrainerSageJin: - trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, SageJinScript + trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script -SageJinScript: +.Script: end_if_just_battled opentext writetext SageJinAfterBattleText @@ -104,9 +104,9 @@ SageJinScript: end TrainerSageTroy: - trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, SageTroyScript + trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script -SageTroyScript: +.Script: end_if_just_battled opentext writetext SageTroyAfterBattleText @@ -115,9 +115,9 @@ SageTroyScript: end TrainerSageNeal: - trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, SageNealScript + trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script -SageNealScript: +.Script: end_if_just_battled opentext writetext SageNealAfterBattleText diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 390ea5d7a..34781a23c 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -481,9 +481,9 @@ NoExplodingTrap: end TrainerScientistJed: - trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, ScientistJedScript + trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script -ScientistJedScript: +.Script: end_if_just_battled opentext writetext ScientistJedAfterBattleText @@ -492,9 +492,9 @@ ScientistJedScript: end TrainerGruntM16: - trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script + trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script -GruntM16Script: +.Script: end_if_just_battled opentext writetext GruntM16AfterBattleText diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9223be138..84f1a3148 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -189,9 +189,9 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script + trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script -GruntM17Script: +.Script: end_if_just_battled opentext writetext GruntM17AfterBattleText @@ -200,9 +200,9 @@ GruntM17Script: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script + trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script -GruntM18Script: +.Script: end_if_just_battled opentext writetext GruntM18AfterBattleText @@ -211,9 +211,9 @@ GruntM18Script: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script + trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script -GruntM19Script: +.Script: end_if_just_battled opentext writetext GruntM19AfterBattleText diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 916e7dd9d..905cdad4d 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -83,8 +83,8 @@ RocketBaseRival: special RestartMapMusic end -RocketScript_0x6e048: - jumptextfaceplayer UnknownText_0x6e235 +TeamRocketBaseB3FRocketScript: + jumptextfaceplayer TeamRocketBaseB3FRocketText UnknownScript_0x6e04b: applymovement PLAYER, MovementData_0x6e133 @@ -152,9 +152,9 @@ GruntM28Script: end TrainerScientistRoss: - trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, ScientistRossScript + trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script -ScientistRossScript: +.Script: end_if_just_battled opentext writetext ScientistRossAfterBattleText @@ -163,9 +163,9 @@ ScientistRossScript: end TrainerScientistMitch: - trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, ScientistMitchScript + trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script -ScientistMitchScript: +.Script: end_if_just_battled opentext writetext ScientistMitchAfterBattleText @@ -337,7 +337,7 @@ LanceGetPasswordText: line "get the passwords." done -UnknownText_0x6e235: +TeamRocketBaseB3FRocketText: text "Urrggh… The guy" line "in the cape is" cont "incredibly tough…" @@ -604,7 +604,7 @@ TeamRocketBaseB3F_MapEventHeader: person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 73b5f3554..87fbfe13e 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -169,31 +169,31 @@ TinTower1F_MapScriptHeader: playmapmusic end -SageScript_0x185173: - jumptextfaceplayer UnknownText_0x185386 +TinTower1FSage1Script: + jumptextfaceplayer TinTower1FSage1Text -SageScript_0x185176: - jumptextfaceplayer UnknownText_0x185433 +TinTower1FSage2Script: + jumptextfaceplayer TinTower1FSage2Text -SageScript_0x185179: - jumptextfaceplayer UnknownText_0x185544 +TinTower1FSage3Script: + jumptextfaceplayer TinTower1FSage3Text -SageScript_0x18517c: +TinTower1FSage4Script: checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x185185 - jumptextfaceplayer UnknownText_0x1855ee + iftrue .FoughtHoOh + jumptextfaceplayer TinTower1FSage4Text1 -UnknownScript_0x185185: - jumptextfaceplayer UnknownText_0x185765 +.FoughtHoOh: + jumptextfaceplayer TinTower1FSage4Text2 -SageScript_0x185188: +TinTower1FSage5Script: faceplayer opentext checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x1851b6 + iftrue .FoughtHoOh checkevent EVENT_GOT_RAINBOW_WING - iftrue UnknownScript_0x1851b0 - writetext UnknownText_0x185629 + iftrue .GotRainbowWing + writetext TinTower1FSage5Text1 buttonsound verbosegiveitem RAINBOW_WING closetext @@ -206,25 +206,25 @@ SageScript_0x185188: setevent EVENT_GOT_RAINBOW_WING closetext opentext -UnknownScript_0x1851b0: - writetext UnknownText_0x18564a +.GotRainbowWing: + writetext TinTower1FSage5Text2 waitbutton closetext end -UnknownScript_0x1851b6: - writetext UnknownText_0x185803 +.FoughtHoOh: + writetext TinTower1FSage5Text3 waitbutton closetext end -SageScript_0x1851bc: +TinTower1FSage6Script: checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x1851c5 - jumptextfaceplayer UnknownText_0x185654 + iftrue .FoughtHoOh + jumptextfaceplayer TinTower1FSage6Text1 -UnknownScript_0x1851c5: - jumptextfaceplayer UnknownText_0x1858d0 +.FoughtHoOh: + jumptextfaceplayer TinTower1FSage6Text2 TinTowerEusine: jumptextfaceplayer TinTowerEusineHoOhText @@ -347,7 +347,7 @@ TinTowerEusineSuicuneText: para "Later, <PLAYER>!" done -UnknownText_0x185386: +TinTower1FSage1Text: text "According to" line "legend…" @@ -367,7 +367,7 @@ UnknownText_0x185386: line "humans?" done -UnknownText_0x185433: +TinTower1FSage2Text: text "When the BRASS" line "TOWER burned down," @@ -399,7 +399,7 @@ UnknownText_0x185433: line "say." done -UnknownText_0x185544: +TinTower1FSage3Text: text "The two TOWERS are" line "said to have been" @@ -416,7 +416,7 @@ UnknownText_0x185544: line "important today." done -UnknownText_0x1855ee: +TinTower1FSage4Text1: text "HO-OH appears to" line "have descended" @@ -424,16 +424,16 @@ UnknownText_0x1855ee: line "TOWER!" done -UnknownText_0x185629: +TinTower1FSage5Text1: text "This will protect" line "you. Take it." done -UnknownText_0x18564a: +TinTower1FSage5Text2: text "Now, go." done -UnknownText_0x185654: +TinTower1FSage6Text1: text "I believe you are" line "being tested." @@ -464,7 +464,7 @@ TinTowerEusineHoOhText: line "#MANIAC!" done -UnknownText_0x185765: +TinTower1FSage4Text2: text "The legendary" line "#MON are said" @@ -481,7 +481,7 @@ UnknownText_0x185765: line "put out the fire…" done -UnknownText_0x185803: +TinTower1FSage5Text3: text "When the legendary" line "#MON appeared…" @@ -502,7 +502,7 @@ UnknownText_0x185803: cont "frightened people." done -UnknownText_0x1858d0: +TinTower1FSage6Text2: text "Of the legendary" line "#MON, SUICUNE" @@ -544,9 +544,9 @@ TinTower1F_MapEventHeader: person_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU person_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE - person_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - person_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - person_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 2, 14, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 728a94147..14a458528 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -11,11 +11,13 @@ TinTower9F_MapScriptHeader: TinTower9FHPUp: itemball HP_UP -UnknownText_0x185b8a: +; unused +TinTower9FUnusedHoOhText: text "HO-OH: Shaoooh!" done -UnknownText_0x185b9b: +; unused +TinTower9FUnusedLugiaText: text "LUGIA: Gyaaan!" done diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 98b0960f1..87fd7b592 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -12,20 +12,20 @@ TrainerHouse1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x9af67: - jumptextfaceplayer UnknownText_0x9af7f +TrainerHouse1FReceptionistScript: + jumptextfaceplayer TrainerHouse1FReceptionistText -CooltrainerMScript_0x9af6a: - jumptextfaceplayer UnknownText_0x9b025 +TrainerHouse1FCooltrainerMScript: + jumptextfaceplayer TrainerHouse1FCooltrainerMText -CooltrainerFScript_0x9af6d: - jumptextfaceplayer UnknownText_0x9b0b5 +TrainerHouse1FCooltrainerFScript: + jumptextfaceplayer TrainerHouse1FCooltrainerFText -YoungsterScript_0x9af70: - jumptextfaceplayer UnknownText_0x9b11d +TrainerHouse1FYoungsterScript: + jumptextfaceplayer TrainerHouse1FYoungsterText -GentlemanScript_0x9af73: - jumptextfaceplayer UnknownText_0x9b1c9 +TrainerHouse1FGentlemanScript: + jumptextfaceplayer TrainerHouse1FGentlemanText MapTrainerHouse1FSignpost0Script: jumptext UnknownText_0x9b1f4 @@ -36,7 +36,7 @@ MapTrainerHouse1FSignpost1Script: MapTrainerHouse1FSignpost2Script: jumptext UnknownText_0x9b2c1 -UnknownText_0x9af7f: +TrainerHouse1FReceptionistText: text "Welcome to TRAINER" line "HOUSE, the newest" @@ -53,7 +53,7 @@ UnknownText_0x9af7f: line "downstairs." done -UnknownText_0x9b025: +TrainerHouse1FCooltrainerMText: text "VIRIDIAN is the" line "town closest to" cont "INDIGO PLATEAU." @@ -68,7 +68,7 @@ UnknownText_0x9b025: line "PLATEAU." done -UnknownText_0x9b0b5: +TrainerHouse1FCooltrainerFText: text "They hold practice" line "battles downstairs" cont "here." @@ -80,7 +80,7 @@ UnknownText_0x9b0b5: line "battles." done -UnknownText_0x9b11d: +TrainerHouse1FYoungsterText: text "I guess you can't" line "become the CHAMP" @@ -97,7 +97,7 @@ UnknownText_0x9b11d: line "towns in KANTO." done -UnknownText_0x9b1c9: +TrainerHouse1FGentlemanText: text "Whew… I'm taking a" line "rest from #MON" cont "battles." @@ -158,8 +158,8 @@ TrainerHouse1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9af67, -1 - person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9af6a, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9af6d, -1 - person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9af70, -1 - person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x9af73, -1 + person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 + person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 + person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 + person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index f060fbf1a..abfbb0f72 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -206,9 +206,9 @@ UndergroundSilverBattleScript: end TrainerGruntM11: - trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script + trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script -GruntM11Script: +.Script: end_if_just_battled opentext writetext GruntM11AfterBattleText @@ -217,9 +217,9 @@ GruntM11Script: end TrainerGruntM25: - trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script + trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script -GruntM25Script: +.Script: end_if_just_battled opentext writetext GruntM25AfterBattleText @@ -228,9 +228,9 @@ GruntM25Script: end TrainerBurglarDuncan: - trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, BurglarDuncanScript + trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script -BurglarDuncanScript: +.Script: end_if_just_battled opentext writetext BurglarDuncanAfterBattleText @@ -239,9 +239,9 @@ BurglarDuncanScript: end TrainerBurglarEddie: - trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, BurglarEddieScript + trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script -BurglarEddieScript: +.Script: end_if_just_battled opentext writetext BurglarEddieAfterBattleText @@ -250,9 +250,9 @@ BurglarEddieScript: end TrainerGruntM13: - trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script + trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script -GruntM13Script: +.Script: end_if_just_battled opentext writetext GruntM13AfterBattleText @@ -261,9 +261,9 @@ GruntM13Script: end TrainerGruntF3: - trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script + trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script -GruntF3Script: +.Script: end_if_just_battled opentext writetext GruntF3AfterBattleText diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 67f5632ca..7876d0557 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -36,9 +36,9 @@ UndergroundWarehouse_MapScriptHeader: return TrainerGruntM24: - trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script + trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script -GruntM24Script: +.Script: end_if_just_battled opentext writetext GruntM24AfterBattleText @@ -47,9 +47,9 @@ GruntM24Script: end TrainerGruntM14: - trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script + trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script -GruntM14Script: +.Script: end_if_just_battled opentext writetext GruntM14AfterBattleText @@ -58,9 +58,9 @@ GruntM14Script: end TrainerGruntM15: - trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script + trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script -GruntM15Script: +.Script: end_if_just_battled opentext writetext GruntM15AfterBattleText diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index fbcaa23e9..0879a120c 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -17,9 +17,9 @@ UnionCave1F_MapScriptHeader: db 0 TrainerPokemaniacLarry: - trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, PokemaniacLarryScript + trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script -PokemaniacLarryScript: +.Script: end_if_just_battled opentext writetext PokemaniacLarryAfterBattleText @@ -28,9 +28,9 @@ PokemaniacLarryScript: end TrainerHikerRussell: - trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, HikerRussellScript + trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script -HikerRussellScript: +.Script: end_if_just_battled opentext writetext HikerRussellAfterBattleText @@ -39,9 +39,9 @@ HikerRussellScript: end TrainerHikerDaniel: - trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, HikerDanielScript + trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script -HikerDanielScript: +.Script: end_if_just_battled opentext writetext HikerDanielAfterBattleText @@ -50,9 +50,9 @@ HikerDanielScript: end TrainerFirebreatherBill: - trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, FirebreatherBillScript + trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script -FirebreatherBillScript: +.Script: end_if_just_battled opentext writetext FirebreatherBillAfterBattleText @@ -61,9 +61,9 @@ FirebreatherBillScript: end TrainerFirebreatherRay: - trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, FirebreatherRayScript + trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script -FirebreatherRayScript: +.Script: end_if_just_battled opentext writetext FirebreatherRayAfterBattleText diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 1608b6884..a11702651 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -15,9 +15,9 @@ UnionCaveB1F_MapScriptHeader: db 0 TrainerPokemaniacAndrew: - trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, PokemaniacAndrewScript + trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script -PokemaniacAndrewScript: +.Script: end_if_just_battled opentext writetext PokemaniacAndrewAfterBattleText @@ -26,9 +26,9 @@ PokemaniacAndrewScript: end TrainerPokemaniacCalvin: - trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, PokemaniacCalvinScript + trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script -PokemaniacCalvinScript: +.Script: end_if_just_battled opentext writetext PokemaniacCalvinAfterBattleText @@ -37,9 +37,9 @@ PokemaniacCalvinScript: end TrainerHikerPhillip: - trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, HikerPhillipScript + trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script -HikerPhillipScript: +.Script: end_if_just_battled opentext writetext HikerPhillipAfterBattleText @@ -48,9 +48,9 @@ HikerPhillipScript: end TrainerHikerLeonard: - trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, HikerLeonardScript + trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script -HikerLeonardScript: +.Script: end_if_just_battled opentext writetext HikerLeonardAfterBattleText diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 55c5fde36..6ad0ff78e 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -38,9 +38,9 @@ UnionCaveLapras: end TrainerCooltrainermNick: - trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, CooltrainermNickScript + trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script -CooltrainermNickScript: +.Script: end_if_just_battled opentext writetext CooltrainermNickAfterBattleText @@ -49,9 +49,9 @@ CooltrainermNickScript: end TrainerCooltrainerfGwen: - trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, CooltrainerfGwenScript + trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script -CooltrainerfGwenScript: +.Script: end_if_just_battled opentext writetext CooltrainerfGwenAfterBattleText @@ -60,9 +60,9 @@ CooltrainerfGwenScript: end TrainerCooltrainerfEmma: - trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, CooltrainerfEmmaScript + trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script -CooltrainerfEmmaScript: +.Script: end_if_just_battled opentext writetext CooltrainerfEmmaAfterBattleText diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index ea794dd6a..405f450b3 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -18,8 +18,8 @@ VermilionCity_MapScriptHeader: setflag ENGINE_FLYPOINT_VERMILION return -TeacherScript_0x1aa983: - jumptextfaceplayer UnknownText_0x1aaa15 +VermilionCityTeacherScript: + jumptextfaceplayer VermilionCityTeacherText VermilionMachopOwner: jumptextfaceplayer VermilionMachopOwnerText @@ -37,8 +37,8 @@ VermilionMachop: closetext end -SuperNerdScript_0x1aa99b: - jumptextfaceplayer UnknownText_0x1aab1a +VermilionCitySuperNerdScript: + jumptextfaceplayer VermilionCitySuperNerdText VermilionSnorlax: opentext @@ -125,7 +125,7 @@ VermilionCityMartSign: VermilionCityHiddenFullHeal: dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL -UnknownText_0x1aaa15: +VermilionCityTeacherText: text "VERMILION PORT is" line "KANTO's seaside" cont "gateway." @@ -156,7 +156,7 @@ VermilionMachopText2: cont "the ground flat." done -UnknownText_0x1aab1a: +VermilionCitySuperNerdText: text "There are eight" line "GYMS in KANTO." @@ -300,9 +300,9 @@ VermilionCity_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1aa983, -1 + person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMachopOwner, -1 person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VermilionMachop, -1 - person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1aa99b, -1 + person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1 person_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX person_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index f5cf8e96a..e98ebb848 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -45,9 +45,9 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, GentlemanGregoryScript + trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script -GentlemanGregoryScript: +.Script: end_if_just_battled opentext writetext GentlemanGregoryAfterBattleText @@ -56,9 +56,9 @@ GentlemanGregoryScript: end TrainerGuitaristVincent: - trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, GuitaristVincentScript + trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script -GuitaristVincentScript: +.Script: end_if_just_battled opentext writetext GuitaristVincentAfterBattleText @@ -67,9 +67,9 @@ GuitaristVincentScript: end TrainerJugglerHorton: - trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, JugglerHortonScript + trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script -JugglerHortonScript: +.Script: end_if_just_battled opentext writetext JugglerHortonAfterBattleText diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 53360680c..b7440fcd7 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -8,10 +8,10 @@ VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GentlemanScript_0x192031: - jumptextfaceplayer UnknownText_0x192034 +VermilionHouseDiglettsCaveSpeechHouseGentlemanScript: + jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText -UnknownText_0x192034: +VermilionHouseDiglettsCaveSpeechHouseGentlemanText: text "Over many years," line "DIGLETT dug a" cont "large tunnel." @@ -37,4 +37,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x192031, -1 + person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 763f89755..1d94b09a9 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -9,16 +9,16 @@ VermilionMagnetTrainSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanFScript_0x191eb7: - jumptextfaceplayer UnknownText_0x191ec0 +VermilionMagnetTrainSpeechHousePokefanFScript: + jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText -YoungsterScript_0x191eba: - jumptextfaceplayer UnknownText_0x191f16 +VermilionMagnetTrainSpeechHouseYoungsterScript: + jumptextfaceplayer VermilionMagnetTrainSpeechHouseYoungsterText VermilionMagnetTrainSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x191ec0: +VermilionMagnetTrainSpeechHousePokefanFText: text "Do you know about" line "the MAGNET TRAIN?" @@ -27,7 +27,7 @@ UnknownText_0x191ec0: cont "DENROD in JOHTO." done -UnknownText_0x191f16: +VermilionMagnetTrainSpeechHouseYoungsterText: text "I want to go to" line "SAFFRON to see" cont "the MAGNET TRAIN." @@ -52,5 +52,5 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x191eb7, -1 - person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x191eba, -1 + person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 + person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index e5092c8ca..71a7d601f 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x191f7e: closetext end -SuperNerdScript_0x191f85: - jumptextfaceplayer UnknownText_0x191f8b +VermilionMartSuperNerdScript: + jumptextfaceplayer VermilionMartSuperNerdText -BuenaScript_0x191f88: - jumptextfaceplayer UnknownText_0x191fca +VermilionMartBuenaScript: + jumptextfaceplayer VermilionMartBuenaText -UnknownText_0x191f8b: +VermilionMartSuperNerdText: text "TEAM ROCKET is no" line "longer in KANTO." @@ -30,7 +30,7 @@ UnknownText_0x191f8b: line "me happy." done -UnknownText_0x191fca: +VermilionMartBuenaText: text "I'm thinking about" line "going shopping in" cont "SAFFRON." @@ -54,5 +54,5 @@ VermilionMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x191f85, -1 - person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x191f88, -1 + person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 + person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index f4bbd0140..1a6e6b905 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -30,11 +30,11 @@ UnknownScript_0x191614: closetext end -SailorScript_0x19161a: - jumptextfaceplayer UnknownText_0x1916fe +VermilionPokecenter1FSailorScript: + jumptextfaceplayer VermilionPokecenter1FSailorText -BugCatcherScript_0x19161d: - jumptextfaceplayer UnknownText_0x19173b +VermilionPokecenter1FBugCatcherScript: + jumptextfaceplayer VermilionPokecenter1FBugCatcherText UnknownText_0x191620: text "A sleeping #MON" @@ -59,7 +59,7 @@ UnknownText_0x191698: line "have disappeared." done -UnknownText_0x1916fe: +VermilionPokecenter1FSailorText: text "The FAST SHIP is a" line "great place to" @@ -67,7 +67,7 @@ UnknownText_0x1916fe: line "trainers." done -UnknownText_0x19173b: +VermilionPokecenter1FBugCatcherText: text "Oh? You have some" line "BADGES I've never" cont "seen before." @@ -96,5 +96,5 @@ VermilionPokecenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x191603, -1 person_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 - person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x19161a, -1 - person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x19161d, -1 + person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 + person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 8acb74505..028bb6094 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -8,10 +8,10 @@ VermilionPortPassage_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x7701a: - jumptextfaceplayer UnknownText_0x7701d +VermilionPortPassageTeacherScript: + jumptextfaceplayer VermilionPortPassageTeacherText -UnknownText_0x7701d: +VermilionPortPassageTeacherText: text "The FAST SHIP" line "sails on Wednes-" cont "days and Sundays" @@ -38,4 +38,4 @@ VermilionPortPassage_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7701a, -1 + person_event SPRITE_TEACHER, 1, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 2d503853b..93a71312a 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -289,7 +289,7 @@ VioletCity_MapEventHeader: warp_def $11, $1e, 1, EARLS_POKEMON_ACADEMY warp_def $f, $3, 1, VIOLET_NICKNAME_SPEECH_HOUSE warp_def $19, $1f, 1, VIOLET_POKECENTER_1F - warp_def $1d, $15, 1, VIOLET_ONIX_TRADE_HOUSE + warp_def $1d, $15, 1, VIOLET_KYLES_HOUSE warp_def $5, $17, 1, SPROUT_TOWER_1F warp_def $18, $27, 1, ROUTE_31_VIOLET_GATE warp_def $19, $27, 2, ROUTE_31_VIOLET_GATE diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index a1f6beeb7..b98a789a5 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -67,9 +67,9 @@ VioletGymTriggerRockets: jumpstd radiotowerrockets TrainerBird_keeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, Bird_keeperRodScript + trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, .Script -Bird_keeperRodScript: +.Script: end_if_just_battled opentext writetext Bird_keeperRodAfterBattleText @@ -78,9 +78,9 @@ Bird_keeperRodScript: end TrainerBird_keeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, Bird_keeperAbeScript + trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, .Script -Bird_keeperAbeScript: +.Script: end_if_just_battled opentext writetext Bird_keeperAbeAfterBattleText diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletKylesHouse.asm index feb5b10af..de6a1edf8 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,16 +1,16 @@ const_value set 2 - const VIOLETONIXTRADEHOUSE_POKEFAN_M - const VIOLETONIXTRADEHOUSE_KYLE + const VIOLETKYLESHOUSE_POKEFAN_M + const VIOLETKYLESHOUSE_KYLE -VioletOnixTradeHouse_MapScriptHeader: +VioletKylesHouse_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -PokefanMScript_0x6998d: - jumptextfaceplayer UnknownText_0x69997 +VioletKylesHousePokefanMScript: + jumptextfaceplayer VioletKylesHousePokefanMText Kyle: faceplayer @@ -20,7 +20,7 @@ Kyle: closetext end -UnknownText_0x69997: +VioletKylesHousePokefanMText: text "A #MON you get" line "in a trade grows" cont "quickly." @@ -32,7 +32,7 @@ UnknownText_0x69997: line "disobey you." done -VioletOnixTradeHouse_MapEventHeader: +VioletKylesHouse_MapEventHeader: ; filler db 0, 0 @@ -49,5 +49,5 @@ VioletOnixTradeHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6998d, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 35b0d5593..db6790bfe 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -16,13 +16,13 @@ ClerkScript_0x68295: closetext end -GrannyScript_0x6829c: - jumptextfaceplayer UnknownText_0x682a2 +VioletMartGrannyScript: + jumptextfaceplayer VioletMartGrannyText -CooltrainerMScript_0x6829f: - jumptextfaceplayer UnknownText_0x68323 +VioletMartCooltrainerMScript: + jumptextfaceplayer VioletMartCooltrainerMText -UnknownText_0x682a2: +VioletMartGrannyText: text "When you first" line "catch a #MON," cont "it may be weak." @@ -36,7 +36,7 @@ UnknownText_0x682a2: cont "love." done -UnknownText_0x68323: +VioletMartCooltrainerMText: text "#MON can hold" line "items like POTION" cont "and ANTIDOTE." @@ -66,5 +66,5 @@ VioletMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 - person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x6829c, -1 - person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x6829f, -1 + person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 + person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index e10c41d0a..61f95bb0b 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -10,11 +10,11 @@ VioletNicknameSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x693e9: - jumptextfaceplayer UnknownText_0x693fa +VioletNicknameSpeechHouseTeacherScript: + jumptextfaceplayer VioletNicknameSpeechHouseTeacherText -LassScript_0x693ec: - jumptextfaceplayer UnknownText_0x6945e +VioletNicknameSpeechHouseLassScript: + jumptextfaceplayer VioletNicknameSpeechHouseLassText BirdScript_0x693ef: faceplayer @@ -25,7 +25,7 @@ BirdScript_0x693ef: closetext end -UnknownText_0x693fa: +VioletNicknameSpeechHouseTeacherText: text "She uses the names" line "of her favorite" cont "things to eat." @@ -35,7 +35,7 @@ UnknownText_0x693fa: cont "#MON, I mean." done -UnknownText_0x6945e: +VioletNicknameSpeechHouseLassText: text "I call my PIDGEY" line "STRAWBERRY!" done @@ -61,6 +61,6 @@ VioletNicknameSpeechHouse_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x693e9, -1 - person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x693ec, -1 + person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 + person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 person_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 46afff49a..f871a5977 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -78,14 +78,14 @@ VioletPokecenter1F_ElmsAideScript: writetext UnknownText_0x69712 jump .AskTakeEgg -GameboyKidScript_0x69540: - jumptextfaceplayer UnknownText_0x69809 +VioletPokecenter1FGameboyKidScript: + jumptextfaceplayer VioletPokecenter1FGameboyKidText -GentlemanScript_0x69543: - jumptextfaceplayer UnknownText_0x6983c +VioletPokecenter1FGentlemanScript: + jumptextfaceplayer VioletPokecenter1FGentlemanText -YoungsterScript_0x69546: - jumptextfaceplayer UnknownText_0x698b8 +VioletPokecenter1FYoungsterScript: + jumptextfaceplayer VioletPokecenter1FYoungsterText MovementData_AideWalksStraightOutOfPokecenter: step DOWN @@ -182,13 +182,13 @@ UnknownText_0x69791: line "a friend far away." done -UnknownText_0x69809: +VioletPokecenter1FGameboyKidText: text "A guy named BILL" line "made the #MON" cont "PC storage system." done -UnknownText_0x6983c: +VioletPokecenter1FGentlemanText: text "It was around" line "three years ago." @@ -201,7 +201,7 @@ UnknownText_0x6983c: cont "kid broke 'em up." done -UnknownText_0x698b8: +VioletPokecenter1FYoungsterText: text "#MON are smart." line "They won't obey a" @@ -234,7 +234,7 @@ VioletPokecenter1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 - person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1 - person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x69543, -1 - person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1 + person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 + person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 + person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index a6b30627a..3b4ce8f33 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -66,8 +66,8 @@ FisherScript_0x1a9a75: closetext end -YoungsterScript_0x1a9a90: - jumptextfaceplayer UnknownText_0x1a9daa +ViridianCityYoungsterScript: + jumptextfaceplayer ViridianCityYoungsterText ViridianCitySign: jumptext ViridianCitySignText @@ -176,7 +176,7 @@ UnknownText_0x1a9d86: para "…Zzzzz…" done -UnknownText_0x1a9daa: +ViridianCityYoungsterText: text "I heard that there" line "are many items on" @@ -244,4 +244,4 @@ ViridianCity_MapEventHeader: person_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 person_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 person_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 - person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9a90, -1 + person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 25764b0a5..dbb1e8d09 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -16,19 +16,19 @@ ClerkScript_0x9b5e7: closetext end -LassScript_0x9b5ee: - jumptextfaceplayer UnknownText_0x9b5f4 +ViridianMartLassScript: + jumptextfaceplayer ViridianMartLassText -CooltrainerMScript_0x9b5f1: - jumptextfaceplayer UnknownText_0x9b61a +ViridianMartCooltrainerMScript: + jumptextfaceplayer ViridianMartCooltrainerMText -UnknownText_0x9b5f4: +ViridianMartLassText: text "The GYM LEADER" line "here is totally" cont "cool." done -UnknownText_0x9b61a: +ViridianMartCooltrainerMText: text "Have you been to" line "CINNABAR?" @@ -54,5 +54,5 @@ ViridianMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 - person_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x9b5ee, -1 - person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b5f1, -1 + person_event SPRITE_LASS, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianMartLassScript, -1 + person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index b28c14ac1..9c402b327 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -11,11 +11,11 @@ ViridianNicknameSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x9ae3a: - jumptextfaceplayer UnknownText_0x9ae54 +ViridianNicknameSpeechHousePokefanMScript: + jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText -LassScript_0x9ae3d: - jumptextfaceplayer UnknownText_0x9aecb +ViridianNicknameSpeechHouseLassScript: + jumptextfaceplayer ViridianNicknameSpeechHouseLassText Speary: opentext @@ -33,7 +33,7 @@ Rattey: closetext end -UnknownText_0x9ae54: +ViridianNicknameSpeechHousePokefanMText: text "Do you put a lot" line "of thought into" @@ -47,7 +47,7 @@ UnknownText_0x9ae54: line "with others." done -UnknownText_0x9aecb: +ViridianNicknameSpeechHouseLassText: text "They're SPEARY--" line "a SPEAROW--and" cont "RATTEY--a RATTATA." @@ -78,7 +78,7 @@ ViridianNicknameSpeechHouse_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x9ae3a, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9ae3d, -1 + person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 + person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Speary, -1 person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Rattey, -1 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 35c634f03..2db55de00 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -30,11 +30,11 @@ CooltrainerMScript_0x9b693: closetext end -CooltrainerFScript_0x9b6a7: - jumptextfaceplayer UnknownText_0x9b76b +ViridianPokecenter1FCooltrainerFScript: + jumptextfaceplayer ViridianPokecenter1FCooltrainerFText -BugCatcherScript_0x9b6aa: - jumptextfaceplayer UnknownText_0x9b7c8 +ViridianPokecenter1FBugCatcherScript: + jumptextfaceplayer ViridianPokecenter1FBugCatcherText UnknownText_0x9b6ad: text "Where in the world" @@ -56,7 +56,7 @@ UnknownText_0x9b6f5: line "any underlings." done -UnknownText_0x9b76b: +ViridianPokecenter1FCooltrainerFText: text "I heard that the" line "GYM in CINNABAR is" cont "gone." @@ -66,7 +66,7 @@ UnknownText_0x9b76b: cont "the GYM LEADER." done -UnknownText_0x9b7c8: +ViridianPokecenter1FBugCatcherText: text "My dream is to be-" line "come a GYM LEADER." done @@ -91,5 +91,5 @@ ViridianPokecenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 - person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9b6a7, -1 - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9b6aa, -1 + person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 + person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 6acaa08b2..9028ccb8f 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -111,9 +111,9 @@ WarehouseEntrance_MapScriptHeader: return TrainerSupernerdEric: - trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, SupernerdEricScript + trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script -SupernerdEricScript: +.Script: end_if_just_battled opentext writetext SupernerdEricAfterBattleText @@ -122,9 +122,9 @@ SupernerdEricScript: end TrainerSupernerdTeru: - trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, SupernerdTeruScript + trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script -SupernerdTeruScript: +.Script: end_if_just_battled opentext writetext SupernerdTeruAfterBattleText @@ -133,9 +133,9 @@ SupernerdTeruScript: end TrainerPokemaniacIssac: - trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, PokemaniacIssacScript + trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script -PokemaniacIssacScript: +.Script: end_if_just_battled opentext writetext PokemaniacIssacAfterBattleText @@ -144,9 +144,9 @@ PokemaniacIssacScript: end TrainerPokemaniacDonald: - trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, PokemaniacDonaldScript + trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script -PokemaniacDonaldScript: +.Script: end_if_just_battled opentext writetext PokemaniacDonaldAfterBattleText diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 5f4a38dad..a14a3d3fb 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -43,14 +43,14 @@ WiseTriosRoom_MapScriptHeader: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -SageScript_0x9859a: - jumptextfaceplayer UnknownText_0x9862b +WiseTriosRoomSage1Script: + jumptextfaceplayer WiseTriosRoomSage1Text -SageScript_0x9859d: - jumptextfaceplayer UnknownText_0x9868b +WiseTriosRoomSage2Script: + jumptextfaceplayer WiseTriosRoomSage2Text -SageScript_0x985a0: - jumptextfaceplayer UnknownText_0x987af +WiseTriosRoomSage3Script: + jumptextfaceplayer WiseTriosRoomSage3Text UnknownScript_0x985a3: spriteface WISETRIOSROOM_SAGE3, UP @@ -69,9 +69,9 @@ UnknownScript_0x985a3: end TrainerSageGaku: - trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, SageGakuScript + trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script -SageGakuScript: +.Script: opentext writetext UnknownText_0x98938 waitbutton @@ -79,9 +79,9 @@ SageGakuScript: end TrainerSageMasa: - trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, SageMasaScript + trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script -SageMasaScript: +.Script: opentext writetext UnknownText_0x98a35 waitbutton @@ -89,9 +89,9 @@ SageMasaScript: end TrainerSageKoji: - trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, SageKojiScript + trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script -SageKojiScript: +.Script: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 @@ -130,7 +130,7 @@ MovementData_0x98628: step DOWN step_end -UnknownText_0x9862b: +WiseTriosRoomSage1Text: text "Astounding…" para "SUICUNE, ENTEI and" @@ -141,7 +141,7 @@ UnknownText_0x9862b: line "coming true?" done -UnknownText_0x9868b: +WiseTriosRoomSage2Text: text "We train at the" line "BURNED TOWER, but" @@ -172,7 +172,7 @@ UnknownText_0x98712: line "entering!" done -UnknownText_0x987af: +WiseTriosRoomSage3Text: text "We, the WISE TRIO," line "are the protectors" @@ -363,9 +363,9 @@ WiseTriosRoom_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - person_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 person_event SPRITE_SAGE, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 person_event SPRITE_SAGE, 6, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 person_event SPRITE_SAGE, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 diff --git a/maps/blockdata.asm b/maps/blockdata.asm index e6c3e7ae9..c14b30743 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -443,7 +443,7 @@ TimeCapsule_BlockData: EcruteakLugiaSpeechHouse_BlockData: EcruteakItemfinderHouse_BlockData: VioletNicknameSpeechHouse_BlockData: -VioletOnixTradeHouse_BlockData: +VioletKylesHouse_BlockData: INCBIN "maps/House2.blk" BetaCave_BlockData: diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 378356624..3b2607e31 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -1,3 +1,20 @@ +map_header: macro +;\1: map label +;\2: tileset: a TILESET_* constant +;\3: permission: TOWN, ROUTE, INDOOR, CAVE, PERM_5, GATE, or DUNGEON +;\4: location: from constants/landmark_constants.asm +;\5: music: a MUSIC_* constant +;\6: phone service flag: 1 to prevent phone calls +;\7: time of day: a PALETTE_* constant +;\8: fishing group: a FISHGROUP_* constant +\1_MapHeader: + db BANK(\1_SecondMapHeader), \2, \3 + dw \1_SecondMapHeader + db \4, \5 + dn \6, \7 + db \8 +endm + MapGroupPointers:: ; pointers to the first map header of each map group dw MapGroup_Olivine ; 1 @@ -27,7 +44,6 @@ MapGroupPointers:: dw MapGroup_Saffron ; 25 dw MapGroup_Cherrygrove ; 26 - MapGroup_Olivine: map_header OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -235,7 +251,7 @@ MapGroup_Violet: map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletOnixTradeHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VioletKylesHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index b58895f4b..e81c8c774 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -1,3 +1,90 @@ +map_header_2: macro +;\1: map label +;\2: map id +;\3: border block +;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none +\1_SecondMapHeader:: + db \3 + db \2_HEIGHT, \2_WIDTH + db BANK(\1_BlockData) + dw \1_BlockData + db BANK(\1_MapScriptHeader) + dw \1_MapScriptHeader + dw \1_MapEventHeader + db \4 +endm + +connection: macro +if "\1" == "north" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: x +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + \2_WIDTH * (\2_HEIGHT - 3) + \5 + dw OverworldMap + \4 + 3 + db \6 + db \2_WIDTH + db \2_HEIGHT * 2 - 1 + db (\4 - \5) * -2 + dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 +endc + +if "\1" == "south" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: x +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + \5 + dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 + db \6 + db \2_WIDTH + db 0 + db (\4 - \5) * -2 + dw OverworldMap + \2_WIDTH + 7 +endc + +if "\1" == "west" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: y +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + (\2_WIDTH * \5) + \2_WIDTH - 3 + dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3) + db \6 + db \2_WIDTH + db (\4 - \5) * -2 + db \2_WIDTH * 2 - 1 + dw OverworldMap + \2_WIDTH * 2 + 6 +endc + +if "\1" == "east" +;\2: map id +;\3: map label (eventually will be rolled into map id) +;\4: y +;\5: offset? +;\6: strip length +;\7: this map id + map \2 + dw \3_BlockData + (\2_WIDTH * \5) + dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 + db \6 + db \2_WIDTH + db (\4 - \5) * -2 + db 0 + dw OverworldMap + \2_WIDTH + 7 +endc +endm + + map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN @@ -427,7 +514,7 @@ map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0 map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0 map_header_2 VioletPokecenter1F, VIOLET_POKECENTER_1F, $0, 0 - map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, 0 + map_header_2 VioletKylesHouse, VIOLET_KYLES_HOUSE, $0, 0 map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 map_header_2 Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $0, 0 map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0 |