diff options
Diffstat (limited to 'maps')
-rw-r--r-- | maps/GoldenrodCity.asm | 8 | ||||
-rw-r--r-- | maps/LakeOfRage.asm | 28 | ||||
-rw-r--r-- | maps/LancesRoom.asm | 20 | ||||
-rw-r--r-- | maps/MahoganyMart1F.asm | 16 | ||||
-rw-r--r-- | maps/MountMortarB1F.asm | 24 | ||||
-rw-r--r-- | maps/NationalPark.asm | 12 | ||||
-rw-r--r-- | maps/OlivinePort.asm | 50 | ||||
-rw-r--r-- | maps/PlayersHouse1F.asm | 4 | ||||
-rw-r--r-- | maps/Pokecenter2F.asm | 8 | ||||
-rw-r--r-- | maps/Route36.asm | 8 | ||||
-rw-r--r-- | maps/Route38.asm | 8 | ||||
-rw-r--r-- | maps/RuinsOfAlphKabutoChamber.asm | 12 | ||||
-rw-r--r-- | maps/SilverCaveRoom3.asm | 12 | ||||
-rw-r--r-- | maps/TeamRocketBaseB2F.asm | 69 | ||||
-rw-r--r-- | maps/VermilionCity.asm | 28 | ||||
-rw-r--r-- | maps/VermilionPort.asm | 48 | ||||
-rw-r--r-- | maps/VioletPokecenter1F.asm | 26 |
17 files changed, 192 insertions, 189 deletions
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index d9d916243..6b7ff934d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -73,21 +73,21 @@ MoveTutorScript: .Flamethrower: setval MOVETUTOR_FLAMETHROWER - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible .Thunderbolt: setval MOVETUTOR_THUNDERBOLT - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible .IceBeam: setval MOVETUTOR_ICE_BEAM - writetext UnknownText_0x1991cf + writetext GoldenrodCityMoveTutorMoveText special MoveTutor ifequal FALSE, .TeachMove sjump .Incompatible @@ -545,7 +545,7 @@ GoldenrodCityMoveTutorYouDontHaveEnoughCoinsText: line "enough coins here…" done -UnknownText_0x1991cf: +GoldenrodCityMoveTutorMoveText: text_start done diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 733d5e024..97a7fd855 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -45,14 +45,14 @@ LakeOfRageLanceScript: checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue .AskAgainForHelp opentext - writetext UnknownText_0x70157 + writetext LakeOfRageLanceForcedToEvolveText buttonsound faceplayer - writetext UnknownText_0x701b4 + writetext LakeOfRageLanceIntroText yesorno iffalse .RefusedToHelp .AgreedToHelp: - writetext UnknownText_0x702c6 + writetext LakeOfRageLanceRadioSignalText waitbutton closetext playsound SFX_WARP_TO @@ -64,7 +64,7 @@ LakeOfRageLanceScript: end .RefusedToHelp: - writetext UnknownText_0x70371 + writetext LakeOfRageLanceRefusedText waitbutton closetext setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE @@ -73,14 +73,14 @@ LakeOfRageLanceScript: .AskAgainForHelp: faceplayer opentext - writetext UnknownText_0x703a5 + writetext LakeOfRageLanceAskHelpText yesorno iffalse .RefusedToHelp sjump .AgreedToHelp RedGyarados: opentext - writetext UnknownText_0x703cb + writetext LakeOfRageGyaradosCryText pause 15 cry GYARADOS closetext @@ -94,7 +94,7 @@ RedGyarados: opentext giveitem RED_SCALE waitsfx - writetext UnknownText_0x703df + writetext LakeOfRageGotRedScaleText playsound SFX_ITEM waitsfx itemnotify @@ -242,7 +242,7 @@ MovementData_0x70155: teleport_from step_end -UnknownText_0x70157: +LakeOfRageLanceForcedToEvolveText: text "This lake is full" line "of GYARADOS but" cont "nothing else…" @@ -252,7 +252,7 @@ UnknownText_0x70157: cont "to evolve…" done -UnknownText_0x701b4: +LakeOfRageLanceIntroText: text "Did you come here" line "because of the" cont "rumors?" @@ -280,7 +280,7 @@ UnknownText_0x701b4: cont "investigate?" done -UnknownText_0x702c6: +LakeOfRageLanceRadioSignalText: text "LANCE: Excellent!" para "It seems that the" @@ -299,22 +299,22 @@ UnknownText_0x702c6: line "for you, <PLAY_G>." done -UnknownText_0x70371: +LakeOfRageLanceRefusedText: text "Oh… Well, if you" line "change your mind," cont "please help me." done -UnknownText_0x703a5: +LakeOfRageLanceAskHelpText: text "LANCE: Hm? Are you" line "going to help me?" done -UnknownText_0x703cb: +LakeOfRageGyaradosCryText: text "GYARADOS: Gyashaa!" done -UnknownText_0x703df: +LakeOfRageGotRedScaleText: text "<PLAYER> obtained a" line "RED SCALE." done diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 7a47c37d1..e09c60763 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -80,7 +80,7 @@ LancesRoomLanceScript: appear LANCESROOM_MARY applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn opentext - writetext UnknownText_0x1811dd + writetext LancesRoomMaryOhNoOakText waitbutton closetext appear LANCESROOM_OAK @@ -91,19 +91,19 @@ LancesRoomLanceScript: turnobject LANCESROOM_OAK, UP turnobject LANCESROOM_LANCE, LEFT opentext - writetext UnknownText_0x18121b + writetext LancesRoomOakCongratulationsText waitbutton closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion turnobject PLAYER, LEFT opentext - writetext UnknownText_0x18134b + writetext LancesRoomMaryInterviewText waitbutton closetext applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway turnobject PLAYER, UP opentext - writetext UnknownText_0x18137b + writetext LancesRoomNoisyText waitbutton closetext follow LANCESROOM_LANCE, PLAYER @@ -119,7 +119,7 @@ LancesRoomLanceScript: applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryTriesToFollow showemote EMOTE_SHOCK, LANCESROOM_MARY, 15 opentext - writetext UnknownText_0x1813c5 + writetext LancesRoomMaryNoInterviewText pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth @@ -273,7 +273,7 @@ LanceBattleAfterText: line "your #MON." done -UnknownText_0x1811dd: +LancesRoomMaryOhNoOakText: text "MARY: Oh, no!" line "It's all over!" @@ -281,7 +281,7 @@ UnknownText_0x1811dd: line "weren't so slow…" done -UnknownText_0x18121b: +LancesRoomOakCongratulationsText: text "PROF.OAK: Ah," line "<PLAY_G>!" @@ -314,13 +314,13 @@ UnknownText_0x18121b: line "<PLAY_G>!" done -UnknownText_0x18134b: +LancesRoomMaryInterviewText: text "MARY: Let's inter-" line "view the brand new" cont "CHAMPION!" done -UnknownText_0x18137b: +LancesRoomNoisyText: text "LANCE: This is" line "getting to be a" cont "bit too noisy…" @@ -329,7 +329,7 @@ UnknownText_0x18137b: line "come with me?" done -UnknownText_0x1813c5: +LancesRoomMaryNoInterviewText: text "MARY: Oh, wait!" line "We haven't done" cont "the interview!" diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index d63430709..cd517f930 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -63,7 +63,7 @@ MahogayMart1FBlackBeltScript: MahoganyMart1FLanceUncoversStaircaseScript: pause 15 opentext - writetext UnknownText_0x6c52a + writetext MahoganyMart1FLanceDragoniteHyperBeamText pause 15 closetext playsound SFX_TACKLE @@ -74,7 +74,7 @@ MahoganyMart1FLanceUncoversStaircaseScript: pause 15 applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407 opentext - writetext UnknownText_0x6c549 + writetext MahoganyMart1FLanceRadioText waitbutton closetext follow MAHOGANYMART1F_LANCE, PLAYER @@ -83,7 +83,7 @@ MahoganyMart1FLanceUncoversStaircaseScript: applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e stopfollow opentext - writetext UnknownText_0x6c59e + writetext MahoganyMart1FLanceStairsText waitbutton showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT @@ -93,7 +93,7 @@ MahoganyMart1FLanceUncoversStaircaseScript: setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART turnobject MAHOGANYMART1F_LANCE, LEFT opentext - writetext UnknownText_0x6c5ba + writetext MahoganyMart1FLanceSplitUpText waitbutton closetext applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 @@ -189,12 +189,12 @@ MahogayMart1FBlackBeltText_LanceEntered: line "#MON are tough…" done -UnknownText_0x6c52a: +MahoganyMart1FLanceDragoniteHyperBeamText: text "LANCE: DRAGONITE," line "HYPER BEAM." done -UnknownText_0x6c549: +MahoganyMart1FLanceRadioText: text "What took you," line "<PLAY_G>?" @@ -205,12 +205,12 @@ UnknownText_0x6c549: line "from here." done -UnknownText_0x6c59e: +MahoganyMart1FLanceStairsText: text "The stairs are" line "right here." done -UnknownText_0x6c5ba: +MahoganyMart1FLanceSplitUpText: text "LANCE: <PLAY_G>, we" line "should split up to" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 25ffc862f..7cf4f6ce0 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -19,34 +19,34 @@ MountMortarB1FKiyoScript: iftrue .GotTyrogue checkevent EVENT_BEAT_BLACKBELT_KIYO iftrue .BeatKiyo - writetext UnknownText_0x7e24d + writetext MountMortarB1FKiyoIntroText waitbutton closetext - winlosstext UnknownText_0x7e2a9, 0 + winlosstext MountMortarB1FKiyoWinText, 0 loadtrainer BLACKBELT_T, KIYO startbattle reloadmapafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO opentext .BeatKiyo: - writetext UnknownText_0x7e2c0 + writetext MountMortarB1FTyrogueRewardText buttonsound waitsfx readvar VAR_PARTYCOUNT ifequal PARTY_LENGTH, .NoRoom - writetext UnknownText_0x7e355 + writetext MountMortarB1FReceiveMonText playsound SFX_CAUGHT_MON waitsfx givepoke TYROGUE, 10 setevent EVENT_GOT_TYROGUE_FROM_KIYO .GotTyrogue: - writetext UnknownText_0x7e36a + writetext MountMortarB1FKiyoGotTyrogueText waitbutton closetext end .NoRoom: - writetext UnknownText_0x7e3df + writetext MountMortarB1FKiyoFullPartyText waitbutton closetext end @@ -72,7 +72,7 @@ MountMortarB1FPPUp: MountMortarB1FHiddenMaxRevive: hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE -UnknownText_0x7e24d: +MountMortarB1FKiyoIntroText: text "Hey!" para "I am the KARATE" @@ -87,12 +87,12 @@ UnknownText_0x7e24d: para "Hwaaarggh!" done -UnknownText_0x7e2a9: +MountMortarB1FKiyoWinText: text "Waaaarggh!" line "I'm beaten!" done -UnknownText_0x7e2c0: +MountMortarB1FTyrogueRewardText: text "I… I'm crushed…" para "My training is" @@ -108,12 +108,12 @@ UnknownText_0x7e2c0: line "fighting #MON." done -UnknownText_0x7e355: +MountMortarB1FReceiveMonText: text "<PLAYER> received" line "TYROGUE." done -UnknownText_0x7e36a: +MountMortarB1FKiyoGotTyrogueText: text "TYROGUE is a" line "fighting-type." @@ -127,7 +127,7 @@ UnknownText_0x7e36a: para "Farewell!" done -UnknownText_0x7e3df: +MountMortarB1FKiyoFullPartyText: text "You have no room" line "in your party!" done diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index b4fc2aff8..5fb0b1003 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -82,7 +82,7 @@ TrainerSchoolboyJack1: iftrue .NumberAccepted checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x5c4f3 + writetext SchoolboyJackTradeMonText buttonsound setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -212,7 +212,7 @@ TrainerPokefanfBeverly1: iffalse .NoMarill checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x5c5bd + writetext PokefanBeverlyCuteMonText buttonsound setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -239,7 +239,7 @@ TrainerPokefanfBeverly1: sjump .PackFull .NoMarill: - writetext UnknownText_0x5c68a + writetext PokefanFBeverlyMarillFriendText waitbutton closetext end @@ -405,7 +405,7 @@ SchoolboyJack1BeatenText: text "Wha-wha-what?" done -UnknownText_0x5c4f3: +SchoolboyJackTradeMonText: text "There is a lot" line "to learn." @@ -432,7 +432,7 @@ PokefanfBeverly1BeatenText: line "pride, but…" done -UnknownText_0x5c5bd: +PokefanBeverlyCuteMonText: text "I must say, your" line "#MON are quite" cont "cute, too." @@ -459,7 +459,7 @@ PokefanmWilliamAfterBattleText: line "being most lovely." done -UnknownText_0x5c68a: +PokefanFBeverlyMarillFriendText: text "My friend keeps a" line "MARILL!" diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 1cb28288a..dce328919 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -34,7 +34,7 @@ OlivinePortSailorAtGangwayScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue OlivinePortAlreadyRodeScript - writetext UnknownText_0x74a55 + writetext OlivinePortSailorGetOnBoardText waitbutton closetext turnobject OLIVINEPORT_SAILOR1, DOWN @@ -67,7 +67,7 @@ OlivinePortSailorAtGangwayScript: end OlivinePortAlreadyRodeScript: - writetext UnknownText_0x74a80 + writetext OlivinePortCantBoardText waitbutton closetext end @@ -89,14 +89,14 @@ OlivinePortWalkUpToShipScript: ifequal WEDNESDAY, .NextShipFriday ifequal THURSDAY, .NextShipFriday .FirstTime: - writetext UnknownText_0x74a9c + writetext OlivinePortAskBoardText yesorno iffalse OlivinePortNotRidingMoveAwayScript - writetext UnknownText_0x74ada + writetext OlivinePortAskTicketText buttonsound checkitem S_S_TICKET iffalse .NoTicket - writetext UnknownText_0x74b11 + writetext OlivinePortFlashTicketText waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -104,21 +104,21 @@ OlivinePortWalkUpToShipScript: sjump OlivinePortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74b41 + writetext OlivinePortNoTicketText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 end .NextShipMonday: - writetext UnknownText_0x74ba8 + writetext OlivinePortMondayShipText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 end .NextShipFriday: - writetext UnknownText_0x74bce + writetext OlivinePortFridayShipText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 @@ -128,13 +128,13 @@ OlivinePortWalkUpToShipScript: end OlivinePortNotRidingScript: - writetext UnknownText_0x74af6 + writetext OlivinePortComeAgainText waitbutton closetext end OlivinePortNotRidingMoveAwayScript: - writetext UnknownText_0x74af6 + writetext OlivinePortComeAgainText waitbutton closetext applymovement PLAYER, MovementData_0x74a34 @@ -154,14 +154,14 @@ OlivinePortSailorAfterHOFScript: ifequal WEDNESDAY, .NextShipFriday ifequal THURSDAY, .NextShipFriday .FirstTime: - writetext UnknownText_0x74a9c + writetext OlivinePortAskBoardText yesorno iffalse OlivinePortNotRidingScript - writetext UnknownText_0x74ada + writetext OlivinePortAskTicketText buttonsound checkitem S_S_TICKET iffalse .NoTicket - writetext UnknownText_0x74b11 + writetext OlivinePortFlashTicketText waitbutton closetext setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 @@ -175,19 +175,19 @@ OlivinePortSailorAfterHOFScript: sjump OlivinePortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74b41 + writetext OlivinePortNoTicketText waitbutton closetext end .NextShipMonday: - writetext UnknownText_0x74ba8 + writetext OlivinePortMondayShipText waitbutton closetext end .NextShipFriday: - writetext UnknownText_0x74bce + writetext OlivinePortFridayShipText waitbutton closetext end @@ -283,18 +283,18 @@ MovementData_0x74a49: step DOWN step_end -UnknownText_0x74a55: +OlivinePortSailorGetOnBoardText: text "We're departing" line "soon. Please get" cont "on board." done -UnknownText_0x74a80: +OlivinePortCantBoardText: text "Sorry. You can't" line "board now." done -UnknownText_0x74a9c: +OlivinePortAskBoardText: text "Welcome to FAST" line "SHIP S.S.AQUA." @@ -302,17 +302,17 @@ UnknownText_0x74a9c: line "ing today?" done -UnknownText_0x74ada: +OlivinePortAskTicketText: text "May I see your" line "S.S.TICKET?" done -UnknownText_0x74af6: +OlivinePortComeAgainText: text "We hope to see you" line "again!" done -UnknownText_0x74b11: +OlivinePortFlashTicketText: text "<PLAYER> flashed" line "the S.S.TICKET." @@ -320,7 +320,7 @@ UnknownText_0x74b11: line "Thank you!" done -UnknownText_0x74b41: +OlivinePortNoTicketText: text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" @@ -334,12 +334,12 @@ UnknownText_0x74b41: line "S.S.TICKET." done -UnknownText_0x74ba8: +OlivinePortMondayShipText: text "The FAST SHIP will" line "sail next Monday." done -UnknownText_0x74bce: +OlivinePortFridayShipText: text "The FAST SHIP will" line "sail next Friday." done diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index b77cc011e..e09ec19ec 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -36,7 +36,7 @@ MeetMomScript: opentext writetext ElmsLookingForYouText buttonsound - getstring STRING_BUFFER_4, GearName + getstring STRING_BUFFER_4, PokegearName scall PlayersHouse1FReceiveItemStd setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD @@ -103,7 +103,7 @@ MeetMomTalkedScript: playmusic MUSIC_MOM sjump MeetMomScript -GearName: +PokegearName: db "#GEAR@" PlayersHouse1FReceiveItemStd: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 7dc6f32ac..e06d4c633 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -106,7 +106,7 @@ LinkReceptionistScript_Trade: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -208,7 +208,7 @@ LinkReceptionistScript_Battle: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -341,7 +341,7 @@ LinkReceptionistScript_TimeCapsule: .FriendNotReady: special WaitForOtherPlayerToExit - writetext Text_FriendNotReady + writetext YourFriendIsNotReadyText closetext end @@ -853,7 +853,7 @@ Text_TimeCapsuleReceptionistIntro: line "trade across time?" done -Text_FriendNotReady: +YourFriendIsNotReadyText: text "Your friend is not" line "ready." prompt diff --git a/maps/Route36.asm b/maps/Route36.asm index 4604e8c5a..51d012074 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -179,7 +179,7 @@ TrainerSchoolboyAlan1: iftrue .NumberAccepted checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER iftrue .AskAgainForPhoneNumber - writetext UnknownText_0x1947aa + writetext SchoolboyAlanBooksText buttonsound setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 @@ -489,7 +489,7 @@ RockSmashGuyText2: cont "have this." done -UnknownText_0x19451a: +UnusedReceivedTM08Text: text "<PLAYER> received" line "TM08." done @@ -509,7 +509,7 @@ RockSmashGuyText3: cont "smash 'em up!" done -UnknownText_0x1945b8: +UnusedOddTreeText: text "An odd tree is" line "blocking the way" cont "to GOLDENROD CITY." @@ -570,7 +570,7 @@ SchoolboyAlan1BeatenText: line "error?" done -UnknownText_0x1947aa: +SchoolboyAlanBooksText: text "Darn. I study five" line "hours a day too." diff --git a/maps/Route38.asm b/maps/Route38.asm index 427c12f0a..3a4305b59 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -49,7 +49,7 @@ TrainerLassDana1: iftrue .NumberAccepted checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking - writetext UnknownText_0x1a20ec + writetext LassDanaMoomooMilkText buttonsound setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1F @@ -185,7 +185,7 @@ TrainerSchoolboyChad1: iftrue .HaveChadsNumber checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking - writetext UnknownText_0x1a200e + writetext SchoolboyChadSoManyTestsText buttonsound setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumber1 @@ -350,7 +350,7 @@ SchoolboyChad1BeatenText: line "enough, I guess." done -UnknownText_0x1a200e: +SchoolboyChadSoManyTestsText: text "I have to take so" line "many tests, I" @@ -376,7 +376,7 @@ LassDana1BeatenText: line "battle that way." done -UnknownText_0x1a20ec: +LassDanaMoomooMilkText: text "I know something" line "good!" diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index f93036396..d63624b25 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -89,17 +89,17 @@ RuinsOfAlphKabutoChamberScientistScript: iftrue .WallOpen checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse .PuzzleIncomplete - writetext UnknownText_0x589b8 + writetext RuinsOfAlphKabutoChamberScientistTremorText buttonsound .PuzzleIncomplete: - writetext UnknownText_0x588f5 + writetext RuinsOfAlphKabutoChamberScientistCrypticText waitbutton closetext turnobject RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP end .WallOpen: - writetext UnknownText_0x5897c + writetext RuinsOfAlphKabutoChamberScientistHoleText waitbutton closetext end @@ -170,7 +170,7 @@ RuinsOfAlphKabutoChamberReceptionistText: line "patterns." done -UnknownText_0x588f5: +RuinsOfAlphKabutoChamberScientistCrypticText: text "Recently, strange," line "cryptic patterns" cont "have appeared." @@ -183,7 +183,7 @@ UnknownText_0x588f5: line "look at the walls." done -UnknownText_0x5897c: +RuinsOfAlphKabutoChamberScientistHoleText: text "Ah! Here's another" line "huge hole!" @@ -191,7 +191,7 @@ UnknownText_0x5897c: line "go through!" done -UnknownText_0x589b8: +RuinsOfAlphKabutoChamberScientistTremorText: text "That tremor was" line "pretty scary!" diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index e56a86945..45acce4af 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -10,17 +10,17 @@ Red: special FadeOutMusic faceplayer opentext - writetext .Text1 + writetext RedSeenText waitbutton closetext - winlosstext .Text2, .Text2 + winlosstext RedWinLossText, RedWinLossText loadtrainer RED, RED1 startbattle dontrestartmapmusic reloadmapafterbattle special FadeOutMusic opentext - writetext .Text3 + writetext RedLeavesText waitbutton closetext special FadeBlackQuickly @@ -34,16 +34,16 @@ Red: credits end -.Text1: +RedSeenText: text "<……>" line "<……>" done -.Text2: +RedWinLossText: text "…" done -.Text3: +RedLeavesText: text "<……>" line "<……>" done diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 64ea130af..417b10da4 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -58,7 +58,7 @@ RocketBaseBossFScript: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 opentext - writetext UnknownText_0x6d2ad + writetext RocketBaseExecutiveFHoldItText waitbutton closetext turnobject PLAYER, DOWN @@ -69,7 +69,7 @@ RocketBaseBossFScript: turnobject PLAYER, UP applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f opentext - writetext UnknownText_0x6d2c3 + writetext RocketBaseBossFThrashText waitbutton closetext cry DRAGONITE @@ -82,18 +82,18 @@ RocketBaseBossFScript: appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244 opentext - writetext UnknownText_0x6d38c + writetext RocketBaseLanceShareFunText waitbutton closetext turnobject PLAYER, RIGHT applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 opentext - writetext UnknownText_0x6d3bd + writetext RocketBaseBossDontMeddleText waitbutton closetext applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 - winlosstext UnknownText_0x6d45c, 0 + winlosstext RocketBaseBossWinText, 0 setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL loadtrainer EXECUTIVEF, EXECUTIVEF_2 startbattle @@ -104,7 +104,7 @@ RocketBaseBossFScript: reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 opentext - writetext UnknownText_0x6d4c6 + writetext RocketBaseBossRetreatText waitbutton closetext special FadeBlackQuickly @@ -120,13 +120,13 @@ RocketBaseBossFScript: clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE turnobject TEAMROCKETBASEB2F_LANCE, DOWN opentext - writetext UnknownText_0x6d5d8 + writetext RocketBaseLancePostBattleText waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 turnobject PLAYER, UP opentext - writetext UnknownText_0x6d64e + writetext RocketBaseLancePowerOffText waitbutton closetext follow TEAMROCKETBASEB2F_LANCE, PLAYER @@ -134,7 +134,7 @@ RocketBaseBossFScript: stopfollow applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258 opentext - writetext UnknownText_0x6d6cf + writetext RockerBaseLanceElectrodeFaintText waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267 @@ -146,7 +146,7 @@ RocketBaseCantLeaveScript: RocketBaseLancesSideScript: opentext - writetext UnknownText_0x6d7ea + writetext RocketBaseLancesSideText waitbutton closetext applymovement PLAYER, MovementData_0x6d278 @@ -283,16 +283,16 @@ RocketBaseElectrodeScript: applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a turnobject PLAYER, RIGHT opentext - writetext UnknownText_0x6d809 + writetext RocketBaseLanceElectrodeDoneText buttonsound verbosegiveitem HM_WHIRLPOOL setevent EVENT_GOT_HM06_WHIRLPOOL - writetext UnknownText_0x6d8f8 + writetext RocketBaseLanceWhirlpoolText waitbutton closetext turnobject TEAMROCKETBASEB2F_LANCE, DOWN opentext - writetext UnknownText_0x6d994 + writetext RocketBaseLanceMonMasterText waitbutton closetext turnobject PLAYER, DOWN @@ -319,13 +319,13 @@ TeamRocketBaseB2FLockedDoor: opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue .KnowsPassword - writetext UnknownText_0x6dd39 + writetext RocketBaseDoorNoPasswordText waitbutton closetext end .KnowsPassword: - writetext UnknownText_0x6dd6b + writetext RocketBaseDoorKnowPasswordText waitbutton playsound SFX_ENTER_DOOR changeblock 14, 12, $07 ; floor @@ -339,13 +339,13 @@ TeamRocketBaseB2FTransmitterScript: opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .Deactivated - writetext UnknownText_0x6dda7 + writetext RocketBaseB2FTransmitterText waitbutton closetext end .Deactivated: - writetext UnknownText_0x6de03 + writetext RocketBaseB2FDeactivateTransmitterText waitbutton closetext end @@ -557,12 +557,12 @@ MovementData_0x6d2a4: step RIGHT step_end -UnknownText_0x6d2ad: +RocketBaseExecutiveFHoldItText: text "Hold it right" line "there!" done -UnknownText_0x6d2c3: +RocketBaseBossFThrashText: text "We can't have a" line "brat like you on" cont "the loose." @@ -582,13 +582,13 @@ UnknownText_0x6d2c3: cont "thrashed." done -UnknownText_0x6d38c: +RocketBaseLanceShareFunText: text "Hey! Don't be so" line "selfish. Spread" cont "the fun around." done -UnknownText_0x6d3bd: +RocketBaseBossDontMeddleText: text "What? You had an" line "accomplice?" @@ -605,7 +605,7 @@ UnknownText_0x6d3bd: line "with TEAM ROCKET!" done -UnknownText_0x6d45c: +RocketBaseBossWinText: text "Tch, you really" line "are strong." @@ -618,7 +618,7 @@ UnknownText_0x6d45c: line "an EXECUTIVE." done -UnknownText_0x6d4c6: +RocketBaseBossRetreatText: text "…This hideout is" line "done for…" @@ -646,7 +646,7 @@ UnknownText_0x6d4c6: para "Fufufufu…" done -UnknownText_0x6d5d8: +RocketBaseLancePostBattleText: text "LANCE: That did" line "it. We defeated" @@ -660,7 +660,7 @@ UnknownText_0x6d5d8: line "the process…" done -UnknownText_0x6d64e: +RocketBaseLancePowerOffText: text "Sorry, <PLAY_G>." line "I saw how well you" @@ -674,7 +674,7 @@ UnknownText_0x6d64e: line "radio signal." done -UnknownText_0x6d6cf: +RockerBaseLanceElectrodeFaintText: text "It's this machine" line "that's causing all" cont "the problems." @@ -704,12 +704,12 @@ UnknownText_0x6d6cf: line "split the job." done -UnknownText_0x6d7ea: +RocketBaseLancesSideText: text "LANCE: Leave this" line "side to me." done -UnknownText_0x6d809: +RocketBaseLanceElectrodeDoneText: text "LANCE: That odd" line "signal has finally" cont "stopped." @@ -731,12 +731,13 @@ UnknownText_0x6d809: cont "any need for it." done +; unused UnknownText_0x6d8e6: text "<PLAYER> received" line "HM06." done -UnknownText_0x6d8f8: +RocketBaseLanceWhirlpoolText: text "That's WHIRLPOOL." line "Teach it to a" @@ -753,7 +754,7 @@ UnknownText_0x6d8f8: line "from MAHOGANY GYM." done -UnknownText_0x6d994: +RocketBaseLanceMonMasterText: text "<PLAY_G>…" para "The journey to be-" @@ -871,14 +872,14 @@ GruntM19AfterBattleText: cont "for yourself." done -UnknownText_0x6dd39: +RocketBaseDoorNoPasswordText: text "The door's closed…" para "It needs a pass-" line "word to open." done -UnknownText_0x6dd6b: +RocketBaseDoorKnowPasswordText: text "The door's closed…" para "<PLAYER> entered" @@ -887,7 +888,7 @@ UnknownText_0x6dd6b: para "The door opened!" done -UnknownText_0x6dda7: +RocketBaseB2FTransmitterText: text "It's the radio" line "transmitter that's" @@ -898,7 +899,7 @@ UnknownText_0x6dda7: line "full capacity." done -UnknownText_0x6de03: +RocketBaseB2FDeactivateTransmitterText: text "The radio trans-" line "mitter has finally" diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index d6d5fa6de..5834d796c 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -42,13 +42,13 @@ VermilionSnorlax: opentext special SnorlaxAwake iftrue .Awake - writetext UnknownText_0x1aab64 + writetext VermilionCitySnorlaxSleepingText waitbutton closetext end .Awake: - writetext UnknownText_0x1aab84 + writetext VermilionCityRadioNearSnorlaxText pause 15 cry SNORLAX closetext @@ -69,31 +69,31 @@ VermilionGymBadgeGuy: ifequal NUM_BADGES, .AllBadges ifgreater 13, .MostBadges ifgreater 9, .SomeBadges - writetext UnknownText_0x1aabc8 + writetext VermilionCityBadgeGuyTrainerText waitbutton closetext end .SomeBadges: - writetext UnknownText_0x1aac2b + writetext VermilionCityBadgeGuySomeBadgesText waitbutton closetext end .MostBadges: - writetext UnknownText_0x1aac88 + writetext VermilionCityBadgeGuyMostBadgesText waitbutton closetext end .AllBadges: - writetext UnknownText_0x1aacf3 + writetext VermilionCityBadgeGuyAllBadgesText buttonsound verbosegiveitem HP_UP iffalse .Done setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY .AlreadyGotItem: - writetext UnknownText_0x1aad4a + writetext VermilionCityBadgeGuyBattleEdgeText waitbutton .Done: closetext @@ -163,12 +163,12 @@ VermilionCitySuperNerdText: cont "#MON GYM." done -UnknownText_0x1aab64: +VermilionCitySnorlaxSleepingText: text "SNORLAX is snoring" line "peacefully…" done -UnknownText_0x1aab84: +VermilionCityRadioNearSnorlaxText: text "The #GEAR was" line "placed near the" cont "sleeping SNORLAX…" @@ -178,7 +178,7 @@ UnknownText_0x1aab84: para "SNORLAX woke up!" done -UnknownText_0x1aabc8: +VermilionCityBadgeGuyTrainerText: text "Skilled trainers" line "gather in KANTO." @@ -189,7 +189,7 @@ UnknownText_0x1aabc8: line "to defeat." done -UnknownText_0x1aac2b: +VermilionCityBadgeGuySomeBadgesText: text "You've started to" line "collect KANTO GYM" cont "BADGES?" @@ -199,7 +199,7 @@ UnknownText_0x1aac2b: cont "here are tough?" done -UnknownText_0x1aac88: +VermilionCityBadgeGuyMostBadgesText: text "I guess you'll be" line "finished with your" @@ -211,7 +211,7 @@ UnknownText_0x1aac88: cont "BADGES." done -UnknownText_0x1aacf3: +VermilionCityBadgeGuyAllBadgesText: text "Congratulations!" para "You got all the" @@ -221,7 +221,7 @@ UnknownText_0x1aacf3: line "for your efforts." done -UnknownText_0x1aad4a: +VermilionCityBadgeGuyBattleEdgeText: text "Having a variety" line "of #MON types" diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index bba156b39..66ea6bb25 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -40,7 +40,7 @@ VermilionPortSailorAtGangwayScript: opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue VermilionPortAlreadyRodeScript - writetext UnknownText_0x74f06 + writetext VermilionPortDepartingText waitbutton closetext turnobject VERMILIONPORT_SAILOR1, DOWN @@ -71,7 +71,7 @@ VermilionPortSailorAtGangwayScript: end VermilionPortAlreadyRodeScript: - writetext UnknownText_0x74f31 + writetext VermilionPortCantBoardText waitbutton closetext end @@ -90,10 +90,10 @@ VermilionPortWalkUpToShipScript: ifequal THURSDAY, .NextShipSunday ifequal FRIDAY, .NextShipSunday ifequal SATURDAY, .NextShipSunday - writetext UnknownText_0x74f4d + writetext VermilionPortAskBoardingText yesorno iffalse VermilionPortNotRidingMoveAwayScript - writetext UnknownText_0x74f8b + writetext VermilionPortAskTicketText buttonsound checkitem S_S_TICKET iffalse .NoTicket @@ -105,21 +105,21 @@ VermilionPortWalkUpToShipScript: sjump VermilionPortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74ff2 + writetext VermilionPortNoTicketText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 end .NextShipWednesday: - writetext UnknownText_0x75059 + writetext VermilionPortSailMondayText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 end .NextShipSunday: - writetext UnknownText_0x75080 + writetext VermilionPortSailSundayText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 @@ -129,13 +129,13 @@ VermilionPortWalkUpToShipScript: end VermilionPortNotRidingScript: - writetext UnknownText_0x74fa7 + writetext VermilionPortComeAgainText waitbutton closetext end VermilionPortNotRidingMoveAwayScript: - writetext UnknownText_0x74fa7 + writetext VermilionPortComeAgainText waitbutton closetext applymovement PLAYER, MovementData_0x74ef5 @@ -152,10 +152,10 @@ VermilionPortSailorScript: ifequal THURSDAY, .NextShipSunday ifequal FRIDAY, .NextShipSunday ifequal SATURDAY, .NextShipSunday - writetext UnknownText_0x74f4d + writetext VermilionPortAskBoardingText yesorno iffalse VermilionPortNotRidingScript - writetext UnknownText_0x74f8b + writetext VermilionPortAskTicketText buttonsound checkitem S_S_TICKET iffalse .NoTicket @@ -167,19 +167,19 @@ VermilionPortSailorScript: sjump VermilionPortSailorAtGangwayScript .NoTicket: - writetext UnknownText_0x74ff2 + writetext VermilionPortNoTicketText waitbutton closetext end .NextShipWednesday: - writetext UnknownText_0x75059 + writetext VermilionPortSailMondayText waitbutton closetext end .NextShipSunday: - writetext UnknownText_0x75080 + writetext VermilionPortSailSundayText waitbutton closetext end @@ -187,7 +187,7 @@ VermilionPortSailorScript: VermilionPortSuperNerdScript: faceplayer opentext - writetext UnknownText_0x750a6 + writetext VermilionPortSuperNerdText waitbutton closetext end @@ -226,18 +226,18 @@ MovementData_0x74efe: step DOWN step_end -UnknownText_0x74f06: +VermilionPortDepartingText: text "We're departing" line "soon. Please get" cont "on board." done -UnknownText_0x74f31: +VermilionPortCantBoardText: text "Sorry. You can't" line "board now." done -UnknownText_0x74f4d: +VermilionPortAskBoardingText: text "Welcome to FAST" line "SHIP S.S.AQUA." @@ -245,12 +245,12 @@ UnknownText_0x74f4d: line "ing today?" done -UnknownText_0x74f8b: +VermilionPortAskTicketText: text "May I see your" line "S.S.TICKET?" done -UnknownText_0x74fa7: +VermilionPortComeAgainText: text "We hope to see you" line "again!" done @@ -263,7 +263,7 @@ VermilionPortSSTicketText: line "Thank you!" done -UnknownText_0x74ff2: +VermilionPortNoTicketText: text "<PLAYER> tried to" line "show the S.S." cont "TICKET…" @@ -277,17 +277,17 @@ UnknownText_0x74ff2: line "S.S.TICKET." done -UnknownText_0x75059: +VermilionPortSailMondayText: text "The FAST SHIP will" line "sail on Wednesday." done -UnknownText_0x75080: +VermilionPortSailSundayText: text "The FAST SHIP will" line "sail next Sunday." done -UnknownText_0x750a6: +VermilionPortSuperNerdText: text "You came from" line "JOHTO?" diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 2124cf27b..67d7d17ec 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -18,7 +18,7 @@ VioletPokecenter1F_ElmsAideScript: opentext checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE iftrue .SecondTimeAsking - writetext UnknownText_0x69555 + writetext VioletPokecenterElmsAideFavorText .AskTakeEgg: yesorno iffalse .RefusedEgg @@ -31,7 +31,7 @@ VioletPokecenter1F_ElmsAideScript: clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED setmapscene ROUTE_32, SCENE_ROUTE32_OFFER_SLOWPOKETAIL - writetext UnknownText_0x695c5 + writetext VioletPokecenterElmsAideGiveEggText waitbutton closetext readvar VAR_FACING @@ -60,20 +60,20 @@ VioletPokecenter1F_ElmsAideScript: end .PartyFull: - writetext UnknownText_0x69693 + writetext VioletCityElmsAideFullPartyText waitbutton closetext end .RefusedEgg: - writetext UnknownText_0x696f2 + writetext VioletPokecenterElmsAideRefuseText waitbutton closetext setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE end .SecondTimeAsking: - writetext UnknownText_0x69712 + writetext VioletPokecenterElmsAideAskEggText sjump .AskTakeEgg VioletPokecenter1FGameboyKidScript: @@ -103,7 +103,7 @@ MovementData_AideFinishesLeavingPokecenter: step DOWN step_end -UnknownText_0x69555: +VioletPokecenterElmsAideFavorText: text "<PLAY_G>, long" line "time, no see." @@ -117,7 +117,7 @@ UnknownText_0x69555: line "#MON EGG?" done -UnknownText_0x695c5: +VioletPokecenterElmsAideGiveEggText: text "We discovered that" line "a #MON will not" @@ -137,7 +137,7 @@ UnknownText_0x695c5: cont "hatches!" done -UnknownText_0x69693: +VioletCityElmsAideFullPartyText: text "Oh, no. You can't" line "carry any more" cont "#MON with you." @@ -147,17 +147,18 @@ UnknownText_0x69693: cont "room for the EGG." done -UnknownText_0x696f2: +VioletPokecenterElmsAideRefuseText: text "B-but… PROF.ELM" line "asked for you…" done -UnknownText_0x69712: +VioletPokecenterElmsAideAskEggText: text "<PLAY_G>, will you" line "take the EGG?" done -UnknownText_0x6972d: +; unused +VioletPokecenterFarawayLinkText: text "I've been thinking" line "it'd be great to" @@ -168,7 +169,8 @@ UnknownText_0x6972d: line "far away." done -UnknownText_0x69791: +; unused +VioletPokecenterMobileAdapterText: text "I just battled a" line "friend in CIANWOOD" cont "over a link." |