diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index ed88a0fd1..104a5a57a 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -10,19 +10,19 @@ AzaleaMart_MapScriptHeader: .MapCallbacks: db 0 -ClerkScript_0x18e040: +AzaleaMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_AZALEA closetext end -CooltrainerMScript_0x18e047: - jumptextfaceplayer UnknownText_0x18e04d +AzaleaMartCooltrainerMScript: + jumptextfaceplayer AzaleaMartCooltrainerMText -BugCatcherScript_0x18e04a: - jumptextfaceplayer UnknownText_0x18e0b6 +AzaleaMartBugCatcherScript: + jumptextfaceplayer AzaleaMartBugCatcherText -UnknownText_0x18e04d: +AzaleaMartCooltrainerMText: text "There's no GREAT" line "BALL here. #" @@ -34,7 +34,7 @@ UnknownText_0x18e04d: cont "his custom BALLS." done -UnknownText_0x18e0b6: +AzaleaMartBugCatcherText: text "A GREAT BALL is" line "better for catch-" cont "ing #MON than a" @@ -62,6 +62,6 @@ AzaleaMart_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18e040, -1 - person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18e047, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18e04a, -1 + person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 + person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 + person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 617db23a4..2b3ca2e70 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -9,27 +9,27 @@ AzaleaPokeCenter1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x18db27, 0 + maptrigger .Trigger0 .MapCallbacks: db 0 -UnknownScript_0x18db27: +.Trigger0: end -NurseScript_0x18db28: +AzaleaPokeCenter1FNurseScript: jumpstd pokecenternurse -GentlemanScript_0x18db2b: - jumptextfaceplayer UnknownText_0x18db34 +AzaleaPokeCenter1FGentlemanScript: + jumptextfaceplayer AzaleaPokeCenter1FGentlemanText -FishingGuruScript_0x18db2e: - jumptextfaceplayer UnknownText_0x18dbee +AzaleaPokeCenter1FFishingGuruScript: + jumptextfaceplayer AzaleaPokeCenter1FFishingGuruText -PokefanFScript_0x18db31: - jumptextfaceplayer UnknownText_0x18dc19 +AzaleaPokeCenter1FPokefanFScript: + jumptextfaceplayer AzaleaPokeCenter1FPokefanFText -UnknownText_0x18db34: +AzaleaPokeCenter1FGentlemanText: text "Do your #MON" line "know HM moves?" @@ -40,7 +40,7 @@ UnknownText_0x18db34: line "fainted." done -UnknownText_0x18db88: +AzaleaPokeCenter1FUnusedText: text "This BILL guy" line "created the system" @@ -52,13 +52,13 @@ UnknownText_0x18db88: cont "#MON per BOX." done -UnknownText_0x18dbee: +AzaleaPokeCenter1FFishingGuruText: text "BILL's PC can" line "store up to 20" cont "#MON per BOX." done -UnknownText_0x18dc19: +AzaleaPokeCenter1FPokefanFText: text "Do you know about" line "APRICORNS?" @@ -96,7 +96,7 @@ AzaleaPokeCenter1F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18db28, -1 - person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x18db2b, -1 - person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18db2e, -1 - person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18db31, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FNurseScript, -1 + person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FGentlemanScript, -1 + person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FFishingGuruScript, -1 + person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FPokefanFScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 23da7452d..1714e0432 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -112,10 +112,10 @@ AzaleaTownRivalBattleScript: end AzaleaTownRocket1Script: - jumptextfaceplayer GoodSamaritanRocketText + jumptextfaceplayer AzaleaTownRocket1Text AzaleaTownRocket2Script: - jumptextfaceplayer TastySlowpokeTailRocketText + jumptextfaceplayer AzaleaTownRocket2Text AzaleaTownGrampsScript: faceplayer @@ -159,15 +159,15 @@ WoosterScript: closetext end -AzaleaTown_CelebiEventScript: - applymovement PLAYER, Movement_PlayerWalksOutOfKurtsHouse +AzaleaTownCelebiTrigger: + applymovement PLAYER, AzaleaTownPlayerLeavesKurtsHouseMovement opentext - writetext IlexForestIsRestlessText + writetext AzaleaTownKurtText1 buttonsound spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT - writetext HeresTheGSBallBackText + writetext AzaleaTownKurtText2 buttonsound - writetext PleaseInvestigateIlexForestText + writetext AzaleaTownKurtText3 waitbutton verbosegiveitem GS_BALL spriteface AZALEATOWN_KURT_OUTSIDE, LEFT @@ -181,7 +181,7 @@ AzaleaTown_CelebiEventScript: AzaleaTownKurtScript: faceplayer opentext - writetext PleaseInvestigateIlexForestText + writetext AzaleaTownKurtText3 waitbutton spriteface AZALEATOWN_KURT_OUTSIDE, LEFT closetext @@ -217,7 +217,6 @@ WhiteApricornTree: AzaleaTownHiddenFullHeal: dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL - AzaleaTownRivalBattleApproachMovement1: step LEFT step LEFT @@ -244,7 +243,7 @@ AzaleaTownRivalBattleExitMovement: step LEFT step_end -Movement_PlayerWalksOutOfKurtsHouse: +AzaleaTownPlayerLeavesKurtsHouseMovement: step LEFT step LEFT step UP @@ -314,7 +313,7 @@ AzaleaTownRivalLossText: line "you were lying." done -GoodSamaritanRocketText: +AzaleaTownRocket1Text: text "It's unsafe to go" line "in there, so I'm" cont "standing guard." @@ -323,7 +322,7 @@ GoodSamaritanRocketText: line "Samaritan?" done -TastySlowpokeTailRocketText: +AzaleaTownRocket2Text: text "Do you know about" line "SLOWPOKETAIL? I" cont "heard it's tasty!" @@ -392,19 +391,19 @@ WoosterText: text "WOOSTER: Gugyoo…" done -IlexForestIsRestlessText: +AzaleaTownKurtText1: text "ILEX FOREST is" line "restless!" para "What is going on?" done -HeresTheGSBallBackText: +AzaleaTownKurtText2: text ", here's" line "your GS BALL back!" done -PleaseInvestigateIlexForestText: +AzaleaTownKurtText3: text "Could you go see" line "why ILEX FOREST is" cont "so restless?" @@ -479,7 +478,7 @@ AzaleaTown_MapEventHeader: db 3 xy_trigger 1, $a, $5, $0, AzaleaTownRivalBattleTrigger1, $0, $0 xy_trigger 1, $b, $5, $0, AzaleaTownRivalBattleTrigger2, $0, $0 - xy_trigger 2, $6, $9, $0, AzaleaTown_CelebiEventScript, $0, $0 + xy_trigger 2, $6, $9, $0, AzaleaTownCelebiTrigger, $0, $0 .Signposts: db 9 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index b36e7ef67..b291385ca 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -100,7 +100,7 @@ TrainerCooltrainermPaul: CooltrainermPaulScript: end_if_just_battled opentext - writetext CooltrainermPaulAfterText + writetext CooltrainermPaulAfterBattleText waitbutton closetext end @@ -111,7 +111,7 @@ TrainerCooltrainermMike: CooltrainermMikeScript: end_if_just_battled opentext - writetext CooltrainermMikeAfterText + writetext CooltrainermMikeAfterBattleText waitbutton closetext end @@ -122,7 +122,7 @@ TrainerCooltrainerfLola: CooltrainerfLolaScript: end_if_just_battled opentext - writetext CooltrainerfLolaAfterText + writetext CooltrainerfLolaAfterBattleText waitbutton closetext end @@ -300,7 +300,7 @@ CooltrainermPaulBeatenText: line "lost?" done -CooltrainermPaulAfterText: +CooltrainermPaulAfterBattleText: text "LANCE told you" line "that he'd like to" @@ -318,7 +318,7 @@ CooltrainermMikeBeatenText: text "That's odd." done -CooltrainermMikeAfterText: +CooltrainermMikeAfterBattleText: text "I know my short-" line "comings now." @@ -344,7 +344,7 @@ CooltrainerfLolaBeatenText: text "Way to go!" done -CooltrainerfLolaAfterText: +CooltrainerfLolaAfterBattleText: text "Dragons are weak" line "against dragon-" cont "type moves." diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index eeff34d3e..bb6a8e5a1 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -68,7 +68,7 @@ TrainerCooltrainermCody: CooltrainermCodyScript: end_if_just_battled opentext - writetext CooltrainermCodyAfterText + writetext CooltrainermCodyAfterBattleText waitbutton closetext end @@ -79,7 +79,7 @@ TrainerCooltrainerfFran: CooltrainerfFranScript: end_if_just_battled opentext - writetext CooltrainerfFranAfterText + writetext CooltrainerfFranAfterBattleText waitbutton closetext end @@ -95,7 +95,7 @@ CooltrainermCodyBeatenText: line "had a dragon!" done -CooltrainermCodyAfterText: +CooltrainermCodyAfterBattleText: text "Members of our" line "dragon-user clan" @@ -119,7 +119,7 @@ CooltrainerfFranBeatenText: text "Awww… I lost…" done -CooltrainerfFranAfterText: +CooltrainerfFranAfterBattleText: text "Uh-oh… CLAIR is" line "going to be mad…" done diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 411d109f7..96681f351 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -55,7 +55,7 @@ TrainerLassMichelle: LassMichelleScript: end_if_just_battled opentext - writetext UnknownText_0x72e30 + writetext LassMichelleAfterBattleText waitbutton closetext end @@ -66,7 +66,7 @@ TrainerPicnickerTanya: PicnickerTanyaScript: end_if_just_battled opentext - writetext UnknownText_0x72e8e + writetext PicnickerTanyaAfterBattleText waitbutton closetext end @@ -77,7 +77,7 @@ TrainerBeautyJulia: BeautyJuliaScript: end_if_just_battled opentext - writetext UnknownText_0x72f01 + writetext BeautyJuliaAfterBattleText waitbutton closetext end @@ -88,7 +88,7 @@ TrainerTwinsJoandzoe1: TwinsJoandzoe1Script: end_if_just_battled opentext - writetext UnknownText_0x72f70 + writetext TwinsJoandzoe1AfterBattleText waitbutton closetext end @@ -99,7 +99,7 @@ TrainerTwinsJoandzoe2: TwinsJoandzoe2Script: end_if_just_battled opentext - writetext UnknownText_0x72fc0 + writetext TwinsJoandzoe2AfterBattleText waitbutton closetext end @@ -199,7 +199,7 @@ LassMichelleBeatenText: text "Oh, bleah!" done -UnknownText_0x72e30: +LassMichelleAfterBattleText: text "I just got care-" line "less, that's all!" done @@ -214,7 +214,7 @@ PicnickerTanyaBeatenText: text "Oh, that's it?" done -UnknownText_0x72e8e: +PicnickerTanyaAfterBattleText: text "Oh, look at all" line "your BADGES. No" @@ -232,7 +232,7 @@ BeautyJuliaBeatenText: text "How annoying!" done -UnknownText_0x72f01: +BeautyJuliaAfterBattleText: text "How do I go about" line "becoming ladylike" cont "like ERIKA?" @@ -248,7 +248,7 @@ TwinsJoandzoe1BeatenText: text "Oh… We lost…" done -UnknownText_0x72f70: +TwinsJoandzoe1AfterBattleText: text "ERIKA will get you" line "back for us!" done @@ -262,7 +262,7 @@ TwinsJoandzoe2BeatenText: text "We couldn't win…" done -UnknownText_0x72fc0: +TwinsJoandzoe2AfterBattleText: text "ERIKA is much," line "much stronger!" done diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index a91a3cc9d..52e993891 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -93,7 +93,7 @@ TrainerSwimmerfDiana: SwimmerfDianaScript: end_if_just_battled opentext - writetext UnknownText_0x188856 + writetext SwimmerfDianaAfterBattleText waitbutton closetext end @@ -104,7 +104,7 @@ TrainerSwimmerfBriana: SwimmerfBrianaScript: end_if_just_battled opentext - writetext UnknownText_0x1888c0 + writetext SwimmerfBrianaAfterBattleText waitbutton closetext end @@ -115,7 +115,7 @@ TrainerSwimmermParker: SwimmermParkerScript: end_if_just_battled opentext - writetext UnknownText_0x188943 + writetext SwimmermParkerAfterBattleText waitbutton closetext end @@ -299,7 +299,7 @@ SwimmerfDianaBeatenText: line "the winner!" done -UnknownText_0x188856: +SwimmerfDianaAfterBattleText: text "I'll be swimming" line "quietly." done @@ -315,7 +315,7 @@ SwimmerfBrianaBeatenText: line "disposed of me…" done -UnknownText_0x1888c0: +SwimmerfBrianaAfterBattleText: text "Don't be too smug" line "about beating me." @@ -335,7 +335,7 @@ SwimmermParkerBeatenText: text "This can't be…" done -UnknownText_0x188943: +SwimmermParkerAfterBattleText: text "MISTY has gotten" line "much better in the" cont "past few years." diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index d4a647207..ce7ea5958 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -22,7 +22,7 @@ TrainerKimono_girlNaoko2: Kimono_girlNaoko2Script: end_if_just_battled opentext - writetext UnknownText_0x99579 + writetext Kimono_girlNaoko2AfterBattleText waitbutton closetext end @@ -33,7 +33,7 @@ TrainerKimono_girlSayo: Kimono_girlSayoScript: end_if_just_battled opentext - writetext UnknownText_0x9960b + writetext Kimono_girlSayoAfterBattleText waitbutton closetext end @@ -44,7 +44,7 @@ TrainerKimono_girlZuki: Kimono_girlZukiScript: end_if_just_battled opentext - writetext UnknownText_0x99688 + writetext Kimono_girlZukiAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ TrainerKimono_girlKuni: Kimono_girlKuniScript: end_if_just_battled opentext - writetext UnknownText_0x99714 + writetext Kimono_girlKuniAfterBattleText waitbutton closetext end @@ -66,7 +66,7 @@ TrainerKimono_girlMiki: Kimono_girlMikiScript: end_if_just_battled opentext - writetext UnknownText_0x997a8 + writetext Kimono_girlMikiAfterBattleText waitbutton closetext end @@ -148,7 +148,7 @@ Kimono_girlNaoko2BeatenText: line "strong." done -UnknownText_0x99579: +Kimono_girlNaoko2AfterBattleText: text "I enjoyed that" line "bout. I would like" cont "to see you again." @@ -167,7 +167,7 @@ Kimono_girlSayoBeatenText: line "I almost had you." done -UnknownText_0x9960b: +Kimono_girlSayoAfterBattleText: text "Rhythm is impor-" line "tant for both" @@ -188,7 +188,7 @@ Kimono_girlZukiBeatenText: line "#MON left…" done -UnknownText_0x99688: +Kimono_girlZukiAfterBattleText: text "I put a different" line "flower in my bar-" cont "rette every month." @@ -205,7 +205,7 @@ Kimono_girlKuniBeatenText: line "than you look." done -UnknownText_0x99714: +Kimono_girlKuniAfterBattleText: text "I trained a lot," line "so I thought I was" @@ -224,7 +224,7 @@ Kimono_girlMikiBeatenText: line "at #MON too." done -UnknownText_0x997a8: +Kimono_girlMikiAfterBattleText: text "I can keep dancing" line "because there are" diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 3a93fc87d..ef6ec59ed 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -94,7 +94,7 @@ TrainerCooltrainermDarin: CooltrainermDarinScript: end_if_just_battled opentext - writetext CooltrainermDarinAfterText + writetext CooltrainermDarinAfterBattleText waitbutton closetext end @@ -105,7 +105,7 @@ TrainerCooltrainerfCara: CooltrainerfCaraScript: end_if_just_battled opentext - writetext CooltrainerfCaraAfterText + writetext CooltrainerfCaraAfterBattleText waitbutton closetext end @@ -116,7 +116,7 @@ TrainerTwinsLeaandpia1: TwinsLeaandpia1Script: end_if_just_battled opentext - writetext TrinsLeaandpia1AfterText + writetext TwinsLeaandpia1AfterBattleText waitbutton closetext end @@ -127,7 +127,7 @@ TrainerTwinsLeaandpia2: TwinsLeaandpia2Script: end_if_just_battled opentext - writetext TrinsLeaandpia2AfterText + writetext TwinsLeaandpia2AfterBattleText waitbutton closetext end @@ -332,7 +332,7 @@ CooltrainermDarinBeatenText: text "S-strong!" done -CooltrainermDarinAfterText: +CooltrainermDarinAfterBattleText: text "The SHRINE ahead" line "is home to the" @@ -352,7 +352,7 @@ CooltrainerfCaraBeatenText: text "Oh yikes, I lost!" done -CooltrainerfCaraAfterText: +CooltrainerfCaraAfterBattleText: text "Soon I'm going to" line "get permission" @@ -378,7 +378,7 @@ TwinsLeaandpia1BeatenText: text "Ouchies." done -TrinsLeaandpia1AfterText: +TwinsLeaandpia1AfterBattleText: text "It was like having" line "to battle LANCE." done @@ -391,7 +391,7 @@ TwinsLeaandpia2BeatenText: text "Meanie." done -TrinsLeaandpia2AfterText: +TwinsLeaandpia2AfterBattleText: text "We'll tell on you." para "MASTER will be" diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index b01e9af81..0af0cf3c9 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -105,7 +105,7 @@ TrainerSageJeffrey: SageJeffreyScript: end_if_just_battled opentext - writetext UnknownText_0x9a263 + writetext SageJeffreyAfterBattleText waitbutton closetext end @@ -116,7 +116,7 @@ TrainerSagePing: SagePingScript: end_if_just_battled opentext - writetext UnknownText_0x9a2b7 + writetext SagePingAfterBattleText waitbutton closetext end @@ -127,7 +127,7 @@ TrainerMediumMartha: MediumMarthaScript: end_if_just_battled opentext - writetext UnknownText_0x9a318 + writetext MediumMarthaAfterBattleText waitbutton closetext end @@ -138,7 +138,7 @@ TrainerMediumGrace: MediumGraceScript: end_if_just_battled opentext - writetext UnknownText_0x9a38a + writetext MediumGraceAfterBattleText waitbutton closetext end @@ -297,7 +297,7 @@ SageJeffreyBeatenText: line "experienced both." done -UnknownText_0x9a263: +SageJeffreyAfterBattleText: text "Where did #MON" line "come from?" done @@ -312,7 +312,7 @@ SagePingBeatenText: text "Ah! Well done!" done -UnknownText_0x9a2b7: +SagePingAfterBattleText: text "We use only ghost-" line "type #MON." @@ -329,7 +329,7 @@ MediumMarthaBeatenText: text "I, I, I lost!" done -UnknownText_0x9a318: +MediumMarthaAfterBattleText: text "The one who wants" line "to win most--will!" done @@ -346,7 +346,7 @@ MediumGraceBeatenText: text "Wha-what?" done -UnknownText_0x9a38a: +MediumGraceAfterBattleText: text "Fine. I shall tell" line "you the secret of" diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 4a4d3a87c..e3478657b 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -101,7 +101,7 @@ TrainerSailorJeff: SailorJeffScript: end_if_just_battled opentext - writetext UnknownText_0x76a38 + writetext SailorJeffAfterBattleText waitbutton closetext end @@ -112,7 +112,7 @@ TrainerPicnickerDebra: PicnickerDebraScript: end_if_just_battled opentext - writetext UnknownText_0x76a99 + writetext PicnickerDebraAfterBattleText waitbutton closetext end @@ -123,7 +123,7 @@ TrainerJugglerFritz: JugglerFritzScript: end_if_just_battled opentext - writetext UnknownText_0x76b02 + writetext JugglerFritzAfterBattleText waitbutton closetext end @@ -134,7 +134,7 @@ TrainerSailorGarrett: SailorGarrettScript: end_if_just_battled opentext - writetext UnknownText_0x76b7a + writetext SailorGarrettAfterBattleText waitbutton closetext end @@ -145,7 +145,7 @@ TrainerFisherJonah: FisherJonahScript: end_if_just_battled opentext - writetext UnknownText_0x76c22 + writetext FisherJonahAfterBattleText waitbutton closetext end @@ -156,7 +156,7 @@ TrainerBlackbeltWai: BlackbeltWaiScript: end_if_just_battled opentext - writetext UnknownText_0x76c9e + writetext BlackbeltWaiAfterBattleText waitbutton closetext end @@ -167,7 +167,7 @@ TrainerSailorKenneth: SailorKennethScript: end_if_just_battled opentext - writetext UnknownText_0x76d5f + writetext SailorKennethAfterBattleText waitbutton closetext end @@ -178,7 +178,7 @@ TrainerTeacherShirley: TeacherShirleyScript: end_if_just_battled opentext - writetext UnknownText_0x76de1 + writetext TeacherShirleyAfterBattleText waitbutton closetext end @@ -189,7 +189,7 @@ TrainerSchoolboyNate: SchoolboyNateScript: end_if_just_battled opentext - writetext UnknownText_0x76e3d + writetext SchoolboyNateAfterBattleText waitbutton closetext end @@ -200,7 +200,7 @@ TrainerSchoolboyRicky: SchoolboyRickyScript: end_if_just_battled opentext - writetext UnknownText_0x76eb6 + writetext SchoolboyRickyAfterBattleText waitbutton closetext end @@ -278,7 +278,7 @@ SailorJeffBeatenText: line "break's over!" done -UnknownText_0x76a38: +SailorJeffAfterBattleText: text "I guess I can't" line "win if I don't get" cont "serious." @@ -294,7 +294,7 @@ PicnickerDebraBeatenText: line "strong!" done -UnknownText_0x76a99: +PicnickerDebraAfterBattleText: text "SAFFRON, CELADON…" line "I hear there are" @@ -312,7 +312,7 @@ JugglerFritzBeatenText: line "more…" done -UnknownText_0x76b02: +JugglerFritzAfterBattleText: text "No more ships for" line "me. Next time," @@ -330,7 +330,7 @@ SailorGarrettBeatenText: line "field…" done -UnknownText_0x76b7a: +SailorGarrettAfterBattleText: text "We get different" line "passengers from" @@ -352,7 +352,7 @@ FisherJonahBeatenText: line "anymore…" done -UnknownText_0x76c22: +FisherJonahAfterBattleText: text "I plan to fish off" line "VERMILION's pier." done @@ -370,7 +370,7 @@ BlackbeltWaiBeatenText: line "over!" done -UnknownText_0x76c9e: +BlackbeltWaiAfterBattleText: text "I couldn't find" line "the KARATE KING in" cont "JOHTO." @@ -393,7 +393,7 @@ SailorKennethBeatenText: line "ing is obvious…" done -UnknownText_0x76d5f: +SailorKennethAfterBattleText: text "Eight BADGES!" line "They must prove" @@ -413,7 +413,7 @@ TeacherShirleyBeatenText: text "Aaack!" done -UnknownText_0x76de1: +TeacherShirleyAfterBattleText: text "We're on a field" line "trip to the RUINS" cont "outside VIOLET." @@ -428,7 +428,7 @@ SchoolboyNateBeatenText: text "Yaargh!" done -UnknownText_0x76e3d: +SchoolboyNateAfterBattleText: text "Radios pick up" line "strange signals" cont "inside the RUINS." @@ -444,7 +444,7 @@ SchoolboyRickyBeatenText: text "I was done in!" done -UnknownText_0x76eb6: +SchoolboyRickyAfterBattleText: text "I read that there" line "are four of those" cont "stone panels." diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 9c7960201..28cdc79f0 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -20,7 +20,7 @@ TrainerCooltrainermSean: CooltrainermSeanScript: end_if_just_battled opentext - writetext UnknownText_0x7567b + writetext CooltrainermSeanAfterBattleText waitbutton closetext end @@ -31,7 +31,7 @@ TrainerCooltrainerfCarol: CooltrainerfCarolScript: end_if_just_battled opentext - writetext UnknownText_0x756f7 + writetext CooltrainerfCarolAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ TrainerPokemaniacEthan: PokemaniacEthanScript: end_if_just_battled opentext - writetext UnknownText_0x7574b + writetext PokemaniacEthanAfterBattleText waitbutton closetext end @@ -53,7 +53,7 @@ TrainerHikerNoland: HikerNolandScript: end_if_just_battled opentext - writetext UnknownText_0x757d4 + writetext HikerNolandAfterBattleText waitbutton closetext end @@ -64,7 +64,7 @@ TrainerGentlemanEdward: GentlemanEdwardScript: end_if_just_battled opentext - writetext UnknownText_0x75937 + writetext GentlemanEdwardAfterBattleText waitbutton closetext end @@ -75,7 +75,7 @@ TrainerBurglarCorey: BurglarCoreyScript: end_if_just_battled opentext - writetext UnknownText_0x75996 + writetext BurglarCoreyAfterBattleText waitbutton closetext end @@ -142,7 +142,7 @@ CooltrainermSeanBeatenText: text "I wanted to win!" done -UnknownText_0x7567b: +CooltrainermSeanAfterBattleText: text "Trainers from" line "JOHTO can battle" @@ -160,7 +160,7 @@ CooltrainerfCarolBeatenText: line "ent between us?" done -UnknownText_0x756f7: +CooltrainerfCarolAfterBattleText: text "I'm going to beat" line "you someday!" done @@ -175,7 +175,7 @@ PokemaniacEthanBeatenText: text "Gyaaaah!" done -UnknownText_0x7574b: +PokemaniacEthanAfterBattleText: text "LILY's nice, but" line "MARY's the best!" @@ -194,7 +194,7 @@ HikerNolandBeatenText: line "handle!" done -UnknownText_0x757d4: +HikerNolandAfterBattleText: text "I wonder if there" line "are any mountains" @@ -240,7 +240,7 @@ GentlemanEdwardBeatenText: line "it…" done -UnknownText_0x75937: +GentlemanEdwardAfterBattleText: text "I give up." line "You don't have to" @@ -258,7 +258,7 @@ BurglarCoreyBeatenText: line "I lost!" done -UnknownText_0x75996: +BurglarCoreyAfterBattleText: text "I found a pretty" line "coin here." diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 9b8aeac85..6850eb85c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -146,7 +146,7 @@ TrainerPokefanmColin: PokefanmColinScript: end_if_just_battled opentext - writetext UnknownText_0x7635b + writetext PokefanmColinAfterBattleText waitbutton closetext end @@ -157,7 +157,7 @@ TrainerTwinsMegandpeg1: TwinsMegandpeg1Script: end_if_just_battled opentext - writetext UnknownText_0x763c2 + writetext TwinsMegandpeg1AfterBattleText waitbutton closetext end @@ -168,7 +168,7 @@ TrainerTwinsMegandpeg2: TwinsMegandpeg2Script: end_if_just_battled opentext - writetext UnknownText_0x76428 + writetext TwinsMegandpeg2AfterBattleText waitbutton closetext end @@ -179,7 +179,7 @@ TrainerPsychicRodney: PsychicRodneyScript: end_if_just_battled opentext - writetext UnknownText_0x76497 + writetext PsychicRodneyAfterBattleText waitbutton closetext end @@ -190,7 +190,7 @@ TrainerPokefanmJeremy: PokefanmJeremyScript: end_if_just_battled opentext - writetext UnknownText_0x7651c + writetext PokefanmJeremyAfterBattleText waitbutton closetext end @@ -201,7 +201,7 @@ TrainerPokefanfGeorgia: PokefanfGeorgiaScript: end_if_just_battled opentext - writetext UnknownText_0x76596 + writetext PokefanfGeorgiaAfterBattleText waitbutton closetext end @@ -212,7 +212,7 @@ TrainerSupernerdShawn: SupernerdShawnScript: end_if_just_battled opentext - writetext UnknownText_0x7660f + writetext SupernerdShawnAfterBattleText waitbutton closetext end @@ -347,7 +347,7 @@ PokefanmColinBeatenText: text "You're strong!" done -UnknownText_0x7635b: +PokefanmColinAfterBattleText: text "You're traveling" line "all alone?" @@ -365,7 +365,7 @@ TwinsMegandpeg1BeatenText: text "Oh! We lost!" done -UnknownText_0x763c2: +TwinsMegandpeg1AfterBattleText: text "Baby is a rude" line "name to call us" cont "girls!" @@ -382,7 +382,7 @@ TwinsMegandpeg2BeatenText: text "Oh! We lost!" done -UnknownText_0x76428: +TwinsMegandpeg2AfterBattleText: text "Sometimes, kids" line "are smarter than" cont "grown-ups!" @@ -399,7 +399,7 @@ PsychicRodneyBeatenText: line "thing!" done -UnknownText_0x76497: +PsychicRodneyAfterBattleText: text "I get it. You can" line "hear JOHTO's radio" cont "on the FAST SHIP." @@ -416,7 +416,7 @@ PokefanmJeremyBeatenText: line "ful #MON!" done -UnknownText_0x7651c: +PokefanmJeremyAfterBattleText: text "I must go to the" line "#MON SALON and" cont "fix them up nice!" @@ -433,7 +433,7 @@ PokefanfGeorgiaBeatenText: line "to do?" done -UnknownText_0x76596: +PokefanfGeorgiaAfterBattleText: text "Oh, yes! I have to" line "get my #MON out" cont "of DAY-CARE!" @@ -450,7 +450,7 @@ SupernerdShawnBeatenText: line "Please!" done -UnknownText_0x7660f: +SupernerdShawnAfterBattleText: text "You should use the" line "right BALLS to fit" cont "the situation." diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 76933c600..88dac7f49 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -17,7 +17,7 @@ TrainerFirebreatherLyle: FirebreatherLyleScript: end_if_just_battled opentext - writetext UnknownText_0x75b52 + writetext FirebreatherLyleAfterBattleText waitbutton closetext end @@ -28,7 +28,7 @@ TrainerBug_catcherKen: Bug_catcherKenScript: end_if_just_battled opentext - writetext UnknownText_0x75bd5 + writetext Bug_catcherKenAfterBattleText waitbutton closetext end @@ -39,7 +39,7 @@ TrainerBeautyCassie: BeautyCassieScript: end_if_just_battled opentext - writetext UnknownText_0x75c43 + writetext BeautyCassieAfterBattleText waitbutton closetext end @@ -124,7 +124,7 @@ FirebreatherLyleBeatenText: line "flame's tiny…" done -UnknownText_0x75b52: +FirebreatherLyleAfterBattleText: text "I guess fire is" line "weak on the sea." @@ -143,7 +143,7 @@ Bug_catcherKenBeatenText: line "You're tough!" done -UnknownText_0x75bd5: +Bug_catcherKenAfterBattleText: text "You can find lots" line "of #MON in the" cont "trees of JOHTO!" @@ -159,7 +159,7 @@ BeautyCassieBeatenText: text "My heart weeps…" done -UnknownText_0x75c43: +BeautyCassieAfterBattleText: text "A voyage is best" line "for getting over" cont "a broken heart." diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 3fb6057dc..b014bc126 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -100,7 +100,7 @@ TrainerLassCarrie: LassCarrieScript: end_if_just_battled opentext - writetext LassCarrieOWText + writetext LassCarrieAfterBattleText waitbutton closetext end @@ -124,7 +124,7 @@ TrainerLassBridget: LassBridgetScript: end_if_just_battled opentext - writetext LassBridgetOWText + writetext LassBridgetAfterBattleText waitbutton closetext end @@ -135,7 +135,7 @@ TrainerBeautyVictoria: BeautyVictoriaScript: end_if_just_battled opentext - writetext BeautyVictoriaOWText + writetext BeautyVictoriaAfterBattleText waitbutton closetext end @@ -146,7 +146,7 @@ TrainerBeautySamantha: BeautySamanthaScript: end_if_just_battled opentext - writetext BeautySamanthaOWText + writetext BeautySamanthaAfterBattleText waitbutton closetext end @@ -285,7 +285,7 @@ LassCarrieBeatenText: line "you were weak…" done -LassCarrieOWText: +LassCarrieAfterBattleText: text "Do my #MON" line "think I'm cute?" done @@ -303,7 +303,7 @@ LassBridgetBeatenText: text "Oh, no, no, no!" done -LassBridgetOWText: +LassBridgetAfterBattleText: text "I'm trying to beat" line "WHITNEY, but…" cont "It's depressing." @@ -339,7 +339,7 @@ BeautyVictoriaBeatenText: line "it's over?" done -BeautyVictoriaOWText: +BeautyVictoriaAfterBattleText: text "Wow, you must be" line "good to beat me!" cont "Keep it up!" @@ -356,7 +356,7 @@ BeautySamanthaBeatenText: line "I'm so sorry!" done -BeautySamanthaOWText: +BeautySamanthaAfterBattleText: text "I taught MEOWTH" line "moves for taking" cont "on any type…" diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d09ec7ab7..c1817a6cc 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -396,7 +396,7 @@ TrainerBug_catcherWayne: Bug_catcherWayneScript: end_if_just_battled opentext - writetext Bug_catcherWayneAfterText + writetext Bug_catcherWayneAfterBattleText waitbutton closetext end @@ -929,7 +929,7 @@ Bug_catcherWayneBeatenText: line "#MON before…" done -Bug_catcherWayneAfterText: +Bug_catcherWayneAfterBattleText: text "A #MON I've" line "never seen before" diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index d741ec62e..db08e2b5f 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -156,7 +156,7 @@ TrainerFisherAndre: FisherAndreScript: end_if_just_battled opentext - writetext UnknownText_0x7058f + writetext FisherAndreAfterBattleText waitbutton closetext end @@ -167,7 +167,7 @@ TrainerFisherRaymond: FisherRaymondScript: end_if_just_battled opentext - writetext UnknownText_0x70611 + writetext FisherRaymondAfterBattleText waitbutton closetext end @@ -178,7 +178,7 @@ TrainerCooltrainermAaron: CooltrainermAaronScript: end_if_just_battled opentext - writetext UnknownText_0x7069c + writetext CooltrainermAaronAfterBattleText waitbutton closetext end @@ -189,7 +189,7 @@ TrainerCooltrainerfLois: CooltrainerfLoisScript: end_if_just_battled opentext - writetext UnknownText_0x70752 + writetext CooltrainerfLoisAfterBattleText waitbutton closetext end @@ -379,7 +379,7 @@ FisherAndreBeatenText: line "MON trainer…" done -UnknownText_0x7058f: +FisherAndreAfterBattleText: text "I won't lose as an" line "angler! I catch" cont "#MON all day." @@ -398,7 +398,7 @@ FisherRaymondBeatenText: line "tangled up…" done -UnknownText_0x70611: +FisherRaymondAfterBattleText: text "Why can't I catch" line "any good #MON?" done @@ -419,7 +419,7 @@ CooltrainermAaronBeatenText: line "Good battle." done -UnknownText_0x7069c: +CooltrainermAaronAfterBattleText: text "#MON and their" line "trainer become" @@ -444,7 +444,7 @@ CooltrainerfLoisBeatenText: text "Good going!" done -UnknownText_0x70752: +CooltrainerfLoisAfterBattleText: text "Come to think of" line "it, I've seen a" cont "pink BUTTERFREE." diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 5ac4ef61b..fb78311eb 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -76,7 +76,7 @@ TrainerSkierRoxanne: SkierRoxanneScript: end_if_just_battled opentext - writetext UnknownText_0x19a116 + writetext SkierRoxanneAfterBattleText waitbutton closetext end @@ -87,7 +87,7 @@ TrainerSkierClarissa: SkierClarissaScript: end_if_just_battled opentext - writetext UnknownText_0x19a18f + writetext SkierClarissaAfterBattleText waitbutton closetext end @@ -98,7 +98,7 @@ TrainerBoarderRonald: BoarderRonaldScript: end_if_just_battled opentext - writetext UnknownText_0x199f2d + writetext BoarderRonaldAfterBattleText waitbutton closetext end @@ -109,7 +109,7 @@ TrainerBoarderBrad: BoarderBradScript: end_if_just_battled opentext - writetext BorderBradTalkText + writetext BoarderBradAfterBattleText waitbutton closetext end @@ -120,7 +120,7 @@ TrainerBoarderDouglas: BoarderDouglasScript: end_if_just_battled opentext - writetext BorderDouglasTalkText + writetext BoarderDouglasAfterBattleText waitbutton closetext end @@ -251,7 +251,7 @@ BoarderRonaldBeatenText: line "do a thing." done -UnknownText_0x199f2d: +BoarderRonaldAfterBattleText: text "I think there's a" line "move a #MON" @@ -276,7 +276,7 @@ BoarderBradBeatenText: line "serious we are?" done -BorderBradTalkText: +BoarderBradAfterBattleText: text "This GYM is great." line "I love boarding" cont "with my #MON!" @@ -292,7 +292,7 @@ BoarderDouglasBeatenText: line "PRYCE's secret." done -BorderDouglasTalkText: +BoarderDouglasAfterBattleText: text "The secret behind" line "PRYCE's power…" @@ -316,7 +316,7 @@ SkierRoxanneBeatenText: line "you in skiing!" done -UnknownText_0x19a116: +SkierRoxanneAfterBattleText: text "If you don't skate" line "with precision," @@ -334,7 +334,7 @@ SkierClarissaBeatenText: line "wipe out!" done -UnknownText_0x19a18f: +SkierClarissaAfterBattleText: text "I shouldn't have" line "been bragging" cont "about my skiing…" diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 18abb2152..4335f190f 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -23,7 +23,7 @@ TrainerPokemaniacMiller: PokemaniacMillerScript: end_if_just_battled opentext - writetext UnknownText_0x7debd + writetext PokemaniacMillerAfterBattleText waitbutton closetext end @@ -34,7 +34,7 @@ TrainerSupernerdMarkus: SupernerdMarkusScript: end_if_just_battled opentext - writetext UnknownText_0x7df97 + writetext SupernerdMarkusAfterBattleText waitbutton closetext end @@ -77,7 +77,7 @@ PokemaniacMillerBeatenText: line "kid…?" done -UnknownText_0x7debd: +PokemaniacMillerAfterBattleText: text "A while back, this" line "karate dude wanted" @@ -103,7 +103,7 @@ SupernerdMarkusBeatenText: line "someone else…" done -UnknownText_0x7df97: +SupernerdMarkusAfterBattleText: text "I came to explore" line "MT.MORTAR, but I" diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index f76300a68..1d1da1da1 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -20,7 +20,7 @@ TrainerSupernerdHugh: SupernerdHughScript: end_if_just_battled opentext - writetext UnknownText_0x7e10e + writetext SupernerdHughAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ SupernerdHughBeatenText: text "Sorry, my mistake." done -UnknownText_0x7e10e: +SupernerdHughAfterBattleText: text "I'm investigating" line "MT.MORTAR, but my" cont "pal's gone AWOL." diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 1babc73a2..f174a8efe 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -194,7 +194,7 @@ TrainerPokefanmWilliam: PokefanmWilliamScript: end_if_just_battled opentext - writetext UnknownText_0x5c645 + writetext PokefanmWilliamAfterBattleText waitbutton closetext end @@ -284,7 +284,7 @@ TrainerLassKrise: LassKriseScript: end_if_just_battled opentext - writetext UnknownText_0x5c71d + writetext LassKriseAfterBattleText waitbutton closetext end @@ -454,7 +454,7 @@ PokefanmWilliamBeatenText: text "M-my #MON!" done -UnknownText_0x5c645: +PokefanmWilliamAfterBattleText: text "I lost the battle," line "but my #MON win" @@ -484,7 +484,7 @@ LassKriseBeatenText: text "…Hmmm…" done -UnknownText_0x5c71d: +LassKriseAfterBattleText: text "I thought you were" line "staring at me" cont "because I'm cute!" diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 9afec908a..9348dce9f 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -15,7 +15,7 @@ TrainerGentlemanAlfred: GentlemanAlfredScript: end_if_just_battled opentext - writetext UnknownText_0x5b13e + writetext GentlemanAlfredAfterBattleText waitbutton closetext end @@ -183,7 +183,7 @@ GentlemanAlfredBeatenText: line "you're serious." done -UnknownText_0x5b13e: +GentlemanAlfredAfterBattleText: text "Up top is a #-" line "MON that keeps the" cont "LIGHTHOUSE lit." diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index ea1c26ac3..531492190 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -17,7 +17,7 @@ TrainerBird_keeperTheo: Bird_keeperTheoScript: end_if_just_battled opentext - writetext UnknownText_0x5b2df + writetext Bird_keeperTheoAfterBattleText waitbutton closetext end @@ -28,7 +28,7 @@ TrainerGentlemanPreston: GentlemanPrestonScript: end_if_just_battled opentext - writetext UnknownText_0x5b457 + writetext GentlemanPrestonAfterBattleText waitbutton closetext end @@ -39,7 +39,7 @@ TrainerSailorTerrell: SailorTerrellScript: end_if_just_battled opentext - writetext UnknownText_0x5b384 + writetext SailorTerrellAfterBattleText waitbutton closetext end @@ -60,7 +60,7 @@ Bird_keeperTheoBeatenText: line "concerned…" done -UnknownText_0x5b2df: +Bird_keeperTheoAfterBattleText: text "How the heck do" line "you go up?" @@ -82,7 +82,7 @@ SailorTerrellBeatenText: line "and strong…" done -UnknownText_0x5b384: +SailorTerrellAfterBattleText: text "Every time I come" line "back to OLIVINE, I" cont "visit the GYM." @@ -106,7 +106,7 @@ GentlemanPrestonBeatenText: line "train some more…" done -UnknownText_0x5b457: +GentlemanPrestonAfterBattleText: text "JASMINE used to" line "use rock #MON" cont "like ONIX." diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index ae5571dec..ec20af243 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -15,7 +15,7 @@ TrainerLassConnie: LassConnie1Script: end_if_just_battled opentext - writetext UnknownText_0x5b63c + writetext LassConnie1AfterBattleText waitbutton closetext end @@ -26,7 +26,7 @@ TrainerSailorKent: SailorKentScript: end_if_just_battled opentext - writetext UnknownText_0x5b584 + writetext SailorKentAfterBattleText waitbutton closetext end @@ -45,7 +45,7 @@ SailorKentBeatenText: line "smile either…" done -UnknownText_0x5b584: +SailorKentAfterBattleText: text "Speaking of sick," line "I've heard there's" @@ -68,7 +68,7 @@ LassConnie1BeatenText: text "Aaack! My #MON!" done -UnknownText_0x5b63c: +LassConnie1AfterBattleText: text "Right. Anybody" line "would be worried" cont "if his or her own" diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 7b8b334c9..963dfd2eb 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -18,7 +18,7 @@ TrainerBird_keeperDenis: Bird_keeperDenisScript: end_if_just_battled opentext - writetext UnknownText_0x60ac3 + writetext Bird_keeperDenisAfterBattleText waitbutton closetext end @@ -29,7 +29,7 @@ TrainerSailorErnest: SailorErnestScript: end_if_just_battled opentext - writetext UnknownText_0x60a1f + writetext SailorErnestAfterBattleText waitbutton closetext end @@ -60,7 +60,7 @@ SailorErnestBeatenText: line "overwhelming!" done -UnknownText_0x60a1f: +SailorErnestAfterBattleText: text "A GYM LEADER isn't" line "just about being" @@ -81,7 +81,7 @@ Bird_keeperDenisBeatenText: text "Oops…They crashed…" done -UnknownText_0x60ac3: +Bird_keeperDenisAfterBattleText: text "My #MON learned" line "how to use FLY in" cont "CIANWOOD." diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 3adc06019..fd5f9d74a 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -46,7 +46,7 @@ TrainerCamperJerry: CamperJerryScript: end_if_just_battled opentext - writetext UnknownText_0x1a2c0f + writetext CamperJerryAfterBattleText waitbutton closetext end @@ -166,7 +166,7 @@ CamperJerryBeatenText: line "these battles…" done -UnknownText_0x1a2c0f: +CamperJerryAfterBattleText: text "Hey, you! Trainer" line "from JOHTO! BROCK" diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 4e670be07..8fe22d242 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -191,7 +191,7 @@ TrainerGruntM3: GruntM3Script: end_if_just_battled opentext - writetext UnknownText_0x5d5a2 + writetext GruntM3AfterBattleText waitbutton closetext end @@ -442,7 +442,7 @@ GruntM3BeatenText: line "must watch you…" done -UnknownText_0x5d5a2: +GruntM3AfterBattleText: text "You're too strong." para "Our plan could be" diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 5925532e9..093ad758c 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -60,7 +60,7 @@ TrainerGruntM4: GruntM4Script: end_if_just_battled opentext - writetext UnknownText_0x5db07 + writetext GruntM4AfterBattleText waitbutton closetext end @@ -71,7 +71,7 @@ TrainerGruntM5: GruntM5Script: end_if_just_battled opentext - writetext UnknownText_0x5db99 + writetext GruntM5AfterBattleText waitbutton closetext end @@ -82,7 +82,7 @@ TrainerGruntM6: GruntM6Script: end_if_just_battled opentext - writetext UnknownText_0x5dc00 + writetext GruntM6AfterBattleText waitbutton closetext end @@ -93,7 +93,7 @@ TrainerGruntF2: GruntF2Script: end_if_just_battled opentext - writetext UnknownText_0x5dcd0 + writetext GruntF2AfterBattleText waitbutton closetext end @@ -402,7 +402,7 @@ GruntM4BeatenText: line "cute!" done -UnknownText_0x5db07: +GruntM4AfterBattleText: text "We won't let you" line "ruin our plans" cont "for our comeback!" @@ -422,7 +422,7 @@ GruntM5BeatenText: line "hero?" done -UnknownText_0x5db99: +GruntM5AfterBattleText: text "We're not always" line "evil. We just do" cont "whatever we like." @@ -437,7 +437,7 @@ GruntM6BeatenText: text "Arggh. I give up." done -UnknownText_0x5dc00: +GruntM6AfterBattleText: text "Our EXECUTIVES are" line "trying to take" cont "this place over." @@ -464,7 +464,7 @@ GruntF2BeatenText: text "Wh-who are you?" done -UnknownText_0x5dcd0: +GruntF2AfterBattleText: text "You beat me, and" line "I won't forget it!" done diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 166950d44..fef269adf 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -91,7 +91,7 @@ TrainerGruntM7: GruntM7Script: end_if_just_battled opentext - writetext UnknownText_0x5e8d0 + writetext GruntM7AfterBattleText waitbutton closetext end @@ -102,7 +102,7 @@ TrainerGruntM8: GruntM8Script: end_if_just_battled opentext - writetext UnknownText_0x5e944 + writetext GruntM8AfterBattleText waitbutton closetext end @@ -113,7 +113,7 @@ TrainerGruntM9: GruntM9Script: end_if_just_battled opentext - writetext UnknownText_0x5e9d0 + writetext GruntM9AfterBattleText waitbutton closetext end @@ -124,7 +124,7 @@ TrainerScientistMarc: ScientistMarcScript: end_if_just_battled opentext - writetext UnknownText_0x5ea61 + writetext ScientistMarcAfterBattleText waitbutton closetext end @@ -246,7 +246,7 @@ GruntM7BeatenText: text "What?!" done -UnknownText_0x5e8d0: +GruntM7AfterBattleText: text "I failed in my" line "duties…" @@ -264,7 +264,7 @@ GruntM8BeatenText: text "You're kidding!" done -UnknownText_0x5e944: +GruntM8AfterBattleText: text "I feel lousy over" line "losing!" @@ -284,7 +284,7 @@ GruntM9BeatenText: text "I'm done for!" done -UnknownText_0x5e9d0: +GruntM9AfterBattleText: text "What?! You made it" line "past our men in" cont "the UNDERGROUND?" @@ -304,7 +304,7 @@ ScientistMarcBeatenText: line "too lightly!" done -UnknownText_0x5ea61: +ScientistMarcAfterBattleText: text "Bwahahaha…" para "I can transmit as" diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 983beb843..353977c3d 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -61,7 +61,7 @@ TrainerGruntM10: GruntM10Script: end_if_just_battled opentext - writetext UnknownText_0x5ede2 + writetext GruntM10AfterBattleText waitbutton closetext end @@ -72,7 +72,7 @@ TrainerExecutivem2: Executivem2Script: end_if_just_battled opentext - writetext UnknownText_0x5ee69 + writetext Executivem2AfterBattleText waitbutton closetext end @@ -83,7 +83,7 @@ TrainerGruntF4: GruntF4Script: end_if_just_battled opentext - writetext UnknownText_0x5ef31 + writetext GruntF4AfterBattleText waitbutton closetext end @@ -94,7 +94,7 @@ TrainerScientistRich: ScientistRichScript: end_if_just_battled opentext - writetext UnknownText_0x5efcb + writetext ScientistRichAfterBattleText waitbutton closetext end @@ -163,7 +163,7 @@ GruntM10BeatenText: text "No! Unbelievable!" done -UnknownText_0x5ede2: +GruntM10AfterBattleText: text "I don't believe" line "it! I was beaten!" done @@ -182,7 +182,7 @@ Executivem2BeatenText: line "down!" done -UnknownText_0x5ee69: +Executivem2AfterBattleText: text "You've earned my" line "respect, so here's" cont "some advice." @@ -208,7 +208,7 @@ GruntF4BeatenText: line "useless!" done -UnknownText_0x5ef31: +GruntF4AfterBattleText: text "I love my" line "beautiful self!" @@ -231,7 +231,7 @@ ScientistRichBeatenText: line "come with snags." done -UnknownText_0x5efcb: +ScientistRichAfterBattleText: text "Do you honestly" line "believe you can" cont "stop TEAM ROCKET?" diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c9c965496..3f8b444d4 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -75,7 +75,7 @@ TrainerExecutivef1: Executivef1Script: end_if_just_battled opentext - writetext Executivef1AfterText + writetext Executivef1AfterBattleText waitbutton closetext end @@ -258,7 +258,7 @@ Executivef1BeatenText: line "I still lost…" done -Executivef1AfterText: +Executivef1AfterBattleText: text ", isn't it?" para "A brat like you" diff --git a/maps/Route1.asm b/maps/Route1.asm index a8070b4e5..90377eb9b 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -16,7 +16,7 @@ TrainerSchoolboyDanny: SchoolboyDannyScript: end_if_just_battled opentext - writetext UnknownText_0x1ac5d7 + writetext SchoolboyDannyAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerCooltrainerfQuinn: CooltrainerfQuinnScript: end_if_just_battled opentext - writetext UnknownText_0x1ac640 + writetext CooltrainerfQuinnAfterBattleText waitbutton closetext end @@ -49,7 +49,7 @@ SchoolboyDannyBeatenText: line "losing record…" done -UnknownText_0x1ac5d7: +SchoolboyDannyAfterBattleText: text "For trainers, it's" line "a given that we'll" @@ -66,7 +66,7 @@ CooltrainerfQuinnBeatenText: text "Down and out…" done -UnknownText_0x1ac640: +CooltrainerfQuinnAfterBattleText: text "You're strong." para "You obviously must" diff --git a/maps/Route10South.asm b/maps/Route10South.asm index a644f1540..c923c44d3 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -15,7 +15,7 @@ TrainerHikerJim: HikerJimScript: end_if_just_battled opentext - writetext UnknownText_0x1ae43b + writetext HikerJimAfterBattleText waitbutton closetext end @@ -26,7 +26,7 @@ TrainerPokefanmRobert: PokefanmRobertScript: end_if_just_battled opentext - writetext UnknownText_0x1ae4a9 + writetext PokefanmRobertAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ HikerJimBeatenText: text "Hahaha-hachoo!" done -UnknownText_0x1ae43b: +HikerJimAfterBattleText: text "Hay fever is" line "making me sneeze!" cont "Ahahah-CHOO!" @@ -60,7 +60,7 @@ PokefanmRobertBeatenText: line "that's my loss." done -UnknownText_0x1ae4a9: +PokefanmRobertAfterBattleText: text "Look what you did" line "to my #MON…" diff --git a/maps/Route11.asm b/maps/Route11.asm index 05b19d424..444800a0d 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -18,7 +18,7 @@ TrainerYoungsterOwen: YoungsterOwenScript: end_if_just_battled opentext - writetext UnknownText_0x680b2 + writetext YoungsterOwenAfterBattleText waitbutton closetext end @@ -29,7 +29,7 @@ TrainerYoungsterJason: YoungsterJasonScript: end_if_just_battled opentext - writetext UnknownText_0x6814a + writetext YoungsterJasonAfterBattleText waitbutton closetext end @@ -40,7 +40,7 @@ TrainerPsychicHerman: PsychicHermanScript: end_if_just_battled opentext - writetext UnknownText_0x6817b + writetext PsychicHermanAfterBattleText waitbutton closetext end @@ -51,7 +51,7 @@ TrainerPsychicFidel: PsychicFidelScript: end_if_just_battled opentext - writetext UnknownText_0x681ec + writetext PsychicFidelAfterBattleText waitbutton closetext end @@ -79,7 +79,7 @@ YoungsterOwenBeatenText: line "happen?" done -UnknownText_0x680b2: +YoungsterOwenAfterBattleText: text "I fought fair and" line "square with honor." @@ -100,7 +100,7 @@ YoungsterJasonBeatenText: line "I got stomped!" done -UnknownText_0x6814a: +YoungsterJasonAfterBattleText: text "I'm going to catch" line "more #MON in" cont "the grass." @@ -114,7 +114,7 @@ PsychicHermanBeatenText: text "…" done -UnknownText_0x6817b: +PsychicHermanAfterBattleText: text "…" para "I lost while I had" @@ -133,7 +133,7 @@ PsychicFidelBeatenText: line "your power…" done -UnknownText_0x681ec: +PsychicFidelAfterBattleText: text "Strength in con-" line "viction…" diff --git a/maps/Route12.asm b/maps/Route12.asm index 2a1e078f5..cc5397534 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -19,7 +19,7 @@ TrainerFisherKyle: FisherKyleScript: end_if_just_battled opentext - writetext UnknownText_0x1a7238 + writetext FisherKyleAfterBattleText waitbutton closetext end @@ -30,7 +30,7 @@ TrainerFisherMartin: FisherMartinScript: end_if_just_battled opentext - writetext UnknownText_0x1a704c + writetext FisherMartinAfterBattleText waitbutton closetext end @@ -41,7 +41,7 @@ TrainerFisherStephen: FisherStephenScript: end_if_just_battled opentext - writetext UnknownText_0x1a70d4 + writetext FisherStephenAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ TrainerFisherBarney: FisherBarneyScript: end_if_just_battled opentext - writetext UnknownText_0x1a716d + writetext FisherBarneyAfterBattleText waitbutton closetext end @@ -83,7 +83,7 @@ FisherMartinBeatenText: text "Gwaaah!" done -UnknownText_0x1a704c: +FisherMartinAfterBattleText: text "I'm too impatient" line "for fishing…" done @@ -100,7 +100,7 @@ FisherStephenBeatenText: line "distracted me!" done -UnknownText_0x1a70d4: +FisherStephenAfterBattleText: text "Have you checked" line "out KANTO's radio" @@ -119,7 +119,7 @@ FisherBarneyBeatenText: line "coming up next!" done -UnknownText_0x1a716d: +FisherBarneyAfterBattleText: text "I think electric-" line "ity is the most" @@ -144,7 +144,7 @@ FisherKyleBeatenText: text "You do remember?" done -UnknownText_0x1a7238: +FisherKyleAfterBattleText: text "The tug you feel" line "on the ROD when" diff --git a/maps/Route13.asm b/maps/Route13.asm index 79e035aa6..966bb61f5 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -18,7 +18,7 @@ TrainerPokefanmAlex: PokefanmAlexScript: end_if_just_battled opentext - writetext UnknownText_0x1a24e3 + writetext PokefanmAlexAfterBattleText waitbutton closetext end @@ -29,7 +29,7 @@ TrainerPokefanmJoshua: PokefanmJoshuaScript: end_if_just_battled opentext - writetext UnknownText_0x1a254f + writetext PokefanmJoshuaAfterBattleText waitbutton closetext end @@ -40,7 +40,7 @@ TrainerBird_keeperPerry: Bird_keeperPerryScript: end_if_just_battled opentext - writetext UnknownText_0x1a25db + writetext Bird_keeperPerryAfterBattleText waitbutton closetext end @@ -51,7 +51,7 @@ TrainerBird_keeperBret: Bird_keeperBretScript: end_if_just_battled opentext - writetext UnknownText_0x1a2662 + writetext Bird_keeperBretAfterBattleText waitbutton closetext end @@ -62,7 +62,7 @@ TrainerHikerKenny: HikerKennyScript: end_if_just_battled opentext - writetext UnknownText_0x1a26c2 + writetext HikerKennyAfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ PokefanmAlexBeatenText: line "mock royalty!" done -UnknownText_0x1a24e3: +PokefanmAlexAfterBattleText: text "Doesn't everyone" line "wish to someday be" cont "a king?" @@ -106,7 +106,7 @@ PokefanmJoshuaBeatenText: text "PI-PIKACHU!" done -UnknownText_0x1a254f: +PokefanmJoshuaAfterBattleText: text "You look like you" line "have many #MON," @@ -125,7 +125,7 @@ Bird_keeperPerryBeatenText: line "your speed…" done -UnknownText_0x1a25db: +Bird_keeperPerryAfterBattleText: text "Your #MON are" line "remarkably well-" cont "trained." @@ -144,7 +144,7 @@ Bird_keeperBretBeatenText: line "Not good enough!" done -UnknownText_0x1a2662: +Bird_keeperBretAfterBattleText: text "If you groom them," line "#MON get happy." done @@ -159,7 +159,7 @@ HikerKennyBeatenText: text "I lost…" done -UnknownText_0x1a26c2: +HikerKennyAfterBattleText: text "Geological fea-" line "tures don't appear" cont "to change." diff --git a/maps/Route14.asm b/maps/Route14.asm index fabb3af5c..0a42a2a8e 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -25,7 +25,7 @@ TrainerPokefanmCarter: PokefanmCarterScript: end_if_just_battled opentext - writetext UnknownText_0x1ad508 + writetext PokefanmCarterAfterBattleText waitbutton closetext end @@ -36,7 +36,7 @@ TrainerBird_keeperRoy: Bird_keeperRoyScript: end_if_just_battled opentext - writetext UnknownText_0x1ad5a4 + writetext Bird_keeperRoyAfterBattleText waitbutton closetext end @@ -47,7 +47,7 @@ TrainerPokefanmTrevor: PokefanmTrevorScript: end_if_just_battled opentext - writetext UnknownText_0x1ad660 + writetext PokefanmTrevorAfterBattleText waitbutton closetext end @@ -64,7 +64,7 @@ PokefanmCarterBeatenText: text "Awaaah!" done -UnknownText_0x1ad508: +PokefanmCarterAfterBattleText: text "SQUIRTLE, CHARMAN-" line "DER and BULBASAUR…" @@ -83,7 +83,7 @@ Bird_keeperRoyBeatenText: line "can't ever fly…" done -UnknownText_0x1ad5a4: +Bird_keeperRoyAfterBattleText: text "You have #MON" line "that know the HM" @@ -107,7 +107,7 @@ PokefanmTrevorBeatenText: line "this PSYDUCK?" done -UnknownText_0x1ad660: +PokefanmTrevorAfterBattleText: text "If only there were" line "an easy way to" diff --git a/maps/Route15.asm b/maps/Route15.asm index 50406872e..48a56dba9 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -20,7 +20,7 @@ TrainerTeacherColette: TeacherColetteScript: end_if_just_battled opentext - writetext UnknownText_0x1aa60d + writetext TeacherColetteAfterBattleText waitbutton closetext end @@ -31,7 +31,7 @@ TrainerTeacherHillary: TeacherHillaryScript: end_if_just_battled opentext - writetext UnknownText_0x1aa6ca + writetext TeacherHillaryAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ TrainerSchoolboyKipp: SchoolboyKippScript: end_if_just_battled opentext - writetext UnknownText_0x1aa740 + writetext SchoolboyKippAfterBattleText waitbutton closetext end @@ -53,7 +53,7 @@ TrainerSchoolboyTommy: SchoolboyTommyScript: end_if_just_battled opentext - writetext UnknownText_0x1aa7bc + writetext SchoolboyTommyAfterBattleText waitbutton closetext end @@ -64,7 +64,7 @@ TrainerSchoolboyJohnny: SchoolboyJohnnyScript: end_if_just_battled opentext - writetext UnknownText_0x1aa84a + writetext SchoolboyJohnnyAfterBattleText waitbutton closetext end @@ -75,7 +75,7 @@ TrainerSchoolboyBilly: SchoolboyBillyScript: end_if_just_battled opentext - writetext UnknownText_0x1aa8b0 + writetext SchoolboyBillyAfterBattleText waitbutton closetext end @@ -95,7 +95,7 @@ TeacherColetteBeatenText: text "Kyaaah!" done -UnknownText_0x1aa60d: +TeacherColetteAfterBattleText: text "Before I became a" line "teacher, I used to" @@ -119,7 +119,7 @@ TeacherHillaryBeatenText: line "lose…" done -UnknownText_0x1aa6ca: +TeacherHillaryAfterBattleText: text "Studying is impor-" line "tant, but exercise" cont "is just as vital." @@ -135,7 +135,7 @@ SchoolboyKippBeatenText: line "I was beaten!" done -UnknownText_0x1aa740: +SchoolboyKippAfterBattleText: text "My mom worries so" line "much about me, I" @@ -153,7 +153,7 @@ SchoolboyTommyBeatenText: line "homework!" done -UnknownText_0x1aa7bc: +SchoolboyTommyAfterBattleText: text "Sayonara! I just" line "learned that in my" cont "Japanese class." @@ -172,7 +172,7 @@ SchoolboyJohnnyBeatenText: line "tough!" done -UnknownText_0x1aa84a: +SchoolboyJohnnyAfterBattleText: text "I'm tired of walk-" line "ing. I need to" cont "take a break." @@ -188,7 +188,7 @@ SchoolboyBillyBeatenText: line "How could I lose?" done -UnknownText_0x1aa8b0: +SchoolboyBillyAfterBattleText: text "If #MON were a" line "subject at school," cont "I'd be the best!" diff --git a/maps/Route17.asm b/maps/Route17.asm index b01ce1ddc..0a20a3e78 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -26,7 +26,7 @@ TrainerBikerCharles: BikerCharlesScript: end_if_just_battled opentext - writetext UnknownText_0x1ad293 + writetext BikerCharlesAfterBattleText waitbutton closetext end @@ -37,7 +37,7 @@ TrainerBikerRiley: BikerRileyScript: end_if_just_battled opentext - writetext UnknownText_0x1ad13b + writetext BikerRileyAfterBattleText waitbutton closetext end @@ -48,7 +48,7 @@ TrainerBikerJoel: BikerJoelScript: end_if_just_battled opentext - writetext UnknownText_0x1ad196 + writetext BikerJoelAfterBattleText waitbutton closetext end @@ -59,7 +59,7 @@ TrainerBikerGlenn: BikerGlennScript: end_if_just_battled opentext - writetext UnknownText_0x1ad225 + writetext BikerGlennAfterBattleText waitbutton closetext end @@ -81,7 +81,7 @@ BikerRileyBeatenText: text "Whoa, you kick!" done -UnknownText_0x1ad13b: +BikerRileyAfterBattleText: text "Don't get cocky," line "you JOHTO punk!" done @@ -96,7 +96,7 @@ BikerJoelBeatenText: line "look cool…" done -UnknownText_0x1ad196: +BikerJoelAfterBattleText: text "I look cool, but" line "I'm weak, so I'm" cont "not really cool." @@ -115,7 +115,7 @@ BikerGlennBeatenText: line "awesome torque!" done -UnknownText_0x1ad225: +BikerGlennAfterBattleText: text "Hands-free riding" line "is considered cool" cont "on CYCLING ROAD." @@ -131,7 +131,7 @@ BikerCharlesBeatenText: line "burn!" done -UnknownText_0x1ad293: +BikerCharlesAfterBattleText: text "Reckless driving" line "causes accidents!" cont "Take it easy!" diff --git a/maps/Route18.asm b/maps/Route18.asm index 6c28da07e..c51cb389d 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -15,7 +15,7 @@ TrainerBird_keeperBoris: Bird_keeperBorisScript: end_if_just_battled opentext - writetext UnknownText_0x1acfa5 + writetext Bird_keeperBorisAfterBattleText waitbutton closetext end @@ -26,7 +26,7 @@ TrainerBird_keeperBob: Bird_keeperBobScript: end_if_just_battled opentext - writetext UnknownText_0x1ad00d + writetext Bird_keeperBobAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ Bird_keeperBorisBeatenText: text "Ayieee!" done -UnknownText_0x1acfa5: +Bird_keeperBorisAfterBattleText: text "Since you're so" line "strong, it must be" cont "fun to battle." @@ -62,7 +62,7 @@ Bird_keeperBobBeatenText: text "…Whew!" done -UnknownText_0x1ad00d: +Bird_keeperBobAfterBattleText: text "If you don't have" line "a BICYCLE, you're" diff --git a/maps/Route19.asm b/maps/Route19.asm index d414459a0..11e21de7f 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -35,7 +35,7 @@ TrainerSwimmerfDawn: SwimmerfDawnScript: end_if_just_battled opentext - writetext UnknownText_0x19ebad + writetext SwimmerfDawnAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ TrainerSwimmermHarold: SwimmermHaroldScript: end_if_just_battled opentext - writetext UnknownText_0x19eab4 + writetext SwimmermHaroldAfterBattleText waitbutton closetext end @@ -57,7 +57,7 @@ TrainerSwimmermJerome: SwimmermJeromeScript: end_if_just_battled opentext - writetext UnknownText_0x19ec7e + writetext SwimmermJeromeAfterBattleText waitbutton closetext end @@ -68,7 +68,7 @@ TrainerSwimmermTucker: SwimmermTuckerScript: end_if_just_battled opentext - writetext UnknownText_0x19eb3b + writetext SwimmermTuckerAfterBattleText waitbutton closetext end @@ -121,7 +121,7 @@ SwimmermHaroldBeatenText: text "Glub…" done -UnknownText_0x19eab4: +SwimmermHaroldAfterBattleText: text "At night, the sea" line "turns black. It" @@ -141,7 +141,7 @@ SwimmermTuckerBeatenText: text "I'm drowning!" done -UnknownText_0x19eb3b: +SwimmermTuckerAfterBattleText: text "I… asked my girl-" line "friend to swim to" cont "FUCHSIA… Gasp…" @@ -157,7 +157,7 @@ SwimmerfDawnBeatenText: line "at swimming…" done -UnknownText_0x19ebad: +SwimmerfDawnAfterBattleText: text "It's a quick swim" line "between FUCHSIA" @@ -184,7 +184,7 @@ SwimmermJeromeBeatenText: line "win." done -UnknownText_0x19ec7e: +SwimmermJeromeAfterBattleText: text "I might be bad at" line "swimming, but I" cont "love the sea." diff --git a/maps/Route2.asm b/maps/Route2.asm index 6b7a0e8ec..14d025c09 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -21,7 +21,7 @@ TrainerBug_catcherRob: Bug_catcherRobScript: end_if_just_battled opentext - writetext UnknownText_0x1ac34d + writetext Bug_catcherRobAfterBattleText waitbutton closetext end @@ -32,7 +32,7 @@ TrainerBug_catcherEd: Bug_catcherEdScript: end_if_just_battled opentext - writetext UnknownText_0x1ac3cf + writetext Bug_catcherEdAfterBattleText waitbutton closetext end @@ -43,7 +43,7 @@ TrainerBug_catcherDoug: Bug_catcherDougScript: end_if_just_battled opentext - writetext UnknownText_0x1ac423 + writetext Bug_catcherDougAfterBattleText waitbutton closetext end @@ -91,7 +91,7 @@ Bug_catcherRobBeatenText: text "I was whipped…" done -UnknownText_0x1ac34d: +Bug_catcherRobAfterBattleText: text "I'm going to look" line "for stronger bug" cont "#MON." @@ -109,7 +109,7 @@ Bug_catcherEdBeatenText: text "Ouch, ouch, ouch!" done -UnknownText_0x1ac3cf: +Bug_catcherEdAfterBattleText: text "They'll really" line "sting when you" cont "take a bath." @@ -124,7 +124,7 @@ Bug_catcherDougBeatenText: text "No good!" done -UnknownText_0x1ac423: +Bug_catcherDougAfterBattleText: text "Bug #MON squish" line "like plush toys" diff --git a/maps/Route20.asm b/maps/Route20.asm index 3355026dd..5733f3f9f 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -24,7 +24,7 @@ TrainerSwimmerfNicole: SwimmerfNicoleScript: end_if_just_battled opentext - writetext UnknownText_0x1acd93 + writetext SwimmerfNicoleAfterBattleText waitbutton closetext end @@ -35,7 +35,7 @@ TrainerSwimmerfLori: SwimmerfLoriScript: end_if_just_battled opentext - writetext UnknownText_0x1ace15 + writetext SwimmerfLoriAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ TrainerSwimmermCameron: SwimmermCameronScript: end_if_just_battled opentext - writetext UnknownText_0x1ace8b + writetext SwimmermCameronAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ SwimmerfNicoleBeatenText: text "Oh, no!" done -UnknownText_0x1acd93: +SwimmerfNicoleAfterBattleText: text "Swimming exercises" line "your full body." @@ -83,7 +83,7 @@ SwimmerfLoriBeatenText: text "No!" done -UnknownText_0x1ace15: +SwimmerfLoriAfterBattleText: text "SURF is no longer" line "the only HM move" cont "you use in water." @@ -101,7 +101,7 @@ SwimmermCameronBeatenText: text "Aiyah!" done -UnknownText_0x1ace8b: +SwimmermCameronAfterBattleText: text "Besides the sea, I" line "can also swim in" cont "ponds and rivers." diff --git a/maps/Route21.asm b/maps/Route21.asm index bb3a2cb59..8fd1ab52e 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -16,7 +16,7 @@ TrainerSwimmermSeth: SwimmermSethScript: end_if_just_battled opentext - writetext UnknownText_0x1ac873 + writetext SwimmermSethAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerSwimmerfNikki: SwimmerfNikkiScript: end_if_just_battled opentext - writetext UnknownText_0x1ac8f1 + writetext SwimmerfNikkiAfterBattleText waitbutton closetext end @@ -38,7 +38,7 @@ TrainerFisherArnold: FisherArnoldScript: end_if_just_battled opentext - writetext UnknownText_0x1ac95c + writetext FisherArnoldAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ SwimmermSethBeatenText: text "Glug…" done -UnknownText_0x1ac873: +SwimmermSethAfterBattleText: text "This arrogant guy" line "was at CINNABAR's" cont "volcano." @@ -69,7 +69,7 @@ SwimmerfNikkiBeatenText: line "sunburn…" done -UnknownText_0x1ac8f1: +SwimmerfNikkiAfterBattleText: text "I have to watch" line "out for blemishes" cont "caused by the sun." @@ -84,7 +84,7 @@ FisherArnoldBeatenText: text "Utter failure…" done -UnknownText_0x1ac95c: +FisherArnoldAfterBattleText: text "I'll just go back" line "to fishing…" done diff --git a/maps/Route25.asm b/maps/Route25.asm index f49c4c3d4..911017ef6 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -86,7 +86,7 @@ TrainerSchoolboyDudley: SchoolboyDudleyScript: end_if_just_battled opentext - writetext UnknownText_0x19f1b5 + writetext SchoolboyDudleyAfterBattleText waitbutton closetext end @@ -97,7 +97,7 @@ TrainerLassEllen: LassEllenScript: end_if_just_battled opentext - writetext UnknownText_0x19f208 + writetext LassEllenAfterBattleText waitbutton closetext end @@ -108,7 +108,7 @@ TrainerSchoolboyJoe: SchoolboyJoeScript: end_if_just_battled opentext - writetext UnknownText_0x19f25c + writetext SchoolboyJoeAfterBattleText waitbutton closetext end @@ -119,7 +119,7 @@ TrainerLassLaura: LassLauraScript: end_if_just_battled opentext - writetext UnknownText_0x19f2a6 + writetext LassLauraAfterBattleText waitbutton closetext end @@ -130,7 +130,7 @@ TrainerCamperLloyd: CamperLloydScript: end_if_just_battled opentext - writetext UnknownText_0x19f2f8 + writetext CamperLloydAfterBattleText waitbutton closetext end @@ -141,7 +141,7 @@ TrainerLassShannon: LassShannonScript: end_if_just_battled opentext - writetext UnknownText_0x19f35b + writetext LassShannonAfterBattleText waitbutton closetext end @@ -152,7 +152,7 @@ TrainerSupernerdPat: SupernerdPatScript: end_if_just_battled opentext - writetext UnknownText_0x19f41a + writetext SupernerdPatAfterBattleText waitbutton closetext end @@ -287,7 +287,7 @@ SchoolboyDudleyBeatenText: text "Whoo! Good stuff." done -UnknownText_0x19f1b5: +SchoolboyDudleyAfterBattleText: text "I did my best." line "I have no regrets." done @@ -301,7 +301,7 @@ LassEllenBeatenText: text "How could I lose?" done -UnknownText_0x19f208: +LassEllenAfterBattleText: text "I did my best." line "I have no regrets." done @@ -315,7 +315,7 @@ SchoolboyJoeBeatenText: text "Ow! Stomped flat!" done -UnknownText_0x19f25c: +SchoolboyJoeAfterBattleText: text "I did my best." line "I have no regrets." done @@ -329,7 +329,7 @@ LassLauraBeatenText: text "I lost too…" done -UnknownText_0x19f2a6: +LassLauraAfterBattleText: text "I did my best." line "I have no regrets." done @@ -343,7 +343,7 @@ CamperLloydBeatenText: text "Whoa! Too much." done -UnknownText_0x19f2f8: +CamperLloydAfterBattleText: text "I did my best." line "I have no regrets." done @@ -358,7 +358,7 @@ LassShannonBeatenText: text "You're kidding." done -UnknownText_0x19f35b: +LassShannonAfterBattleText: text "I did my best." line "I have no regrets." done @@ -382,7 +382,7 @@ SupernerdPatBeatenText: line "at all?" done -UnknownText_0x19f41a: +SupernerdPatAfterBattleText: text "I'm sorry… I won't" line "cheat anymore…" done diff --git a/maps/Route26.asm b/maps/Route26.asm index ccc32ed63..dc0538fb3 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -21,7 +21,7 @@ TrainerCooltrainermJake: CooltrainermJakeScript: end_if_just_battled opentext - writetext UnknownText_0x1a4f08 + writetext CooltrainermJakeAfterBattleText waitbutton closetext end @@ -125,7 +125,7 @@ TrainerCooltrainerfJoyce: CooltrainerfJoyceScript: end_if_just_battled opentext - writetext UnknownText_0x1a50d7 + writetext CooltrainerfJoyceAfterBattleText waitbutton closetext end @@ -229,7 +229,7 @@ TrainerPsychicRichard: PsychicRichardScript: end_if_just_battled opentext - writetext UnknownText_0x1a5278 + writetext PsychicRichardAfterBattleText waitbutton closetext end @@ -240,7 +240,7 @@ TrainerFisherScott: FisherScottScript: end_if_just_battled opentext - writetext UnknownText_0x1a5326 + writetext FisherScottAfterBattleText waitbutton closetext end @@ -266,7 +266,7 @@ CooltrainermJakeBeatenText: text "I blew it!" done -UnknownText_0x1a4f08: +CooltrainermJakeAfterBattleText: text "It's going to be" line "tough to win at" cont "the LEAGUE." @@ -321,7 +321,7 @@ CooltrainerfJoyceBeatenText: line "believe this!" done -UnknownText_0x1a50d7: +CooltrainerfJoyceAfterBattleText: text "I've defeated" line "eight GYM LEADERS," @@ -374,7 +374,7 @@ PsychicRichardBeatenText: text "Good battle!" done -UnknownText_0x1a5278: +PsychicRichardAfterBattleText: text "People and #MON" line "grow from their" cont "experiences." @@ -397,7 +397,7 @@ FisherScottBeatenText: line "battle!" done -UnknownText_0x1a5326: +FisherScottAfterBattleText: text "Just like in fish-" line "ing, it's all over" diff --git a/maps/Route27.asm b/maps/Route27.asm index 1ff42703a..7781e5bbf 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -56,7 +56,7 @@ TrainerPsychicGilbert: PsychicGilbertScript: end_if_just_battled opentext - writetext UnknownText_0x1a0dd2 + writetext PsychicGilbertAfterBattleText waitbutton closetext end @@ -180,7 +180,7 @@ TrainerCooltrainermBlake: CooltrainermBlakeScript: end_if_just_battled opentext - writetext UnknownText_0x1a0b0b + writetext CooltrainermBlakeAfterBattleText waitbutton closetext end @@ -191,7 +191,7 @@ TrainerCooltrainermBrian: CooltrainermBrianScript: end_if_just_battled opentext - writetext UnknownText_0x1a0bac + writetext CooltrainermBrianAfterBattleText waitbutton closetext end @@ -295,7 +295,7 @@ TrainerCooltrainerfMegan: CooltrainerfMeganScript: end_if_just_battled opentext - writetext UnknownText_0x1a0cce + writetext CooltrainerfMeganAfterBattleText waitbutton closetext end @@ -344,7 +344,7 @@ CooltrainermBlakeBeatenText: text "Yow!" done -UnknownText_0x1a0b0b: +CooltrainermBlakeAfterBattleText: text "If you prevail on" line "this harsh trek," @@ -365,7 +365,7 @@ CooltrainermBrianBeatenText: text "Just as I thought!" done -UnknownText_0x1a0bac: +CooltrainermBrianAfterBattleText: text "A good trainer can" line "recognize other" cont "good trainers." @@ -405,7 +405,7 @@ CooltrainerfMeganBeatenText: line "strong!" done -UnknownText_0x1a0cce: +CooltrainerfMeganAfterBattleText: text "I'm checking out" line "pre- and post-" cont "evolution #MON." @@ -436,7 +436,7 @@ PsychicGilbertBeatenText: text "You're too much!" done -UnknownText_0x1a0dd2: +PsychicGilbertAfterBattleText: text "With your skills," line "you'll do well at" cont "the LEAGUE." diff --git a/maps/Route3.asm b/maps/Route3.asm index b5e08faf9..339e0c2b1 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -17,7 +17,7 @@ TrainerFirebreatherOtis: FirebreatherOtisScript: end_if_just_battled opentext - writetext UnknownText_0x1adff7 + writetext FirebreatherOtisAfterBattleText waitbutton closetext end @@ -28,7 +28,7 @@ TrainerYoungsterWarren: YoungsterWarrenScript: end_if_just_battled opentext - writetext UnknownText_0x1ae051 + writetext YoungsterWarrenAfterBattleText waitbutton closetext end @@ -39,7 +39,7 @@ TrainerYoungsterJimmy: YoungsterJimmyScript: end_if_just_battled opentext - writetext UnknownText_0x1ae0a9 + writetext YoungsterJimmyAfterBattleText waitbutton closetext end @@ -50,7 +50,7 @@ TrainerFirebreatherBurt: FirebreatherBurtScript: end_if_just_battled opentext - writetext UnknownText_0x1ae118 + writetext FirebreatherBurtAfterBattleText waitbutton closetext end @@ -68,7 +68,7 @@ FirebreatherOtisBeatenText: line "I'm all wet…" done -UnknownText_0x1adff7: +FirebreatherOtisAfterBattleText: text "When it rains," line "it's hard to get" cont "ignition…" @@ -83,7 +83,7 @@ YoungsterWarrenBeatenText: text "I knew I'd lose…" done -UnknownText_0x1ae051: +YoungsterWarrenAfterBattleText: text "You looked strong." para "I was afraid to" @@ -99,7 +99,7 @@ YoungsterJimmyBeatenText: text "Blown away!" done -UnknownText_0x1ae0a9: +YoungsterJimmyAfterBattleText: text "I wear shorts the" line "whole year round." @@ -116,7 +116,7 @@ FirebreatherBurtBeatenText: text "Yow! That's hot!" done -UnknownText_0x1ae118: +FirebreatherBurtAfterBattleText: text "The greatest fire-" line "breather in KANTO," cont "that's me." diff --git a/maps/Route35.asm b/maps/Route35.asm index afa3f8ce0..05abdc63e 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -24,7 +24,7 @@ TrainerBird_keeperBryan: Bird_keeperBryanScript: end_if_just_battled opentext - writetext UnknownText_0x19cc87 + writetext Bird_keeperBryanAfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ TrainerCamperIvan: CamperIvanScript: end_if_just_battled opentext - writetext UnknownText_0x19cac4 + writetext CamperIvanAfterBattleText waitbutton closetext end @@ -101,7 +101,7 @@ TrainerCamperElliot: CamperElliotScript: end_if_just_battled opentext - writetext UnknownText_0x19cb47 + writetext CamperElliotAfterBattleText waitbutton closetext end @@ -112,7 +112,7 @@ TrainerPicnickerBrooke: PicnickerBrookeScript: end_if_just_battled opentext - writetext UnknownText_0x19cbba + writetext PicnickerBrookeAfterBattleText waitbutton closetext end @@ -123,7 +123,7 @@ TrainerPicnickerKim: PicnickerKimScript: end_if_just_battled opentext - writetext UnknownText_0x19cc21 + writetext PicnickerKimAfterBattleText waitbutton closetext end @@ -231,7 +231,7 @@ TrainerFirebreatherWalt: FirebreatherWaltScript: end_if_just_battled opentext - writetext UnknownText_0x19cebc + writetext FirebreatherWaltAfterBattleText waitbutton closetext end @@ -288,7 +288,7 @@ CamperIvanBeatenText: text "I give!" done -UnknownText_0x19cac4: +CamperIvanAfterBattleText: text "Music on the radio" line "changes the moods" cont "of wild #MON." @@ -305,7 +305,7 @@ CamperElliotBeatenText: line "have lost for me…" done -UnknownText_0x19cb47: +CamperElliotAfterBattleText: text "I was humiliated" line "in front of my" cont "girlfriend…" @@ -322,7 +322,7 @@ PicnickerBrookeBeatenText: line "strong!" done -UnknownText_0x19cbba: +PicnickerBrookeAfterBattleText: text "I can count on my" line "#MON more than" cont "my boyfriend." @@ -338,7 +338,7 @@ PicnickerKimBeatenText: line "win…" done -UnknownText_0x19cc21: +PicnickerKimAfterBattleText: text "The GYM BADGES are" line "pretty. I collect" cont "them." @@ -354,7 +354,7 @@ Bird_keeperBryanBeatenText: line "enough!" done -UnknownText_0x19cc87: +Bird_keeperBryanAfterBattleText: text "Some #MON flee" line "right away." @@ -426,7 +426,7 @@ FirebreatherWaltBeatenText: line "tip of my nose!" done -UnknownText_0x19cebc: +FirebreatherWaltAfterBattleText: text "The #MON March" line "on the radio lures" cont "wild #MON." diff --git a/maps/Route37.asm b/maps/Route37.asm index 7c4b6e98f..df3877226 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -34,7 +34,7 @@ TrainerTwinsAnnandanne1: TwinsAnnandanne1Script: end_if_just_battled opentext - writetext UnknownText_0x1a8e62 + writetext TwinsAnnandanne1AfterBattleText waitbutton closetext end @@ -45,7 +45,7 @@ TrainerTwinsAnnandanne2: TwinsAnnandanne2Script: end_if_just_battled opentext - writetext UnknownText_0x1a8eec + writetext TwinsAnnandanne2AfterBattleText waitbutton closetext end @@ -56,7 +56,7 @@ TrainerPsychicGreg: PsychicGregScript: end_if_just_battled opentext - writetext UnknownText_0x1a8f80 + writetext PsychicGregAfterBattleText waitbutton closetext end @@ -131,7 +131,7 @@ TwinsAnnandanne1BeatenText: line "little too strong." done -UnknownText_0x1a8e62: +TwinsAnnandanne1AfterBattleText: text "ANN: I can tell" line "what my sister and" @@ -150,7 +150,7 @@ TwinsAnnandanne2BeatenText: line "little too strong." done -UnknownText_0x1a8eec: +TwinsAnnandanne2AfterBattleText: text "ANNE: We share the" line "same feelings as" cont "our #MON." @@ -170,7 +170,7 @@ PsychicGregBeatenText: line "pretty sad…" done -UnknownText_0x1a8f80: +PsychicGregAfterBattleText: text "Putting #MON to" line "sleep or paralyz-" cont "ing them are good" diff --git a/maps/Route39.asm b/maps/Route39.asm index 5f7d33279..eb90889a5 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -110,7 +110,7 @@ TrainerPokefanfRuth: PokefanfRuthScript: end_if_just_battled opentext - writetext UnknownText_0x1a5db2 + writetext PokefanfRuthAfterBattleText waitbutton closetext end @@ -121,7 +121,7 @@ TrainerSailorEugene: SailorEugeneScript: end_if_just_battled opentext - writetext UnknownText_0x1a5c4d + writetext SailorEugeneAfterBattleText waitbutton closetext end @@ -132,7 +132,7 @@ TrainerPsychicNorman: PsychicNormanScript: end_if_just_battled opentext - writetext UnknownText_0x1a5e57 + writetext PsychicNormanAfterBattleText waitbutton closetext end @@ -199,7 +199,7 @@ SailorEugeneBeatenText: text "Awaaargh!" done -UnknownText_0x1a5c4d: +SailorEugeneAfterBattleText: text "My #MON were" line "caught and raised" cont "overseas." @@ -245,7 +245,7 @@ PokefanfRuthBeatenText: line "losing." done -UnknownText_0x1a5db2: +PokefanfRuthAfterBattleText: text "Do you know about" line "baby #MON?" @@ -269,7 +269,7 @@ PsychicNormanBeatenText: line "have potential." done -UnknownText_0x1a5e57: +PsychicNormanAfterBattleText: text "You know how #-" line "MON have different" cont "abilities?" diff --git a/maps/Route4.asm b/maps/Route4.asm index bfea8c8aa..1bd5ae694 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -17,7 +17,7 @@ TrainerBird_keeperHank: Bird_keeperHankScript: end_if_just_battled opentext - writetext UnknownText_0x1ae258 + writetext Bird_keeperHankAfterBattleText waitbutton closetext end @@ -28,7 +28,7 @@ TrainerPicnickerHope: PicnickerHopeScript: end_if_just_battled opentext - writetext UnknownText_0x1ae320 + writetext PicnickerHopeAfterBattleText waitbutton closetext end @@ -39,7 +39,7 @@ TrainerPicnickerSharon: PicnickerSharonScript: end_if_just_battled opentext - writetext UnknownText_0x1ae369 + writetext PicnickerSharonAfterBattleText waitbutton closetext end @@ -65,7 +65,7 @@ Bird_keeperHankBeatenText: line "one…" done -UnknownText_0x1ae258: +Bird_keeperHankAfterBattleText: text "If you have a" line "specific #MON" @@ -92,7 +92,7 @@ PicnickerHopeBeatenText: line "strong." done -UnknownText_0x1ae320: +PicnickerHopeAfterBattleText: text "I heard CLEFAIRY" line "appear at MT.MOON." @@ -109,7 +109,7 @@ PicnickerSharonBeatenText: text "…" done -UnknownText_0x1ae369: +PicnickerSharonAfterBattleText: text "……I'll go train" line "some more…" done diff --git a/maps/Route40.asm b/maps/Route40.asm index 6ae3d5922..81891c7b9 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -40,7 +40,7 @@ TrainerSwimmerfElaine: SwimmerfElaineScript: end_if_just_battled opentext - writetext UnknownText_0x1a637b + writetext SwimmerfElaineAfterBattleText waitbutton closetext end @@ -51,7 +51,7 @@ TrainerSwimmerfPaula: SwimmerfPaulaScript: end_if_just_battled opentext - writetext UnknownText_0x1a63f5 + writetext SwimmerfPaulaAfterBattleText waitbutton closetext end @@ -62,7 +62,7 @@ TrainerSwimmermSimon: SwimmermSimonScript: end_if_just_battled opentext - writetext UnknownText_0x1a6282 + writetext SwimmermSimonAfterBattleText waitbutton closetext end @@ -73,7 +73,7 @@ TrainerSwimmermRandall: SwimmermRandallScript: end_if_just_battled opentext - writetext UnknownText_0x1a62fa + writetext SwimmermRandallAfterBattleText waitbutton closetext end @@ -177,7 +177,7 @@ SwimmermSimonBeatenText: text "OK! Uncle! I give!" done -UnknownText_0x1a6282: +SwimmermSimonAfterBattleText: text "CIANWOOD CITY is" line "a good distance" cont "away from here." @@ -195,7 +195,7 @@ SwimmermRandallBeatenText: text "Uh-oh. I lost…" done -UnknownText_0x1a62fa: +SwimmermRandallAfterBattleText: text "Swimming exercises" line "your entire body." cont "It's healthy." @@ -213,7 +213,7 @@ SwimmerfElaineBeatenText: text "I lost that one!" done -UnknownText_0x1a637b: +SwimmerfElaineAfterBattleText: text "I'd say I'm a bet-" line "ter swimmer than" cont "you. Yeah!" @@ -232,7 +232,7 @@ SwimmerfPaulaBeatenText: line "dizzy!" done -UnknownText_0x1a63f5: +SwimmerfPaulaAfterBattleText: text "While I float like" line "this, the waves" cont "carry me along." diff --git a/maps/Route41.asm b/maps/Route41.asm index 6c4b5c0d5..27c4a400e 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -23,7 +23,7 @@ TrainerSwimmerfKaylee: SwimmerfKayleeScript: end_if_just_battled opentext - writetext UnknownText_0x1a6c7f + writetext SwimmerfKayleeAfterBattleText waitbutton closetext end @@ -34,7 +34,7 @@ TrainerSwimmerfSusie: SwimmerfSusieScript: end_if_just_battled opentext - writetext UnknownText_0x1a6d11 + writetext SwimmerfSusieAfterBattleText waitbutton closetext end @@ -45,7 +45,7 @@ TrainerSwimmerfDenise: SwimmerfDeniseScript: end_if_just_battled opentext - writetext UnknownText_0x1a6d79 + writetext SwimmerfDeniseAfterBattleText waitbutton closetext end @@ -56,7 +56,7 @@ TrainerSwimmerfKara: SwimmerfKaraScript: end_if_just_battled opentext - writetext UnknownText_0x1a6e58 + writetext SwimmerfKaraAfterBattleText waitbutton closetext end @@ -67,7 +67,7 @@ TrainerSwimmerfWendy: SwimmerfWendyScript: end_if_just_battled opentext - writetext UnknownText_0x1a6ec2 + writetext SwimmerfWendyAfterBattleText waitbutton closetext end @@ -78,7 +78,7 @@ TrainerSwimmermCharlie: SwimmermCharlieScript: end_if_just_battled opentext - writetext UnknownText_0x1a696e + writetext SwimmermCharlieAfterBattleText waitbutton closetext end @@ -89,7 +89,7 @@ TrainerSwimmermGeorge: SwimmermGeorgeScript: end_if_just_battled opentext - writetext UnknownText_0x1a69d4 + writetext SwimmermGeorgeAfterBattleText waitbutton closetext end @@ -100,7 +100,7 @@ TrainerSwimmermBerke: SwimmermBerkeScript: end_if_just_battled opentext - writetext UnknownText_0x1a6aa4 + writetext SwimmermBerkeAfterBattleText waitbutton closetext end @@ -111,7 +111,7 @@ TrainerSwimmermKirk: SwimmermKirkScript: end_if_just_battled opentext - writetext UnknownText_0x1a6b6c + writetext SwimmermKirkAfterBattleText waitbutton closetext end @@ -122,7 +122,7 @@ TrainerSwimmermMathew: SwimmermMathewScript: end_if_just_battled opentext - writetext UnknownText_0x1a6bed + writetext SwimmermMathewAfterBattleText waitbutton closetext end @@ -148,7 +148,7 @@ SwimmermCharlieBeatenText: line "prune skin!" done -UnknownText_0x1a696e: +SwimmermCharlieAfterBattleText: text "Isn't it relaxing" line "just floating like" cont "this?" @@ -164,7 +164,7 @@ SwimmermGeorgeBeatenText: text "Pant, pant…" done -UnknownText_0x1a69d4: +SwimmermGeorgeAfterBattleText: text "It's so far to" line "CIANWOOD." @@ -189,7 +189,7 @@ SwimmermBerkeBeatenText: line "to your strength?" done -UnknownText_0x1a6aa4: +SwimmermBerkeAfterBattleText: text "It was a dark and" line "stormy night…" @@ -214,7 +214,7 @@ SwimmermKirkBeatenText: text "I'm beat!" done -UnknownText_0x1a6b6c: +SwimmermKirkAfterBattleText: text "The currents keep" line "me from reaching" cont "that island." @@ -231,7 +231,7 @@ SwimmermMathewBeatenText: line "great endurance!" done -UnknownText_0x1a6bed: +SwimmermMathewAfterBattleText: text "A secret about" line "WHIRL ISLANDS…" @@ -252,7 +252,7 @@ SwimmerfKayleeBeatenText: line "it?" done -UnknownText_0x1a6c7f: +SwimmerfKayleeAfterBattleText: text "There's supposed" line "to be a big #-" cont "MON deep beneath" @@ -272,7 +272,7 @@ SwimmerfSusieBeatenText: text "I'm crushed…" done -UnknownText_0x1a6d11: +SwimmerfSusieAfterBattleText: text "Wasn't there a hit" line "song about a boy" cont "riding a LAPRAS?" @@ -288,7 +288,7 @@ SwimmerfDeniseBeatenText: text "Ohhh!" done -UnknownText_0x1a6d79: +SwimmerfDeniseAfterBattleText: text "A sunburn is the" line "worst for skin." @@ -316,7 +316,7 @@ SwimmerfKaraBeatenText: line "energy than I do." done -UnknownText_0x1a6e58: +SwimmerfKaraAfterBattleText: text "I heard roars from" line "deep inside the" cont "ISLANDS." @@ -332,7 +332,7 @@ SwimmerfWendyBeatenText: text "Oh, dear…" done -UnknownText_0x1a6ec2: +SwimmerfWendyAfterBattleText: text "The clusters of" line "STARYU light up" cont "at the same time." diff --git a/maps/Route42.asm b/maps/Route42.asm index b9007bb08..cd52b8973 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -170,7 +170,7 @@ TrainerPokemaniacShane: PokemaniacShaneScript: end_if_just_battled opentext - writetext UnknownText_0x1a94d6 + writetext PokemaniacShaneAfterBattleText waitbutton closetext end @@ -181,7 +181,7 @@ TrainerHikerBenjamin: HikerBenjaminScript: end_if_just_battled opentext - writetext UnknownText_0x1a943f + writetext HikerBenjaminAfterBattleText waitbutton closetext end @@ -260,7 +260,7 @@ HikerBenjaminBeatenText: text "Gahahah!" done -UnknownText_0x1a943f: +HikerBenjaminAfterBattleText: text "Losing feels in-" line "significant if you" @@ -281,7 +281,7 @@ PokemaniacShaneBeatenText: line "my MOON STONE…" done -UnknownText_0x1a94d6: +PokemaniacShaneAfterBattleText: text "You're working on" line "a #DEX?" diff --git a/maps/Route43.asm b/maps/Route43.asm index b3c3da115..fa04dbe53 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -35,7 +35,7 @@ TrainerCamperSpencer: CamperSpencerScript: end_if_just_battled opentext - writetext UnknownText_0x19d57e + writetext CamperSpencerAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ TrainerPokemaniacBen: PokemaniacBenScript: end_if_just_battled opentext - writetext UnknownText_0x19d2d2 + writetext PokemaniacBenAfterBattleText waitbutton closetext end @@ -162,7 +162,7 @@ TrainerPokemaniacRon: PokemaniacRonScript: end_if_just_battled opentext - writetext UnknownText_0x19d3f8 + writetext PokemaniacRonAfterBattleText waitbutton closetext end @@ -173,7 +173,7 @@ TrainerFisherMarvin: FisherMarvinScript: end_if_just_battled opentext - writetext UnknownText_0x19d4d3 + writetext FisherMarvinAfterBattleText waitbutton closetext end @@ -342,7 +342,7 @@ PokemaniacBenBeatenText: line "this to me?" done -UnknownText_0x19d2d2: +PokemaniacBenAfterBattleText: text "What else do I" line "like besides" cont "#MON?" @@ -384,7 +384,7 @@ PokemaniacRonBeatenText: line "pretty right on!" done -UnknownText_0x19d3f8: +PokemaniacRonAfterBattleText: text "It's okay for" line "people to like" @@ -411,7 +411,7 @@ FisherMarvinBeatenText: line "better anyway." done -UnknownText_0x19d4d3: +FisherMarvinAfterBattleText: text "KURT's LURE BALL" line "is the best for" @@ -434,7 +434,7 @@ CamperSpencerBeatenText: line "at all…" done -UnknownText_0x19d57e: +CamperSpencerAfterBattleText: text "What is going on" line "at LAKE OF RAGE?" diff --git a/maps/Route44.asm b/maps/Route44.asm index 48d7a2eb5..b46695bc9 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -155,7 +155,7 @@ TrainerPsychicPhil: PsychicPhilScript: end_if_just_battled opentext - writetext UnknownText_0x19dcfc + writetext PsychicPhilAfterBattleText waitbutton closetext end @@ -261,7 +261,7 @@ TrainerFisherEdgar: FisherEdgarScript: end_if_just_battled opentext - writetext UnknownText_0x19db6f + writetext FisherEdgarAfterBattleText waitbutton closetext end @@ -272,7 +272,7 @@ TrainerCooltrainerfCybil: CooltrainerfCybilScript: end_if_just_battled opentext - writetext UnknownText_0x19df4d + writetext CooltrainerfCybilAfterBattleText waitbutton closetext end @@ -283,7 +283,7 @@ TrainerPokemaniacZach: PokemaniacZachScript: end_if_just_battled opentext - writetext UnknownText_0x19dd7e + writetext PokemaniacZachAfterBattleText waitbutton closetext end @@ -294,7 +294,7 @@ TrainerCooltrainermAllen: CooltrainermAllenScript: end_if_just_battled opentext - writetext UnknownText_0x19de66 + writetext CooltrainermAllenAfterBattleText waitbutton closetext end @@ -360,7 +360,7 @@ FisherEdgarBeatenText: line "This isn't right." done -UnknownText_0x19db6f: +FisherEdgarAfterBattleText: text "That's 100 wins" line "to 101 losses." @@ -412,7 +412,7 @@ PsychicPhilBeatenText: line "shocking loss…" done -UnknownText_0x19dcfc: +PsychicPhilAfterBattleText: text "It's important to" line "have conviction" cont "on your side." @@ -429,7 +429,7 @@ PokemaniacZachBeatenText: line "are so appealing." done -UnknownText_0x19dd7e: +PokemaniacZachAfterBattleText: text "If a #MON has" line "different colors" @@ -455,7 +455,7 @@ CooltrainermAllenBeatenText: line "loss on my part." done -UnknownText_0x19de66: +CooltrainermAllenAfterBattleText: text "Wow. You have a" line "lot of BADGES." @@ -485,7 +485,7 @@ CooltrainerfCybilBeatenText: line "do at all." done -UnknownText_0x19df4d: +CooltrainerfCybilAfterBattleText: text "We all get better" line "by experiencing" cont "many battles." diff --git a/maps/Route45.asm b/maps/Route45.asm index 67459ad8b..615cb0606 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -130,7 +130,7 @@ TrainerHikerErik: HikerErikScript: end_if_just_battled opentext - writetext UnknownText_0x19e301 + writetext HikerErikAfterBattleText waitbutton closetext end @@ -141,7 +141,7 @@ TrainerHikerMichael: HikerMichaelScript: end_if_just_battled opentext - writetext UnknownText_0x19e3b1 + writetext HikerMichaelAfterBattleText waitbutton closetext end @@ -238,7 +238,7 @@ TrainerHikerTimothy: HikerTimothyScript: end_if_just_battled opentext - writetext UnknownText_0x19e4f1 + writetext HikerTimothyAfterBattleText waitbutton closetext end @@ -249,7 +249,7 @@ TrainerCooltrainermRyan: CooltrainermRyanScript: end_if_just_battled opentext - writetext UnknownText_0x19e70d + writetext CooltrainermRyanAfterBattleText waitbutton closetext end @@ -260,7 +260,7 @@ TrainerCooltrainerfKelly: CooltrainerfKellyScript: end_if_just_battled opentext - writetext UnknownText_0x19e7d1 + writetext CooltrainerfKellyAfterBattleText waitbutton closetext end @@ -328,7 +328,7 @@ HikerErikBeatenText: text "Oh, I lost that!" done -UnknownText_0x19e301: +HikerErikAfterBattleText: text "I'll head back to" line "BLACKTHORN's ICE" @@ -350,7 +350,7 @@ HikerMichaelBeatenText: line "spunky enough!" done -UnknownText_0x19e3b1: +HikerMichaelAfterBattleText: text "Boy, do I love" line "HP UP! Mmmm, yum!" @@ -397,7 +397,7 @@ HikerTimothyBeatenText: line "They're there too!" done -UnknownText_0x19e4f1: +HikerTimothyAfterBattleText: text "The best thing to" line "ever happen to me" @@ -467,7 +467,7 @@ CooltrainermRyanBeatenText: line "respect." done -UnknownText_0x19e70d: +CooltrainermRyanAfterBattleText: text "I see you're rais-" line "ing your #MON" cont "with care." @@ -490,7 +490,7 @@ CooltrainerfKellyBeatenText: text "Fine. I lost." done -UnknownText_0x19e7d1: +CooltrainerfKellyAfterBattleText: text "I'm not in favor" line "of overly power-" cont "ful moves." diff --git a/maps/Route46.asm b/maps/Route46.asm index ce4d4d5ec..f84563a6d 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -19,7 +19,7 @@ TrainerCamperTed: CamperTedScript: end_if_just_battled opentext - writetext UnknownText_0x1a9851 + writetext CamperTedAfterBattleText waitbutton closetext end @@ -153,7 +153,7 @@ TrainerHikerBailey: HikerBaileyScript: end_if_just_battled opentext - writetext UnknownText_0x1a97e8 + writetext HikerBaileyAfterBattleText waitbutton closetext end @@ -181,7 +181,7 @@ HikerBaileyBeatenText: line "me your power!" done -UnknownText_0x1a97e8: +HikerBaileyAfterBattleText: text "It's over. I don't" line "mind. We HIKERS" cont "are like that." @@ -199,7 +199,7 @@ CamperTedBeatenText: text "Wha…?" done -UnknownText_0x1a9851: +CamperTedAfterBattleText: text "I did my best but" line "came up short." diff --git a/maps/Route6.asm b/maps/Route6.asm index 335980dca..34c03ca0f 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -16,7 +16,7 @@ TrainerPokefanmRex: PokefanmRexScript: end_if_just_battled opentext - writetext UnknownText_0x1ad9ff + writetext PokefanmRexAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerPokefanmAllan: PokefanmAllanScript: end_if_just_battled opentext - writetext UnknownText_0x1ada88 + writetext PokefanmAllanAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ PokefanmRexBeatenText: text "My PHANPY!" done -UnknownText_0x1ad9ff: +PokefanmRexAfterBattleText: text "Look how adorable" line "my PHANPY acts!" @@ -82,7 +82,7 @@ PokefanmAllanBeatenText: text "My TEDDIURSA!" done -UnknownText_0x1ada88: +PokefanmAllanAfterBattleText: text "Look how adorable" line "my TEDDIURSA acts!" diff --git a/maps/Route8.asm b/maps/Route8.asm index 67318446c..3863041d9 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -19,7 +19,7 @@ TrainerBikerDwayne: BikerDwayneScript: end_if_just_battled opentext - writetext UnknownText_0x6c0c8 + writetext BikerDwayneAfterBattleText waitbutton closetext end @@ -30,7 +30,7 @@ TrainerBikerHarris: BikerHarrisScript: end_if_just_battled opentext - writetext UnknownText_0x6c143 + writetext BikerHarrisAfterBattleText waitbutton closetext end @@ -41,7 +41,7 @@ TrainerBikerZeke: BikerZekeScript: end_if_just_battled opentext - writetext UnknownText_0x6c1a3 + writetext BikerZekeAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ TrainerSupernerdSam: SupernerdSamScript: end_if_just_battled opentext - writetext UnknownText_0x6c219 + writetext SupernerdSamAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ TrainerSupernerdTom: SupernerdTomScript: end_if_just_battled opentext - writetext UnknownText_0x6c27e + writetext SupernerdTomAfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ BikerDwayneBeatenText: text "S-sorry!" done -UnknownText_0x6c0c8: +BikerDwayneAfterBattleText: text "The KANTO #MON" line "FEDERATION will" cont "never fall!" @@ -108,7 +108,7 @@ BikerHarrisBeatenText: text "F-forgive me!" done -UnknownText_0x6c143: +BikerHarrisAfterBattleText: text "Wiped out by some" line "punk from JOHTO…" done @@ -124,7 +124,7 @@ BikerZekeBeatenText: text "Yikes! Sorry!" done -UnknownText_0x6c1a3: +BikerZekeAfterBattleText: text "We'll try not to" line "disturb anyone" cont "from now on…" @@ -140,7 +140,7 @@ SupernerdSamBeatenText: line "the MAGNET TRAIN…" done -UnknownText_0x6c219: +SupernerdSamAfterBattleText: text "The power of mag-" line "nets is awesome!" done @@ -155,7 +155,7 @@ SupernerdTomBeatenText: line "You're tough!" done -UnknownText_0x6c27e: +SupernerdTomAfterBattleText: text "GYM BADGES give" line "you advantages in" cont "battles." diff --git a/maps/Route9.asm b/maps/Route9.asm index a8842e17b..baad4738d 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -19,7 +19,7 @@ TrainerCamperDean: CamperDeanScript: end_if_just_battled opentext - writetext UnknownText_0x1aafd9 + writetext CamperDeanAfterBattleText waitbutton closetext end @@ -30,7 +30,7 @@ TrainerPicnickerHeidi: PicnickerHeidiScript: end_if_just_battled opentext - writetext UnknownText_0x1ab07c + writetext PicnickerHeidiAfterBattleText waitbutton closetext end @@ -41,7 +41,7 @@ TrainerCamperSid: CamperSidScript: end_if_just_battled opentext - writetext UnknownText_0x1ab0f6 + writetext CamperSidAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ TrainerPicnickerEdna: PicnickerEdnaScript: end_if_just_battled opentext - writetext UnknownText_0x1ab15f + writetext PicnickerEdnaAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ TrainerHikerTim: HikerTimScript: end_if_just_battled opentext - writetext UnknownText_0x1ab210 + writetext HikerTimAfterBattleText waitbutton closetext end @@ -74,7 +74,7 @@ TrainerHikerSidney: HikerSidneyScript: end_if_just_battled opentext - writetext UnknownText_0x1ab278 + writetext HikerSidneyAfterBattleText waitbutton closetext end @@ -95,7 +95,7 @@ CamperDeanBeatenText: text "Whoa! Danger, man." done -UnknownText_0x1aafd9: +CamperDeanAfterBattleText: text "My #MON were" line "hurt before even" @@ -119,7 +119,7 @@ PicnickerHeidiBeatenText: text "Ohhhh!" done -UnknownText_0x1ab07c: +PicnickerHeidiAfterBattleText: text "We bake lots of" line "goodies and share" @@ -137,7 +137,7 @@ CamperSidBeatenText: line "ing out…" done -UnknownText_0x1ab0f6: +CamperSidAfterBattleText: text "Sorry. You weren't" line "littering. It was" cont "my mistake." @@ -153,7 +153,7 @@ PicnickerEdnaBeatenText: text "Ohh… I lost…" done -UnknownText_0x1ab15f: +PicnickerEdnaAfterBattleText: text "Conserving energy" line "is important, but" @@ -175,7 +175,7 @@ HikerTimBeatenText: line "singing…" done -UnknownText_0x1ab210: +HikerTimAfterBattleText: text "Battles are about" line "concentration." done @@ -193,7 +193,7 @@ HikerSidneyBeatenText: line "I lost that…" done -UnknownText_0x1ab278: +HikerSidneyAfterBattleText: text "The POWER PLANT is" line "across a small" cont "river." diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 5159266ba..e291a3d73 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -112,7 +112,7 @@ TrainerPsychicNathan: PsychicNathanScript: end_if_just_battled opentext - writetext UnknownText_0x5830e + writetext PsychicNathanAfterBattleText waitbutton closetext end @@ -225,7 +225,7 @@ PsychicNathanBeatenText: text "…" done -UnknownText_0x5830e: +PsychicNathanAfterBattleText: text "I like thinking" line "here." done diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 8e7dce341..88dec668e 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -52,7 +52,7 @@ TrainerMediumRebecca: MediumRebeccaScript: end_if_just_battled opentext - writetext UnknownText_0x18a034 + writetext MediumRebeccaAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ TrainerPsychicFranklin: PsychicFranklinScript: end_if_just_battled opentext - writetext UnknownText_0x18a0a6 + writetext PsychicFranklinAfterBattleText waitbutton closetext end @@ -74,7 +74,7 @@ TrainerMediumDoris: MediumDorisScript: end_if_just_battled opentext - writetext UnknownText_0x18a136 + writetext MediumDorisAfterBattleText waitbutton closetext end @@ -85,7 +85,7 @@ TrainerPsychicJared: PsychicJaredScript: end_if_just_battled opentext - writetext UnknownText_0x18a1b3 + writetext PsychicJaredAfterBattleText waitbutton closetext end @@ -206,7 +206,7 @@ MediumRebeccaBeatenText: line "Far too strong…" done -UnknownText_0x18a034: +MediumRebeccaAfterBattleText: text "What is the source" line "of your power?" done @@ -222,7 +222,7 @@ PsychicFranklinBeatenText: line "power than mine!" done -UnknownText_0x18a0a6: +PsychicFranklinAfterBattleText: text "You made your soul" line "stronger, not just" cont "your abilities." @@ -241,7 +241,7 @@ MediumDorisBeatenText: line "I still lost…" done -UnknownText_0x18a136: +MediumDorisAfterBattleText: text "Darn! I forgot" line "that I predicted I" cont "would lose to you." @@ -257,7 +257,7 @@ PsychicJaredBeatenText: text "I was no match…" done -UnknownText_0x18a1b3: +PsychicJaredAfterBattleText: text "KARATE KING, the" line "master of the" diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 5714d6340..5587d486f 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -25,7 +25,7 @@ TrainerGruntM29: GruntM29Script: end_if_just_battled opentext - writetext TrainerGruntM29SlowpokeProfitText + writetext GruntM29AfterBattleText waitbutton closetext end @@ -79,7 +79,7 @@ TrainerGruntM2: GruntM2Script: end_if_just_battled opentext - writetext UnknownText_0x5aaf2 + writetext GruntM2AfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ TrainerGruntF1: GruntF1Script: end_if_just_battled opentext - writetext UnknownText_0x5ab8d + writetext GruntF1AfterBattleText waitbutton closetext end @@ -207,7 +207,7 @@ GruntM29BeatenText: line "my day!" done -TrainerGruntM29SlowpokeProfitText: +GruntM29AfterBattleText: text "Sure, we've been" line "hacking the tails" @@ -266,7 +266,7 @@ GruntM2BeatenText: line "Too strong…" done -UnknownText_0x5aaf2: +GruntM2AfterBattleText: text "We need the money," line "but selling SLOW-" cont "POKETAILS?" @@ -286,7 +286,7 @@ GruntF1BeatenText: text "You rotten brat!" done -UnknownText_0x5ab8d: +GruntF1AfterBattleText: text "SLOWPOKETAILS" line "grow back fast!" diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index e32946903..a3b298052 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -31,7 +31,7 @@ TrainerSageChow: SageChowScript: end_if_just_battled opentext - writetext UnknownText_0x184583 + writetext SageChowAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ SageChowBeatenText: text "Th-Thank you!" done -UnknownText_0x184583: +SageChowAfterBattleText: text "All living beings" line "coexist through" cont "cooperation." diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 621693f99..788c7bc34 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -16,7 +16,7 @@ TrainerSageNico: SageNicoScript: end_if_just_battled opentext - writetext UnknownText_0x1847ff + writetext SageNicoAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerSageEdmond: SageEdmondScript: end_if_just_battled opentext - writetext UnknownText_0x18486f + writetext SageEdmondAfterBattleText waitbutton closetext end @@ -49,7 +49,7 @@ SageNicoBeatenText: line "I'm too weak." done -UnknownText_0x1847ff: +SageNicoAfterBattleText: text "The flexible pil-" line "lar protects the" @@ -66,7 +66,7 @@ SageEdmondBeatenText: text "Oh, I'm weak!" done -UnknownText_0x18486f: +SageEdmondAfterBattleText: text "I tried to copy" line "BELLSPROUT's" diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index ee6420d35..f0129e5ce 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -100,7 +100,7 @@ TrainerSageJin: SageJinScript: end_if_just_battled opentext - writetext UnknownText_0x184dfa + writetext SageJinAfterBattleText waitbutton closetext end @@ -111,7 +111,7 @@ TrainerSageTroy: SageTroyScript: end_if_just_battled opentext - writetext UnknownText_0x184ea4 + writetext SageTroyAfterBattleText waitbutton closetext end @@ -122,7 +122,7 @@ TrainerSageNeal: SageNealScript: end_if_just_battled opentext - writetext UnknownText_0x184f12 + writetext SageNealAfterBattleText waitbutton closetext end @@ -274,7 +274,7 @@ SageJinBeatenText: line "incomplete…" done -UnknownText_0x184dfa: +SageJinAfterBattleText: text "As #MON grow" line "stronger, so does" cont "the trainer." @@ -297,7 +297,7 @@ SageTroyBeatenText: line "real!" done -UnknownText_0x184ea4: +SageTroyAfterBattleText: text "It is not far to" line "the ELDER." done @@ -313,7 +313,7 @@ SageNealBeatenText: line "is bright!" done -UnknownText_0x184f12: +SageNealAfterBattleText: text "Let there be light" line "on your journey." done diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index a4fff5e88..ea699ea1b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -491,7 +491,7 @@ TrainerScientistJed: ScientistJedScript: end_if_just_battled opentext - writetext UnknownText_0x6cc16 + writetext ScientistJedAfterBattleText waitbutton closetext end @@ -502,7 +502,7 @@ TrainerGruntM16: GruntM16Script: end_if_just_battled opentext - writetext UnknownText_0x6cd1b + writetext GruntM16AfterBattleText waitbutton closetext end @@ -673,7 +673,7 @@ ScientistJedBeatenText: text "I get it…" done -UnknownText_0x6cc16: +ScientistJedAfterBattleText: text "All right. I'll" line "divulge a secret" cont "about our hideout." @@ -704,7 +704,7 @@ GruntM16BeatenText: text "Kaboom!" done -UnknownText_0x6cd1b: +GruntM16AfterBattleText: text "I don't even know" line "where the traps" cont "are planted." diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index d3e208e99..9c3e00a9b 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -199,7 +199,7 @@ TrainerGruntM17: GruntM17Script: end_if_just_battled opentext - writetext UnknownText_0x6db88 + writetext GruntM17AfterBattleText waitbutton closetext end @@ -210,7 +210,7 @@ TrainerGruntM18: GruntM18Script: end_if_just_battled opentext - writetext UnknownText_0x6dc1a + writetext GruntM18AfterBattleText waitbutton closetext end @@ -221,7 +221,7 @@ TrainerGruntM19: GruntM19Script: end_if_just_battled opentext - writetext UnknownText_0x6dcd1 + writetext GruntM19AfterBattleText waitbutton closetext end @@ -826,7 +826,7 @@ GruntM17BeatenText: text "What? I lost?" done -UnknownText_0x6db88: +GruntM17AfterBattleText: text "Heh, I'm just a" line "GRUNT." @@ -847,7 +847,7 @@ GruntM18BeatenText: text "I knew I'd lose…" done -UnknownText_0x6dc1a: +GruntM18AfterBattleText: text "I got wiped out on" line "the last mission" cont "by a kid too." @@ -871,7 +871,7 @@ GruntM19BeatenText: text "Grrrr…" done -UnknownText_0x6dcd1: +GruntM19AfterBattleText: text "Heh, only the boss" line "knows the password" cont "for that door." diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index c08d004b5..473e1d281 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -138,7 +138,7 @@ SlowpokeTailGrunt: GruntF5Script: end_if_just_battled opentext - writetext UnknownText_0x6e611 + writetext GruntF5AfterBattleText waitbutton closetext setevent EVENT_LEARNED_SLOWPOKETAIL @@ -150,7 +150,7 @@ RaticateTailGrunt: GruntM28Script: end_if_just_battled opentext - writetext UnknownText_0x6e737 + writetext GruntM28AfterBattleText waitbutton closetext setevent EVENT_LEARNED_RATICATE_TAIL @@ -162,7 +162,7 @@ TrainerScientistRoss: ScientistRossScript: end_if_just_battled opentext - writetext UnknownText_0x6e822 + writetext ScientistRossAfterBattleText waitbutton closetext end @@ -173,7 +173,7 @@ TrainerScientistMitch: ScientistMitchScript: end_if_just_battled opentext - writetext UnknownText_0x6e90a + writetext ScientistMitchAfterBattleText waitbutton closetext end @@ -456,7 +456,7 @@ GruntF5BeatenText: line "I'll tell you." done -UnknownText_0x6e611: +GruntF5AfterBattleText: text "The password to" line "the boss's room is" @@ -490,7 +490,7 @@ GruntM28BeatenText: line "You're good!" done -UnknownText_0x6e737: +GruntM28AfterBattleText: text "Hyuck-hyuck-hyuck!" para "The password to" @@ -517,7 +517,7 @@ ScientistRossBeatenText: line "error cost me…" done -UnknownText_0x6e822: +ScientistRossAfterBattleText: text "A radio signal" line "that drives #-" cont "MON mad…" @@ -544,7 +544,7 @@ ScientistMitchBeatenText: cont "battling." done -UnknownText_0x6e90a: +ScientistMitchAfterBattleText: text "If we turn up the" line "power of our radio" diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 66d9a417f..1354f2753 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -216,7 +216,7 @@ TrainerGruntM11: GruntM11Script: end_if_just_battled opentext - writetext GruntM11AfterText + writetext GruntM11AfterBattleText waitbutton closetext end @@ -227,7 +227,7 @@ TrainerGruntM25: GruntM25Script: end_if_just_battled opentext - writetext GruntM25AfterText + writetext GruntM25AfterBattleText waitbutton closetext end @@ -238,7 +238,7 @@ TrainerBurglarDuncan: BurglarDuncanScript: end_if_just_battled opentext - writetext BurglarDuncanAfterText + writetext BurglarDuncanAfterBattleText waitbutton closetext end @@ -249,7 +249,7 @@ TrainerBurglarEddie: BurglarEddieScript: end_if_just_battled opentext - writetext BurglarEddieAfterText + writetext BurglarEddieAfterBattleText waitbutton closetext end @@ -260,7 +260,7 @@ TrainerGruntM13: GruntM13Script: end_if_just_battled opentext - writetext GruntM13AfterText + writetext GruntM13AfterBattleText waitbutton closetext end @@ -271,7 +271,7 @@ TrainerGruntF3: GruntF3Script: end_if_just_battled opentext - writetext GruntF3AfterText + writetext GruntF3AfterBattleText waitbutton closetext end @@ -790,7 +790,7 @@ GruntM11BeatenText: line "by indecision!" done -GruntM11AfterText: +GruntM11AfterBattleText: text "I'm confused too…" line "The switch on the" @@ -814,7 +814,7 @@ GruntM25BeatenText: line "I blew it." done -GruntM25AfterText: +GruntM25AfterBattleText: text "All right. A hint!" para "Change the order" @@ -834,7 +834,7 @@ BurglarDuncanBeatenText: text "Mercy!" done -BurglarDuncanAfterText: +BurglarDuncanAfterBattleText: text "Steal and sell!" line "That's basic in" cont "crime, kid!" @@ -853,7 +853,7 @@ BurglarEddieBeatenText: text "Over the top!" done -BurglarEddieAfterText: +BurglarEddieAfterBattleText: text "UNDERGROUND WARE-" line "HOUSE?" @@ -878,7 +878,7 @@ GruntM13BeatenText: line "you're cool, huh?" done -GruntM13AfterText: +GruntM13AfterBattleText: text "You must have ice" line "in your veins to" cont "dis TEAM ROCKET." @@ -905,7 +905,7 @@ GruntF3BeatenText: text "How could you?" done -GruntF3AfterText: +GruntF3AfterBattleText: text "Go wherever you'd" line "like! Get lost!" cont "See if I care!" diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 943a042c1..60a87339c 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -44,7 +44,7 @@ TrainerGruntM24: GruntM24Script: end_if_just_battled opentext - writetext UnknownText_0x7da48 + writetext GruntM24AfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ TrainerGruntM14: GruntM14Script: end_if_just_battled opentext - writetext UnknownText_0x7db01 + writetext GruntM14AfterBattleText waitbutton closetext end @@ -66,7 +66,7 @@ TrainerGruntM15: GruntM15Script: end_if_just_battled opentext - writetext UnknownText_0x7db8e + writetext GruntM15AfterBattleText waitbutton closetext end @@ -113,7 +113,7 @@ GruntM24BeatenText: text "I got disposed of…" done -UnknownText_0x7da48: +GruntM24AfterBattleText: text "TEAM ROCKET will" line "keep going, wait-" cont "ing for the return" @@ -136,7 +136,7 @@ GruntM14BeatenText: text "Blast it!" done -UnknownText_0x7db01: +GruntM14AfterBattleText: text "I lost…" para "Please forgive me," @@ -156,7 +156,7 @@ GruntM15BeatenText: line "So, that's how?" done -UnknownText_0x7db8e: +GruntM15AfterBattleText: text "Hyuck-hyuck-hyuck!" line "That was a blast!" cont "I'll remember you!" diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 01875f6ae..cdf26ed82 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -22,7 +22,7 @@ TrainerPokemaniacLarry: PokemaniacLarryScript: end_if_just_battled opentext - writetext UnknownText_0x59d31 + writetext PokemaniacLarryAfterBattleText waitbutton closetext end @@ -33,7 +33,7 @@ TrainerHikerRussell: HikerRussellScript: end_if_just_battled opentext - writetext UnknownText_0x59c6c + writetext HikerRussellAfterBattleText waitbutton closetext end @@ -44,7 +44,7 @@ TrainerHikerDaniel: HikerDanielScript: end_if_just_battled opentext - writetext UnknownText_0x59dc9 + writetext HikerDanielAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ TrainerFirebreatherBill: FirebreatherBillScript: end_if_just_battled opentext - writetext UnknownText_0x59e6f + writetext FirebreatherBillAfterBattleText waitbutton closetext end @@ -66,7 +66,7 @@ TrainerFirebreatherRay: FirebreatherRayScript: end_if_just_battled opentext - writetext UnknownText_0x59efc + writetext FirebreatherRayAfterBattleText waitbutton closetext end @@ -99,7 +99,7 @@ HikerRussellBeatenText: text "Oh, oh, oh!" done -UnknownText_0x59c6c: +HikerRussellAfterBattleText: text "All right, then!" line "I've decided." @@ -125,7 +125,7 @@ PokemaniacLarryBeatenText: line "MON…" done -UnknownText_0x59d31: +PokemaniacLarryAfterBattleText: text "Every Friday, you" line "can hear #MON" @@ -146,7 +146,7 @@ HikerDanielBeatenText: line "big time!" done -UnknownText_0x59dc9: +HikerDanielAfterBattleText: text "I was conned into" line "buying a SLOWPOKE-" cont "TAIL." @@ -168,7 +168,7 @@ FirebreatherBillBeatenText: text "I flamed out!" done -UnknownText_0x59e6f: +FirebreatherBillAfterBattleText: text "On weekends, you" line "can hear strange" @@ -189,7 +189,7 @@ FirebreatherRayBeatenText: text "FLASH!" done -UnknownText_0x59efc: +FirebreatherRayAfterBattleText: text "It's my #MON's" line "fire that lights" cont "up this cave." diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 26295aab0..e498dbeea 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -20,7 +20,7 @@ TrainerPokemaniacAndrew: PokemaniacAndrewScript: end_if_just_battled opentext - writetext UnknownText_0x5a181 + writetext PokemaniacAndrewAfterBattleText waitbutton closetext end @@ -31,7 +31,7 @@ TrainerPokemaniacCalvin: PokemaniacCalvinScript: end_if_just_battled opentext - writetext UnknownText_0x5a230 + writetext PokemaniacCalvinAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ TrainerHikerPhillip: HikerPhillipScript: end_if_just_battled opentext - writetext UnknownText_0x5a073 + writetext HikerPhillipAfterBattleText waitbutton closetext end @@ -53,7 +53,7 @@ TrainerHikerLeonard: HikerLeonardScript: end_if_just_battled opentext - writetext UnknownText_0x5a0fb + writetext HikerLeonardAfterBattleText waitbutton closetext end @@ -80,7 +80,7 @@ HikerPhillipBeatenText: text "Uurggh…" done -UnknownText_0x5a073: +HikerPhillipAfterBattleText: text "I've been lost for" line "a long time…" @@ -99,7 +99,7 @@ HikerLeonardBeatenText: line "feisty one!" done -UnknownText_0x5a0fb: +HikerLeonardAfterBattleText: text "I live down here." para "You can, too, if" @@ -121,7 +121,7 @@ PokemaniacAndrewBeatenText: line "Go away!" done -UnknownText_0x5a181: +PokemaniacAndrewAfterBattleText: text "Just me and my" line "#MON. I'm de-" cont "lirious with joy." @@ -142,7 +142,7 @@ PokemaniacCalvinBeatenText: line "on me!" done -UnknownText_0x5a230: +PokemaniacCalvinAfterBattleText: text "I should compile" line "and announce my" cont "study findings." diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 68b3147f9..f0f49cf27 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -46,7 +46,7 @@ TrainerCooltrainermNick: CooltrainermNickScript: end_if_just_battled opentext - writetext UnknownText_0x5a3f0 + writetext CooltrainermNickAfterBattleText waitbutton closetext end @@ -57,7 +57,7 @@ TrainerCooltrainerfGwen: CooltrainerfGwenScript: end_if_just_battled opentext - writetext UnknownText_0x5a488 + writetext CooltrainerfGwenAfterBattleText waitbutton closetext end @@ -68,7 +68,7 @@ TrainerCooltrainerfEmma: CooltrainerfEmmaScript: end_if_just_battled opentext - writetext UnknownText_0x5a52b + writetext CooltrainerfEmmaAfterBattleText waitbutton closetext end @@ -96,7 +96,7 @@ CooltrainermNickBeatenText: line "dazzling style!" done -UnknownText_0x5a3f0: +CooltrainermNickAfterBattleText: text "Your #MON style" line "is stunning and" cont "colorful, I admit." @@ -115,7 +115,7 @@ CooltrainerfGwenBeatenText: line "too good for me." done -UnknownText_0x5a488: +CooltrainerfGwenAfterBattleText: text "I'm going to train" line "by myself until I" cont "improve." @@ -135,7 +135,7 @@ CooltrainerfEmmaBeatenText: line "babies than this!" done -UnknownText_0x5a52b: +CooltrainerfEmmaAfterBattleText: text "Just once a week," line "a #MON comes to" cont "the water's edge." diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 4a2af8fc1..7b03bc3ff 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -50,7 +50,7 @@ TrainerGentlemanGregory: GentlemanGregoryScript: end_if_just_battled opentext - writetext UnknownText_0x1923b0 + writetext GentlemanGregoryAfterBattleText waitbutton closetext end @@ -61,7 +61,7 @@ TrainerGuitaristVincent: GuitaristVincentScript: end_if_just_battled opentext - writetext UnknownText_0x19244b + writetext GuitaristVincentAfterBattleText waitbutton closetext end @@ -72,7 +72,7 @@ TrainerJugglerHorton: JugglerHortonScript: end_if_just_battled opentext - writetext UnknownText_0x1924d6 + writetext JugglerHortonAfterBattleText waitbutton closetext end @@ -175,7 +175,7 @@ GentlemanGregoryBeatenText: cont "sir!" done -UnknownText_0x1923b0: +GentlemanGregoryAfterBattleText: text "When I was still" line "in the army, LT." @@ -198,7 +198,7 @@ GuitaristVincentBeatenText: text "Ooh, how shocking!" done -UnknownText_0x19244b: +GuitaristVincentAfterBattleText: text "If the GYM's traps" line "were working, you" @@ -217,7 +217,7 @@ JugglerHortonBeatenText: line "I was overpowered…" done -UnknownText_0x1924d6: +JugglerHortonAfterBattleText: text "Don't get too com-" line "fortable about" diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index b67784821..4fd845c36 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -72,7 +72,7 @@ TrainerBird_keeperRod: Bird_keeperRodScript: end_if_just_battled opentext - writetext UnknownText_0x68837 + writetext Bird_keeperRodAfterBattleText waitbutton closetext end @@ -83,7 +83,7 @@ TrainerBird_keeperAbe: Bird_keeperAbeScript: end_if_just_battled opentext - writetext UnknownText_0x688c7 + writetext Bird_keeperAbeAfterBattleText waitbutton closetext end @@ -226,7 +226,7 @@ Bird_keeperRodBeatenText: text "Gaaah!" done -UnknownText_0x68837: +Bird_keeperRodAfterBattleText: text "FALKNER's skills" line "are for real!" @@ -246,7 +246,7 @@ Bird_keeperAbeBeatenText: line "true!" done -UnknownText_0x688c7: +Bird_keeperAbeAfterBattleText: text "This is pathetic," line "losing to some" cont "rookie trainer…" diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 402e41294..39da084b4 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -121,7 +121,7 @@ TrainerSupernerdEric: SupernerdEricScript: end_if_just_battled opentext - writetext UnknownText_0x7c36c + writetext SupernerdEricAfterBattleText waitbutton closetext end @@ -132,7 +132,7 @@ TrainerSupernerdTeru: SupernerdTeruScript: end_if_just_battled opentext - writetext UnknownText_0x7c410 + writetext SupernerdTeruAfterBattleText waitbutton closetext end @@ -143,7 +143,7 @@ TrainerPokemaniacIssac: PokemaniacIssacScript: end_if_just_battled opentext - writetext UnknownText_0x7c498 + writetext PokemaniacIssacAfterBattleText waitbutton closetext end @@ -154,7 +154,7 @@ TrainerPokemaniacDonald: PokemaniacDonaldScript: end_if_just_battled opentext - writetext UnknownText_0x7c52f + writetext PokemaniacDonaldAfterBattleText waitbutton closetext end @@ -439,7 +439,7 @@ SupernerdEricBeatenText: text "…Grumble…" done -UnknownText_0x7c36c: +SupernerdEricAfterBattleText: text "I guess I have to" line "do things fair and" cont "square…" @@ -461,7 +461,7 @@ SupernerdTeruBeatenText: text "Ow, ow, ow!" done -UnknownText_0x7c410: +SupernerdTeruAfterBattleText: text "I know my #MON" line "type alignments." @@ -481,7 +481,7 @@ PokemaniacIssacBeatenText: text "Aiyeeee!" done -UnknownText_0x7c498: +PokemaniacIssacAfterBattleText: text "Your #MON will" line "like you more if" @@ -502,7 +502,7 @@ PokemaniacDonaldBeatenText: line "That makes me mad!" done -UnknownText_0x7c52f: +PokemaniacDonaldAfterBattleText: text "Are you making a" line "#DEX? Here's a" cont "hot tip."