From 39faa7a9f66b4189a5101e9cd4e9d6180b10a0c1 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 19 Aug 2018 13:33:35 -0400 Subject: [PATCH 1/4] Update file paths in comments --- constants/menu_constants.asm | 2 +- data/mon_menu.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 7c5f23377..bf6945bf4 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -33,7 +33,7 @@ shift_const SCROLLINGMENU_ENABLE_SELECT ; MonMenuOptions indexes (see data/mon_menu.asm) -; used by PokemonActionSubmenu (see engine/menus/start_menu.asm) +; used by PokemonActionSubmenu (see engine/pokemon/mon_menu.asm) const_def 1 ; moves const MONMENUITEM_CUT ; 1 diff --git a/data/mon_menu.asm b/data/mon_menu.asm index b6130a199..f2b9f3ac0 100644 --- a/data/mon_menu.asm +++ b/data/mon_menu.asm @@ -19,7 +19,7 @@ MonMenuOptionStrings: db "ERROR!@" MonMenuOptions: -; category, item, value; actions are in PokemonActionSubmenu (see engine/start_menu.asm) +; category, item, value; actions are in PokemonActionSubmenu (see engine/pokemon/mon_menu.asm) ; moves db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT db MONMENU_FIELD_MOVE, MONMENUITEM_FLY, FLY From 5574ec64ca662d76ef0eac8e2c6812c49700fed7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 19 Aug 2018 13:56:41 -0400 Subject: [PATCH 2/4] 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." From a09cfc0c36d01de5e56236e348b1b81aabf1ea40 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 19 Aug 2018 13:56:41 -0400 Subject: [PATCH 3/4] Label some Unknown map text --- maps/BillsFamilysHouse.asm | 56 +++++++++--------- maps/CeladonMansion3F.asm | 56 +++++++++--------- maps/CeladonMansionRoofHouse.asm | 16 +++--- maps/CeruleanGym.asm | 36 ++++++------ maps/EarlsPokemonAcademy.asm | 20 +++---- maps/EcruteakGym.asm | 16 +++--- maps/ElmsLab.asm | 4 +- maps/FastShip1F.asm | 4 +- maps/FastShipB1F.asm | 20 +++---- maps/FastShipCabins_NNW_NNE_NE.asm | 12 ++-- maps/FastShipCabins_SW_SSW_NW.asm | 8 +-- maps/GoldenrodBikeShop.asm | 21 ++++--- maps/GoldenrodDeptStoreB1F.asm | 4 +- maps/GoldenrodDeptStoreRoof.asm | 12 ++-- maps/GoldenrodUndergroundWarehouse.asm | 12 ++-- maps/IlexForest.asm | 8 +-- maps/MahoganyTown.asm | 24 ++++---- maps/NationalParkBugContest.asm | 40 ++++++------- maps/OlivineCity.asm | 6 +- maps/PewterGym.asm | 20 +++---- maps/Route12SuperRodHouse.asm | 16 +++--- maps/Route24.asm | 16 +++--- maps/Route26HealHouse.asm | 8 +-- maps/Route29.asm | 4 +- maps/Route36NationalParkGate.asm | 80 +++++++++++++------------- maps/Route39Barn.asm | 62 ++++++++++---------- maps/Route43MahoganyGate.asm | 8 +-- maps/SaffronGym.asm | 20 +++---- maps/SaffronPokecenter1F.asm | 16 +++--- maps/SeafoamGym.asm | 20 +++---- maps/SproutTower3F.asm | 4 +- maps/TeamRocketBaseB3F.asm | 8 +-- maps/VermilionGym.asm | 20 +++---- maps/VioletGym.asm | 24 ++++---- maps/ViridianCity.asm | 28 ++++----- maps/WiseTriosRoom.asm | 24 ++++---- 36 files changed, 376 insertions(+), 377 deletions(-) diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 1c95dc68d..b100f1e61 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -13,38 +13,38 @@ BillScript: opentext checkevent EVENT_GOT_EEVEE iftrue .GotEevee - writetext UnknownText_0x54c74 + writetext BillTakeThisEeveeText yesorno iffalse .Refused - writetext UnknownText_0x54d3f + writetext BillImCountingOnYouText buttonsound waitsfx checkcode VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom - writetext UnknownText_0x54dae + writetext ReceivedEeveeText playsound SFX_CAUGHT_MON waitsfx givepoke EEVEE, 20 setevent EVENT_GOT_EEVEE - writetext UnknownText_0x54dc1 + writetext BillEeveeMayEvolveText waitbutton closetext end .NoRoom: - writetext UnknownText_0x54e02 + writetext BillPartyFullText waitbutton closetext end .Refused: - writetext UnknownText_0x54e2d + writetext BillNoEeveeText waitbutton closetext end .GotEevee: - writetext UnknownText_0x54e42 + writetext BillPopWontWorkText waitbutton closetext end @@ -54,13 +54,13 @@ BillsMomScript: opentext checkevent EVENT_MET_BILL iffalse .HaventMetBill - writetext UnknownText_0x54ea8 + writetext BillsPopText waitbutton closetext end .HaventMetBill: - writetext UnknownText_0x54f4e + writetext BillsMomText waitbutton closetext end @@ -70,30 +70,30 @@ BillsSisterScript: opentext checkcellnum PHONE_BILL iftrue .GotBillsNumber - writetext UnknownText_0x54f9e + writetext BillsSisterUsefulNumberText askforphonenumber PHONE_BILL ifequal PHONE_CONTACTS_FULL, .NoRoom ifequal PHONE_CONTACT_REFUSED, .Refused waitsfx addcellnum PHONE_BILL - writetext UnknownText_0x54fd9 + writetext RecordedBillsNumberText playsound SFX_REGISTER_PHONE_NUMBER waitsfx buttonsound .GotBillsNumber: - writetext UnknownText_0x55069 + writetext BillsSisterStorageSystemText waitbutton closetext end .Refused: - writetext UnknownText_0x54ff3 + writetext BillsSisterRefusedNumberText waitbutton closetext end .NoRoom: - writetext UnknownText_0x55046 + writetext BillsSisterPhoneFullText buttonsound jump .Refused @@ -106,7 +106,7 @@ BillsHouseBookshelf2: BillsHouseRadio: jumpstd radio2 -UnknownText_0x54c74: +BillTakeThisEeveeText: text "BILL: Hi, !" line "Do us a favor and" cont "take this EEVEE." @@ -126,7 +126,7 @@ UnknownText_0x54c74: cont "?" done -UnknownText_0x54d3f: +BillImCountingOnYouText: text "BILL: I knew you'd" line "come through!" @@ -140,12 +140,12 @@ UnknownText_0x54d3f: line "it!" done -UnknownText_0x54dae: +ReceivedEeveeText: text " received" line "EEVEE!" done -UnknownText_0x54dc1: +BillEeveeMayEvolveText: text "BILL: PROF.ELM" line "claims EEVEE may" @@ -153,18 +153,18 @@ UnknownText_0x54dc1: line "unknown ways." done -UnknownText_0x54e02: +BillPartyFullText: text "Whoa, wait. You" line "can't carry any" cont "more #MON." done -UnknownText_0x54e2d: +BillNoEeveeText: text "Oh… Now what to" line "do?" done -UnknownText_0x54e42: +BillPopWontWorkText: text "BILL: My pop, he" line "won't work. All he" @@ -175,7 +175,7 @@ UnknownText_0x54e42: line "a real headache…" done -UnknownText_0x54ea8: +BillsPopText: text "Oh, you collect" line "#MON? My son" cont "BILL is an expert." @@ -193,7 +193,7 @@ UnknownText_0x54ea8: line "being called…" done -UnknownText_0x54f4e: +BillsMomText: text "My husband was" line "once known as a" @@ -204,7 +204,7 @@ UnknownText_0x54f4e: line "father." done -UnknownText_0x54f9e: +BillsSisterUsefulNumberText: text "Are you a trainer?" para "I've got a useful" @@ -212,12 +212,12 @@ UnknownText_0x54f9e: cont "you." done -UnknownText_0x54fd9: +RecordedBillsNumberText: text " recorded" line "BILL's number." done -UnknownText_0x54ff3: +BillsSisterRefusedNumberText: text "My brother made" line "the PC #MON" cont "storage system." @@ -227,12 +227,12 @@ UnknownText_0x54ff3: cont "number…" done -UnknownText_0x55046: +BillsSisterPhoneFullText: text "You can't record" line "any more numbers." done -UnknownText_0x55069: +BillsSisterStorageSystemText: text "My big brother" line "BILL made the PC" diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 2bb4cf186..29f043092 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -9,10 +9,10 @@ CeladonMansion3F_MapScripts: db 0 ; callbacks -CeladonMansion3FCooltrainerMScript: +GameFreakGameDesignerScript: faceplayer opentext - writetext UnknownText_0x716ce + writetext GameFreakGameDesignerText checkcode VAR_DEXCAUGHT ifgreater NUM_POKEMON - 2 - 1, .CompletedPokedex ; ignore Mew and Celebi waitbutton @@ -21,30 +21,30 @@ CeladonMansion3FCooltrainerMScript: .CompletedPokedex: buttonsound - writetext UnknownText_0x71725 + writetext GameFreakGameDesignerCompletedPokedexText playsound SFX_DEX_FANFARE_230_PLUS waitsfx - writetext UnknownText_0x71760 + writetext GameFreakGameDesignerPauseForDiplomaText buttonsound special Diploma - writetext UnknownText_0x71763 + writetext GameFreakGameDesignerAfterDiplomaText waitbutton closetext setevent EVENT_ENABLE_DIPLOMA_PRINTING end -CeladonMansion3FGymGuyScript: +GameFreakGraphicArtistScript: faceplayer opentext checkevent EVENT_ENABLE_DIPLOMA_PRINTING iftrue .CanPrintDiploma - writetext UnknownText_0x717b4 + writetext GameFreakGraphicArtistText waitbutton closetext end .CanPrintDiploma: - writetext UnknownText_0x717d8 + writetext GameFreakGraphicArtistPrintDiplomaText yesorno iffalse .Refused special PrintDiploma @@ -52,23 +52,23 @@ CeladonMansion3FGymGuyScript: end .Refused: - writetext UnknownText_0x71830 + writetext GameFreakGraphicArtistRefusedText waitbutton closetext end .CancelPrinting: ; unused - writetext UnknownText_0x71863 + writetext GameFreakGraphicArtistErrorText waitbutton closetext end -CeladonMansion3FSuperNerdScript: - jumptextfaceplayer CeladonMansion3FSuperNerdText +GameFreakProgrammerScript: + jumptextfaceplayer GameFreakProgrammerText -CeladonMansion3FFisherScript: - jumptextfaceplayer CeladonMansion3FFisherText +GameFreakCharacterDesignerScript: + jumptextfaceplayer GameFreakCharacterDesignerText CeladonMansion3FDevRoomSign: jumptext CeladonMansion3FDevRoomSignText @@ -82,7 +82,7 @@ CeladonMansion3FGameProgram: CeladonMansion3FReferenceMaterial: jumptext CeladonMansion3FReferenceMaterialText -UnknownText_0x716ce: +GameFreakGameDesignerText: text "Is that right?" para "I'm the GAME" @@ -93,7 +93,7 @@ UnknownText_0x716ce: cont "but don't give up!" done -UnknownText_0x71725: +GameFreakGameDesignerCompletedPokedexText: text "Wow! Excellent!" line "You completed your" cont "#DEX!" @@ -101,11 +101,11 @@ UnknownText_0x71725: para "Congratulations!" done -UnknownText_0x71760: +GameFreakGameDesignerPauseForDiplomaText: text "…" done -UnknownText_0x71763: +GameFreakGameDesignerAfterDiplomaText: text "The GRAPHIC ARTIST" line "will print out a" cont "DIPLOMA for you." @@ -114,14 +114,14 @@ UnknownText_0x71763: line "it off." done -UnknownText_0x717b4: +GameFreakGraphicArtistText: text "I'm the GRAPHIC" line "ARTIST." para "I drew you!" done -UnknownText_0x717d8: +GameFreakGraphicArtistPrintDiplomaText: text "I'm the GRAPHIC" line "ARTIST." @@ -132,19 +132,19 @@ UnknownText_0x717d8: line "out your DIPLOMA?" done -UnknownText_0x71830: +GameFreakGraphicArtistRefusedText: text "Give me a shout if" line "you want your" cont "DIPLOMA printed." done -UnknownText_0x71863: +GameFreakGraphicArtistErrorText: text "Something's wrong." line "I'll have to can-" cont "cel printing." done -CeladonMansion3FSuperNerdText: +GameFreakProgrammerText: text "Who, me? I'm the" line "PROGRAMMER." @@ -152,7 +152,7 @@ CeladonMansion3FSuperNerdText: line "machines!" done -CeladonMansion3FFisherText: +GameFreakCharacterDesignerText: text "Aren't the TWINS" line "adorable?" @@ -206,7 +206,7 @@ CeladonMansion3F_MapEvents: bg_event 1, 3, BGEVENT_UP, CeladonMansion3FReferenceMaterial db 4 ; object events - object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FCooltrainerMScript, -1 - object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FGymGuyScript, -1 - object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 - object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 + object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GameFreakGameDesignerScript, -1 + object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GameFreakGraphicArtistScript, -1 + object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GameFreakProgrammerScript, -1 + object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GameFreakCharacterDesignerScript, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 9ffceb59c..31bda62b8 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -11,34 +11,34 @@ CeladonMansionRoofHousePharmacistScript: opentext checkevent EVENT_GOT_TM03_CURSE iftrue .GotCurse - writetext UnknownText_0x71b27 + writetext CeladonMansionRoofHousePharmacistIntroText buttonsound checktime NITE iftrue .Night - writetext UnknownText_0x71b4a + writetext CeladonMansionRoofHousePharmacistNotNightText waitbutton closetext end .Night: - writetext UnknownText_0x71ba3 + writetext CeladonMansionRoofHousePharmacistStoryText buttonsound verbosegiveitem TM_CURSE iffalse .NoRoom setevent EVENT_GOT_TM03_CURSE .GotCurse: - writetext UnknownText_0x71db3 + writetext CeladonMansionRoofHousePharmacistCurseText waitbutton .NoRoom: closetext end -UnknownText_0x71b27: +CeladonMansionRoofHousePharmacistIntroText: text "Let me recount a" line "terrifying tale…" done -UnknownText_0x71b4a: +CeladonMansionRoofHousePharmacistNotNightText: text "Then again, it's" line "not as scary while" @@ -49,7 +49,7 @@ UnknownText_0x71b4a: line "sunset, OK?" done -UnknownText_0x71ba3: +CeladonMansionRoofHousePharmacistStoryText: text "Once upon a time," line "there was a little" @@ -104,7 +104,7 @@ UnknownText_0x71ba3: cont "take this--TM03!" done -UnknownText_0x71db3: +CeladonMansionRoofHousePharmacistCurseText: text "TM03 is CURSE." para "It's a terrifying" 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/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 982369994..4fbbb6d89 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -15,23 +15,23 @@ AcademyEarl: applymovement EARLSPOKEMONACADEMY_EARL, AcademyEarlSpinMovement faceplayer opentext - writetext UnknownText_0x68b3b + writetext AcademyEarlIntroText yesorno iffalse .Part1 - writetext UnknownText_0x68bbd + writetext AcademyEarlTeachHowToWinText yesorno iffalse .Done .Part1: - writetext UnknownText_0x68c51 + writetext AcademyEarlTeachMoreText yesorno iffalse .Done - writetext UnknownText_0x68c7b + writetext AcademyEarlTeachHowToRaiseWellText waitbutton closetext end .Done: - writetext UnknownText_0x68d31 + writetext AcademyEarlNoMoreToTeachText waitbutton closetext end @@ -161,7 +161,7 @@ AcademyEarlSpinMovement: turn_head DOWN step_end -UnknownText_0x68b3b: +AcademyEarlIntroText: text "EARL, I am!" para "Wonderful are" @@ -176,7 +176,7 @@ UnknownText_0x68b3b: cont "a winner is you?" done -UnknownText_0x68bbd: +AcademyEarlTeachHowToWinText: text "Good! Teach you," line "I will!" @@ -192,13 +192,13 @@ UnknownText_0x68bbd: line "want to hear?" done -UnknownText_0x68c51: +AcademyEarlTeachMoreText: text "So, want to know" line "how to raise" cont "#MON well?" done -UnknownText_0x68c7b: +AcademyEarlTeachHowToRaiseWellText: text "Fine! Teach you," line "I will!" @@ -219,7 +219,7 @@ UnknownText_0x68c7b: cont "become!" done -UnknownText_0x68d31: +AcademyEarlNoMoreToTeachText: text "Oh! Smart student" line "you are! Nothing" cont "more do I teach!" 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/FastShip1F.asm b/maps/FastShip1F.asm index 8b6b50419..0d3b3fc62 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -127,7 +127,7 @@ WorriedGrandpaSceneLeft: applymovement PLAYER, MovementData_0x7522e applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220 opentext - writetext UnknownText_0x75412 + writetext FastShip1FGrandpaText waitbutton closetext turnobject PLAYER, RIGHT @@ -257,7 +257,7 @@ FastShip1FSailor3Text: cont "their cabins." done -UnknownText_0x75412: +FastShip1FGrandpaText: text "Whoa! Excuse me." line "I was in a hurry!" diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 7eb6813c7..a8c1cafdd 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -57,7 +57,7 @@ FastShipB1FSailorScript: iftrue .LazySailor checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR iftrue .AlreadyInformed - writetext UnknownText_0x7687b + writetext FastShipB1FOnDutySailorText waitbutton closetext setevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR @@ -65,13 +65,13 @@ FastShipB1FSailorScript: end .AlreadyInformed: - writetext UnknownText_0x76907 + writetext FastShipB1FOnDutySailorRefusedText waitbutton closetext end .LazySailor: - writetext UnknownText_0x7692e + writetext FastShipB1FOnDutySailorThanksText checkevent EVENT_FAST_SHIP_FOUND_GIRL iffalse .NotFoundGirl waitbutton @@ -80,13 +80,13 @@ FastShipB1FSailorScript: .NotFoundGirl: buttonsound - writetext UnknownText_0x7696d + writetext FastShipB1FOnDutySailorSawLittleGirlText waitbutton closetext end .FirstTime: - writetext UnknownText_0x7699d + writetext FastShipB1FOnDutySailorDirectionsText waitbutton closetext end @@ -218,7 +218,7 @@ FashShipB1FSailorBlocksLeftMovement: turn_head DOWN step_end -UnknownText_0x7687b: +FastShipB1FOnDutySailorText: text "Hey, kid. Could I" line "get you to look" cont "for my buddy?" @@ -232,14 +232,14 @@ UnknownText_0x7687b: cont "duty right now." done -UnknownText_0x76907: +FastShipB1FOnDutySailorRefusedText: text "Oh, gee…" para "The CAPTAIN will" line "be furious…" done -UnknownText_0x7692e: +FastShipB1FOnDutySailorThanksText: text "Thanks, kid!" line "I chewed him out" @@ -247,14 +247,14 @@ UnknownText_0x7692e: line "slacking off!" done -UnknownText_0x7696d: +FastShipB1FOnDutySailorSawLittleGirlText: text "A little girl?" para "I may have seen" line "her go by here." done -UnknownText_0x7699d: +FastShipB1FOnDutySailorDirectionsText: text "The dining room is" line "up ahead." diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index c2af9728b..2f52b0c14 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -82,17 +82,17 @@ FastShipLazySailorScript: playmusic MUSIC_HIKER_ENCOUNTER faceplayer opentext - writetext UnknownText_0x75812 + writetext SailorStanlySeenText waitbutton closetext - winlosstext UnknownText_0x75897, 0 + winlosstext SailorStanlyBeatenText, 0 loadtrainer SAILOR, STANLY startbattle reloadmap special HealParty setevent EVENT_BEAT_SAILOR_STANLY opentext - writetext UnknownText_0x758b1 + writetext SailorStanlyAfterBattleText waitbutton closetext setevent EVENT_FAST_SHIP_LAZY_SAILOR @@ -200,7 +200,7 @@ HikerNolandAfterBattleText: line "KANTO?" done -UnknownText_0x75812: +SailorStanlySeenText: text "Yeah, I'm a sail-" line "or, all right." @@ -215,12 +215,12 @@ UnknownText_0x75812: line "Let's battle!" done -UnknownText_0x75897: +SailorStanlyBeatenText: text "Sorry! It's all my" line "fault!" done -UnknownText_0x758b1: +SailorStanlyAfterBattleText: text "Being a sailor, I" line "have to do phys-" cont "ical labor. It's" diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index ab1a27b13..2d38d5439 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -50,14 +50,14 @@ TrainerGuitaristClyde: special Mobile_DummyReturnFalse iftrue .mobile opentext - writetext UnknownText_0x75d65 + writetext GuitaristClydeAfterBattleText waitbutton closetext end .mobile opentext - writetext UnknownText_0x75cfe + writetext GuitaristClydeAfterBattleMobileText waitbutton closetext end @@ -180,7 +180,7 @@ GuitaristClydeBeatenText: line "Total distortion!" done -UnknownText_0x75cfe: +GuitaristClydeAfterBattleMobileText: text "I was going to" line "make my debut at" cont "the BATTLE TOWER…" @@ -190,7 +190,7 @@ UnknownText_0x75cfe: cont "redo my training…" done -UnknownText_0x75d65: +GuitaristClydeAfterBattleText: text "Speaking of the" line "RADIO STATION," diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 62a1902e9..caf328d14 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -14,27 +14,27 @@ GoldenrodBikeShopClerkScript: opentext checkevent EVENT_GOT_BICYCLE iftrue .GotBicycle - writetext UnknownText_0x54787 + writetext GoldenrodBikeShopClerkIntroText yesorno iffalse .Refused - writetext UnknownText_0x547f8 + writetext GoldenrodBikeShopClerkAgreedText buttonsound waitsfx giveitem BICYCLE - writetext UnknownText_0x54848 + writetext BorrowedABicycleText playsound SFX_KEY_ITEM waitsfx itemnotify setflag ENGINE_BIKE_SHOP_CALL_ENABLED setevent EVENT_GOT_BICYCLE .GotBicycle: - writetext UnknownText_0x5485f + writetext GoldenrodBikeShopClerkFirstRateBikesText waitbutton closetext end .Refused: - writetext UnknownText_0x54898 + writetext GoldenrodBikeShopClerkRefusedText waitbutton closetext end @@ -46,7 +46,7 @@ GoldenrodBikeShopJustReleasedCompactBike: GoldenrodBikeShopBicycle: jumptext GoldenrodBikeShopBicycleText -UnknownText_0x54787: +GoldenrodBikeShopClerkIntroText: text "…sigh… I moved" line "here, but I can't" @@ -58,7 +58,7 @@ UnknownText_0x54787: cont "tise for me?" done -UnknownText_0x547f8: +GoldenrodBikeShopClerkAgreedText: text "Really? Great!" para "Give me your name" @@ -68,12 +68,12 @@ UnknownText_0x547f8: line "a BICYCLE." done -UnknownText_0x54848: +BorrowedABicycleText: text " borrowed a" line "BICYCLE." done -UnknownText_0x5485f: +GoldenrodBikeShopClerkFirstRateBikesText: text "My BICYCLES are" line "first-rate! You" @@ -81,13 +81,12 @@ UnknownText_0x5485f: line "anywhere." done -UnknownText_0x54898: +GoldenrodBikeShopClerkRefusedText: text "…sigh… Oh, for" line "the kindness of" cont "people…" done -; possibly unused GoldenrodBikeShopJustReleasedCompactBikeText: text "Just released!" diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 9c08c4198..d34dcfbe3 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -55,7 +55,7 @@ GoldenrodDeptStoreB1FBlackBelt3Script: GoldenrodDeptStoreB1FMachopScript: opentext - writetext UnknownText_0x7d8bb + writetext GoldenrodDeptStoreB1FMachokeText cry MACHOKE waitbutton closetext @@ -103,7 +103,7 @@ GoldenrodDeptStoreB1FBlackBelt3Text: line "want it!" done -UnknownText_0x7d8bb: +GoldenrodDeptStoreB1FMachokeText: text "MACHOKE: Maaacho!" done diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index f385a3e8a..187d7b69b 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -49,7 +49,7 @@ GoldenrodDeptStoreRoofPokefanFScript: GoldenrodDeptStoreRoofFisherScript: faceplayer opentext - writetext UnknownText_0x567d2 + writetext GoldenrodDeptStoreRoofFisherText waitbutton closetext turnobject GOLDENRODDEPTSTOREROOF_FISHER, UP @@ -60,12 +60,12 @@ GoldenrodDeptStoreRoofTwinScript: GoldenrodDeptStoreRoofSuperNerdScript: opentext - writetext UnknownText_0x56867 + writetext GoldenrodDeptStoreRoofSuperNerdOhWowText waitbutton closetext turnobject GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP opentext - writetext UnknownText_0x56871 + writetext GoldenrodDeptStoreRoofSuperNerdQuitBotheringMeText waitbutton closetext turnobject GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT @@ -102,7 +102,7 @@ GoldenrodDeptStoreRoofPokefanFText: line "from shopping." done -UnknownText_0x567d2: +GoldenrodDeptStoreRoofFisherText: text "Pardon? Who says" line "an adult can't get" cont "into this?" @@ -120,11 +120,11 @@ GoldenrodDeptStoreRoofTwinText: cont "so often." done -UnknownText_0x56867: +GoldenrodDeptStoreRoofSuperNerdOhWowText: text "Oh, wow!" done -UnknownText_0x56871: +GoldenrodDeptStoreRoofSuperNerdQuitBotheringMeText: text "Will you quit" line "bothering me?" done 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/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index bf2911e3a..75623e360 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -20,7 +20,7 @@ NationalParkBugContest_MapScripts: BugCatchingContestant1AScript: faceplayer opentext - writetext UnknownText_0x5c94c + writetext BugCatchingContestant1AText waitbutton closetext end @@ -28,7 +28,7 @@ BugCatchingContestant1AScript: BugCatchingContestant2AScript: faceplayer opentext - writetext UnknownText_0x5c973 + writetext BugCatchingContestant2AText waitbutton closetext end @@ -36,7 +36,7 @@ BugCatchingContestant2AScript: BugCatchingContestant3AScript: faceplayer opentext - writetext UnknownText_0x5c9a3 + writetext BugCatchingContestant3AText waitbutton closetext end @@ -44,7 +44,7 @@ BugCatchingContestant3AScript: BugCatchingContestant4AScript: faceplayer opentext - writetext UnknownText_0x5c9cc + writetext BugCatchingContestant4AText waitbutton closetext end @@ -52,7 +52,7 @@ BugCatchingContestant4AScript: BugCatchingContestant5AScript: faceplayer opentext - writetext UnknownText_0x5ca15 + writetext BugCatchingContestant5AText waitbutton closetext end @@ -60,7 +60,7 @@ BugCatchingContestant5AScript: BugCatchingContestant6AScript: faceplayer opentext - writetext UnknownText_0x5ca52 + writetext BugCatchingContestant6AText waitbutton closetext end @@ -68,7 +68,7 @@ BugCatchingContestant6AScript: BugCatchingContestant7AScript: faceplayer opentext - writetext UnknownText_0x5ca8f + writetext BugCatchingContestant7AText waitbutton closetext end @@ -76,7 +76,7 @@ BugCatchingContestant7AScript: BugCatchingContestant8AScript: faceplayer opentext - writetext UnknownText_0x5cac8 + writetext BugCatchingContestant8AText waitbutton closetext end @@ -84,7 +84,7 @@ BugCatchingContestant8AScript: BugCatchingContestant9AScript: faceplayer opentext - writetext UnknownText_0x5cb25 + writetext BugCatchingContestant9AText waitbutton closetext end @@ -92,7 +92,7 @@ BugCatchingContestant9AScript: BugCatchingContestant10AScript: faceplayer opentext - writetext UnknownText_0x5cb64 + writetext BugCatchingContestant10AText waitbutton closetext end @@ -115,25 +115,25 @@ NationalParkBugContestTMDig: NationalParkBugContestHiddenFullHeal: hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL -UnknownText_0x5c94c: +BugCatchingContestant1AText: text "DON: I'm going to" line "win! Don't bother" cont "me." done -UnknownText_0x5c973: +BugCatchingContestant2AText: text "ED: My PARASECT" line "puts #MON to" cont "sleep with SPORE." done -UnknownText_0x5c9a3: +BugCatchingContestant3AText: text "NICK: I'm raising" line "fast #MON for" cont "battles." done -UnknownText_0x5c9cc: +BugCatchingContestant4AText: text "WILLIAM: I'm not" line "concerned about" cont "winning." @@ -142,7 +142,7 @@ UnknownText_0x5c9cc: line "for rare #MON." done -UnknownText_0x5ca15: +BugCatchingContestant5AText: text "BENNY: Ssh! You'll" line "scare off SCYTHER." @@ -150,7 +150,7 @@ UnknownText_0x5ca15: line "later." done -UnknownText_0x5ca52: +BugCatchingContestant6AText: text "BARRY: You should" line "weaken bug #MON" @@ -158,7 +158,7 @@ UnknownText_0x5ca52: line "a BALL." done -UnknownText_0x5ca8f: +BugCatchingContestant7AText: text "CINDY: I love bug" line "#MON." @@ -166,7 +166,7 @@ UnknownText_0x5ca8f: line "like them too." done -UnknownText_0x5cac8: +BugCatchingContestant8AText: text "JOSH: I've been" line "collecting bug" @@ -177,7 +177,7 @@ UnknownText_0x5cac8: line "going to lose!" done -UnknownText_0x5cb25: +BugCatchingContestant9AText: text "SAMUEL: If you've" line "got the time to" @@ -185,7 +185,7 @@ UnknownText_0x5cb25: line "bug #MON." done -UnknownText_0x5cb64: +BugCatchingContestant10AText: text "KIPP: I've studied" line "about bug #MON" cont "a lot." 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/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index cd2ebd6cb..f91e78026 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -11,22 +11,22 @@ Route12SuperRodHouseFishingGuruScript: opentext checkevent EVENT_GOT_SUPER_ROD iftrue .GotSuperRod - writetext UnknownText_0x7f4af + writetext OfferSuperRodText yesorno iffalse .Refused - writetext UnknownText_0x7f52f + writetext GiveSuperRodText buttonsound verbosegiveitem SUPER_ROD iffalse .NoRoom setevent EVENT_GOT_SUPER_ROD .GotSuperRod: - writetext UnknownText_0x7f57c + writetext GaveSuperRodText waitbutton closetext end .Refused: - writetext UnknownText_0x7f5ec + writetext DontWantSuperRodText waitbutton .NoRoom: closetext @@ -36,7 +36,7 @@ SuperRodHouseBookshelf: ; unused jumpstd picturebookshelf -UnknownText_0x7f4af: +OfferSuperRodText: text "I'm the FISHING" line "GURU's younger" cont "brother." @@ -51,7 +51,7 @@ UnknownText_0x7f4af: line "right." done -UnknownText_0x7f52f: +GiveSuperRodText: text "Yes, yes. Just as" line "I thought!" @@ -60,7 +60,7 @@ UnknownText_0x7f52f: cont "SUPER ROD." done -UnknownText_0x7f57c: +GaveSuperRodText: text "Try your hand at" line "fishing wherever" cont "there is water." @@ -72,7 +72,7 @@ UnknownText_0x7f57c: line "different RODS." done -UnknownText_0x7f5ec: +DontWantSuperRodText: text "Huh? My own eyes" line "deceived me?" done diff --git a/maps/Route24.asm b/maps/Route24.asm index 227503e73..903ff57d0 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -10,20 +10,20 @@ Route24RocketScript: faceplayer playmusic MUSIC_ROCKET_ENCOUNTER opentext - writetext UnknownText_0x1adc2e + writetext Route24RocketSeenText waitbutton closetext - winlosstext UnknownText_0x1add67, -1 + winlosstext Route24RocketBeatenText, -1 loadtrainer GRUNTM, GRUNTM_31 startbattle dontrestartmapmusic reloadmapafterbattle playmusic MUSIC_ROCKET_ENCOUNTER opentext - writetext UnknownText_0x1addc0 + writetext Route24RocketAfterBattleText buttonsound special FadeOutMusic - writetext UnknownText_0x1adee1 + writetext Route24RocketDisappearsText waitbutton closetext special FadeBlackQuickly @@ -34,7 +34,7 @@ Route24RocketScript: playmapmusic end -UnknownText_0x1adc2e: +Route24RocketSeenText: text "Hey, kid! Me am a" line "TEAM ROCKET member" cont "kind of guy!" @@ -63,7 +63,7 @@ UnknownText_0x1adc2e: line "begin we do!" done -UnknownText_0x1add67: +Route24RocketBeatenText: text "Ayieeeh! No, no," line "no, believe it I" cont "can't!" @@ -73,7 +73,7 @@ UnknownText_0x1add67: cont "not to you!" done -UnknownText_0x1addc0: +Route24RocketAfterBattleText: text "OK. Tell you mine" line "secret will I." @@ -102,7 +102,7 @@ UnknownText_0x1addc0: line "revenge they are." done -UnknownText_0x1adee1: +Route24RocketDisappearsText: text "…" para "You say what? TEAM" 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/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 7faddf989..417dd346a 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -308,13 +308,13 @@ BugCatchingContestant1BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b399 + writetext BugCatchingContestant1BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b3c4 + writetext BugCatchingContestant1BStillCompetingText waitbutton closetext end @@ -324,13 +324,13 @@ BugCatchingContestant2BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b40f + writetext BugCatchingContestant2BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b440 + writetext BugCatchingContestant2BStillCompetingText waitbutton closetext end @@ -340,13 +340,13 @@ BugCatchingContestant3BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b462 + writetext BugCatchingContestant3BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b496 + writetext BugCatchingContestant3BStillCompetingText waitbutton closetext end @@ -356,13 +356,13 @@ BugCatchingContestant4BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b4da + writetext BugCatchingContestant4BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b50a + writetext BugCatchingContestant4BStillCompetingText waitbutton closetext end @@ -372,13 +372,13 @@ BugCatchingContestant5BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b54e + writetext BugCatchingContestant5BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b57c + writetext BugCatchingContestant5BStillCompetingText waitbutton closetext end @@ -388,13 +388,13 @@ BugCatchingContestant6BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b5b0 + writetext BugCatchingContestant6BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b5dd + writetext BugCatchingContestant6BStillCompetingText waitbutton closetext end @@ -404,13 +404,13 @@ BugCatchingContestant7BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b64b + writetext BugCatchingContestant7BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b698 + writetext BugCatchingContestant7BStillCompetingText waitbutton closetext end @@ -420,13 +420,13 @@ BugCatchingContestant8BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b6b8 + writetext BugCatchingContestant8BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b6e9 + writetext BugCatchingContestant8BStillCompetingText waitbutton closetext end @@ -436,13 +436,13 @@ BugCatchingContestant9BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b71b + writetext BugCatchingContestant9BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b740 + writetext BugCatchingContestant9BStillCompetingText waitbutton closetext end @@ -452,13 +452,13 @@ BugCatchingContestant10BScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse .StillCompeting - writetext UnknownText_0x6b76f + writetext BugCatchingContestant10BText waitbutton closetext end .StillCompeting: - writetext UnknownText_0x6b7af + writetext BugCatchingContestant10BStillCompetingText waitbutton closetext end @@ -658,13 +658,13 @@ UnknownText_0x6b370: cont "the PARK." done -UnknownText_0x6b399: +BugCatchingContestant1BText: text "DON: Wow, you beat" line "me. You're pretty" cont "good." done -UnknownText_0x6b3c4: +BugCatchingContestant1BStillCompetingText: text "DON: Luck plays a" line "big part in this." @@ -673,24 +673,24 @@ UnknownText_0x6b3c4: cont "appear." done -UnknownText_0x6b40f: +BugCatchingContestant2BText: text "ED: I envy you." line "I just couldn't" cont "do it this time." done -UnknownText_0x6b440: +BugCatchingContestant2BStillCompetingText: text "ED: Maybe you win" line "with big #MON?" done -UnknownText_0x6b462: +BugCatchingContestant3BText: text "NICK: Well done!" line "I'm going to raise" cont "my #MON better." done -UnknownText_0x6b496: +BugCatchingContestant3BStillCompetingText: text "NICK: Maybe you" line "get a higher score" @@ -698,13 +698,13 @@ UnknownText_0x6b496: line "an unusual color." done -UnknownText_0x6b4da: +BugCatchingContestant4BText: text "WILLIAM: You're" line "the winner? What" cont "did you catch?" done -UnknownText_0x6b50a: +BugCatchingContestant4BStillCompetingText: text "WILLIAM: Well, I'm" line "satisfied because" @@ -712,25 +712,25 @@ UnknownText_0x6b50a: line "that I wanted." done -UnknownText_0x6b54e: +BugCatchingContestant5BText: text "BENNY: Congrats!" line "You have earned my" cont "respect!" done -UnknownText_0x6b57c: +BugCatchingContestant5BStillCompetingText: text "BENNY: I caught a" line "SCYTHER before," cont "but I didn't win." done -UnknownText_0x6b5b0: +BugCatchingContestant6BText: text "BARRY: That #-" line "MON you caught…" cont "it's awesome!" done -UnknownText_0x6b5dd: +BugCatchingContestant6BStillCompetingText: text "BARRY: It's easier" line "to win if you get" @@ -742,7 +742,7 @@ UnknownText_0x6b5dd: cont "other points." done -UnknownText_0x6b64b: +BugCatchingContestant7BText: text "CINDY: You won?" line "That's great!" @@ -751,35 +751,35 @@ UnknownText_0x6b64b: cont "#MON with me?" done -UnknownText_0x6b698: +BugCatchingContestant7BStillCompetingText: text "CINDY: I really" line "love bug #MON!" done -UnknownText_0x6b6b8: +BugCatchingContestant8BText: text "JOSH: I… I can't" line "believe I lost at" cont "bug-catching…" done -UnknownText_0x6b6e9: +BugCatchingContestant8BStillCompetingText: text "JOSH: I heard that" line "somebody won with" cont "a CATERPIE!" done -UnknownText_0x6b71b: +BugCatchingContestant9BText: text "SAMUEL: Next time," line "I'm going to win." done -UnknownText_0x6b740: +BugCatchingContestant9BStillCompetingText: text "SAMUEL: Darn." line "I thought I would" cont "score higher…" done -UnknownText_0x6b76f: +BugCatchingContestant10BText: text "KIPP: Could you" line "give me some tips?" @@ -787,7 +787,7 @@ UnknownText_0x6b76f: line "your style." done -UnknownText_0x6b7af: +BugCatchingContestant10BStillCompetingText: text "KIPP: I study a" line "lot, but that's" diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 15f69e310..ce3522d9a 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -13,14 +13,14 @@ Route39BarnTwin1Script: opentext checkevent EVENT_HEALED_MOOMOO iftrue .FeedingMooMoo - writetext Text_MoomooIsSick + writetext Route39BarnTwinMoomooIsSickText waitbutton closetext turnobject ROUTE39BARN_TWIN1, RIGHT end .FeedingMooMoo: - writetext Text_WereFeedingMoomoo + writetext Route39BarnTwinWereFeedingMoomooText waitbutton closetext turnobject ROUTE39BARN_TWIN1, RIGHT @@ -31,28 +31,28 @@ Route39BarnTwin2Script: opentext checkevent EVENT_HEALED_MOOMOO iftrue .FeedingMooMoo - writetext Text_MoomooIsSick + writetext Route39BarnTwinMoomooIsSickText waitbutton closetext turnobject ROUTE39BARN_TWIN2, LEFT end .FeedingMooMoo: - writetext Text_WereFeedingMoomoo + writetext Route39BarnTwinWereFeedingMoomooText waitbutton closetext turnobject ROUTE39BARN_TWIN2, LEFT end -MooMoo: +MoomooScript: opentext checkevent EVENT_HEALED_MOOMOO iftrue .HappyCow - writetext Text_WeakMoo + writetext MoomooWeakMooText writebyte MILTANK special PlaySlowCry buttonsound - writetext Text_ItsCryIsWeak + writetext Route39BarnItsCryIsWeakText checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO iftrue .GiveBerry waitbutton @@ -61,7 +61,7 @@ MooMoo: .GiveBerry: buttonsound - writetext Text_AskGiveBerry + writetext Route39BarnAskGiveBerryText yesorno iffalse .Refused checkitem BERRY @@ -73,113 +73,113 @@ MooMoo: ifequal 3, .ThreeBerries ifequal 5, .FiveBerries ifequal 7, .SevenBerries - writetext Text_GaveBerry + writetext Route39BarnGaveBerryText waitbutton closetext end .ThreeBerries: - writetext Text_GaveBerry + writetext Route39BarnGaveBerryText buttonsound - writetext Text_LittleHealthier + writetext Route39BarnLittleHealthierText waitbutton closetext end .FiveBerries: - writetext Text_GaveBerry + writetext Route39BarnGaveBerryText buttonsound - writetext Text_QuiteHealthy + writetext Route39BarnQuiteHealthyText waitbutton closetext end .SevenBerries: playmusic MUSIC_HEAL - writetext Text_GaveBerry + writetext Route39BarnGaveBerryText pause 60 buttonsound special RestartMapMusic - writetext Text_TotallyHealthy + writetext Route39BarnTotallyHealthyText waitbutton closetext setevent EVENT_HEALED_MOOMOO end .NoBerriesInBag: - writetext Text_NoBerries + writetext Route39BarnNoBerriesText waitbutton closetext end .Refused: - writetext Text_RefusedToGiveBerry + writetext Route39BarnRefusedBerryText waitbutton closetext end .HappyCow: - writetext UnknownText_0x9cd92 + writetext MoomooHappyMooText cry MILTANK waitbutton closetext end -Text_MoomooIsSick: +Route39BarnTwinMoomooIsSickText: text "MOOMOO is sick…" para "She needs lots of" line "BERRIES." done -Text_WereFeedingMoomoo: +Route39BarnTwinWereFeedingMoomooText: text "We're feeding" line "MOOMOO!" done -Text_WeakMoo: +MoomooWeakMooText: text "MILTANK: …Moo…" done -Text_ItsCryIsWeak: +Route39BarnItsCryIsWeakText: text "Its cry is weak…" done -UnknownText_0x9cd92: +MoomooHappyMooText: text "MILTANK: Mooo!" done -Text_AskGiveBerry: +Route39BarnAskGiveBerryText: text "Give a BERRY to" line "MILTANK?" done -Text_GaveBerry: +Route39BarnGaveBerryText: text " gave a" line "BERRY to MILTANK." done -Text_LittleHealthier: +Route39BarnLittleHealthierText: text "MILTANK became a" line "little healthier!" done -Text_QuiteHealthy: +Route39BarnQuiteHealthyText: text "MILTANK became" line "quite healthy!" done -Text_TotallyHealthy: +Route39BarnTotallyHealthyText: text "MILTANK became" line "totally healthy!" done -Text_NoBerries: +Route39BarnNoBerriesText: text " has no" line "BERRIES…" done -Text_RefusedToGiveBerry: +Route39BarnRefusedBerryText: text " wouldn't" line "give a BERRY." @@ -200,4 +200,4 @@ Route39Barn_MapEvents: db 3 ; object events object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin1Script, -1 object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin2Script, -1 - object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 + object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoomooScript, -1 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 6af688f1a..671b64aed 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -11,18 +11,18 @@ Route43MahoganyGateOfficer: opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .RocketsCleared - writetext UnknownText_0x19ab1f + writetext Route43MahoganyGateOfficerText waitbutton closetext end .RocketsCleared: - writetext UnknownText_0x19ab65 + writetext Route43MahoganyGateOfficerRocketsClearedText waitbutton closetext end -UnknownText_0x19ab1f: +Route43MahoganyGateOfficerText: text "Only people headed" line "up to LAKE OF RAGE" @@ -30,7 +30,7 @@ UnknownText_0x19ab1f: line "here lately." done -UnknownText_0x19ab65: +Route43MahoganyGateOfficerRocketsClearedText: text "Nobody goes up to" line "LAKE OF RAGE these" cont "days." 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/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 960f9f9be..161c4c169 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -15,23 +15,23 @@ SaffronPokecenter1FNurseScript: SaffronPokecenter1FTeacherScript: special Mobile_DummyReturnFalse iftrue .mobile - jumptextfaceplayer UnknownText_0x18a4a3 + jumptextfaceplayer SaffronPokecenter1FTeacherText .mobile - jumptextfaceplayer UnknownText_0x18a532 + jumptextfaceplayer SaffronPokecenter1FTeacherMobileText SaffronPokecenter1FFisherScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .SolvedKantoPowerCrisis - writetext UnknownText_0x18a5d3 + writetext SaffronPokecenter1FFisherText waitbutton closetext end .SolvedKantoPowerCrisis: - writetext UnknownText_0x18a62e + writetext SaffronPokecenter1FFisherReturnedMachinePartText waitbutton closetext end @@ -39,7 +39,7 @@ SaffronPokecenter1FFisherScript: SaffronPokecenter1FYoungsterScript: jumptextfaceplayer SaffronPokecenter1FYoungsterText -UnknownText_0x18a4a3: +SaffronPokecenter1FTeacherText: text "What are JOHTO's" line "#MON CENTERS" cont "like?" @@ -55,7 +55,7 @@ UnknownText_0x18a4a3: cont "then!" done -UnknownText_0x18a532: +SaffronPokecenter1FTeacherMobileText: text "What are JOHTO's" line "#MON CENTERS" cont "like?" @@ -73,7 +73,7 @@ UnknownText_0x18a532: line "trade it to me!" done -UnknownText_0x18a5d3: +SaffronPokecenter1FFisherText: text "I just happened to" line "come through ROCK" @@ -82,7 +82,7 @@ UnknownText_0x18a5d3: cont "the POWER PLANT." done -UnknownText_0x18a62e: +SaffronPokecenter1FFisherReturnedMachinePartText: text "Caves collapse" line "easily." 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/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index f1092aca7..9396a882a 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -183,13 +183,13 @@ TeamRocketBaseB3FLockedDoor: jump .OpenSesame .NeedsPassword: - writetext UnknownText_0x6e970 + writetext TeamRocketBaseB3FLockedDoorNeedsPasswordText waitbutton closetext end .OpenSesame: - writetext UnknownText_0x6e9a3 + writetext TeamRocketBaseB3FLockedDoorOpenSesameText waitbutton playsound SFX_ENTER_DOOR changeblock 10, 8, $07 ; floor @@ -547,14 +547,14 @@ ScientistMitchAfterBattleText: line "excites me!" done -UnknownText_0x6e970: +TeamRocketBaseB3FLockedDoorNeedsPasswordText: text "The door's closed…" para "It needs two" line "passwords to open." done -UnknownText_0x6e9a3: +TeamRocketBaseB3FLockedDoorOpenSesameText: text "The door's closed…" para " entered" 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." diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 70c0b8ced..2ed7d7441 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -17,16 +17,16 @@ ViridianCity_MapScripts: ViridianCityCoffeeGramps: faceplayer opentext - writetext UnknownText_0x1a9aa5 + writetext ViridianCityCoffeeGrampsQuestionText yesorno iffalse .no - writetext UnknownText_0x1a9b6f + writetext ViridianCityCoffeeGrampsBelievedText waitbutton closetext end .no: - writetext UnknownText_0x1a9bb7 + writetext ViridianCityCoffeeGrampsDoubtedText waitbutton closetext end @@ -36,13 +36,13 @@ ViridianCityGrampsNearGym: opentext checkevent EVENT_BLUE_IN_CINNABAR iftrue .BlueReturned - writetext UnknownText_0x1a9c11 + writetext ViridianCityGrampsNearGymText waitbutton closetext end .BlueReturned: - writetext UnknownText_0x1a9c7e + writetext ViridianCityGrampsNearGymBlueReturnedText waitbutton closetext end @@ -52,13 +52,13 @@ ViridianCityDreamEaterFisher: opentext checkevent EVENT_GOT_TM42_DREAM_EATER iftrue .GotDreamEater - writetext UnknownText_0x1a9cc4 + writetext ViridianCityDreamEaterFisherText buttonsound verbosegiveitem TM_DREAM_EATER iffalse .NoRoomForDreamEater setevent EVENT_GOT_TM42_DREAM_EATER .GotDreamEater: - writetext UnknownText_0x1a9d86 + writetext ViridianCityDreamEaterFisherGotDreamEaterText waitbutton .NoRoomForDreamEater: closetext @@ -85,7 +85,7 @@ ViridianCityPokecenterSign: ViridianCityMartSign: jumpstd martsign -UnknownText_0x1a9aa5: +ViridianCityCoffeeGrampsQuestionText: text "Hey, kid! I just" line "had a double shot" @@ -105,7 +105,7 @@ UnknownText_0x1a9aa5: para "Do you believe me?" done -UnknownText_0x1a9b6f: +ViridianCityCoffeeGrampsBelievedText: text "Good, good. Yes, I" line "was something out" @@ -113,7 +113,7 @@ UnknownText_0x1a9b6f: line "let me tell you!" done -UnknownText_0x1a9bb7: +ViridianCityCoffeeGrampsDoubtedText: text "What? You little" line "whelp!" @@ -124,7 +124,7 @@ UnknownText_0x1a9bb7: line "or two. Humph!" done -UnknownText_0x1a9c11: +ViridianCityGrampsNearGymText: text "This GYM didn't" line "have a LEADER" cont "until recently." @@ -136,7 +136,7 @@ UnknownText_0x1a9c11: line "often away." done -UnknownText_0x1a9c7e: +ViridianCityGrampsNearGymBlueReturnedText: text "Are you going to" line "battle the LEADER?" @@ -144,7 +144,7 @@ UnknownText_0x1a9c7e: line "You'll need it." done -UnknownText_0x1a9cc4: +ViridianCityDreamEaterFisherText: text "Yawn!" para "I must have dozed" @@ -167,7 +167,7 @@ UnknownText_0x1a9cc4: cont "this TM." done -UnknownText_0x1a9d86: +ViridianCityDreamEaterFisherGotDreamEaterText: text "TM42 contains" line "DREAM EATER…" diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index e1136222a..ada1a726b 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -59,7 +59,7 @@ WiseTriosRoom_CannotEnterTinTowerScript: stopfollow turnobject PLAYER, RIGHT opentext - writetext UnknownText_0x98712 + writetext WiseTriosRoomSage3BlocksExitText waitbutton closetext applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625 @@ -71,7 +71,7 @@ TrainerSageGaku: .Script: opentext - writetext UnknownText_0x98938 + writetext SageGakuAfterBattleText waitbutton closetext end @@ -81,7 +81,7 @@ TrainerSageMasa: .Script: opentext - writetext UnknownText_0x98a35 + writetext SageMasaAfterBattleText waitbutton closetext end @@ -95,9 +95,9 @@ TrainerSageKoji: pause 10 showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE6, 20 opentext - writetext UnknownText_0x98c6c + writetext SageKojiAfterBattleQuestionText buttonsound - writetext UnknownText_0x98cac + writetext SageKojiAfterBattleSpeechText waitbutton closetext applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 @@ -108,7 +108,7 @@ TrainerSageKoji: .KojiAllowsPassage: opentext - writetext UnknownText_0x98db5 + writetext SageKojiAfterBattleFinalText waitbutton closetext end @@ -153,7 +153,7 @@ WiseTriosRoomSage2Text: line "by someone." done -UnknownText_0x98712: +WiseTriosRoomSage3BlocksExitText: text "TIN TOWER may be" line "entered by those" @@ -213,7 +213,7 @@ SageGakuBeatenText: line "thought? Perhaps…" done -UnknownText_0x98938: +SageGakuAfterBattleText: text "Ah, so it is you" line "who claim to have" @@ -241,7 +241,7 @@ SageMasaBeatenText: line "the truth…" done -UnknownText_0x98a35: +SageMasaAfterBattleText: text "In the past, there" line "were two nine-tier" cont "towers here." @@ -301,7 +301,7 @@ SageKojiBeatenText: line "Why?" done -UnknownText_0x98c6c: +SageKojiAfterBattleQuestionText: text "You… Are you the" line "trainer who is" @@ -309,7 +309,7 @@ UnknownText_0x98c6c: line "legendary #MON?" done -UnknownText_0x98cac: +SageKojiAfterBattleSpeechText: text "I see…" para "We, the WISE TRIO," @@ -335,7 +335,7 @@ UnknownText_0x98cac: line "you to the test." done -UnknownText_0x98db5: +SageKojiAfterBattleFinalText: text "Please, do go on." para "SUICUNE will put" From 33ff8f2aed95ec9d1d45d91c36a6d44a6edfce74 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 23 Aug 2018 10:07:05 -0400 Subject: [PATCH 4/4] =?UTF-8?q?asm=20=E2=86=92=20diff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/bugs_and_glitches.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 251ff3403..33df631b2 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -986,7 +986,7 @@ Then edit [engine/battle/start_battle.asm](/engine/battle/start_battle.asm): Finally, edit [engine/battle/read_trainer_party.asm](/engine/battle/read_trainer_party.asm): -```asm +```diff INCLUDE "data/trainers/parties.asm" + +SetTrainerBattleLevel: @@ -1370,7 +1370,7 @@ This supports up to six entries. **Fix:** Edit `PlacePartyMonEvoStoneCompatibility.DetermineCompatibility` in [engine/pokemon/party_menu.asm](/engine/pokemon/party_menu.asm): -```asm +```diff .loop2 ld a, [hli] and a