From 1aae9eb52808b5d897376dac3dd15c93212bf13b Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 21:14:48 -0500 Subject: [PATCH 01/19] Labelling simple local jumps. --- maps/SlowpokeWellB2F.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index c30261b25..67e8303a8 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -13,17 +13,17 @@ GymGuyScript_0x5ad0b: faceplayer opentext checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL - iftrue UnknownScript_0x5ad22 + iftrue .GotKingsRock writetext UnknownText_0x5ad2a buttonsound verbosegiveitem KINGS_ROCK - iffalse UnknownScript_0x5ad20 + iffalse .NoRoom setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL -UnknownScript_0x5ad20: +.NoRoom: closetext end -UnknownScript_0x5ad22: +.GotKingsRock: writetext UnknownText_0x5adf2 waitbutton closetext From b098816b46a6e5b0e12e207782025c0c9c576bfb Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 21:23:32 -0500 Subject: [PATCH 02/19] Labelling Route 44; Birdkeeper Vance and Fisher Wilton. --- maps/Route44.asm | 144 +++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/maps/Route44.asm b/maps/Route44.asm index 4f9261a59..85e2dbe6e 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -26,29 +26,29 @@ TrainerBirdKeeperVance1: end_if_just_battled opentext checkflag ENGINE_VANCE - iftrue UnknownScript_0x19d86a + iftrue VanceWantsBattle checkcellnum PHONE_BIRDKEEPER_VANCE - iftrue UnknownScript_0x19d8eb + iftrue NumberAcceptedM checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x19d853 - writetext UnknownText_0x19dbf3 + iftrue .AskedAlready + writetext BirdKeeperVanceLegendaryBirdsText buttonsound setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x19d8df - jump UnknownScript_0x19d856 + scall AskNumber1M + jump .AskForNumber -UnknownScript_0x19d853: - scall UnknownScript_0x19d8e3 -UnknownScript_0x19d856: +.AskedAlready: + scall AskNumber2M +.AskForNumber: askforphonenumber PHONE_BIRDKEEPER_VANCE - if_equal $1, UnknownScript_0x19d8f3 - if_equal $2, UnknownScript_0x19d8ef + if_equal $1, PhoneFullM + if_equal $2, NumberDeclinedM trainertotext BIRD_KEEPER, VANCE1, $0 - scall UnknownScript_0x19d8e7 - jump UnknownScript_0x19d8eb + scall RegisteredNumberM + jump NumberAcceptedM -UnknownScript_0x19d86a: - scall UnknownScript_0x19d8f7 +VanceWantsBattle: + scall RematchM winlosstext BirdKeeperVance1BeatenText, 0 copybytetovar wVanceFightCount if_equal 2, .Fight2 @@ -82,70 +82,70 @@ UnknownScript_0x19d86a: reloadmapafterbattle clearflag ENGINE_VANCE checkevent EVENT_VANCE_CARBOS - iftrue UnknownScript_0x19d8cb + iftrue .Carbos checkevent EVENT_GOT_CARBOS_FROM_VANCE - iftrue UnknownScript_0x19d8ca - scall UnknownScript_0x19d90a + iftrue .ReceivedCarbosBefore + scall RematchGiftM verbosegiveitem CARBOS - iffalse UnknownScript_0x19d903 + iffalse VancePackFull setevent EVENT_GOT_CARBOS_FROM_VANCE - jump UnknownScript_0x19d8eb + jump NumberAcceptedM -UnknownScript_0x19d8ca: +.ReceivedCarbosBefore: end -UnknownScript_0x19d8cb: +.Carbos: opentext - writetext UnknownText_0x19dc67 + writetext BirdKeeperVance2BeatenText waitbutton verbosegiveitem CARBOS - iffalse UnknownScript_0x19d903 + iffalse VancePackFull clearevent EVENT_VANCE_CARBOS setevent EVENT_GOT_CARBOS_FROM_VANCE - jump UnknownScript_0x19d8eb + jump NumberAcceptedM -UnknownScript_0x19d8df: +AskNumber1M: jumpstd asknumber1m end -UnknownScript_0x19d8e3: +AskNumber2M: jumpstd asknumber2m end -UnknownScript_0x19d8e7: +RegisteredNumberM: jumpstd registerednumberm end -UnknownScript_0x19d8eb: +NumberAcceptedM: jumpstd numberacceptedm end -UnknownScript_0x19d8ef: +NumberDeclinedM: jumpstd numberdeclinedm end -UnknownScript_0x19d8f3: +PhoneFullM: jumpstd phonefullm end -UnknownScript_0x19d8f7: +RematchM: jumpstd rematchm end -UnknownScript_0x19d8fb: +GiftM: jumpstd giftm end -UnknownScript_0x19d8ff: +PackFullM: jumpstd packfullm end -UnknownScript_0x19d903: +VancePackFull: setevent EVENT_VANCE_CARBOS jumpstd packfullm end -UnknownScript_0x19d90a: +RematchGiftM: jumpstd rematchgiftm end @@ -168,31 +168,31 @@ TrainerFisherWilton1: end_if_just_battled opentext checkflag ENGINE_WILTON - iftrue UnknownScript_0x19d96e + iftrue WiltonWantsBattle checkflag ENGINE_WILTON_HAS_ITEM - iftrue UnknownScript_0x19d9b4 + iftrue WiltonHasItem checkcellnum PHONE_FISHER_WILTON - iftrue UnknownScript_0x19d8eb + iftrue NumberAcceptedM checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x19d957 - writetext UnknownText_0x19daa8 + iftrue .AskedAlready + writetext FisherWiltonHugePoliwagText buttonsound setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x19d8df - jump UnknownScript_0x19d95a + scall AskNumber1M + jump .AskForNumber -UnknownScript_0x19d957: - scall UnknownScript_0x19d8e3 -UnknownScript_0x19d95a: +.AskedAlready: + scall AskNumber2M +.AskForNumber: askforphonenumber PHONE_FISHER_WILTON - if_equal $1, UnknownScript_0x19d8f3 - if_equal $2, UnknownScript_0x19d8ef + if_equal $1, PhoneFullM + if_equal $2, NumberDeclinedM trainertotext FISHER, WILTON1, $0 - scall UnknownScript_0x19d8e7 - jump UnknownScript_0x19d8eb + scall RegisteredNumberM + jump NumberAcceptedM -UnknownScript_0x19d96e: - scall UnknownScript_0x19d8f7 +WiltonWantsBattle: + scall RematchM winlosstext FisherWilton1BeatenText, 0 copybytetovar wWiltonFightCount if_equal 2, .Fight2 @@ -227,33 +227,33 @@ UnknownScript_0x19d96e: clearflag ENGINE_WILTON end -UnknownScript_0x19d9b4: - scall UnknownScript_0x19d8fb +WiltonHasItem: + scall GiftM checkevent EVENT_WILTON_HAS_ULTRA_BALL - iftrue UnknownScript_0x19d9c9 + iftrue .UltraBall checkevent EVENT_WILTON_HAS_GREAT_BALL - iftrue UnknownScript_0x19d9d2 + iftrue .GreatBall checkevent EVENT_WILTON_HAS_POKE_BALL - iftrue UnknownScript_0x19d9db -UnknownScript_0x19d9c9: + iftrue .PokeBall +.UltraBall: verbosegiveitem ULTRA_BALL - iffalse UnknownScript_0x19d9e7 - jump UnknownScript_0x19d9e1 + iffalse .PackFullM + jump .ItemReceived -UnknownScript_0x19d9d2: +.GreatBall: verbosegiveitem GREAT_BALL - iffalse UnknownScript_0x19d9e7 - jump UnknownScript_0x19d9e1 + iffalse .PackFullM + jump .ItemReceived -UnknownScript_0x19d9db: +.PokeBall: verbosegiveitem POKE_BALL - iffalse UnknownScript_0x19d9e7 -UnknownScript_0x19d9e1: + iffalse .PackFullM +.ItemReceived: clearflag ENGINE_WILTON_HAS_ITEM - jump UnknownScript_0x19d8eb + jump NumberAcceptedM -UnknownScript_0x19d9e7: - jump UnknownScript_0x19d8ff +.PackFullM: + jump PackFullM TrainerFisherEdgar: trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script @@ -334,7 +334,7 @@ FisherWilton1BeatenText: line "it." done -UnknownText_0x19daa8: +FisherWiltonHugePoliwagText: text "That POLIWAG that" line "got away…" cont "It was huge." @@ -379,7 +379,7 @@ BirdKeeperVance1BeatenText: line "stuff." done -UnknownText_0x19dbf3: +BirdKeeperVanceLegendaryBirdsText: text "ARTICUNO, ZAPDOS" line "and MOLTRES are" @@ -391,7 +391,7 @@ UnknownText_0x19dbf3: cont "birds, though." done -UnknownText_0x19dc67: +BirdKeeperVance2BeatenText: text "Why can't I ever" line "beat you?" From 3e0cac29e3aa900761813ba3d3767666111d85da Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 21:28:42 -0500 Subject: [PATCH 03/19] Route 5 Cleanse Tag granny labels --- maps/Route5CleanseTagSpeechHouse.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 320ddef89..3692bc3a7 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -9,20 +9,20 @@ Route5CleanseTagSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -GrannyScript_0x18b634: +Route5CleanseTagGrannyScript: faceplayer opentext checkevent EVENT_GOT_CLEANSE_TAG - iftrue UnknownScript_0x18b649 - writetext UnknownText_0x18b655 + iftrue .GotCleanseTag + writetext Route5CleanseTagGrannySinisterShadowText buttonsound verbosegiveitem CLEANSE_TAG - iffalse UnknownScript_0x18b64d + iffalse .NoRoom setevent EVENT_GOT_CLEANSE_TAG -UnknownScript_0x18b649: - writetext UnknownText_0x18b6a7 +.GotCleanseTag: + writetext Route5CleanseTagGrannyProtectedText waitbutton -UnknownScript_0x18b64d: +.NoRoom: closetext end @@ -32,7 +32,7 @@ Route5CleanseTagSpeechHouseTeacherScript: HouseForSaleBookshelf: jumpstd difficultbookshelf -UnknownText_0x18b655: +Route5CleanseTagGrannySinisterShadowText: text "Eeyaaaah!" para "I sense a sinister" @@ -43,7 +43,7 @@ UnknownText_0x18b655: line "it off!" done -UnknownText_0x18b6a7: +Route5CleanseTagGrannyProtectedText: text "You were in mortal" line "danger, but you" cont "are protected now." @@ -79,5 +79,5 @@ Route5CleanseTagSpeechHouse_MapEventHeader: .ObjectEvents: db 2 - object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 + object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagGrannyScript, -1 object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 From e8d651b79af1bed30c75022a06b314d3145f26b2 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 21:32:31 -0500 Subject: [PATCH 04/19] Saffron City guard labels --- maps/Route6SaffronGate.asm | 16 ++++++++-------- maps/Route7SaffronGate.asm | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 713e1476e..b80e5f8e5 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -12,23 +12,23 @@ Route6SaffronGate_MapScriptHeader: .DummyScene: end -OfficerScript_0x1926ea: +Route6SaffronGuardScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x1926f8 - writetext UnknownText_0x1926fe + iftrue .ReturnedPart + writetext Route6SaffronGuardWelcomeText waitbutton closetext end -UnknownScript_0x1926f8: - writetext UnknownText_0x1927cb +.ReturnedPart: + writetext Route6SaffronGuardMagnetTrainText waitbutton closetext end -UnknownText_0x1926fe: +Route6SaffronGuardWelcomeText: text "Welcome to SAFFRON" line "CITY, home of the" cont "MAGNET TRAIN!" @@ -49,7 +49,7 @@ UnknownText_0x1926fe: line "PLANT." done -UnknownText_0x1927cb: +Route6SaffronGuardMagnetTrainText: text "The MAGNET TRAIN" line "is the most famous" @@ -76,4 +76,4 @@ Route6SaffronGate_MapEventHeader: .ObjectEvents: db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index c72a3a571..2317e681b 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -8,23 +8,23 @@ Route7SaffronGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x73518: +Route7SaffronGuardScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x73526 - writetext UnknownText_0x7352c + iftrue .ReturnedPart + writetext Route7SaffronGuardPowerPlantText waitbutton closetext end -UnknownScript_0x73526: - writetext UnknownText_0x73592 +.ReturnedPart: + writetext Route7SaffronGuardSeriousText waitbutton closetext end -UnknownText_0x7352c: +Route7SaffronGuardPowerPlantText: text "Did you hear about" line "the accident at" cont "the POWER PLANT?" @@ -34,7 +34,7 @@ UnknownText_0x7352c: cont "LAVENDER TOWN." done -UnknownText_0x73592: +Route7SaffronGuardSeriousText: text "I take my GUARD" line "job seriously." @@ -64,4 +64,4 @@ Route7SaffronGate_MapEventHeader: .ObjectEvents: db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 From d53881a0d43a3592ead913241fd37b89f7c15a06 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 21:39:07 -0500 Subject: [PATCH 05/19] Picnicker Erin labels --- maps/Route46.asm | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/maps/Route46.asm b/maps/Route46.asm index 36dad82d3..48eaf36b1 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -32,29 +32,29 @@ TrainerPicnickerErin1: end_if_just_battled opentext checkflag ENGINE_ERIN - iftrue UnknownScript_0x1a96da + iftrue ErinWantsBattle checkcellnum PHONE_PICNICKER_ERIN - iftrue UnknownScript_0x1a975b + iftrue NumberAcceptedF checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a96c3 - writetext UnknownText_0x1a98c6 + iftrue .AskedAlready + writetext PicnickerErinAfterBattleText buttonsound setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a974f - jump UnknownScript_0x1a96c6 + scall AskNumber1F + jump .AskForNumber -UnknownScript_0x1a96c3: - scall UnknownScript_0x1a9753 -UnknownScript_0x1a96c6: +.AskedAlready: + scall AskNumber2F +.AskForNumber: askforphonenumber PHONE_PICNICKER_ERIN - if_equal $1, UnknownScript_0x1a9763 - if_equal $2, UnknownScript_0x1a975f + if_equal $1, PhoneFullF + if_equal $2, NumberDeclinedF trainertotext PICNICKER, ERIN1, $0 - scall UnknownScript_0x1a9757 - jump UnknownScript_0x1a975b + scall RegisteredNumberF + jump NumberAcceptedF -UnknownScript_0x1a96da: - scall UnknownScript_0x1a9767 +ErinWantsBattle: + scall RematchF winlosstext PicnickerErin1BeatenText, 0 copybytetovar wErinFightCount if_equal 2, .Fight2 @@ -88,62 +88,62 @@ UnknownScript_0x1a96da: reloadmapafterbattle clearflag ENGINE_ERIN checkevent EVENT_ERIN_CALCIUM - iftrue UnknownScript_0x1a973b + iftrue .HasCalcium checkevent EVENT_GOT_CALCIUM_FROM_ERIN - iftrue UnknownScript_0x1a973a - scall UnknownScript_0x1a9772 + iftrue .GotCalciumAlready + scall RematchGiftF verbosegiveitem CALCIUM - iffalse UnknownScript_0x1a976b + iffalse ErinNoRoomForCalcium setevent EVENT_GOT_CALCIUM_FROM_ERIN - jump UnknownScript_0x1a975b + jump NumberAcceptedF -UnknownScript_0x1a973a: +.GotCalciumAlready: end -UnknownScript_0x1a973b: +.HasCalcium: opentext - writetext UnknownText_0x1a9927 + writetext PicnickerErin2BeatenText waitbutton verbosegiveitem CALCIUM - iffalse UnknownScript_0x1a976b + iffalse ErinNoRoomForCalcium clearevent EVENT_ERIN_CALCIUM setevent EVENT_GOT_CALCIUM_FROM_ERIN - jump UnknownScript_0x1a975b + jump NumberAcceptedF -UnknownScript_0x1a974f: +AskNumber1F: jumpstd asknumber1f end -UnknownScript_0x1a9753: +AskNumber2F: jumpstd asknumber2f end -UnknownScript_0x1a9757: +RegisteredNumberF: jumpstd registerednumberf end -UnknownScript_0x1a975b: +NumberAcceptedF: jumpstd numberacceptedf end -UnknownScript_0x1a975f: +NumberDeclinedF: jumpstd numberdeclinedf end -UnknownScript_0x1a9763: +PhoneFullF: jumpstd phonefullf end -UnknownScript_0x1a9767: +RematchF: jumpstd rematchf end -UnknownScript_0x1a976b: +ErinNoRoomForCalcium: setevent EVENT_ERIN_CALCIUM jumpstd packfullf end -UnknownScript_0x1a9772: +RematchGiftF: jumpstd rematchgiftf end @@ -219,7 +219,7 @@ PicnickerErin1BeatenText: text "Oh, rats!" done -UnknownText_0x1a98c6: +PicnickerErinAfterBattleText: text "I've been to many" line "GYMS, but the GYM" @@ -230,7 +230,7 @@ UnknownText_0x1a98c6: line "pretty flowers!" done -UnknownText_0x1a9927: +PicnickerErin2BeatenText: text "Aww… I keep losing" line "all the time!" From 2548f75feba2d9db28cd9e3e286d473ff27120f4 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 21:59:48 -0500 Subject: [PATCH 06/19] Disambiguating the wrapper functions. --- maps/Route44.asm | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/maps/Route44.asm b/maps/Route44.asm index 85e2dbe6e..09190b278 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -28,27 +28,27 @@ TrainerBirdKeeperVance1: checkflag ENGINE_VANCE iftrue VanceWantsBattle checkcellnum PHONE_BIRDKEEPER_VANCE - iftrue NumberAcceptedM + iftrue Rt44NumberAcceptedM checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BirdKeeperVanceLegendaryBirdsText buttonsound setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER - scall AskNumber1M + scall Rt44AskNumber1M jump .AskForNumber .AskedAlready: - scall AskNumber2M + scall Rt44AskNumber2M .AskForNumber: askforphonenumber PHONE_BIRDKEEPER_VANCE - if_equal $1, PhoneFullM - if_equal $2, NumberDeclinedM + if_equal $1, Rt44PhoneFullM + if_equal $2, Rt44NumberDeclinedM trainertotext BIRD_KEEPER, VANCE1, $0 - scall RegisteredNumberM - jump NumberAcceptedM + scall Rt44RegisteredNumberM + jump Rt44NumberAcceptedM VanceWantsBattle: - scall RematchM + scall Rt44RematchM winlosstext BirdKeeperVance1BeatenText, 0 copybytetovar wVanceFightCount if_equal 2, .Fight2 @@ -85,11 +85,11 @@ VanceWantsBattle: iftrue .Carbos checkevent EVENT_GOT_CARBOS_FROM_VANCE iftrue .ReceivedCarbosBefore - scall RematchGiftM + scall Rt44RematchGiftM verbosegiveitem CARBOS iffalse VancePackFull setevent EVENT_GOT_CARBOS_FROM_VANCE - jump NumberAcceptedM + jump Rt44NumberAcceptedM .ReceivedCarbosBefore: end @@ -102,41 +102,41 @@ VanceWantsBattle: iffalse VancePackFull clearevent EVENT_VANCE_CARBOS setevent EVENT_GOT_CARBOS_FROM_VANCE - jump NumberAcceptedM + jump Rt44NumberAcceptedM -AskNumber1M: +Rt44AskNumber1M: jumpstd asknumber1m end -AskNumber2M: +Rt44AskNumber2M: jumpstd asknumber2m end -RegisteredNumberM: +Rt44RegisteredNumberM: jumpstd registerednumberm end -NumberAcceptedM: +Rt44NumberAcceptedM: jumpstd numberacceptedm end -NumberDeclinedM: +Rt44NumberDeclinedM: jumpstd numberdeclinedm end -PhoneFullM: +Rt44PhoneFullM: jumpstd phonefullm end -RematchM: +Rt44RematchM: jumpstd rematchm end -GiftM: +Rt44GiftM: jumpstd giftm end -PackFullM: +Rt44PackFullM: jumpstd packfullm end @@ -145,7 +145,7 @@ VancePackFull: jumpstd packfullm end -RematchGiftM: +Rt44RematchGiftM: jumpstd rematchgiftm end @@ -172,27 +172,27 @@ TrainerFisherWilton1: checkflag ENGINE_WILTON_HAS_ITEM iftrue WiltonHasItem checkcellnum PHONE_FISHER_WILTON - iftrue NumberAcceptedM + iftrue Rt44NumberAcceptedM checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext FisherWiltonHugePoliwagText buttonsound setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER - scall AskNumber1M + scall Rt44AskNumber1M jump .AskForNumber .AskedAlready: - scall AskNumber2M + scall Rt44AskNumber2M .AskForNumber: askforphonenumber PHONE_FISHER_WILTON - if_equal $1, PhoneFullM - if_equal $2, NumberDeclinedM + if_equal $1, Rt44PhoneFullM + if_equal $2, Rt44NumberDeclinedM trainertotext FISHER, WILTON1, $0 - scall RegisteredNumberM - jump NumberAcceptedM + scall Rt44RegisteredNumberM + jump Rt44NumberAcceptedM WiltonWantsBattle: - scall RematchM + scall Rt44RematchM winlosstext FisherWilton1BeatenText, 0 copybytetovar wWiltonFightCount if_equal 2, .Fight2 @@ -228,7 +228,7 @@ WiltonWantsBattle: end WiltonHasItem: - scall GiftM + scall Rt44GiftM checkevent EVENT_WILTON_HAS_ULTRA_BALL iftrue .UltraBall checkevent EVENT_WILTON_HAS_GREAT_BALL @@ -237,23 +237,23 @@ WiltonHasItem: iftrue .PokeBall .UltraBall: verbosegiveitem ULTRA_BALL - iffalse .PackFullM + iffalse .Rt44PackFullM jump .ItemReceived .GreatBall: verbosegiveitem GREAT_BALL - iffalse .PackFullM + iffalse .Rt44PackFullM jump .ItemReceived .PokeBall: verbosegiveitem POKE_BALL - iffalse .PackFullM + iffalse .Rt44PackFullM .ItemReceived: clearflag ENGINE_WILTON_HAS_ITEM - jump NumberAcceptedM + jump Rt44NumberAcceptedM -.PackFullM: - jump PackFullM +.Rt44PackFullM: + jump Rt44PackFullM TrainerFisherEdgar: trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script From d837c7609afacb6481501eb61eee803050e0aa18 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 22:02:01 -0500 Subject: [PATCH 07/19] Labelling Route 46's wrappers. --- maps/Route46.asm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/maps/Route46.asm b/maps/Route46.asm index 48eaf36b1..f7e491107 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -34,27 +34,27 @@ TrainerPicnickerErin1: checkflag ENGINE_ERIN iftrue ErinWantsBattle checkcellnum PHONE_PICNICKER_ERIN - iftrue NumberAcceptedF + iftrue Rt46NumberAcceptedF checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext PicnickerErinAfterBattleText buttonsound setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER - scall AskNumber1F + scall Rt46AskNumber1F jump .AskForNumber .AskedAlready: - scall AskNumber2F + scall Rt46AskNumber2F .AskForNumber: askforphonenumber PHONE_PICNICKER_ERIN - if_equal $1, PhoneFullF - if_equal $2, NumberDeclinedF + if_equal $1, Rt46PhoneFullF + if_equal $2, Rt46NumberDeclinedF trainertotext PICNICKER, ERIN1, $0 - scall RegisteredNumberF - jump NumberAcceptedF + scall Rt46RegisteredNumberF + jump Rt46NumberAcceptedF ErinWantsBattle: - scall RematchF + scall Rt46RematchF winlosstext PicnickerErin1BeatenText, 0 copybytetovar wErinFightCount if_equal 2, .Fight2 @@ -91,11 +91,11 @@ ErinWantsBattle: iftrue .HasCalcium checkevent EVENT_GOT_CALCIUM_FROM_ERIN iftrue .GotCalciumAlready - scall RematchGiftF + scall Rt46RematchGiftF verbosegiveitem CALCIUM iffalse ErinNoRoomForCalcium setevent EVENT_GOT_CALCIUM_FROM_ERIN - jump NumberAcceptedF + jump Rt46NumberAcceptedF .GotCalciumAlready: end @@ -108,33 +108,33 @@ ErinWantsBattle: iffalse ErinNoRoomForCalcium clearevent EVENT_ERIN_CALCIUM setevent EVENT_GOT_CALCIUM_FROM_ERIN - jump NumberAcceptedF + jump Rt46NumberAcceptedF -AskNumber1F: +Rt46AskNumber1F: jumpstd asknumber1f end -AskNumber2F: +Rt46AskNumber2F: jumpstd asknumber2f end -RegisteredNumberF: +Rt46RegisteredNumberF: jumpstd registerednumberf end -NumberAcceptedF: +Rt46NumberAcceptedF: jumpstd numberacceptedf end -NumberDeclinedF: +Rt46NumberDeclinedF: jumpstd numberdeclinedf end -PhoneFullF: +Rt46PhoneFullF: jumpstd phonefullf end -RematchF: +Rt46RematchF: jumpstd rematchf end @@ -143,7 +143,7 @@ ErinNoRoomForCalcium: jumpstd packfullf end -RematchGiftF: +Rt46RematchGiftF: jumpstd rematchgiftf end From 40952508c21f95326888118b66314853888c3a16 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 22:19:17 -0500 Subject: [PATCH 08/19] Renaming again --- maps/Route44.asm | 76 ++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/maps/Route44.asm b/maps/Route44.asm index 09190b278..5a53e231d 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -26,29 +26,29 @@ TrainerBirdKeeperVance1: end_if_just_battled opentext checkflag ENGINE_VANCE - iftrue VanceWantsBattle + iftrue .WantsBattle checkcellnum PHONE_BIRDKEEPER_VANCE - iftrue Rt44NumberAcceptedM + iftrue Route44NumberAcceptedM checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BirdKeeperVanceLegendaryBirdsText buttonsound setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER - scall Rt44AskNumber1M + scall Route44AskNumber1M jump .AskForNumber .AskedAlready: - scall Rt44AskNumber2M + scall Route44AskNumber2M .AskForNumber: askforphonenumber PHONE_BIRDKEEPER_VANCE - if_equal $1, Rt44PhoneFullM - if_equal $2, Rt44NumberDeclinedM + if_equal $1, Route44PhoneFullM + if_equal $2, Route44NumberDeclinedM trainertotext BIRD_KEEPER, VANCE1, $0 - scall Rt44RegisteredNumberM - jump Rt44NumberAcceptedM + scall Route44RegisteredNumberM + jump Route44NumberAcceptedM -VanceWantsBattle: - scall Rt44RematchM +.WantsBattle: + scall Route44RematchM winlosstext BirdKeeperVance1BeatenText, 0 copybytetovar wVanceFightCount if_equal 2, .Fight2 @@ -85,11 +85,11 @@ VanceWantsBattle: iftrue .Carbos checkevent EVENT_GOT_CARBOS_FROM_VANCE iftrue .ReceivedCarbosBefore - scall Rt44RematchGiftM + scall Route44RematchGiftM verbosegiveitem CARBOS iffalse VancePackFull setevent EVENT_GOT_CARBOS_FROM_VANCE - jump Rt44NumberAcceptedM + jump Route44NumberAcceptedM .ReceivedCarbosBefore: end @@ -102,41 +102,41 @@ VanceWantsBattle: iffalse VancePackFull clearevent EVENT_VANCE_CARBOS setevent EVENT_GOT_CARBOS_FROM_VANCE - jump Rt44NumberAcceptedM + jump Route44NumberAcceptedM -Rt44AskNumber1M: +Route44AskNumber1M: jumpstd asknumber1m end -Rt44AskNumber2M: +Route44AskNumber2M: jumpstd asknumber2m end -Rt44RegisteredNumberM: +Route44RegisteredNumberM: jumpstd registerednumberm end -Rt44NumberAcceptedM: +Route44NumberAcceptedM: jumpstd numberacceptedm end -Rt44NumberDeclinedM: +Route44NumberDeclinedM: jumpstd numberdeclinedm end -Rt44PhoneFullM: +Route44PhoneFullM: jumpstd phonefullm end -Rt44RematchM: +Route44RematchM: jumpstd rematchm end -Rt44GiftM: +Route44GiftM: jumpstd giftm end -Rt44PackFullM: +Route44PackFullM: jumpstd packfullm end @@ -145,7 +145,7 @@ VancePackFull: jumpstd packfullm end -Rt44RematchGiftM: +Route44RematchGiftM: jumpstd rematchgiftm end @@ -172,27 +172,27 @@ TrainerFisherWilton1: checkflag ENGINE_WILTON_HAS_ITEM iftrue WiltonHasItem checkcellnum PHONE_FISHER_WILTON - iftrue Rt44NumberAcceptedM + iftrue Route44NumberAcceptedM checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext FisherWiltonHugePoliwagText buttonsound setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER - scall Rt44AskNumber1M + scall Route44AskNumber1M jump .AskForNumber .AskedAlready: - scall Rt44AskNumber2M + scall Route44AskNumber2M .AskForNumber: askforphonenumber PHONE_FISHER_WILTON - if_equal $1, Rt44PhoneFullM - if_equal $2, Rt44NumberDeclinedM + if_equal $1, Route44PhoneFullM + if_equal $2, Route44NumberDeclinedM trainertotext FISHER, WILTON1, $0 - scall Rt44RegisteredNumberM - jump Rt44NumberAcceptedM + scall Route44RegisteredNumberM + jump Route44NumberAcceptedM WiltonWantsBattle: - scall Rt44RematchM + scall Route44RematchM winlosstext FisherWilton1BeatenText, 0 copybytetovar wWiltonFightCount if_equal 2, .Fight2 @@ -228,7 +228,7 @@ WiltonWantsBattle: end WiltonHasItem: - scall Rt44GiftM + scall Route44GiftM checkevent EVENT_WILTON_HAS_ULTRA_BALL iftrue .UltraBall checkevent EVENT_WILTON_HAS_GREAT_BALL @@ -237,23 +237,23 @@ WiltonHasItem: iftrue .PokeBall .UltraBall: verbosegiveitem ULTRA_BALL - iffalse .Rt44PackFullM + iffalse .Route44PackFullM jump .ItemReceived .GreatBall: verbosegiveitem GREAT_BALL - iffalse .Rt44PackFullM + iffalse .Route44PackFullM jump .ItemReceived .PokeBall: verbosegiveitem POKE_BALL - iffalse .Rt44PackFullM + iffalse .Route44PackFullM .ItemReceived: clearflag ENGINE_WILTON_HAS_ITEM - jump Rt44NumberAcceptedM + jump Route44NumberAcceptedM -.Rt44PackFullM: - jump Rt44PackFullM +.Route44PackFullM: + jump Route44PackFullM TrainerFisherEdgar: trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script From f14d0d8f21da214ce4a304d899bfd50c5d3318f3 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 22:25:11 -0500 Subject: [PATCH 09/19] Route 26 labels --- maps/Route26.asm | 92 ++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/maps/Route26.asm b/maps/Route26.asm index 4af45fe1f..9465f168d 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -34,29 +34,29 @@ TrainerCooltrainermGaven3: end_if_just_battled opentext checkflag ENGINE_GAVEN - iftrue UnknownScript_0x1a4d79 + iftrue .WantsBattle checkcellnum PHONE_COOLTRAINERM_GAVEN - iftrue UnknownScript_0x1a4dcb + iftrue .NumberAcceptedM checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a4d62 - writetext UnknownText_0x1a4fe4 + iftrue .AskedAlready + writetext CooltrainermGavenAfterText buttonsound setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a4dbf - jump UnknownScript_0x1a4d65 + scall .AskNumber1M + jump .AskForNumber -UnknownScript_0x1a4d62: - scall UnknownScript_0x1a4dc3 -UnknownScript_0x1a4d65: +.AskedAlready: + scall .AskNumber2M +.AskForNumber: askforphonenumber PHONE_COOLTRAINERM_GAVEN - if_equal $1, UnknownScript_0x1a4dd3 - if_equal $2, UnknownScript_0x1a4dcf + if_equal $1, .PhoneFullM + if_equal $2, .NumberDeclinedM trainertotext COOLTRAINERM, GAVEN3, $0 - scall UnknownScript_0x1a4dc7 - jump UnknownScript_0x1a4dcb + scall .RegisteredNumberM + jump .NumberAcceptedM -UnknownScript_0x1a4d79: - scall UnknownScript_0x1a4dd7 +.WantsBattle: + scall .RematchM winlosstext CooltrainermGaven3BeatenText, 0 copybytetovar wGavenFightCount if_equal 2, .Fight2 @@ -91,31 +91,31 @@ UnknownScript_0x1a4d79: clearflag ENGINE_GAVEN end -UnknownScript_0x1a4dbf: +.AskNumber1M: jumpstd asknumber1m end -UnknownScript_0x1a4dc3: +.AskNumber2M: jumpstd asknumber2m end -UnknownScript_0x1a4dc7: +.RegisteredNumberM: jumpstd registerednumberm end -UnknownScript_0x1a4dcb: +.NumberAcceptedM: jumpstd numberacceptedm end -UnknownScript_0x1a4dcf: +.NumberDeclinedM: jumpstd numberdeclinedm end -UnknownScript_0x1a4dd3: +.PhoneFullM: jumpstd phonefullm end -UnknownScript_0x1a4dd7: +.RematchM: jumpstd rematchm end @@ -138,29 +138,29 @@ TrainerCooltrainerfBeth1: end_if_just_battled opentext checkflag ENGINE_BETH - iftrue UnknownScript_0x1a4e35 + iftrue .WantsBattle checkcellnum PHONE_COOLTRAINERF_BETH - iftrue UnknownScript_0x1a4e87 + iftrue .NumberAcceptedF checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a4e1e - writetext UnknownText_0x1a51d9 + iftrue .AskedAlready + writetext CooltrainerfBethAfterText buttonsound setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a4e7b - jump UnknownScript_0x1a4e21 + scall .AskNumber1F + jump .AskForNumber -UnknownScript_0x1a4e1e: - scall UnknownScript_0x1a4e7f -UnknownScript_0x1a4e21: +.AskedAlready: + scall .AskNumber2F +.AskForNumber: askforphonenumber PHONE_COOLTRAINERF_BETH - if_equal $1, UnknownScript_0x1a4e8f - if_equal $2, UnknownScript_0x1a4e8b + if_equal $1, .PhoneFullF + if_equal $2, .NumberDeclinedF trainertotext COOLTRAINERF, BETH1, $0 - scall UnknownScript_0x1a4e83 - jump UnknownScript_0x1a4e87 + scall .RegisteredNumberF + jump .NumberAcceptedF -UnknownScript_0x1a4e35: - scall UnknownScript_0x1a4e93 +.WantsBattle: + scall .RematchF winlosstext CooltrainerfBeth1BeatenText, 0 copybytetovar wBethFightCount if_equal 2, .Fight2 @@ -195,31 +195,31 @@ UnknownScript_0x1a4e35: clearflag ENGINE_BETH end -UnknownScript_0x1a4e7b: +.AskNumber1F: jumpstd asknumber1f end -UnknownScript_0x1a4e7f: +.AskNumber2F: jumpstd asknumber2f end -UnknownScript_0x1a4e83: +.RegisteredNumberF: jumpstd registerednumberf end -UnknownScript_0x1a4e87: +.NumberAcceptedF: jumpstd numberacceptedf end -UnknownScript_0x1a4e8b: +.NumberDeclinedF: jumpstd numberdeclinedf end -UnknownScript_0x1a4e8f: +.PhoneFullF: jumpstd phonefullf end -UnknownScript_0x1a4e93: +.RematchF: jumpstd rematchf end @@ -292,7 +292,7 @@ CooltrainermGaven3BeatenText: line "tougher!" done -UnknownText_0x1a4fe4: +CooltrainermGavenAfterText: text "To get to #MON" line "LEAGUE, you have" @@ -352,7 +352,7 @@ CooltrainerfBeth1BeatenText: line "tools of war." done -UnknownText_0x1a51d9: +CooltrainerfBethAfterText: text "#MON are in-" line "valuable, lifelong" cont "partners." From 3734a43062ffdebc965802559fca708b1468959b Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 22:52:19 -0500 Subject: [PATCH 10/19] Route 45 labels --- maps/Route45.asm | 160 +++++++++++++++++++++++------------------------ 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/maps/Route45.asm b/maps/Route45.asm index 38b7f77f2..aceb61610 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -28,99 +28,99 @@ TrainerBlackbeltKenji: end_if_just_battled opentext checkcellnum PHONE_BLACKBELT_KENJI - iftrue UnknownScript_0x19e0e4 + iftrue .Registered checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x19e0cd + iftrue .AskedAlready special Special_SampleKenjiBreakCountdown - writetext UnknownText_0x19e5e2 + writetext BlackbeltKenjiAfterBattleText waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x19e11b - jump UnknownScript_0x19e0d0 + scall Route45AskNumber1M + jump .AskForNumber -UnknownScript_0x19e0cd: - scall UnknownScript_0x19e11f -UnknownScript_0x19e0d0: +.AskedAlready: + scall Route45AskNumber2M +.AskForNumber: askforphonenumber PHONE_BLACKBELT_KENJI - if_equal $1, UnknownScript_0x19e12f - if_equal $2, UnknownScript_0x19e12b + if_equal $1, Route45PhoneFullM + if_equal $2, Route45NumberDeclinedM trainertotext BLACKBELT_T, KENJI3, $0 - scall UnknownScript_0x19e123 - jump UnknownScript_0x19e127 + scall Route45RegisteredNumberM + jump Route45NumberAcceptedM -UnknownScript_0x19e0e4: +.Registered: checkcode VAR_KENJI_BREAK - if_not_equal $1, UnknownScript_0x19e127 + if_not_equal $1, Route45NumberAcceptedM checkmorn - iftrue UnknownScript_0x19e10c + iftrue .Morning checknite - iftrue UnknownScript_0x19e112 + iftrue .Night checkevent EVENT_KENJI_ON_BREAK - iffalse UnknownScript_0x19e127 - scall UnknownScript_0x19e137 + iffalse Route45NumberAcceptedM + scall Route45GiftM verbosegiveitem PP_UP - iffalse UnknownScript_0x19e118 + iffalse .NoRoom clearevent EVENT_KENJI_ON_BREAK special Special_SampleKenjiBreakCountdown - jump UnknownScript_0x19e127 + jump Route45NumberAcceptedM -UnknownScript_0x19e10c: - writetext UnknownText_0x19e634 +.Morning: + writetext BlackbeltKenjiMorningText waitbutton closetext end -UnknownScript_0x19e112: - writetext UnknownText_0x19e66c +.Night: + writetext BlackbeltKenjiNightText waitbutton closetext end -UnknownScript_0x19e118: - jump UnknownScript_0x19e13b +.NoRoom: + jump Route45PackFullM -UnknownScript_0x19e11b: +Route45AskNumber1M: jumpstd asknumber1m end -UnknownScript_0x19e11f: +Route45AskNumber2M: jumpstd asknumber2m end -UnknownScript_0x19e123: +Route45RegisteredNumberM: jumpstd registerednumberm end -UnknownScript_0x19e127: +Route45NumberAcceptedM: jumpstd numberacceptedm end -UnknownScript_0x19e12b: +Route45NumberDeclinedM: jumpstd numberdeclinedm end -UnknownScript_0x19e12f: +Route45PhoneFullM: jumpstd phonefullm end -UnknownScript_0x19e133: +Route45RematchM: jumpstd rematchm end -UnknownScript_0x19e137: +Route45GiftM: jumpstd giftm end -UnknownScript_0x19e13b: +Route45PackFullM: jumpstd packfullm end -UnknownScript_0x19e13f: +HikerParryHasIron: setevent EVENT_PARRY_IRON jumpstd packfullm end -UnknownScript_0x19e146: +Route45RematchGiftM: jumpstd rematchgiftm end @@ -154,29 +154,29 @@ TrainerHikerParry: end_if_just_battled opentext checkflag ENGINE_PARRY - iftrue UnknownScript_0x19e1b8 + iftrue .WantsBattle checkcellnum PHONE_HIKER_PARRY - iftrue UnknownScript_0x19e127 + iftrue Route45NumberAcceptedM checkevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x19e1a1 - writetext UnknownText_0x19e434 + iftrue .AskedAlready + writetext HikerParryAfterBattleText buttonsound setevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x19e11b - jump UnknownScript_0x19e1a4 + scall Route45AskNumber1M + jump .AskForNumber -UnknownScript_0x19e1a1: - scall UnknownScript_0x19e11f -UnknownScript_0x19e1a4: +.AskedAlready: + scall Route45AskNumber2M +.AskForNumber: askforphonenumber PHONE_HIKER_PARRY - if_equal $1, UnknownScript_0x19e12f - if_equal $2, UnknownScript_0x19e12b + if_equal $1, Route45PhoneFullM + if_equal $2, Route45NumberDeclinedM trainertotext HIKER, PARRY1, $0 - scall UnknownScript_0x19e123 - jump UnknownScript_0x19e127 + scall Route45RegisteredNumberM + jump Route45NumberAcceptedM -UnknownScript_0x19e1b8: - scall UnknownScript_0x19e133 +.WantsBattle: + scall Route45RematchM winlosstext HikerParry3BeatenText, 0 copybytetovar wParryFightCount if_equal 2, .Fight2 @@ -210,27 +210,27 @@ UnknownScript_0x19e1b8: reloadmapafterbattle clearflag ENGINE_PARRY checkevent EVENT_PARRY_IRON - iftrue UnknownScript_0x19e219 + iftrue .HasIron checkevent EVENT_GOT_IRON_FROM_PARRY - iftrue UnknownScript_0x19e218 - scall UnknownScript_0x19e146 + iftrue .GotIron + scall Route45RematchGiftM verbosegiveitem IRON - iffalse UnknownScript_0x19e13f + iffalse HikerParryHasIron setevent EVENT_GOT_IRON_FROM_PARRY - jump UnknownScript_0x19e127 + jump Route45NumberAcceptedM -UnknownScript_0x19e218: +.GotIron: end -UnknownScript_0x19e219: +.HasIron: opentext - writetext UnknownText_0x19e52c + writetext HikerParryGivesIronText waitbutton verbosegiveitem IRON - iffalse UnknownScript_0x19e13f + iffalse HikerParryHasIron clearevent EVENT_PARRY_IRON setevent EVENT_GOT_IRON_FROM_PARRY - jump UnknownScript_0x19e127 + jump Route45NumberAcceptedM TrainerHikerTimothy: trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script @@ -265,15 +265,15 @@ TrainerCooltrainerfKelly: closetext end -YoungsterScript_0x19e269: +TrainerCamperQuentin: faceplayer opentext checkevent EVENT_BEAT_CAMPER_QUENTIN - iftrue UnknownScript_0x19e285 - writetext UnknownText_0x19e87f + iftrue .Defeated + writetext CamperQuentinSeenText waitbutton closetext - winlosstext UnknownText_0x19e899, 0 + winlosstext CamperQuentinBeatenText, 0 loadtrainer CAMPER, QUENTIN startbattle reloadmapafterbattle @@ -281,14 +281,14 @@ YoungsterScript_0x19e269: closetext end -UnknownScript_0x19e285: - writetext UnknownText_0x19e8bb +.Defeated: + writetext CamperQuentinAfterBattleText waitbutton closetext end -UnknownScript_0x19e28b: - writetext UnknownText_0x19e830 +Route45DummyScript: + writetext Route45DummyText waitbutton closetext end @@ -370,7 +370,7 @@ HikerParry3BeatenText: line "big loser!" done -UnknownText_0x19e434: +HikerParryAfterBattleText: text "I'm not much good" line "at thinking, see?" @@ -405,7 +405,7 @@ HikerTimothyAfterBattleText: line "#MON." done -UnknownText_0x19e52c: +HikerParryGivesIronText: text "I just can't find" line "a way to win!" @@ -430,7 +430,7 @@ BlackbeltKenji3BeatenText: text "Waaaargh!" done -UnknownText_0x19e5e2: +BlackbeltKenjiAfterBattleText: text "This calls for" line "extreme measures." @@ -439,13 +439,13 @@ UnknownText_0x19e5e2: cont "solitude." done -UnknownText_0x19e634: +BlackbeltKenjiMorningText: text "I'm going to train" line "a bit more before" cont "I break for lunch." done -UnknownText_0x19e66c: +BlackbeltKenjiNightText: text "We had plenty of" line "rest at lunch, so" @@ -500,7 +500,7 @@ CooltrainerfKellyAfterBattleText: cont "to harm #MON." done -UnknownText_0x19e830: +Route45DummyText: text "I'm really, really" line "tough!" @@ -509,17 +509,17 @@ UnknownText_0x19e830: cont "tough I really am?" done -UnknownText_0x19e87f: +CamperQuentinSeenText: text "I'm really, really" line "tough!" done -UnknownText_0x19e899: +CamperQuentinBeatenText: text "I was tough at the" line "BATTLE TOWER…" done -UnknownText_0x19e8bb: +CamperQuentinAfterBattleText: text "Have you been to" line "the BATTLE TOWER?" @@ -562,4 +562,4 @@ Route45_MapEventHeader: object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION - object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 + object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1 From 9ce97c82d4dbcb7cdff1ff50bd485202affc3fca Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 23:02:39 -0500 Subject: [PATCH 11/19] Route 43 labels --- maps/Route43.asm | 142 +++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/maps/Route43.asm b/maps/Route43.asm index b76ebaead..f9a71a8bc 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -48,38 +48,38 @@ TrainerPokemaniacBen: closetext end -TrainerPokemaniacBrent1: - trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, .Script +TrainerPokemaniacBrent: + trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrentSeenText, PokemaniacBrentBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT end_if_just_battled opentext checkflag ENGINE_BRENT - iftrue UnknownScript_0x19d0cf + iftrue .WantsBattle checkcellnum PHONE_POKEMANIAC_BRENT - iftrue UnknownScript_0x19d138 + iftrue .NumberAcceptedM checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x19d0b8 - writetext UnknownText_0x19d359 + iftrue .AskedAlready + writetext PokemaniacBrentAfterBattleText buttonsound setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x19d12c - jump UnknownScript_0x19d0bb + scall .AskNumber1M + jump .AskForNumber -UnknownScript_0x19d0b8: - scall UnknownScript_0x19d130 -UnknownScript_0x19d0bb: +.AskedAlready: + scall .AskNumber2M +.AskForNumber: askforphonenumber PHONE_POKEMANIAC_BRENT - if_equal $1, UnknownScript_0x19d140 - if_equal $2, UnknownScript_0x19d13c + if_equal $1, .PhoneFullM + if_equal $2, .NumberDeclinedM trainertotext POKEMANIAC, BRENT1, $0 - scall UnknownScript_0x19d134 - jump UnknownScript_0x19d138 + scall .RegisteredNumberM + jump .NumberAcceptedM -UnknownScript_0x19d0cf: - scall UnknownScript_0x19d144 - winlosstext PokemaniacBrent1BeatenText, 0 +.WantsBattle: + scall .RematchM + winlosstext PokemaniacBrentBeatenText, 0 copybytetovar wBrentFightCount if_equal 3, .Fight3 if_equal 2, .Fight2 @@ -125,31 +125,31 @@ UnknownScript_0x19d0cf: clearflag ENGINE_BRENT end -UnknownScript_0x19d12c: +.AskNumber1M: jumpstd asknumber1m end -UnknownScript_0x19d130: +.AskNumber2M: jumpstd asknumber2m end -UnknownScript_0x19d134: +.RegisteredNumberM: jumpstd registerednumberm end -UnknownScript_0x19d138: +.NumberAcceptedM: jumpstd numberacceptedm end -UnknownScript_0x19d13c: +.NumberDeclinedM: jumpstd numberdeclinedm end -UnknownScript_0x19d140: +.PhoneFullM: jumpstd phonefullm end -UnknownScript_0x19d144: +.RematchM: jumpstd rematchm end @@ -175,42 +175,42 @@ TrainerFisherMarvin: closetext end -TrainerPicnickerTiffany3: - trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, .Script +TrainerPicnickerTiffany: + trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffanySeenText, PicnickerTiffanyBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY end_if_just_battled opentext checkflag ENGINE_TIFFANY - iftrue UnknownScript_0x19d1c1 + iftrue .WantsBattle checkflag ENGINE_TIFFANY_HAS_PINK_BOW - iftrue UnknownScript_0x19d21e + iftrue .HasPinkBow checkcellnum PHONE_PICNICKER_TIFFANY - iftrue UnknownScript_0x19d245 + iftrue .NumberAcceptedF checkpoke CLEFAIRY - iffalse UnknownScript_0x19d233 + iffalse .NoClefairy checkevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x19d1aa - writetext UnknownText_0x19d618 + iftrue .AskedAlready + writetext PicnickerTiffanyWantsPicnicText buttonsound setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x19d239 - jump UnknownScript_0x19d1ad + scall .AskNumber1F + jump .AskForNumber -UnknownScript_0x19d1aa: - scall UnknownScript_0x19d23d -UnknownScript_0x19d1ad: +.AskedAlready: + scall .AskNumber2F +.AskForNumber: askforphonenumber PHONE_PICNICKER_TIFFANY - if_equal $1, UnknownScript_0x19d24d - if_equal $2, UnknownScript_0x19d249 + if_equal $1, .PhoneFullF + if_equal $2, .NumberDeclinedF trainertotext PICNICKER, TIFFANY3, $0 - scall UnknownScript_0x19d241 - jump UnknownScript_0x19d245 + scall .RegisteredNumberF + jump .NumberAcceptedF -UnknownScript_0x19d1c1: - scall UnknownScript_0x19d251 - winlosstext PicnickerTiffany3BeatenText, 0 +.WantsBattle: + scall .RematchF + winlosstext PicnickerTiffanyBeatenText, 0 copybytetovar wTiffanyFightCount if_equal 3, .Fight3 if_equal 2, .Fight2 @@ -256,56 +256,56 @@ UnknownScript_0x19d1c1: clearflag ENGINE_TIFFANY end -UnknownScript_0x19d21e: - scall UnknownScript_0x19d255 +.HasPinkBow: + scall .GiftF verbosegiveitem PINK_BOW - iffalse UnknownScript_0x19d230 + iffalse .NoRoom clearflag ENGINE_TIFFANY_HAS_PINK_BOW setevent EVENT_TIFFANY_GAVE_PINK_BOW - jump UnknownScript_0x19d245 + jump .NumberAcceptedF -UnknownScript_0x19d230: - jump UnknownScript_0x19d259 +.NoRoom: + jump .PackFullF -UnknownScript_0x19d233: - writetext UnknownText_0x19d64b +.NoClefairy: + writetext PicnickerTiffanyClefairyText waitbutton closetext end -UnknownScript_0x19d239: +.AskNumber1F: jumpstd asknumber1f end -UnknownScript_0x19d23d: +.AskNumber2F: jumpstd asknumber2f end -UnknownScript_0x19d241: +.RegisteredNumberF: jumpstd registerednumberf end -UnknownScript_0x19d245: +.NumberAcceptedF: jumpstd numberacceptedf end -UnknownScript_0x19d249: +.NumberDeclinedF: jumpstd numberdeclinedf end -UnknownScript_0x19d24d: +.PhoneFullF: jumpstd phonefullf end -UnknownScript_0x19d251: +.RematchF: jumpstd rematchf end -UnknownScript_0x19d255: +.GiftF: jumpstd giftf end -UnknownScript_0x19d259: +.PackFullF: jumpstd packfullf end @@ -348,17 +348,17 @@ PokemaniacBenAfterBattleText: line "I bet she's cute!" done -PokemaniacBrent1SeenText: +PokemaniacBrentSeenText: text "Hey! Do you have" line "any rare #MON?" done -PokemaniacBrent1BeatenText: +PokemaniacBrentBeatenText: text "Oh, my poor #-" line "MON! Darlings!" done -UnknownText_0x19d359: +PokemaniacBrentAfterBattleText: text "I'd be happy just" line "to own a single" cont "rare #MON." @@ -439,7 +439,7 @@ CamperSpencerAfterBattleText: line "to camp there." done -PicnickerTiffany3SeenText: +PicnickerTiffanySeenText: text "Are you going to" line "LAKE OF RAGE too?" @@ -447,18 +447,18 @@ PicnickerTiffany3SeenText: line "little while!" done -PicnickerTiffany3BeatenText: +PicnickerTiffanyBeatenText: text "I played too much!" done -UnknownText_0x19d618: +PicnickerTiffanyWantsPicnicText: text "I'm having a pic-" line "nic with #MON." para "Won't you join us?" done -UnknownText_0x19d64b: +PicnickerTiffanyClefairyText: text "Isn't my CLEFAIRY" line "just the most" cont "adorable thing?" @@ -524,10 +524,10 @@ Route43_MapEventHeader: .ObjectEvents: db 8 object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 - object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1 + object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1 object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1 - object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 + object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1 object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1 object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER From c167c8161141cf9a73484c9b4be035c2982532a7 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 23:09:56 -0500 Subject: [PATCH 12/19] Fisherman Tully labels --- maps/Route42.asm | 76 ++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/maps/Route42.asm b/maps/Route42.asm index ccf174b17..a8139f9e8 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -36,40 +36,40 @@ Route42SuicuneScript: setmapscene ROUTE_36, $1 end -TrainerFisherTully1: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script +TrainerFisherTully: + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTullySeenText, FisherTullyBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY end_if_just_battled opentext checkflag ENGINE_TULLY - iftrue UnknownScript_0x1a927f + iftrue .WantsBattle checkflag ENGINE_TULLY_HAS_WATER_STONE - iftrue UnknownScript_0x1a92dc + iftrue .HasWaterStone checkcellnum PHONE_FISHER_TULLY - iftrue UnknownScript_0x1a92fd + iftrue .NumberAcceptedM checkevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a9268 - writetext UnknownText_0x1a93ab + iftrue .AskedAlready + writetext FisherTullyAfterBattleText buttonsound setevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a92f1 - jump UnknownScript_0x1a926b + scall .AskNumber1M + jump .AskForNumber -UnknownScript_0x1a9268: - scall UnknownScript_0x1a92f5 -UnknownScript_0x1a926b: +.AskedAlready: + scall .AskNumber2M +.AskForNumber: askforphonenumber PHONE_FISHER_TULLY - if_equal $1, UnknownScript_0x1a9305 - if_equal $2, UnknownScript_0x1a9301 + if_equal $1, .PhoneFullM + if_equal $2, .NumberDeclinedM trainertotext FISHER, TULLY1, $0 - scall UnknownScript_0x1a92f9 - jump UnknownScript_0x1a92fd + scall .RegisteredNumberM + jump .NumberAcceptedM -UnknownScript_0x1a927f: - scall UnknownScript_0x1a9309 - winlosstext FisherTully1BeatenText, 0 +.WantsBattle: + scall .RematchM + winlosstext FisherTullyBeatenText, 0 copybytetovar wTullyFightCount if_equal 3, .Fight3 if_equal 2, .Fight2 @@ -115,50 +115,50 @@ UnknownScript_0x1a927f: clearflag ENGINE_TULLY end -UnknownScript_0x1a92dc: - scall UnknownScript_0x1a930d +.HasWaterStone: + scall .GiftM verbosegiveitem WATER_STONE - iffalse UnknownScript_0x1a92ee + iffalse .NoRoom clearflag ENGINE_TULLY_HAS_WATER_STONE setevent EVENT_TULLY_GAVE_WATER_STONE - jump UnknownScript_0x1a92fd + jump .NumberAcceptedM -UnknownScript_0x1a92ee: - jump UnknownScript_0x1a9311 +.NoRoom: + jump .PackFullM -UnknownScript_0x1a92f1: +.AskNumber1M: jumpstd asknumber1m end -UnknownScript_0x1a92f5: +.AskNumber2M: jumpstd asknumber2m end -UnknownScript_0x1a92f9: +.RegisteredNumberM: jumpstd registerednumberm end -UnknownScript_0x1a92fd: +.NumberAcceptedM: jumpstd numberacceptedm end -UnknownScript_0x1a9301: +.NumberDeclinedM: jumpstd numberdeclinedm end -UnknownScript_0x1a9305: +.PhoneFullM: jumpstd phonefullm end -UnknownScript_0x1a9309: +.RematchM: jumpstd rematchm end -UnknownScript_0x1a930d: +.GiftM: jumpstd giftm end -UnknownScript_0x1a9311: +.PackFullM: jumpstd packfullm end @@ -226,18 +226,18 @@ MovementData_0x1a9356: db $38 ; movement step_end -FisherTully1SeenText: +FisherTullySeenText: text "Let me demonstrate" line "the power of the" cont "#MON I caught!" done -FisherTully1BeatenText: +FisherTullyBeatenText: text "What? That's not" line "right." done -UnknownText_0x1a93ab: +FisherTullyAfterBattleText: text "I want to become" line "the trainer CHAMP" @@ -345,7 +345,7 @@ Route42_MapEventHeader: .ObjectEvents: db 9 - object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully1, -1 + object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1 object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 From 115a5c236d727adec155817626a418c2f66fa498 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 23:23:04 -0500 Subject: [PATCH 13/19] Changing labels to local. --- maps/Route39.asm | 94 ++++++++++++++++++++++++------------------------ maps/Route40.asm | 12 +++---- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/maps/Route39.asm b/maps/Route39.asm index 6545dd77d..ce75da9a8 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -25,82 +25,82 @@ Route39Miltank: closetext end -TrainerPokefanmDerek1: - trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script +TrainerPokefanmDerek: + trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerekSeenText, PokefanmDerekBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK end_if_just_battled opentext checkflag ENGINE_DEREK_HAS_NUGGET - iftrue PokefanMDerekHasNugget + iftrue .HasNugget checkcellnum PHONE_POKEFANM_DEREK - iftrue PokefanMDerekAccepted + iftrue .NumberAcceptedM checkpoke PIKACHU - iffalse PokefanMDerekWantsPikachu + iffalse .WantsPikachu checkevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER - iftrue PokefanMDerekWantsYourNumber + iftrue .AskedAlready writetext PokefanMDerekText_NotBragging buttonsound setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER - scall PokefanMDerekAsksNumber1 - jump PokefanMDerekAsksForPhoneNumber + scall .AskNumber1M + jump .AskForNumber -PokefanMDerekWantsYourNumber: - scall PokefanMDerekAsksNumber2 -PokefanMDerekAsksForPhoneNumber: +.AskedAlready: + scall .AskNumber2M +.AskForNumber: askforphonenumber PHONE_POKEFANM_DEREK - if_equal $1, PokefanMDerekPhoneFull - if_equal $2, PokefanMDerekDeclined + if_equal $1, .PhoneFullM + if_equal $2, .NumberDeclinedM trainertotext POKEFANM, DEREK1, $0 - scall PokefanMDerekRegistered - jump PokefanMDerekAccepted + scall .RegisteredNumberM + jump .NumberAcceptedM -PokefanMDerekHasNugget: - scall PokefanMDerekGift +.HasNugget: + scall .GiftM verbosegiveitem NUGGET iffalse .PackFull clearflag ENGINE_DEREK_HAS_NUGGET - jump PokefanMDerekAccepted + jump .NumberAcceptedM .PackFull: - jump PackIsFull + jump .PackFullM -PokefanMDerekWantsPikachu: - writetext PokefanMDerekText_PikachuIsIt +.WantsPikachu: + writetext PokefanMDerekPikachuIsItText waitbutton closetext end -PokefanMDerekAsksNumber1: +.AskNumber1M: jumpstd asknumber1m end -PokefanMDerekAsksNumber2: +.AskNumber2M: jumpstd asknumber2m end -PokefanMDerekRegistered: +.RegisteredNumberM: jumpstd registerednumberm end -PokefanMDerekAccepted: +.NumberAcceptedM: jumpstd numberacceptedm end -PokefanMDerekDeclined: +.NumberDeclinedM: jumpstd numberdeclinedm end -PokefanMDerekPhoneFull: +.PhoneFullM: jumpstd phonefullm end -PokefanMDerekGift: +.GiftM: jumpstd giftm end -PackIsFull: +.PackFullM: jumpstd packfullm end @@ -137,17 +137,17 @@ TrainerPsychicNorman: closetext end -PokefanFScript_0x1a5bbe: +TrainerPokefanfJaime: faceplayer opentext checknite - iffalse UnknownScript_0x1a5be5 + iffalse .NotNight checkevent EVENT_BEAT_POKEFANF_JAIME - iftrue UnknownScript_0x1a5bdf - writetext UnknownText_0x1a5ee8 + iftrue .Beaten + writetext PokefanfJaimeSeenText waitbutton closetext - winlosstext UnknownText_0x1a5f17, 0 + winlosstext PokefanfJaimeBeatenText, 0 loadtrainer POKEFANF, JAIME startbattle reloadmapafterbattle @@ -155,14 +155,14 @@ PokefanFScript_0x1a5bbe: closetext end -UnknownScript_0x1a5bdf: - writetext UnknownText_0x1a5f31 +.Beaten: + writetext PokefanfJaimeAfterBattleText waitbutton closetext end -UnknownScript_0x1a5be5: - writetext UnknownText_0x1a5ec4 +.NotNight: + writetext PokefanfJaimeHopeItGetsDarkText waitbutton closetext end @@ -209,13 +209,13 @@ SailorEugeneAfterBattleText: cont "voyages." done -PokefanmDerek1SeenText: +PokefanmDerekSeenText: text "This is a good" line "time to brag about" cont "my PIKACHU!" done -PokefanmDerek1BeatenText: +PokefanmDerekBeatenText: text "I had no time to" line "show off PIKACHU…" done @@ -253,7 +253,7 @@ PokefanfRuthAfterBattleText: line "adorable!" done -PokefanMDerekText_PikachuIsIt: +PokefanMDerekPikachuIsItText: text "PIKACHU is it!" line "Don't you agree?" done @@ -280,24 +280,24 @@ PsychicNormanAfterBattleText: cont "potential." done -UnknownText_0x1a5ec4: +PokefanfJaimeHopeItGetsDarkText: text "Ufufufu… I hope it" line "gets dark soon." done -UnknownText_0x1a5ee8: +PokefanfJaimeSeenText: text "You came at just" line "the right time." para "Let's battle." done -UnknownText_0x1a5f17: +PokefanfJaimeBeatenText: text "Oh, how disap-" line "pointing…" done -UnknownText_0x1a5f31: +PokefanfJaimeAfterBattleText: text "I met my MEOWTH at" line "night, right here" cont "on ROUTE 39." @@ -366,7 +366,7 @@ Route39_MapEventHeader: .ObjectEvents: db 10 object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1 - object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1 + object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1 object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 @@ -374,4 +374,4 @@ Route39_MapEventHeader: object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1 object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 - object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1 + object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1 diff --git a/maps/Route40.asm b/maps/Route40.asm index 73f089bd2..1e9523757 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -96,9 +96,9 @@ MonicaScript: faceplayer opentext checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA - iftrue MonicaMondayScript + iftrue .Monday checkcode VAR_WEEKDAY - if_not_equal MONDAY, MonicaNotMondayScript + if_not_equal MONDAY, .NotMonday checkevent EVENT_MET_MONICA_OF_MONDAY iftrue .MetMonica writetext MeetMonicaText @@ -108,21 +108,21 @@ MonicaScript: writetext MonicaGivesGiftText buttonsound verbosegiveitem SHARP_BEAK - iffalse MonicaDoneScript + iffalse .done setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA writetext MonicaGaveGiftText waitbutton closetext end -MonicaMondayScript: +.Monday: writetext MonicaMondayText waitbutton -MonicaDoneScript: +.done: closetext end -MonicaNotMondayScript: +.NotMonday: writetext MonicaNotMondayText waitbutton closetext From d588033748535fb3ae6d92b55f126784124c6945 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 15 Jan 2018 23:30:39 -0500 Subject: [PATCH 14/19] Route 35 local labels --- maps/Route35.asm | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/maps/Route35.asm b/maps/Route35.asm index becb45ad0..faedc9557 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -39,16 +39,16 @@ TrainerJugglerIrwin: checkcellnum PHONE_JUGGLER_IRWIN iftrue UnknownScript_0x19c90f checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x19c8ec + iftrue .AskedAlready writetext UnknownText_0x19cd5a buttonsound setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19c903 - jump UnknownScript_0x19c8ef + jump .AskForNumber -UnknownScript_0x19c8ec: +.AskedAlready: scall UnknownScript_0x19c907 -UnknownScript_0x19c8ef: +.AskForNumber: askforphonenumber PHONE_JUGGLER_IRWIN if_equal $1, UnknownScript_0x19c917 if_equal $2, UnknownScript_0x19c913 @@ -128,30 +128,30 @@ TrainerPicnickerKim: closetext end -TrainerBugCatcherArnie1: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, BugCatcherArnie1SeenText, BugCatcherArnie1BeatenText, 0, .Script +TrainerBugCatcherArnie: + trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, BugCatcherArnieSeenText, BugCatcherArnieBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE end_if_just_battled opentext checkflag ENGINE_ARNIE - iftrue UnknownScript_0x19c9bb + iftrue .WantsBattle checkflag ENGINE_YANMA_SWARM - iftrue UnknownScript_0x19ca2f + iftrue .YanmaSwarming checkcellnum PHONE_BUG_CATCHER_ARNIE iftrue UnknownScript_0x19c90f checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x19c9a4 - writetext UnknownText_0x19cdf6 + iftrue .AskedAlready + writetext BugCatcherArnieAfterBattleText buttonsound setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19c903 - jump UnknownScript_0x19c9a7 + jump .AskForNumber -UnknownScript_0x19c9a4: +.AskedAlready: scall UnknownScript_0x19c907 -UnknownScript_0x19c9a7: +.AskForNumber: askforphonenumber PHONE_BUG_CATCHER_ARNIE if_equal $1, UnknownScript_0x19c917 if_equal $2, UnknownScript_0x19c913 @@ -159,9 +159,9 @@ UnknownScript_0x19c9a7: scall UnknownScript_0x19c90b jump UnknownScript_0x19c90f -UnknownScript_0x19c9bb: +.WantsBattle: scall UnknownScript_0x19c91b - winlosstext BugCatcherArnie1BeatenText, 0 + winlosstext BugCatcherArnieBeatenText, 0 copybytetovar wArnieFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -219,8 +219,8 @@ UnknownScript_0x19c9bb: clearflag ENGINE_ARNIE end -UnknownScript_0x19ca2f: - writetext UnknownText_0x19ce38 +.YanmaSwarming: + writetext BugCatcherArnieYanmaText waitbutton closetext end @@ -236,18 +236,18 @@ TrainerFirebreatherWalt: closetext end -OfficerScript_0x19ca49: +TrainerOfficerDirk: faceplayer opentext checknite - iffalse UnknownScript_0x19ca73 + iffalse .NotNight checkevent EVENT_BEAT_OFFICER_DIRK - iftrue UnknownScript_0x19ca6d + iftrue .AfterBattle playmusic MUSIC_OFFICER_ENCOUNTER - writetext UnknownText_0x19ceea + writetext OfficerDirkSeenText waitbutton closetext - winlosstext UnknownText_0x19cf06, 0 + winlosstext OfficerDirkBeatenText, 0 loadtrainer OFFICER, DIRK startbattle reloadmapafterbattle @@ -255,14 +255,14 @@ OfficerScript_0x19ca49: closetext end -UnknownScript_0x19ca6d: - writetext UnknownText_0x19cf0f +.AfterBattle: + writetext OfficerDirkAfterBattleText waitbutton closetext end -UnknownScript_0x19ca73: - writetext UnknownText_0x19cf56 +.NotNight: + writetext OfficerDirkPrettyToughText waitbutton closetext end @@ -389,18 +389,18 @@ UnknownText_0x19cd5a: line "electrified me!" done -BugCatcherArnie1SeenText: +BugCatcherArnieSeenText: text "I'll go anywhere" line "if bug #MON" cont "appear there." done -BugCatcherArnie1BeatenText: +BugCatcherArnieBeatenText: text "Huh? I shouldn't" line "have lost that…" done -UnknownText_0x19cdf6: +BugCatcherArnieAfterBattleText: text "My VENONAT won me" line "the Bug-Catching" @@ -408,7 +408,7 @@ UnknownText_0x19cdf6: line "NATIONAL PARK." done -UnknownText_0x19ce38: +BugCatcherArnieYanmaText: text "Wow… Look at all" line "those YANMA!" @@ -432,16 +432,16 @@ FirebreatherWaltAfterBattleText: cont "wild #MON." done -UnknownText_0x19ceea: +OfficerDirkSeenText: text "Danger lurks in" line "the night!" done -UnknownText_0x19cf06: +OfficerDirkBeatenText: text "Whoops!" done -UnknownText_0x19cf0f: +OfficerDirkAfterBattleText: text "You know, night-" line "time is fun in its" cont "own ways." @@ -450,7 +450,7 @@ UnknownText_0x19cf0f: line "it, OK?" done -UnknownText_0x19cf56: +OfficerDirkPrettyToughText: text "Your #MON look" line "pretty tough." @@ -488,8 +488,8 @@ Route35_MapEventHeader: object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1 object_event 14, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1 object_event 2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 - object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie1, -1 + object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1 object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 - object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 + object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1 object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT From fb02e4bde5a442e0d832c6fdb8edbcd691f1d3dd Mon Sep 17 00:00:00 2001 From: surskitty Date: Tue, 16 Jan 2018 13:26:13 -0500 Subject: [PATCH 15/19] Birdkeeper Jose and Cooltrainerf Reena --- maps/Route27.asm | 122 +++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/maps/Route27.asm b/maps/Route27.asm index 3afac9155..8144e5aba 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -37,7 +37,7 @@ UnknownScript_0x1a0881: UnknownScript_0x1a088c: spriteface PLAYER, RIGHT opentext - writetext UnknownText_0x1a0a6b + writetext Route27FisherHeyText buttonsound writetext Route27FisherText waitbutton @@ -67,31 +67,31 @@ TrainerBirdKeeperJose2: end_if_just_battled opentext checkflag ENGINE_JOSE - iftrue UnknownScript_0x1a08ff + iftrue .WantsBattle checkflag ENGINE_JOSE_HAS_STAR_PIECE - iftrue UnknownScript_0x1a0945 + iftrue .HasStarPiece checkcellnum PHONE_BIRDKEEPER_JOSE - iftrue UnknownScript_0x1a0963 + iftrue .NumberAccepted checkevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a08e8 - writetext UnknownText_0x1a0e42 + iftrue .AskedAlready + writetext BirdKeeperJose2AfterBattleText buttonsound setevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a0957 - jump UnknownScript_0x1a08eb + scall .AskNumber1 + jump .AskForNumber -UnknownScript_0x1a08e8: - scall UnknownScript_0x1a095b -UnknownScript_0x1a08eb: +.AskedAlready: + scall .AskNumber2 +.AskForNumber: askforphonenumber PHONE_BIRDKEEPER_JOSE - if_equal $1, UnknownScript_0x1a096b - if_equal $2, UnknownScript_0x1a0967 + if_equal $1, .PhoneFull + if_equal $2, .NumberDeclined trainertotext BIRD_KEEPER, JOSE2, $0 - scall UnknownScript_0x1a095f - jump UnknownScript_0x1a0963 + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x1a08ff: - scall UnknownScript_0x1a096f +.WantsBattle: + scall .Rematch winlosstext BirdKeeperJose2BeatenText, 0 copybytetovar wJoseFightCount if_equal 2, .Fight2 @@ -126,49 +126,49 @@ UnknownScript_0x1a08ff: clearflag ENGINE_JOSE end -UnknownScript_0x1a0945: - scall UnknownScript_0x1a0973 +.HasStarPiece: + scall .Gift verbosegiveitem STAR_PIECE - iffalse UnknownScript_0x1a0954 + iffalse .NoRoom clearflag ENGINE_JOSE_HAS_STAR_PIECE - jump UnknownScript_0x1a0963 + jump .NumberAccepted -UnknownScript_0x1a0954: - jump UnknownScript_0x1a0977 +.NoRoom: + jump .PackFull -UnknownScript_0x1a0957: +.AskNumber1: jumpstd asknumber1m end -UnknownScript_0x1a095b: +.AskNumber2: jumpstd asknumber2m end -UnknownScript_0x1a095f: +.RegisteredNumber: jumpstd registerednumberm end -UnknownScript_0x1a0963: +.NumberAccepted: jumpstd numberacceptedm end -UnknownScript_0x1a0967: +.NumberDeclined: jumpstd numberdeclinedm end -UnknownScript_0x1a096b: +.PhoneFull: jumpstd phonefullm end -UnknownScript_0x1a096f: +.Rematch: jumpstd rematchm end -UnknownScript_0x1a0973: +.Gift: jumpstd giftm end -UnknownScript_0x1a0977: +.PackFull: jumpstd packfullm end @@ -195,37 +195,37 @@ TrainerCooltrainermBrian: end TrainerCooltrainerfReena: - trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, .Script + trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReenaSeenText, CooltrainerfReenaBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA end_if_just_battled opentext checkflag ENGINE_REENA - iftrue UnknownScript_0x1a09e9 + iftrue .WantsBattle checkcellnum PHONE_COOLTRAINERF_REENA - iftrue UnknownScript_0x1a0a3b + iftrue .NumberAccepted checkevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a09d2 - writetext UnknownText_0x1a0c35 + iftrue .AskedAlready + writetext CooltrainerfReenaAfterBattleText buttonsound setevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a0a2f - jump UnknownScript_0x1a09d5 + scall .AskNumber1 + jump .AskForNumber -UnknownScript_0x1a09d2: - scall UnknownScript_0x1a0a33 -UnknownScript_0x1a09d5: +.AskedAlready: + scall .AskNumber2 +.AskForNumber: askforphonenumber PHONE_COOLTRAINERF_REENA - if_equal $1, UnknownScript_0x1a0a43 - if_equal $2, UnknownScript_0x1a0a3f + if_equal $1, .PhoneFull + if_equal $2, .NumberDeclined trainertotext COOLTRAINERF, REENA1, $0 - scall UnknownScript_0x1a0a37 - jump UnknownScript_0x1a0a3b + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x1a09e9: - scall UnknownScript_0x1a0a47 - winlosstext CooltrainerfReena1BeatenText, 0 +.WantsBattle: + scall .Rematch + winlosstext CooltrainerfReenaBeatenText, 0 copybytetovar wReenaFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -259,31 +259,31 @@ UnknownScript_0x1a09e9: clearflag ENGINE_REENA end -UnknownScript_0x1a0a2f: +.AskNumber1: jumpstd asknumber1f end -UnknownScript_0x1a0a33: +.AskNumber2: jumpstd asknumber2f end -UnknownScript_0x1a0a37: +.RegisteredNumber: jumpstd registerednumberf end -UnknownScript_0x1a0a3b: +.NumberAccepted: jumpstd numberacceptedf end -UnknownScript_0x1a0a3f: +.NumberDeclined: jumpstd numberdeclinedf end -UnknownScript_0x1a0a43: +.PhoneFull: jumpstd phonefullf end -UnknownScript_0x1a0a47: +.Rematch: jumpstd rematchf end @@ -316,7 +316,7 @@ MovementData_0x1a0a69: step LEFT step_end -UnknownText_0x1a0a6b: +Route27FisherHeyText: text "Hey!" done @@ -369,7 +369,7 @@ CooltrainermBrianAfterBattleText: cont "good trainers." done -CooltrainerfReena1SeenText: +CooltrainerfReenaSeenText: text "You shouldn't" line "underestimate the" @@ -377,12 +377,12 @@ CooltrainerfReena1SeenText: line "these parts." done -CooltrainerfReena1BeatenText: +CooltrainerfReenaBeatenText: text "Oh! You're much" line "too strong!" done -UnknownText_0x1a0c35: +CooltrainerfReenaAfterBattleText: text "You're just a kid," line "but you're not to" @@ -452,7 +452,7 @@ BirdKeeperJose2BeatenText: text "Tweet!" done -UnknownText_0x1a0e42: +BirdKeeperJose2AfterBattleText: text "BIRD KEEPERS like" line "me mimic bird" From 4162705db909da94a62f30b5e2caee048b3bc107 Mon Sep 17 00:00:00 2001 From: surskitty Date: Tue, 16 Jan 2018 13:35:33 -0500 Subject: [PATCH 16/19] Cooltrainerm Kevin --- maps/Route25.asm | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/maps/Route25.asm b/maps/Route25.asm index ce37fe894..903fb205a 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -26,7 +26,7 @@ Route25_MapScriptHeader: .DummyScene1: end -UnknownScript_0x19eea0: +Route25MistyDate1Script: showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 @@ -39,7 +39,7 @@ UnknownScript_0x19eea0: pause 10 applymovement ROUTE25_MISTY, MovementData_0x19efed opentext - writetext UnknownText_0x19f006 + writetext Route25MistyDateText waitbutton closetext spriteface PLAYER, DOWN @@ -52,7 +52,7 @@ UnknownScript_0x19eea0: special RestartMapMusic end -UnknownScript_0x19eee0: +Route25MistyDate2Script: showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 @@ -65,7 +65,7 @@ UnknownScript_0x19eee0: pause 10 applymovement ROUTE25_MISTY, MovementData_0x19eff4 opentext - writetext UnknownText_0x19f006 + writetext Route25MistyDateText waitbutton closetext spriteface PLAYER, UP @@ -155,32 +155,32 @@ TrainerSupernerdPat: closetext end -CooltrainerMScript_0x19efac: +TrainerCooltrainermKevin: faceplayer opentext checkevent EVENT_BEAT_COOLTRAINERM_KEVIN - iftrue UnknownScript_0x19efda + iftrue .AfterBattle checkevent EVENT_CLEARED_NUGGET_BRIDGE - iftrue UnknownScript_0x19efc7 - writetext UnknownText_0x19f43b + iftrue .AfterNuggetBridge + writetext CooltrainermKevinNuggetText buttonsound verbosegiveitem NUGGET - iffalse UnknownScript_0x19efde + iffalse .NoRoomForNugget setevent EVENT_CLEARED_NUGGET_BRIDGE -UnknownScript_0x19efc7: - writetext UnknownText_0x19f49d +.AfterNuggetBridge: + writetext CooltrainermKevinSeenText waitbutton closetext - winlosstext UnknownText_0x19f4fd, 0 + winlosstext CooltrainermKevinBeatenText, 0 loadtrainer COOLTRAINERM, KEVIN startbattle reloadmapafterbattle setevent EVENT_BEAT_COOLTRAINERM_KEVIN opentext -UnknownScript_0x19efda: - writetext UnknownText_0x19f520 +.AfterBattle: + writetext CooltrainermKevinAfterBattleText waitbutton -UnknownScript_0x19efde: +.NoRoomForNugget: closetext end @@ -238,7 +238,7 @@ MovementData_0x19f000: step LEFT step_end -UnknownText_0x19f006: +Route25MistyDateText: text "MISTY: Aww! Why" line "did you have to" @@ -385,7 +385,7 @@ SupernerdPatAfterBattleText: line "cheat anymore…" done -UnknownText_0x19f43b: +CooltrainermKevinNuggetText: text "You took on one" line "more battle than" @@ -396,7 +396,7 @@ UnknownText_0x19f43b: line "win a prize." done -UnknownText_0x19f49d: +CooltrainermKevinSeenText: text "But after seeing" line "how you battle, I" @@ -407,12 +407,12 @@ UnknownText_0x19f49d: line "me take you on." done -UnknownText_0x19f4fd: +CooltrainermKevinBeatenText: text "I've never had a" line "battle this good!" done -UnknownText_0x19f520: +CooltrainermKevinAfterBattleText: text "That was a great" line "battle!" @@ -440,8 +440,8 @@ Route25_MapEventHeader: .CoordEvents: db 2 - coord_event 42, 6, 1, UnknownScript_0x19eea0 - coord_event 42, 7, 1, UnknownScript_0x19eee0 + coord_event 42, 6, 1, Route25MistyDate1Script + coord_event 42, 7, 1, Route25MistyDate2Script .BGEvents: db 2 @@ -459,5 +459,5 @@ Route25_MapEventHeader: object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1 object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 - object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 + object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1 object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN From 076e604387677c57aad7931c644cb3a7c2025351 Mon Sep 17 00:00:00 2001 From: surskitty Date: Tue, 23 Jan 2018 23:40:25 -0500 Subject: [PATCH 17/19] Labelling some more UnknownScripts. These files remain incomplete. --- maps/Route43MahoganyGate.asm | 8 ++++---- maps/VermilionPort.asm | 18 +++++++++--------- maps/ViridianCity.asm | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index d3d2758ea..d5c29c18a 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -8,17 +8,17 @@ Route43MahoganyGate_MapScripts: .MapCallbacks: db 0 -OfficerScript_0x19ab0b: +Route43MahoganyGateOfficer: faceplayer opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x19ab19 + iftrue .RocketsCleared writetext UnknownText_0x19ab1f waitbutton closetext end -UnknownScript_0x19ab19: +.RocketsCleared: writetext UnknownText_0x19ab65 waitbutton closetext @@ -57,4 +57,4 @@ Route43MahoganyGate_MapEvents: .ObjectEvents: db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index c71739ef6..f698ef9ea 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -149,18 +149,18 @@ SailorScript_0x74e97: checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x74eda - if_equal TUESDAY, UnknownScript_0x74eda - if_equal THURSDAY, UnknownScript_0x74ee0 - if_equal FRIDAY, UnknownScript_0x74ee0 - if_equal SATURDAY, UnknownScript_0x74ee0 + if_equal MONDAY, .NextShipWednesday + if_equal TUESDAY, .NextShipWednesday + if_equal THURSDAY, .NextShipSunday + if_equal FRIDAY, .NextShipSunday + if_equal SATURDAY, .NextShipSunday writetext UnknownText_0x74f4d yesorno iffalse UnknownScript_0x74e87 writetext UnknownText_0x74f8b buttonsound checkitem S_S_TICKET - iffalse UnknownScript_0x74ed4 + iffalse .NoTicket writetext UnknownText_0x74fc2 waitbutton closetext @@ -168,19 +168,19 @@ SailorScript_0x74e97: applymovement PLAYER, MovementData_0x74efe jump SailorScript_0x74dc4 -UnknownScript_0x74ed4: +.NoTicket: writetext UnknownText_0x74ff2 waitbutton closetext end -UnknownScript_0x74eda: +.NextShipWednesday: writetext UnknownText_0x75059 waitbutton closetext end -UnknownScript_0x74ee0: +.NextShipSunday: writetext UnknownText_0x75080 waitbutton closetext diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 1825c1bc7..54899e2a4 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -16,24 +16,24 @@ ViridianCity_MapScripts: setflag ENGINE_FLYPOINT_VIRIDIAN return -GrampsScript_0x1a9a4c: +ViridianCityCoffeeGramps: faceplayer opentext writetext UnknownText_0x1a9aa5 yesorno - iffalse UnknownScript_0x1a9a5b + iffalse .no writetext UnknownText_0x1a9b6f waitbutton closetext end -UnknownScript_0x1a9a5b: +.no: writetext UnknownText_0x1a9bb7 waitbutton closetext end -GrampsScript_0x1a9a61: +ViridianCityGrampsNearGym: faceplayer opentext checkevent EVENT_BLUE_IN_CINNABAR @@ -49,7 +49,7 @@ GrampsScript_0x1a9a61: closetext end -FisherScript_0x1a9a75: +ViridianCityDreamEaterFisher: faceplayer opentext checkevent EVENT_GOT_TM42_DREAM_EATER @@ -241,7 +241,7 @@ ViridianCity_MapEvents: .ObjectEvents: db 4 - object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 - object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 - object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 + object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 + object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 + object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 From b25e5626a166a7c02e96ac8cd901ada9487f8a90 Mon Sep 17 00:00:00 2001 From: surskitty Date: Tue, 23 Jan 2018 23:49:15 -0500 Subject: [PATCH 18/19] Renaming the UnknownScript for reloading the map after battle. --- maps/TeamRocketBaseB2F.asm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index abfd227a1..f31110476 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -178,12 +178,12 @@ LanceHealsCommon: setscene 1 setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING - if_equal RIGHT, UnknownScript_0x6d0be + if_equal RIGHT, .FacingRight applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212 disappear TEAMROCKETBASEB2F_LANCE end -UnknownScript_0x6d0be: +.FacingRight: applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d219 disappear TEAMROCKETBASEB2F_LANCE end @@ -225,15 +225,15 @@ RocketElectrode1: cry ELECTRODE loadwildmon ELECTRODE, 23 startbattle - iftrue UnknownScript_0x6d182 + iftrue TeamRocketBaseB2FReloadMap disappear TEAMROCKETBASEB2F_ELECTRODE1 disappear TEAMROCKETBASEB2F_ELECTRODE4 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d28c @@ -243,15 +243,15 @@ RocketElectrode2: cry ELECTRODE loadwildmon ELECTRODE, 23 startbattle - iftrue UnknownScript_0x6d182 + iftrue TeamRocketBaseB2FReloadMap disappear TEAMROCKETBASEB2F_ELECTRODE2 disappear TEAMROCKETBASEB2F_ELECTRODE5 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d299 @@ -261,21 +261,21 @@ RocketElectrode3: cry ELECTRODE loadwildmon ELECTRODE, 23 startbattle - iftrue UnknownScript_0x6d182 + iftrue TeamRocketBaseB2FReloadMap disappear TEAMROCKETBASEB2F_ELECTRODE3 disappear TEAMROCKETBASEB2F_ELECTRODE6 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - iffalse UnknownScript_0x6d182 + iffalse TeamRocketBaseB2FReloadMap reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d2a4 jump UnknownScript_0x6d184 -UnknownScript_0x6d182: +TeamRocketBaseB2FReloadMap: reloadmapafterbattle end @@ -320,13 +320,13 @@ TeamRocketBaseB2FLockedDoor: .Script: opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI - iftrue UnknownScript_0x6d1e8 + iftrue .KnowsPassword writetext UnknownText_0x6dd39 waitbutton closetext end -UnknownScript_0x6d1e8: +.KnowsPassword: writetext UnknownText_0x6dd6b waitbutton playsound SFX_ENTER_DOOR From 8874ec72529765bb9072ce74beeae8eb62080d34 Mon Sep 17 00:00:00 2001 From: surskitty Date: Tue, 23 Jan 2018 23:49:50 -0500 Subject: [PATCH 19/19] Completing labels for Route 35. --- maps/Route35.asm | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/maps/Route35.asm b/maps/Route35.asm index 6ade790d4..7d9aa9e53 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -37,50 +37,50 @@ TrainerJugglerIrwin: end_if_just_battled opentext checkcellnum PHONE_JUGGLER_IRWIN - iftrue UnknownScript_0x19c90f + iftrue Route35NumberAcceptedM checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready - writetext UnknownText_0x19cd5a + writetext JugglerIrwinAfterBattleText buttonsound setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x19c903 + scall Route35AskNumber1M jump .AskForNumber .AskedAlready: - scall UnknownScript_0x19c907 + scall Route35AskNumber2M .AskForNumber: askforphonenumber PHONE_JUGGLER_IRWIN - if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19c917 - if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19c913 + if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM + if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 - scall UnknownScript_0x19c90b - jump UnknownScript_0x19c90f + scall Route35RegisteredNumberM + jump Route35NumberAcceptedM -UnknownScript_0x19c903: +Route35AskNumber1M: jumpstd asknumber1m end -UnknownScript_0x19c907: +Route35AskNumber2M: jumpstd asknumber2m end -UnknownScript_0x19c90b: +Route35RegisteredNumberM: jumpstd registerednumberm end -UnknownScript_0x19c90f: +Route35NumberAcceptedM: jumpstd numberacceptedm end -UnknownScript_0x19c913: +Route35NumberDeclinedM: jumpstd numberdeclinedm end -UnknownScript_0x19c917: +Route35PhoneFullM: jumpstd phonefullm end -UnknownScript_0x19c91b: +Route35RematchM: jumpstd rematchm end @@ -140,27 +140,27 @@ TrainerBugCatcherArnie: checkflag ENGINE_YANMA_SWARM iftrue .YanmaSwarming checkcellnum PHONE_BUG_CATCHER_ARNIE - iftrue UnknownScript_0x19c90f + iftrue Route35NumberAcceptedM checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready writetext BugCatcherArnieAfterBattleText buttonsound setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x19c903 + scall Route35AskNumber1M jump .AskForNumber .AskedAlready: - scall UnknownScript_0x19c907 + scall Route35AskNumber2M .AskForNumber: askforphonenumber PHONE_BUG_CATCHER_ARNIE - if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19c917 - if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19c913 + if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM + if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0 - scall UnknownScript_0x19c90b - jump UnknownScript_0x19c90f + scall Route35RegisteredNumberM + jump Route35NumberAcceptedM .WantsBattle: - scall UnknownScript_0x19c91b + scall Route35RematchM winlosstext BugCatcherArnieBeatenText, 0 copybytetovar wArnieFightCount if_equal 4, .Fight4 @@ -380,7 +380,7 @@ JugglerIrwin1BeatenText: line "jolt!" done -UnknownText_0x19cd5a: +JugglerIrwinAfterBattleText: text "I was going to" line "dazzle you with my" cont "prize #MON."