From 5574ec64ca662d76ef0eac8e2c6812c49700fed7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 19 Aug 2018 13:56:41 -0400 Subject: [PATCH] Label some Unknown map text --- maps/CeruleanGym.asm | 36 +++++++++++++------------- maps/EcruteakGym.asm | 16 ++++++------ maps/ElmsLab.asm | 4 +-- maps/GoldenrodUndergroundWarehouse.asm | 12 ++++----- maps/IlexForest.asm | 8 +++--- maps/MahoganyTown.asm | 24 ++++++++--------- maps/OlivineCity.asm | 6 ++--- maps/PewterGym.asm | 20 +++++++------- maps/Route26HealHouse.asm | 8 +++--- maps/Route29.asm | 4 +-- maps/SaffronGym.asm | 20 +++++++------- maps/SeafoamGym.asm | 20 +++++++------- maps/SproutTower3F.asm | 4 +-- maps/VermilionGym.asm | 20 +++++++------- maps/VioletGym.asm | 24 ++++++++--------- 15 files changed, 113 insertions(+), 113 deletions(-) diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 4fff92cdf..9c75c5661 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -26,18 +26,18 @@ CeruleanGym_MapScripts: applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement playmusic MUSIC_ROCKET_ENCOUNTER opentext - writetext UnknownText_0x1884fb + writetext CeruleanGymGruntIntroText waitbutton closetext showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15 applymovement CERULEANGYM_ROCKET, CeruleanGymGruntBacksAwayMovement opentext - writetext UnknownText_0x188574 + writetext CeruleanGymGruntBigMistakeText waitbutton closetext applymovement CERULEANGYM_ROCKET, CeruleanGymGruntMovesCloseMovement opentext - writetext UnknownText_0x1885a5 + writetext CeruleanGymGruntByeText waitbutton closetext applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsOutMovement @@ -61,10 +61,10 @@ CeruleanGymMistyScript: opentext checkflag ENGINE_CASCADEBADGE iftrue .FightDone - writetext UnknownText_0x188674 + writetext MistyIntroText waitbutton closetext - winlosstext UnknownText_0x18870c, 0 + winlosstext MistyWinLossText, 0 loadtrainer MISTY, MISTY1 startbattle reloadmapafterbattle @@ -73,12 +73,12 @@ CeruleanGymMistyScript: setevent EVENT_BEAT_SWIMMERF_BRIANA setevent EVENT_BEAT_SWIMMERM_PARKER opentext - writetext UnknownText_0x188768 + writetext ReceivedCascadeBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_CASCADEBADGE .FightDone: - writetext UnknownText_0x188782 + writetext MistyFightDoneText waitbutton closetext end @@ -139,7 +139,7 @@ CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue opentext - writetext CeruleanGymNote1 + writetext CeruleanGymNote1Text waitbutton closetext end @@ -148,7 +148,7 @@ CeruleanGymStatue2: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue opentext - writetext CeruleanGymNote2 + writetext CeruleanGymNote2Text waitbutton closetext end @@ -195,7 +195,7 @@ CeruleanGymGruntBacksAwayMovement: remove_fixed_facing step_end -UnknownText_0x1884fb: +CeruleanGymGruntIntroText: text "Oops! I so sorry!" line "You not hurt," cont "okay?" @@ -207,13 +207,13 @@ UnknownText_0x1884fb: cont "seen by somebody." done -UnknownText_0x188574: +CeruleanGymGruntBigMistakeText: text "Oh no! You seen" line "me already! I make" cont "big mistake!" done -UnknownText_0x1885a5: +CeruleanGymGruntByeText: text "Hey, you! Forget" line "you see me, okay?" @@ -226,19 +226,19 @@ UnknownText_0x1885a5: para "Bye-bye a go-go!" done -CeruleanGymNote1: +CeruleanGymNote1Text: text "Sorry, I'll be out" line "for a while." cont "MISTY, GYM LEADER" done -CeruleanGymNote2: +CeruleanGymNote2Text: text "Since MISTY's out," line "we'll be away too." cont "GYM TRAINERS" done -UnknownText_0x188674: +MistyIntroText: text "MISTY: I was ex-" line "pecting you, you" cont "pest!" @@ -254,7 +254,7 @@ UnknownText_0x188674: line "#MON are tough!" done -UnknownText_0x18870c: +MistyWinLossText: text "MISTY: You really" line "are good…" @@ -265,12 +265,12 @@ UnknownText_0x18870c: line "CASCADEBADGE." done -UnknownText_0x188768: +ReceivedCascadeBadgeText: text " received" line "CASCADEBADGE." done -UnknownText_0x188782: +MistyFightDoneText: text "MISTY: Are there" line "many strong train-" cont "ers in JOHTO? Like" diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 4dd709ec5..8d86f5771 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -26,10 +26,10 @@ EcruteakGymMortyScript: opentext checkevent EVENT_BEAT_MORTY iftrue .FightDone - writetext UnknownText_0x99e65 + writetext MortyIntroText waitbutton closetext - winlosstext UnknownText_0x9a00a, 0 + winlosstext MortyWinLossText, 0 loadtrainer MORTY, MORTY1 startbattle reloadmapafterbattle @@ -62,7 +62,7 @@ EcruteakGymMortyScript: end .GotShadowBall: - writetext UnknownText_0x9a145 + writetext MortyFightDoneText waitbutton .NoRoomForShadowBall: closetext @@ -83,7 +83,7 @@ EcruteakGymClosed: applymovement PLAYER, EcruteakGymPlayerStepUpMovement applymovement ECRUTEAKGYM_GRAMPS, EcruteakGymGrampsSlowStepDownMovement opentext - writetext UnknownText_0x9a49c + writetext EcruteakGymClosedText waitbutton closetext follow PLAYER, ECRUTEAKGYM_GRAMPS @@ -177,7 +177,7 @@ EcruteakGymGrampsSlowStepDownMovement: slow_step DOWN step_end -UnknownText_0x99e65: +MortyIntroText: text "Good of you to" line "have come." @@ -218,7 +218,7 @@ UnknownText_0x99e65: cont "level!" done -UnknownText_0x9a00a: +MortyWinLossText: text "I'm not good" line "enough yet…" @@ -259,7 +259,7 @@ MortyText_ShadowBallSpeech: line "appeals to you." done -UnknownText_0x9a145: +MortyFightDoneText: text "I see…" para "Your journey has" @@ -374,7 +374,7 @@ EcruteakGymGuyWinText: cont "pure terror!" done -UnknownText_0x9a49c: +EcruteakGymClosedText: text "MORTY, the GYM" line "LEADER, is absent." diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 2deaf2016..d2cf87d2f 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -111,7 +111,7 @@ ElmCheckEverstone: writebyte TOGETIC special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript - writetext UnknownText_0x79a40 + writetext ElmThoughtEggHatchedText waitbutton closetext end @@ -1064,7 +1064,7 @@ ElmWaitingEggHatchText: line "EGG changed any?" done -UnknownText_0x79a40: +ElmThoughtEggHatchedText: text "? I thought" line "the EGG hatched." diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index b650ac975..49c4582d8 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -71,17 +71,17 @@ GoldenrodUndergroundWarehouseDirectorScript: opentext checkevent EVENT_RECEIVED_CARD_KEY iftrue .GotCardKey - writetext UnknownText_0x7dbc6 + writetext DirectorIntroText buttonsound verbosegiveitem CARD_KEY setevent EVENT_RECEIVED_CARD_KEY setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2 clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 - writetext UnknownText_0x7dc5b + writetext DirectorCardKeyText buttonsound .GotCardKey: - writetext UnknownText_0x7dc8d + writetext DirectorAfterText waitbutton closetext end @@ -157,7 +157,7 @@ GruntM15AfterBattleText: cont "I'll remember you!" done -UnknownText_0x7dbc6: +DirectorIntroText: text "DIRECTOR: Who?" line "What? You came to" cont "rescue me?" @@ -176,13 +176,13 @@ UnknownText_0x7dbc6: line "CARD KEY." done -UnknownText_0x7dc5b: +DirectorCardKeyText: text "DIRECTOR: Use that" line "to open the shut-" cont "ters on 3F." done -UnknownText_0x7dc8d: +DirectorAfterText: text "I'm begging you to" line "help." diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 806ce41d3..91f6ad6d2 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -89,13 +89,13 @@ IlexForestCharcoalApprenticeScript: opentext checkevent EVENT_HERDED_FARFETCHD iftrue .DoneFarfetchd - writetext UnknownText_0x6ef5c + writetext IlexForestApprenticeIntroText waitbutton closetext end .DoneFarfetchd: - writetext UnknownText_0x6f019 + writetext IlexForestApprenticeAfterText waitbutton closetext end @@ -736,7 +736,7 @@ MovementData_0x6ef58: remove_fixed_facing step_end -UnknownText_0x6ef5c: +IlexForestApprenticeIntroText: text "Oh, man… My boss" line "is going to be" cont "steaming…" @@ -755,7 +755,7 @@ UnknownText_0x6ef5c: line "and scary for me…" done -UnknownText_0x6f019: +IlexForestApprenticeAfterText: text "Wow! Thanks a" line "whole bunch!" diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 0f7f702f1..872303b06 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -43,14 +43,14 @@ RageCandyBarMerchantScript: .ClearedRocketHideout: opentext - writetext RageCandyBarMerchantText_SoldOut + writetext RageCandyBarMerchantSoldOutText waitbutton closetext end .SellRageCandyBars: opentext - writetext RageCandyBarMerchantText_TryOne + writetext RageCandyBarMerchantTryOneText special PlaceMoneyTopRight yesorno iffalse .Refused @@ -62,25 +62,25 @@ RageCandyBarMerchantScript: playsound SFX_TRANSACTION takemoney YOUR_MONEY, 300 special PlaceMoneyTopRight - writetext RageCandyBarMerchantText_SavorIt + writetext RageCandyBarMerchantSavorItText waitbutton closetext end .NotEnoughMoney: - writetext RageCandyBarMerchantText_NotEnoughMoney + writetext RageCandyBarMerchantNotEnoughMoneyText waitbutton closetext end .Refused: - writetext RageCandyBarMerchantText_Refused + writetext RageCandyBarMerchantRefusedText waitbutton closetext end .NoRoom: - writetext UnknownText_0x190188 + writetext RageCandyBarMerchantNoRoomText waitbutton closetext end @@ -138,7 +138,7 @@ MovementData_0x1900ad: turn_head DOWN step_end -RageCandyBarMerchantText_TryOne: +RageCandyBarMerchantTryOneText: text "Hiya, kid!" para "I see you're new" @@ -155,25 +155,25 @@ RageCandyBarMerchantText_TryOne: cont "¥300! Want one?" done -RageCandyBarMerchantText_SavorIt: +RageCandyBarMerchantSavorItText: text "Good! Savor it!" done -RageCandyBarMerchantText_NotEnoughMoney: +RageCandyBarMerchantNotEnoughMoneyText: text "You don't have" line "enough money." done -RageCandyBarMerchantText_Refused: +RageCandyBarMerchantRefusedText: text "Oh, fine then…" done -UnknownText_0x190188: +RageCandyBarMerchantNoRoomText: text "You don't have" line "room for this." done -RageCandyBarMerchantText_SoldOut: +RageCandyBarMerchantSoldOutText: text "RAGECANDYBAR's" line "sold out." diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index f93c584dc..03d0cf7c2 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -33,7 +33,7 @@ OlivineCityRivalSceneTop: applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d2 playmusic MUSIC_RIVAL_ENCOUNTER opentext - writetext UnknownText_0x1a88fa + writetext OlivineCityRivalText waitbutton closetext applymovement PLAYER, MovementData_0x1a88f4 @@ -57,7 +57,7 @@ OlivineCityRivalSceneBottom: applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d6 playmusic MUSIC_RIVAL_ENCOUNTER opentext - writetext UnknownText_0x1a88fa + writetext OlivineCityRivalText waitbutton closetext applymovement PLAYER, MovementData_0x1a88f7 @@ -165,7 +165,7 @@ MovementData_0x1a88f7: turn_head DOWN step_end -UnknownText_0x1a88fa: +OlivineCityRivalText: text "…" para "You again?" diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index e01352895..c5e39a1c2 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -13,27 +13,27 @@ PewterGymBrockScript: opentext checkflag ENGINE_BOULDERBADGE iftrue .FightDone - writetext UnknownText_0x1a28d0 + writetext BrockIntroText waitbutton closetext - winlosstext UnknownText_0x1a29bb, 0 + winlosstext BrockWinLossText, 0 loadtrainer BROCK, BROCK1 startbattle reloadmapafterbattle setevent EVENT_BEAT_BROCK setevent EVENT_BEAT_CAMPER_JERRY opentext - writetext UnknownText_0x1a2a3d + writetext ReceivedBoulderBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_BOULDERBADGE - writetext UnknownText_0x1a2a57 + writetext BrockBoulderBadgeText waitbutton closetext end .FightDone: - writetext UnknownText_0x1a2ada + writetext BrockFightDoneText waitbutton closetext end @@ -73,7 +73,7 @@ PewterGymStatue: trainertotext BROCK, BROCK1, MEM_BUFFER_1 jumpstd gymstatue2 -UnknownText_0x1a28d0: +BrockIntroText: text "BROCK: Wow, it's" line "not often that we" @@ -98,7 +98,7 @@ UnknownText_0x1a28d0: para "Come on!" done -UnknownText_0x1a29bb: +BrockWinLossText: text "BROCK: Your #-" line "MON's powerful at-" cont "tacks overcame my" @@ -111,12 +111,12 @@ UnknownText_0x1a29bb: line "this BADGE." done -UnknownText_0x1a2a3d: +ReceivedBoulderBadgeText: text " received" line "BOULDERBADGE." done -UnknownText_0x1a2a57: +BrockBoulderBadgeText: text "BROCK: ," line "thanks. I enjoyed" @@ -131,7 +131,7 @@ UnknownText_0x1a2a57: line "powerful." done -UnknownText_0x1a2ada: +BrockFightDoneText: text "BROCK: The world" line "is huge. There are" diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index c90025032..3820defce 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -9,7 +9,7 @@ Route26HealHouse_MapScripts: Route26HealHouseTeacherScript: faceplayer opentext - writetext UnknownText_0x7b14d + writetext Route26HealHouseRestAWhileText waitbutton closetext special FadeBlackQuickly @@ -21,7 +21,7 @@ Route26HealHouseTeacherScript: special FadeInQuickly special RestartMapMusic opentext - writetext UnknownText_0x7b18b + writetext Route26HealHouseKeepAtItText waitbutton closetext end @@ -29,7 +29,7 @@ Route26HealHouseTeacherScript: Route26HealHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x7b14d: +Route26HealHouseRestAWhileText: text "Your #MON look" line "a little tired." @@ -37,7 +37,7 @@ UnknownText_0x7b14d: line "them a while." done -UnknownText_0x7b18b: +Route26HealHouseKeepAtItText: text "There!" para "Your #MON are" diff --git a/maps/Route29.asm b/maps/Route29.asm index 1a1f83e94..3b3322f13 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -125,7 +125,7 @@ CatchingTutorialDudeScript: end .BoxFull: - writetext UnknownText_0x1a10a7 + writetext CatchingTutorialBoxFullText waitbutton closetext end @@ -246,7 +246,7 @@ DudeMovementData2b: step DOWN step_end -UnknownText_0x1a10a7: +CatchingTutorialBoxFullText: text "#MON hide in" line "the grass. Who" diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index c495d1104..e9376a6e9 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -16,10 +16,10 @@ SaffronGymSabrinaScript: opentext checkflag ENGINE_MARSHBADGE iftrue .FightDone - writetext UnknownText_0x189cdf + writetext SabrinaIntroText waitbutton closetext - winlosstext UnknownText_0x189df4, 0 + winlosstext SabrinaWinLossText, 0 loadtrainer SABRINA, SABRINA1 startbattle reloadmapafterbattle @@ -29,17 +29,17 @@ SaffronGymSabrinaScript: setevent EVENT_BEAT_PSYCHIC_FRANKLIN setevent EVENT_BEAT_PSYCHIC_JARED opentext - writetext UnknownText_0x189e95 + writetext ReceivedMarshBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_MARSHBADGE - writetext UnknownText_0x189ead + writetext SabrinaMarshBadgeText waitbutton closetext end .FightDone: - writetext UnknownText_0x189f6c + writetext SabrinaFightDoneText waitbutton closetext end @@ -112,7 +112,7 @@ SaffronGymStatue: trainertotext SABRINA, SABRINA1, MEM_BUFFER_1 jumpstd gymstatue2 -UnknownText_0x189cdf: +SabrinaIntroText: text "SABRINA: I knew" line "you were coming…" @@ -138,7 +138,7 @@ UnknownText_0x189cdf: cont "psychic powers!" done -UnknownText_0x189df4: +SabrinaWinLossText: text "SABRINA: Your" line "power…" @@ -156,12 +156,12 @@ UnknownText_0x189df4: cont "MARSHBADGE." done -UnknownText_0x189e95: +ReceivedMarshBadgeText: text " received" line "MARSHBADGE." done -UnknownText_0x189ead: +SabrinaMarshBadgeText: text "SABRINA: MARSH-" line "BADGE draws out" @@ -179,7 +179,7 @@ UnknownText_0x189ead: cont "beloved CHAMPION!" done -UnknownText_0x189f6c: +SabrinaFightDoneText: text "SABRINA: Your love" line "for your #MON" diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index fece1933d..0a4ed0595 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -16,10 +16,10 @@ SeafoamGymBlaineScript: opentext checkflag ENGINE_VOLCANOBADGE iftrue .FightDone - writetext UnknownText_0x1ab548 + writetext BlaineIntroText waitbutton closetext - winlosstext UnknownText_0x1ab646, 0 + winlosstext BlaineWinLossText, 0 loadtrainer BLAINE, BLAINE1 startbattle iftrue .ReturnAfterBattle @@ -28,17 +28,17 @@ SeafoamGymBlaineScript: reloadmapafterbattle setevent EVENT_BEAT_BLAINE opentext - writetext UnknownText_0x1ab683 + writetext ReceivedVolcanoBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_VOLCANOBADGE - writetext UnknownText_0x1ab69d + writetext BlaineAfterBattleText waitbutton closetext end .FightDone: - writetext UnknownText_0x1ab71c + writetext BlaineFightDoneText waitbutton closetext end @@ -60,7 +60,7 @@ SeafoamGymGuyScript: closetext end -UnknownText_0x1ab548: +BlaineIntroText: text "BLAINE: Waaah!" para "My GYM in CINNABAR" @@ -88,7 +88,7 @@ UnknownText_0x1ab548: line "have BURN HEAL!" done -UnknownText_0x1ab646: +BlaineWinLossText: text "BLAINE: Awesome." line "I've burned out…" @@ -96,12 +96,12 @@ UnknownText_0x1ab646: line "VOLCANOBADGE!" done -UnknownText_0x1ab683: +ReceivedVolcanoBadgeText: text " received" line "VOLCANOBADGE." done -UnknownText_0x1ab69d: +BlaineAfterBattleText: text "BLAINE: I did lose" line "this time, but I'm" @@ -115,7 +115,7 @@ UnknownText_0x1ab69d: line "a rematch." done -UnknownText_0x1ab71c: +BlaineFightDoneText: text "BLAINE: My fire" line "#MON will be" diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 0462f279a..a33bc0e58 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -34,7 +34,7 @@ SproutTower3FRivalScene: applymovement PLAYER, MovementData_0x184a1d applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a22 opentext - writetext UnknownText_0x184a27 + writetext SproutTowerElderLecturesRivalText waitbutton closetext showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15 @@ -151,7 +151,7 @@ MovementData_0x184a24: step DOWN step_end -UnknownText_0x184a27: +SproutTowerElderLecturesRivalText: text "ELDER: You are in-" line "deed skilled as a" cont "trainer." diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index aa81430a9..d6cdcd30d 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -15,10 +15,10 @@ VermilionGymSurgeScript: opentext checkflag ENGINE_THUNDERBADGE iftrue .FightDone - writetext UnknownText_0x192142 + writetext LtSurgeIntroText waitbutton closetext - winlosstext UnknownText_0x192238, 0 + winlosstext LtSurgeWinLossText, 0 loadtrainer LT_SURGE, LT_SURGE1 startbattle reloadmapafterbattle @@ -27,17 +27,17 @@ VermilionGymSurgeScript: setevent EVENT_BEAT_GUITARIST_VINCENT setevent EVENT_BEAT_JUGGLER_HORTON opentext - writetext UnknownText_0x192277 + writetext ReceivedThunderBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_THUNDERBADGE - writetext UnknownText_0x192291 + writetext LtSurgeThunderBadgeText waitbutton closetext end .FightDone: - writetext UnknownText_0x192303 + writetext LtSurgeFightDoneText waitbutton closetext end @@ -102,7 +102,7 @@ VermilionGymStatue: trainertotext LT_SURGE, LT_SURGE1, MEM_BUFFER_1 jumpstd gymstatue2 -UnknownText_0x192142: +LtSurgeIntroText: text "SURGE: Hey, you" line "little tyke!" @@ -125,7 +125,7 @@ UnknownText_0x192142: cont "enemies in war!" done -UnknownText_0x192238: +LtSurgeWinLossText: text "SURGE: Arrrgh!" line "You are strong!" @@ -133,12 +133,12 @@ UnknownText_0x192238: line "THUNDERBADGE!" done -UnknownText_0x192277: +ReceivedThunderBadgeText: text " received" line "THUNDERBADGE." done -UnknownText_0x192291: +LtSurgeThunderBadgeText: text "SURGE: THUNDER-" line "BADGE increases" cont "#MON's speed. " @@ -150,7 +150,7 @@ UnknownText_0x192291: line "proudly, hear?" done -UnknownText_0x192303: +LtSurgeFightDoneText: text "SURGE: Hey, kid!" line "Still slugging and" cont "chugging away?" diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 21e588b1d..36561ce12 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -14,16 +14,16 @@ VioletGymFalknerScript: opentext checkevent EVENT_BEAT_FALKNER iftrue .FightDone - writetext UnknownText_0x68473 + writetext FalknerIntroText waitbutton closetext - winlosstext UnknownText_0x6854a, 0 + winlosstext FalknerWinLossText, 0 loadtrainer FALKNER, FALKNER1 startbattle reloadmapafterbattle setevent EVENT_BEAT_FALKNER opentext - writetext UnknownText_0x685af + writetext ReceivedZephyrBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_ZEPHYRBADGE @@ -36,18 +36,18 @@ VioletGymFalknerScript: setevent EVENT_BEAT_BIRD_KEEPER_ABE setmapscene ELMS_LAB, SCENE_ELMSLAB_NOTHING specialphonecall SPECIALCALL_ASSISTANT - writetext UnknownText_0x685c8 + writetext FalknerZephyrBadgeText buttonsound verbosegiveitem TM_MUD_SLAP iffalse .NoRoomForMudSlap setevent EVENT_GOT_TM31_MUD_SLAP - writetext UnknownText_0x68648 + writetext FalknerTMMudSlapText waitbutton closetext end .SpeechAfterTM: - writetext UnknownText_0x68735 + writetext FalknerFightDoneText waitbutton .NoRoomForMudSlap: closetext @@ -110,7 +110,7 @@ VioletGymStatue: trainertotext FALKNER, FALKNER1, MEM_BUFFER_1 jumpstd gymstatue2 -UnknownText_0x68473: +FalknerIntroText: text "I'm FALKNER, the" line "VIOLET #MON GYM" cont "leader!" @@ -133,7 +133,7 @@ UnknownText_0x68473: line "#MON!" done -UnknownText_0x6854a: +FalknerWinLossText: text "…Darn! My dad's" line "cherished bird" cont "#MON…" @@ -146,12 +146,12 @@ UnknownText_0x6854a: cont "ZEPHYRBADGE." done -UnknownText_0x685af: +ReceivedZephyrBadgeText: text " received" line "ZEPHYRBADGE." done -UnknownText_0x685c8: +FalknerZephyrBadgeText: text "ZEPHYRBADGE" line "raises the attack" cont "power of #MON." @@ -166,7 +166,7 @@ UnknownText_0x685c8: line "too." done -UnknownText_0x68648: +FalknerTMMudSlapText: text "By using a TM, a" line "#MON will" @@ -191,7 +191,7 @@ UnknownText_0x68648: cont "and offensive." done -UnknownText_0x68735: +FalknerFightDoneText: text "There are #MON" line "GYMS in cities and" cont "towns ahead."