shithub: pokered

Download patch

ref: 4c5c791264be9d3d59a067eb3f8cab4cfac91bdc
parent: 94e609b4bcbb0c6469a2fa0b3ba235d776e269ef
author: IIMarckus <iimarckus@gmail.com>
date: Sun Dec 6 15:52:46 EST 2015

Define text banks relative to the first one. Clean up address comments.

--- a/text.asm
+++ b/text.asm
@@ -1,18 +1,18 @@
 
 TEXT_1  EQU $20
-TEXT_2  EQU $21
-TEXT_3  EQU $22
-TEXT_4  EQU $23
-TEXT_5  EQU $24
-TEXT_6  EQU $25
-TEXT_7  EQU $26
-TEXT_8  EQU $27
-TEXT_9  EQU $28
-TEXT_10 EQU $29
-TEXT_11 EQU $2a
+TEXT_2  EQU TEXT_1 + 1
+TEXT_3  EQU TEXT_2 + 1
+TEXT_4  EQU TEXT_3 + 1
+TEXT_5  EQU TEXT_4 + 1
+TEXT_6  EQU TEXT_5 + 1
+TEXT_7  EQU TEXT_6 + 1
+TEXT_8  EQU TEXT_7 + 1
+TEXT_9  EQU TEXT_8 + 1
+TEXT_10 EQU TEXT_9 + 1
+TEXT_11 EQU TEXT_10 + 1
 
-POKEDEX_TEXT EQU $2b
-MOVE_NAMES   EQU $2c
+POKEDEX_TEXT EQU TEXT_11 + 1
+MOVE_NAMES   EQU POKEDEX_TEXT + 1
 
 INCLUDE "macros.asm"
 INCLUDE "hram.asm"
@@ -20,75 +20,75 @@
 
 SECTION "Text 1", ROMX, BANK[TEXT_1]
 
-_CardKeySuccessText1:: ; 80000 (20:4000)
+_CardKeySuccessText1::
 	text "Bingo!@@"
 
-_CardKeySuccessText2:: ; 80009 (20:4009)
+_CardKeySuccessText2::
 	db $0
 	line "The CARD KEY"
 	cont "opened the door!"
 	done
 
-_CardKeyFailText:: ; 80029 (20:4029)
+_CardKeyFailText::
 	text "Darn! It needs a"
 	line "CARD KEY!"
 	done
 
-_TrainerNameText:: ; 80045 (20:4045)
+_TrainerNameText::
 	TX_RAM wcd6d
 	text ": @@"
 
-_NoNibbleText:: ; 8004d (20:404d)
+_NoNibbleText::
 	text "Not even a nibble!"
 	prompt
 
-_NothingHereText:: ; 80061 (20:4061)
+_NothingHereText::
 	text "Looks like there's"
 	line "nothing here."
 	prompt
 
-_ItsABiteText:: ; 80082 (20:4082)
+_ItsABiteText::
 	text "Oh!"
 	line "It's a bite!"
 	prompt
 
-_ExclamationText:: ; 80093 (20:4093)
+_ExclamationText::
 	text "!"
 	done
 
-_GroundRoseText:: ; 80096 (20:4096)
+_GroundRoseText::
 	text "Ground rose up"
 	line "somewhere!"
 	done
 
-_BoulderText:: ; 800b1 (20:40b1)
+_BoulderText::
 	text "This requires"
 	line "STRENGTH to move!"
 	done
 
-_MartSignText:: ; 800d2 (20:40d2)
+_MartSignText::
 	text "All your item"
 	line "needs fulfilled!"
 	cont "#MON MART"
 	done
 
-_PokeCenterSignText:: ; 800fc (20:40fc)
+_PokeCenterSignText::
 	text "Heal Your #MON!"
 	line "#MON CENTER"
 	done
 
-_FoundItemText:: ; 80119 (20:4119)
+_FoundItemText::
 	text $52, " found"
 	line "@"
 	TX_RAM wcf4b
 	text "!@@"
 
-_NoMoreRoomForItemText:: ; 8012a (20:412a)
+_NoMoreRoomForItemText::
 	text "No more room for"
 	line "items!"
 	done
 
-_OaksAideHiText:: ; 80143 (20:4143)
+_OaksAideHiText::
 	text "Hi! Remember me?"
 	line "I'm PROF.OAK's"
 	cont "AIDE!"
@@ -111,7 +111,7 @@
 	cont "#MON?"
 	done
 
-_OaksAideUhOhText:: ; 801e4 (20:41e4)
+_OaksAideUhOhText::
 	text "Let's see..."
 	line "Uh-oh! You have"
 	cont "caught only @"
@@ -128,7 +128,7 @@
 	text "."
 	done
 
-_OaksAideComeBackText:: ; 80250 (20:4250)
+_OaksAideComeBackText::
 	text "Oh. I see."
 
 	para "When you get @"
@@ -140,7 +140,7 @@
 	text "."
 	done
 
-_OaksAideHereYouGoText:: ; 8028c (20:428c)
+_OaksAideHereYouGoText::
 	text "Great! You have"
 	line "caught @"
 	TX_NUM hOaksAideNumMonsOwned, 1, 3
@@ -151,13 +151,13 @@
 	para "Here you go!"
 	prompt
 
-_OaksAideGotItemText:: ; 802d9 (20:42d9)
+_OaksAideGotItemText::
 	text $52, " got the"
 	line "@"
 	TX_RAM wOaksAideRewardItemName
 	text "!@@"
 
-_OaksAideNoRoomText:: ; 802ec (20:42ec)
+_OaksAideNoRoomText::
 	text "Oh! I see you"
 	line "don't have any"
 	cont "room for the"
@@ -166,13 +166,6 @@
 	text "."
 	done
 
-IF DEF(_YELLOW)
-_NurseChanseyText::
-	text "CHANSEY: Chaaan"
-	line "sey!"
-	done
-ENDC
-
 INCLUDE "text/maps/viridian_forest.asm"
 INCLUDE "text/maps/mt_moon_1f.asm"
 INCLUDE "text/maps/mt_moon_b1f.asm"
@@ -242,7 +235,7 @@
 INCLUDE "text/maps/seafoam_islands_b3f.asm"
 INCLUDE "text/maps/seafoam_islands_b4f.asm"
 
-_AIBattleWithdrawText:: ; 880be (22:40be)
+_AIBattleWithdrawText::
 	TX_RAM wTrainerName
 	text " with-"
 	line "drew @"
@@ -250,7 +243,7 @@
 	text "!"
 	prompt
 
-_AIBattleUseItemText:: ; 880d5 (22:40d5)
+_AIBattleUseItemText::
 	TX_RAM wTrainerName
 	db $0
 	line "used @"
@@ -261,7 +254,7 @@
 	text "!"
 	prompt
 
-_TradeWentToText:: ; 880ef (22:40ef)
+_TradeWentToText::
 	TX_RAM wcf4b
 	text " went"
 	line "to @"
@@ -269,7 +262,7 @@
 	text "."
 	done
 
-_TradeForText:: ; 88103 (22:4103)
+_TradeForText::
 	text "For ", $52, "'s"
 	line "@"
 	TX_RAM wcf4b
@@ -276,7 +269,7 @@
 	text ","
 	done
 
-_TradeSendsText:: ; 88112 (22:4112)
+_TradeSendsText::
 	TX_RAM wGrassRate
 	text " sends"
 	line "@"
@@ -284,19 +277,19 @@
 	text "."
 	done
 
-_TradeWavesFarewellText:: ; 88124 (22:4124)
+_TradeWavesFarewellText::
 	TX_RAM wGrassRate
 	text " waves"
 	line "farewell as"
 	done
 
-_TradeTransferredText:: ; 8813b (22:413b)
+_TradeTransferredText::
 	TX_RAM wcd6d
 	text " is"
 	line "transferred."
 	done
 
-_TradeTakeCareText:: ; 88150 (22:4150)
+_TradeTakeCareText::
 	text "Take good care of"
 	line "@"
 	TX_RAM wcd6d
@@ -303,7 +296,7 @@
 	text "."
 	done
 
-_TradeWillTradeText:: ; 8816a (22:416a)
+_TradeWillTradeText::
 	TX_RAM wGrassRate
 	text " will"
 	line "trade @"
@@ -311,7 +304,7 @@
 	db $0
 	done
 
-_TradeforText:: ; 88180 (22:4180)
+_TradeforText::
 	text "for ", $52, "'s"
 	line "@"
 	TX_RAM wcf4b
@@ -318,36 +311,36 @@
 	text "."
 	done
 
-_PlaySlotMachineText:: ; 8818f (22:418f)
+_PlaySlotMachineText::
 	text "A slot machine!"
 	line "Want to play?"
 	done
 
-_OutOfCoinsSlotMachineText:: ; 881ae (22:41ae)
+_OutOfCoinsSlotMachineText::
 	text "Darn!"
 	line "Ran out of coins!"
 	done
 
-_BetHowManySlotMachineText:: ; 881c7 (22:41c7)
+_BetHowManySlotMachineText::
 	text "Bet how many"
 	line "coins?"
 	done
 
-_StartSlotMachineText:: ; 881dc (22:41dc)
+_StartSlotMachineText::
 	text "Start!"
 	done
 
-_NotEnoughCoinsSlotMachineText:: ; 881e4 (22:41e4)
+_NotEnoughCoinsSlotMachineText::
 	text "Not enough"
 	line "coins!"
 	prompt
 
-_OneMoreGoSlotMachineText:: ; 881f7 (22:41f7)
+_OneMoreGoSlotMachineText::
 	text "One more "
 	line "go?"
 	done
 
-_LinedUpText:: ; 88206 (22:4206)
+_LinedUpText::
 	text " lined up!"
 	line "Scored @"
 	TX_RAM wcf4b
@@ -354,14 +347,14 @@
 	text " coins!"
 	done
 
-_NotThisTimeText:: ; 88226 (22:4226)
+_NotThisTimeText::
 	text "Not this time!"
 	prompt
 
-_YeahText:: ; 88236 (22:4236)
+_YeahText::
 	text "Yeah!@@"
 
-_DexSeenOwnedText:: ; 8823e (22:423e)
+_DexSeenOwnedText::
 	text "#DEX   Seen:@"
 	TX_NUM wDexRatingNumMonsSeen, 1, 3
 	db $0
@@ -369,11 +362,11 @@
 	TX_NUM wDexRatingNumMonsOwned, 1, 3
 	db "@"
 
-_DexRatingText:: ; 88267 (22:4267)
+_DexRatingText::
 	text "#DEX Rating", $6d
 	done
 
-_GymStatueText1:: ; 88275 (22:4275)
+_GymStatueText1::
 	TX_RAM wGymCityName
 	db $0
 	line "#MON GYM"
@@ -385,7 +378,7 @@
 	line $53
 	done
 
-_GymStatueText2:: ; 882a5 (22:42a5)
+_GymStatueText2::
 	TX_RAM wGymCityName
 	db $0
 	line "#MON GYM"
@@ -398,7 +391,7 @@
 	cont $52
 	done
 
-_ViridianCityPokecenterGuyText:: ; 882d7 (22:42d7)
+_ViridianCityPokecenterGuyText::
 	text "#MON CENTERs"
 	line "heal your tired,"
 	cont "hurt or fainted"
@@ -405,7 +398,7 @@
 	cont "#MON!"
 	done
 
-_PewterCityPokecenterGuyText:: ; 8830c (22:430c)
+_PewterCityPokecenterGuyText::
 	text "Yawn!"
 
 	para "When JIGGLYPUFF"
@@ -416,7 +409,7 @@
 	line "Snore..."
 	done
 
-_CeruleanPokecenterGuyText:: ; 88353 (22:4353)
+_CeruleanPokecenterGuyText::
 	text "BILL has lots of"
 	line "#MON!"
 
@@ -424,7 +417,7 @@
 	line "ones too!"
 	done
 
-_LavenderPokecenterGuyText:: ; 88386 (22:4386)
+_LavenderPokecenterGuyText::
 	text "CUBONEs wear"
 	line "skulls, right?"
 
@@ -432,7 +425,7 @@
 	line "lot for one!"
 	done
 
-_MtMoonPokecenterBenchGuyText:: ; 883c2 (22:43c2)
+_MtMoonPokecenterBenchGuyText::
 	text "If you have too"
 	line "many #MON, you"
 	cont "should store them"
@@ -439,29 +432,29 @@
 	cont "via PC!"
 	done
 
-_RockTunnelPokecenterGuyText:: ; 883fc (22:43fc)
+_RockTunnelPokecenterGuyText::
 	text "I heard that"
 	line "GHOSTs haunt"
 	cont "LAVENDER TOWN!"
 	done
 
-_UnusedBenchGuyText1:: ; 88426 (22:4426)
+_UnusedBenchGuyText1::
 	text "I wish I could"
 	line "catch #MON."
 	done
 
-_UnusedBenchGuyText2:: ; 88442 (22:4442)
+_UnusedBenchGuyText2::
 	text "I'm tired from"
 	line "all the fun..."
 	done
 
-_UnusedBenchGuyText3:: ; 88460 (22:4460)
+_UnusedBenchGuyText3::
 	text "SILPH's manager"
 	line "is hiding in the"
 	cont "SAFARI ZONE."
 	done
 
-_VermilionPokecenterGuyText:: ; 8848e (22:448e)
+_VermilionPokecenterGuyText::
 	text "It is true that a"
 	line "higher level"
 	cont "#MON will be"
@@ -477,13 +470,13 @@
 	cont "strong #MON."
 	done
 
-_CeladonCityPokecenterGuyText:: ; 88531 (22:4531)
+_CeladonCityPokecenterGuyText::
 	text "If I had a BIKE,"
 	line "I would go to"
 	cont "CYCLING ROAD!"
 	done
 
-_FuchsiaCityPokecenterGuyText:: ; 8855f (22:455f)
+_FuchsiaCityPokecenterGuyText::
 	text "If you're studying "
 	line "#MON, visit"
 	cont "the SAFARI ZONE."
@@ -492,7 +485,7 @@
 	line "of rare #MON."
 	done
 
-_CinnabarPokecenterGuyText:: ; 885af (22:45af)
+_CinnabarPokecenterGuyText::
 	text "#MON can still"
 	line "learn techniques"
 	cont "after canceling"
@@ -503,7 +496,7 @@
 	cont "have been learned."
 	done
 
-_SaffronCityPokecenterGuyText1:: ; 88621 (22:4621)
+_SaffronCityPokecenterGuyText1::
 	text "It would be great"
 	line "if the ELITE FOUR"
 	cont "came and stomped"
@@ -510,7 +503,7 @@
 	cont "TEAM ROCKET!"
 	done
 
-_SaffronCityPokecenterGuyText2:: ; 88664 (22:4664)
+_SaffronCityPokecenterGuyText2::
 	text "TEAM ROCKET took"
 	line "off! We can go"
 	cont "out safely again!"
@@ -517,33 +510,33 @@
 	cont "That's great!"
 	done
 
-_CeladonCityHotelText:: ; 886a4 (22:46a4)
+_CeladonCityHotelText::
 	text "My sis brought me"
 	line "on this vacation!"
 	done
 
-_BookcaseText:: ; 886c9 (22:46c9)
+_BookcaseText::
 	text "Crammed full of"
 	line "#MON books!"
 	done
 
-_NewBicycleText:: ; 886e6 (22:46e6)
+_NewBicycleText::
 	text "A shiny new"
 	line "BICYCLE!"
 	done
 
-_PushStartText:: ; 886fc (22:46fc)
+_PushStartText::
 	text "Push START to"
 	line "open the MENU!"
 	done
 
-_SaveOptionText:: ; 8871a (22:471a)
+_SaveOptionText::
 	text "The SAVE option is"
 	line "on the MENU"
 	cont "screen."
 	done
 
-_StrengthsAndWeaknessesText:: ; 88742 (22:4742)
+_StrengthsAndWeaknessesText::
 	text "All #MON types"
 	line "have strong and"
 	cont "weak points"
@@ -550,18 +543,18 @@
 	cont "against others."
 	done
 
-_TimesUpText:: ; 8877e (22:477e)
+_TimesUpText::
 	text "PA: Ding-dong!"
 
 	para "Time's up!"
 	prompt
 
-_GameOverText:: ; 88798 (22:4798)
+_GameOverText::
 	text "PA: Your SAFARI"
 	line "GAME is over!"
 	done
 
-_CinnabarGymQuizIntroText:: ; 887b7 (22:47b7)
+_CinnabarGymQuizIntroText::
 	text "#MON Quiz!"
 
 	para "Get it right and"
@@ -580,29 +573,23 @@
 	line "Here we go!"
 	prompt
 
-IF DEF(_YELLOW)
-	text "#MON Quiz!"
-	line "Test your skill!"
-	done
-ENDC
-
-_CinnabarQuizQuestionsText1:: ; 8886d (22:486d)
+_CinnabarQuizQuestionsText1::
 	text "CATERPIE evolves"
 	line "into BUTTERFREE?"
 	done
 
-_CinnabarQuizQuestionsText2:: ; 88890 (22:4890)
+_CinnabarQuizQuestionsText2::
 	text "There are 9"
 	line "certified #MON"
 	cont "LEAGUE BADGEs?"
 	done
 
-_CinnabarQuizQuestionsText3:: ; 888bb (22:48bb)
+_CinnabarQuizQuestionsText3::
 	text "POLIWAG evolves 3"
 	line "times?"
 	done
 
-_CinnabarQuizQuestionsText4:: ; 888d5 (22:48d5)
+_CinnabarQuizQuestionsText4::
 	text "Are thunder moves"
 	line "effective against"
 	cont "ground element-"
@@ -609,7 +596,7 @@
 	cont "type #MON?"
 	done
 
-_CinnabarQuizQuestionsText5:: ; 88915 (22:4915)
+_CinnabarQuizQuestionsText5::
 	text "#MON of the"
 	line "same kind and"
 	cont "level are not"
@@ -616,22 +603,22 @@
 	cont "identical?"
 	done
 
-_CinnabarQuizQuestionsText6:: ; 88949 (22:4949)
+_CinnabarQuizQuestionsText6::
 	text "TM28 contains"
 	line "TOMBSTONER?"
 	done
 
-_CinnabarGymQuizCorrectText:: ; 88964 (22:4964)
+_CinnabarGymQuizCorrectText::
 	text "You're absolutely"
 	line "correct!"
 
 	para "Go on through!@@"
 
-_CinnabarGymQuizIncorrectText:: ; 8898f (22:498f)
+_CinnabarGymQuizIncorrectText::
 	text "Sorry! Bad call!"
 	prompt
 
-_MagazinesText:: ; 889a1 (22:49a1)
+_MagazinesText::
 	text "#MON magazines!"
 
 	para "#MON notebooks!"
@@ -639,28 +626,28 @@
 	para "#MON graphs!"
 	done
 
-_BillsHouseMonitorText:: ; 889cf (22:49cf)
+_BillsHouseMonitorText::
 	text "TELEPORTER is"
 	line "displayed on the"
 	cont "PC monitor."
 	done
 
-_BillsHouseInitiatedText:: ; 889fb (22:49fb)
+_BillsHouseInitiatedText::
 	text $52, " initiated"
 	line "TELEPORTER's Cell"
 	cont "Separator!@@"
 
-_BillsHousePokemonListText1:: ; 88a25 (22:4a25)
+_BillsHousePokemonListText1::
 	text "BILL's favorite"
 	line "#MON list!"
 	prompt
 
-_BillsHousePokemonListText2:: ; 88a40 (22:4a40)
+_BillsHousePokemonListText2::
 	text "Which #MON do"
 	line "you want to see?"
 	done
 
-_OakLabEmailText:: ; 88a60 (22:4a60)
+_OakLabEmailText::
 	text "There's an e-mail"
 	line "message here!"
 
@@ -687,36 +674,36 @@
 	cont "..."
 	done
 
-_GameCornerCoinCaseText:: ; 88b5b (22:4b5b)
+_GameCornerCoinCaseText::
 	text "A COIN CASE is"
 	line "required!"
 	done
 
-_GameCornerNoCoinsText:: ; 88b75 (22:4b75)
+_GameCornerNoCoinsText::
 	text "You don't have"
 	line "any coins!"
 	done
 
-_GameCornerOutOfOrderText:: ; 88b8f (22:4b8f)
+_GameCornerOutOfOrderText::
 	text "OUT OF ORDER"
 	line "This is broken."
 	done
 
-_GameCornerOutToLunchText:: ; 88bad (22:4bad)
+_GameCornerOutToLunchText::
 	text "OUT TO LUNCH"
 	line "This is reserved."
 	done
 
-_GameCornerSomeonesKeysText:: ; 88bcd (22:4bcd)
+_GameCornerSomeonesKeysText::
 	text "Someone's keys!"
 	line "They'll be back."
 	done
 
-_JustAMomentText:: ; 88bed (22:4bed)
+_JustAMomentText::
 	text "Just a moment."
 	done
 
-TMNotebookText:: ; 88bfd (22:4bfd)
+TMNotebookText::
 	text "It's a pamphlet"
 	line "on TMs."
 
@@ -731,15 +718,15 @@
 
 	para "SILPH CO.@@"
 
-_TurnPageText:: ; 88c6f (22:4c6f)
+_TurnPageText::
 	text "Turn the page?"
 	done
 
-_ViridianSchoolNotebookText5:: ; 88c7f (22:4c7f)
+_ViridianSchoolNotebookText5::
 	text "GIRL: Hey! Don't"
 	line "look at my notes!@@"
 
-_ViridianSchoolNotebookText1:: ; 88ca3 (22:4ca3)
+_ViridianSchoolNotebookText1::
 	text "Looked at the"
 	line "notebook!"
 
@@ -758,7 +745,7 @@
 	cont "#MON trainers."
 	prompt
 
-_ViridianSchoolNotebookText2:: ; 88d46 (22:4d46)
+_ViridianSchoolNotebookText2::
 	text "Second page..."
 
 	para "A healthy #MON"
@@ -771,7 +758,7 @@
 	cont "effective!"
 	prompt
 
-_ViridianSchoolNotebookText3:: ; 88dbd (22:4dbd)
+_ViridianSchoolNotebookText3::
 	text "Third page..."
 
 	para "#MON trainers"
@@ -784,7 +771,7 @@
 	cont "at #MON GYMs."
 	prompt
 
-_ViridianSchoolNotebookText4:: ; 88e2c (22:4e2c)
+_ViridianSchoolNotebookText4::
 	text "Fourth page..."
 
 	para "The goal for"
@@ -800,26 +787,26 @@
 	line "#MON LEAGUE!"
 	prompt
 
-_FightingDojoText_52a10:: ; 88ec1 (22:4ec1)
+_FightingDojoText_52a10::
 	text "Enemies on every"
 	line "side!"
 	done
 
-_FightingDojoText_52a1d:: ; 88ed9 (22:4ed9)
+_FightingDojoText_52a1d::
 	text "What goes around"
 	line "comes around!"
 	done
 
-_FightingDojoText:: ; 88ef9 (22:4ef9)
+_FightingDojoText::
 	text "FIGHTING DOJO"
 	done
 
-_IndigoPlateauHQText:: ; 88f08 (22:4f08)
+_IndigoPlateauHQText::
 	text "INDIGO PLATEAU"
 	line "#MON LEAGUE HQ"
 	done
 
-_RedBedroomSNESText:: ; 88f27 (22:4f27)
+_RedBedroomSNESText::
 	text $52, " is"
 	line "playing the SNES!"
 	cont "...Okay!"
@@ -826,7 +813,7 @@
 	cont "It's time to go!"
 	done
 
-_Route15UpstairsBinocularsText:: ; 88f58 (22:4f58)
+_Route15UpstairsBinocularsText::
 	text "Looked into the"
 	line "binoculars..."
 
@@ -835,29 +822,19 @@
 	cont "toward the sea."
 	done
 
-_AerodactylFossilText:: ; 88fa7 (22:4fa7)
+_AerodactylFossilText::
 	text "AERODACTYL Fossil"
 	line "A primitive and"
 	cont "rare #MON."
 	done
 
-_KabutopsFossilText:: ; 88fd5 (22:4fd5)
+_KabutopsFossilText::
 	text "KABUTOPS Fossil"
 	line "A primitive and"
 	cont "rare #MON."
 	done
 
-IF DEF(_YELLOW)
-_FanClubPicture1Text::
-	text "My cute RAPIDASH."
-	done
-
-_FanClubPicture2Text::
-	text "My beloved FEAROW."
-	done
-ENDC
-
-_LinkCableHelpText1:: ; 89001 (22:5001)
+_LinkCableHelpText1::
 	text "TRAINER TIPS"
 
 	para "Using a Game Link"
@@ -864,12 +841,12 @@
 	line "Cable"
 	prompt
 
-_LinkCableHelpText2:: ; 89027 (22:5027)
+_LinkCableHelpText2::
 	text "Which heading do"
 	line "you want to read?"
 	done
 
-_LinkCableInfoText1:: ; 8904b (22:504b)
+_LinkCableInfoText1::
 	text "When you have"
 	line "linked your GAME"
 	cont "BOY with another"
@@ -879,19 +856,19 @@
 	cont "#MON CENTER."
 	prompt
 
-_LinkCableInfoText2:: ; 890bd (22:50bd)
+_LinkCableInfoText2::
 	text "COLOSSEUM lets"
 	line "you play against"
 	cont "a friend."
 	prompt
 
-_LinkCableInfoText3:: ; 890e8 (22:50e8)
+_LinkCableInfoText3::
 	text "TRADE CENTER is"
 	line "used for trading"
 	cont "#MON."
 	prompt
 
-_ViridianSchoolBlackboardText1:: ; 89110 (22:5110)
+_ViridianSchoolBlackboardText1::
 	text "The blackboard"
 	line "describes #MON"
 	cont "STATUS changes"
@@ -898,12 +875,12 @@
 	cont "during battles."
 	prompt
 
-_ViridianSchoolBlackboardText2:: ; 8914e (22:514e)
+_ViridianSchoolBlackboardText2::
 	text "Which heading do"
 	line "you want to read?"
 	done
 
-_ViridianBlackboardSleepText:: ; 89172 (22:5172)
+_ViridianBlackboardSleepText::
 	text "A #MON can't"
 	line "attack if it's"
 	cont "asleep!"
@@ -916,7 +893,7 @@
 	line "wake them up!"
 	prompt
 
-_ViridianBlackboardPoisonText:: ; 891de (22:51de)
+_ViridianBlackboardPoisonText::
 	text "When poisoned, a"
 	line "#MON's health"
 	cont "steadily drops."
@@ -928,7 +905,7 @@
 	line "to cure poison!"
 	prompt
 
-_ViridianBlackbaordPrlzText:: ; 8924b (22:524b)
+_ViridianBlackbaordPrlzText::
 	text "Paralysis could"
 	line "make #MON"
 	cont "moves misfire!"
@@ -940,7 +917,7 @@
 	line "for treatment!"
 	prompt
 
-_ViridianBlackboardBurnText:: ; 892b5 (22:52b5)
+_ViridianBlackboardBurnText::
 	text "A burn reduces"
 	line "power and speed."
 	cont "It also causes"
@@ -953,7 +930,7 @@
 	line "cure a burn!"
 	prompt
 
-_ViridianBlackboardFrozenText:: ; 8932f (22:532f)
+_ViridianBlackboardFrozenText::
 	text "If frozen, a"
 	line "#MON becomes"
 	cont "totally immobile!"
@@ -966,12 +943,12 @@
 	line "thaw out #MON!"
 	prompt
 
-_VermilionGymTrashText:: ; 893a7 (22:53a7)
+_VermilionGymTrashText::
 	text "Nope, there's"
 	line "only trash here."
 	done
 
-_VermilionGymTrashSuccesText1:: ; 893c6 (22:53c6)
+_VermilionGymTrashSuccesText1::
 	text "Hey! There's a"
 	line "switch under the"
 	cont "trash!"
@@ -980,7 +957,7 @@
 	para "The 1st electric"
 	line "lock opened!@@"
 
-_VermilionGymTrashSuccesText2:: ; 89418 (22:5418)
+_VermilionGymTrashSuccesText2::
 	text "Hey! There's"
 	line "another switch"
 	cont "under the trash!"
@@ -987,7 +964,7 @@
 	cont "Turn it on!"
 	prompt
 
-_VermilionGymTrashSuccesText3:: ; 89451 (22:5451)
+_VermilionGymTrashSuccesText3::
 	text "The 2nd electric"
 	line "lock opened!"
 
@@ -994,82 +971,82 @@
 	para "The motorized door"
 	line "opened!@@"
 
-_VermilionGymTrashFailText:: ; 8948c (22:548c)
+_VermilionGymTrashFailText::
 	text "Nope! There's"
 	line "only trash here."
 	cont "Hey! The electric"
 	cont "locks were reset!@@"
 
-_FoundHiddenItemText:: ; 894d0 (22:54d0)
+_FoundHiddenItemText::
 	text $52, " found"
 	line "@"
 	TX_RAM wcd6d
 	text "!@@"
 
-_HiddenItemBagFullText:: ; 894e1 (22:54e1)
+_HiddenItemBagFullText::
 	text "But, ", $52, " has"
 	line "no more room for"
 	cont "other items!"
 	done
 
-_FoundHiddenCoinsText:: ; 8950b (22:550b)
+_FoundHiddenCoinsText::
 	text $52, " found"
 	line "@"
 	TX_BCD hCoins, $c2
 	text " coins!@@"
 
-_FoundHiddenCoins2Text:: ; 89523 (22:5523)
+_FoundHiddenCoins2Text::
 	text $52, " found"
 	line "@"
 	TX_BCD hCoins, $c2
 	text " coins!@@"
 
-_DroppedHiddenCoinsText:: ; 8953b (22:553b)
+_DroppedHiddenCoinsText::
 	db $0
 	para "Oops! Dropped"
 	line "some coins!"
 	done
 
-_IndigoPlateauStatuesText1:: ; 89557 (22:5557)
+_IndigoPlateauStatuesText1::
 	text "INDIGO PLATEAU"
 	prompt
 
-_IndigoPlateauStatuesText2:: ; 89567 (22:5567)
+_IndigoPlateauStatuesText2::
 	text "The ultimate goal"
 	line "of trainers!"
 	cont "#MON LEAGUE HQ"
 	done
 
-_IndigoPlateauStatuesText3:: ; 89596 (22:5596)
+_IndigoPlateauStatuesText3::
 	text "The highest"
 	line "#MON authority"
 	cont "#MON LEAGUE HQ"
 	done
 
-_PokemonBooksText:: ; 895c1 (22:55c1)
+_PokemonBooksText::
 	text "Crammed full of"
 	line "#MON books!"
 	done
 
-_DiglettSculptureText:: ; 895de (22:55de)
+_DiglettSculptureText::
 	text "It's a sculpture"
 	line "of DIGLETT."
 	done
 
-_ElevatorText:: ; 895fb (22:55fb)
+_ElevatorText::
 	text "This is an"
 	line "elevator."
 	done
 
-_TownMapText:: ; 89611 (22:5611)
+_TownMapText::
 	text "A TOWN MAP.@@"
 
-_PokemonStuffText:: ; 8961f (22:561f)
+_PokemonStuffText::
 	text "Wow! Tons of"
 	line "#MON stuff!"
 	done
 
-_OutOfSafariBallsText:: ; 89639 (22:5639)
+_OutOfSafariBallsText::
 	text "PA: Ding-dong!"
 
 	para "You are out of"
@@ -1076,7 +1053,7 @@
 	line "SAFARI BALLs!"
 	prompt
 
-_WildRanText:: ; 89666 (22:5666)
+_WildRanText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
 	db $0
@@ -1083,7 +1060,7 @@
 	line "ran!"
 	prompt
 
-_EnemyRanText:: ; 89677 (22:5677)
+_EnemyRanText::
 	text "Enemy @"
 	TX_RAM wEnemyMonNick
 	db $0
@@ -1090,22 +1067,22 @@
 	line "ran!"
 	prompt
 
-_HurtByPoisonText:: ; 89689 (22:5689)
+_HurtByPoisonText::
 	text $5a, "'s"
 	line "hurt by poison!"
 	prompt
 
-_HurtByBurnText:: ; 8969d (22:569d)
+_HurtByBurnText::
 	text $5a, "'s"
 	line "hurt by the burn!"
 	prompt
 
-_HurtByLeechSeedText:: ; 896b3 (22:56b3)
+_HurtByLeechSeedText::
 	text "LEECH SEED saps"
 	line $5a, "!"
 	prompt
 
-_EnemyMonFaintedText:: ; 0x896c7
+_EnemyMonFaintedText::
 	text "Enemy @"
 	TX_RAM wEnemyMonNick
 	db $0
@@ -1112,7 +1089,7 @@
 	line "fainted!"
 	prompt
 
-_MoneyForWinningText:: ; 896dd (22:56dd)
+_MoneyForWinningText::
 	text $52, " got ¥@"
 	TX_BCD wAmountMoneyWon, $c3
 	db $0
@@ -1119,7 +1096,7 @@
 	line "for winning!"
 	prompt
 
-_TrainerDefeatedText:: ; 896f9 (22:56f9)
+_TrainerDefeatedText::
 	text $52, " defeated"
 	line "@"
 	TX_RAM wTrainerName
@@ -1126,22 +1103,22 @@
 	text "!"
 	prompt
 
-_PlayerMonFaintedText:: ; 8970c (22:570c)
+_PlayerMonFaintedText::
 	TX_RAM wBattleMonNick
 	db $0
 	line "fainted!"
 	prompt
 
-_UseNextMonText:: ; 8971a (22:571a)
+_UseNextMonText::
 	text "Use next #MON?"
 	done
 
-_Sony1WinText:: ; 8972a (22:572a)
+_Sony1WinText::
 	text $53, ": Yeah! Am"
 	line "I great or what?"
 	prompt
 
-_PlayerBlackedOutText2:: ; 89748 (22:5748)
+_PlayerBlackedOutText2::
 	text $52, " is out of"
 	line "useable #MON!"
 
@@ -1149,7 +1126,7 @@
 	line "out!"
 	prompt
 
-_LinkBattleLostText:: ; 89772 (22:5772)
+_LinkBattleLostText::
 	text $52, " lost to"
 	line "@"
 	TX_RAM wTrainerName
@@ -1156,7 +1133,7 @@
 	text "!"
 	prompt
 
-_TrainerAboutToUseText:: ; 89784 (22:5784)
+_TrainerAboutToUseText::
 	TX_RAM wTrainerName
 	text " is"
 	line "about to use"
@@ -1168,7 +1145,7 @@
 	line "change #MON?"
 	done
 
-_TrainerSentOutText:: ; 897b4 (22:57b4)
+_TrainerSentOutText::
 	TX_RAM wTrainerName
 	text " sent"
 	line "out @"
@@ -1176,59 +1153,53 @@
 	text "!"
 	done
 
-_NoWillText:: ; 897c9 (22:57c9)
+_NoWillText::
 	text "There's no will"
 	line "to fight!"
 	prompt
 
-_CantEscapeText:: ; 897e3 (22:57e3)
+_CantEscapeText::
 	text "Can't escape!"
 	prompt
 
-_NoRunningText:: ; 897f1 (22:57f1)
+_NoRunningText::
 	text "No! There's no"
 	line "running from a"
 	cont "trainer battle!"
 	prompt
 
-_GotAwayText:: ; 8981f (22:581f)
+_GotAwayText::
 	text "Got away safely!"
 	prompt
 
-IF DEF(_YELLOW)
-_RunAwayText::
-	text "Hurry, get away!"
-	prompt
-ENDC
-
-_ItemsCantBeUsedHereText:: ; 89831 (22:5831)
+_ItemsCantBeUsedHereText::
 	text "Items can't be"
 	line "used here."
 	prompt
 
-_AlreadyOutText:: ; 8984b (22:584b)
+_AlreadyOutText::
 	TX_RAM wBattleMonNick
 	text " is"
 	line "already out!"
 	prompt
 
-_MoveNoPPText:: ; 89860 (22:5860)
+_MoveNoPPText::
 	text "No PP left for"
 	line "this move!"
 	prompt
 
-_MoveDisabledText:: ; 8987b (22:587b)
+_MoveDisabledText::
 	text "The move is"
 	line "disabled!"
 	prompt
 
-_NoMovesLeftText:: ; 89892 (22:5892)
+_NoMovesLeftText::
 	TX_RAM wBattleMonNick
 	text " has no"
 	line "moves left!"
 	done
 
-_MultiHitText:: ; 898aa (22:58aa)
+_MultiHitText::
 	text "Hit the enemy"
 	line "@"
 	TX_NUM wPlayerNumHits,1,1
@@ -1235,93 +1206,93 @@
 	text " times!"
 	prompt
 
-_ScaredText:: ; 898c7 (22:58c7)
+_ScaredText::
 	TX_RAM wBattleMonNick
 	text " is too"
 	line "scared to move!"
 	prompt
 
-_GetOutText:: ; 898e3 (22:58e3)
+_GetOutText::
 	text "GHOST: Get out..."
 	line "Get out..."
 	prompt
 
-_FastAsleepText:: ; 89901 (22:5901)
+_FastAsleepText::
 	text $5A
 	line "is fast asleep!"
 	prompt
 
-_WokeUpText:: ; 89914 (22:5914)
+_WokeUpText::
 	text $5A
 	line "woke up!"
 	prompt
 
-_IsFrozenText:: ; 89920 (22:5920)
+_IsFrozenText::
 	text $5A
 	line "is frozen solid!"
 	prompt
 
-_FullyParalyzedText:: ; 89934 (22:5934)
+_FullyParalyzedText::
 	text $5A,"'s"
 	line "fully paralyzed!"
 	prompt
 
-_FlinchedText:: ; 89949 (22:5949)
+_FlinchedText::
 	text $5A
 	line "flinched!"
 	prompt
 
-_MustRechargeText:: ; 89956 (22:5956)
+_MustRechargeText::
 	text $5A
 	line "must recharge!"
 	prompt
 
-_DisabledNoMoreText:: ; 89968 (22:5968)
+_DisabledNoMoreText::
 	text $5A,"'s"
 	line "disabled no more!"
 	prompt
 
-_IsConfusedText:: ; 8997e (22:597e)
+_IsConfusedText::
 	text $5A
 	line "is confused!"
 	prompt
 
-_HurtItselfText:: ; 8998e (22:598e)
+_HurtItselfText::
 	text "It hurt itself in"
 	line "its confusion!"
 	prompt
 
-_ConfusedNoMoreText:: ; 899b0 (22:59b0)
+_ConfusedNoMoreText::
 	text $5A,"'s"
 	line "confused no more!"
 	prompt
 
-_SavingEnergyText:: ; 899c6 (22:59c6)
+_SavingEnergyText::
 	text $5A
 	line "is saving energy!"
 	prompt
 
-_UnleashedEnergyText:: ; 899db (22:59db)
+_UnleashedEnergyText::
 	text $5A
 	line "unleashed energy!"
 	prompt
 
-_ThrashingAboutText:: ; 899f0 (22:59f0)
+_ThrashingAboutText::
 	text $5A,"'s"
 	line "thrashing about!"
 	done
 
-_AttackContinuesText:: ; 89a05 (22:5a05)
+_AttackContinuesText::
 	text $5A,"'s"
 	line "attack continues!"
 	done
 
-_CantMoveText:: ; 89a1b (22:5a1b)
+_CantMoveText::
 	text $5A
 	line "can't move!"
 	prompt
 
-_MoveIsDisabledText:: ; 89a29 (22:5a29)
+_MoveIsDisabledText::
 	text $5a, "'s"
 	line "@"
 	TX_RAM wcd6d
@@ -1329,149 +1300,149 @@
 	cont "disabled!"
 	prompt
 
-_MonName1Text:: ; 89a40 (22:5a40)
+_MonName1Text::
 	text $5a, "@@"
 
-_Used1Text:: ; 89a44 (22:5a44)
+_Used1Text::
 	db $0
 	line "used @@"
 
-_Used2Text:: ; 89a4d (22:5a4d)
+_Used2Text::
 	db $0
 	line "used @@"
 
-_InsteadText:: ; 89a56 (22:5a56)
+_InsteadText::
 	text "instead,"
 	cont "@@"
 
-_CF4BText:: ; 89a62 (22:5a62)
+_CF4BText::
 	TX_RAM wcf4b
 	text "@"
 
-_ExclamationPoint1Text:: ; 89a67 (22:5a67)
+_ExclamationPoint1Text::
 	text "!"
 	done
 
-_ExclamationPoint2Text:: ; 89a6a (22:5a6a)
+_ExclamationPoint2Text::
 	text "!"
 	done
 
-_ExclamationPoint3Text:: ; 89a6d (22:5a6d)
+_ExclamationPoint3Text::
 	text "!"
 	done
 
-_ExclamationPoint4Text:: ; 89a70 (22:5a70)
+_ExclamationPoint4Text::
 	text "!"
 	done
 
-_ExclamationPoint5Text:: ; 89a73 (22:5a73)
+_ExclamationPoint5Text::
 	text "!"
 	done
 
-_AttackMissedText:: ; 89a76 (22:5a76)
+_AttackMissedText::
 	text $5a, "'s"
 	line "attack missed!"
 	prompt
 
-_KeptGoingAndCrashedText:: ; 89a89 (22:5a89)
+_KeptGoingAndCrashedText::
 	text $5a
 	line "kept going and"
 	cont "crashed!"
 	prompt
 
-_UnaffectedText:: ; 89aa4 (22:5aa4)
+_UnaffectedText::
 	text $59, "'s"
 	line "unaffected!"
 	prompt
 
-_DoesntAffectMonText:: ; 89ab4 (22:5ab4)
+_DoesntAffectMonText::
 	text "It doesn't affect"
 	line $59, "!"
 	prompt
 
-_CriticalHitText:: ; 89ac9 (22:5ac9)
+_CriticalHitText::
 	text "Critical hit!"
 	prompt
 
-_OHKOText:: ; 89ad8 (22:5ad8)
+_OHKOText::
 	text "One-hit KO!"
 	prompt
 
-_LoafingAroundText:: ; 89ae5 (22:5ae5)
+_LoafingAroundText::
 	TX_RAM wBattleMonNick
 	text " is"
 	line "loafing around."
 	prompt
 
-_BeganToNapText:: ; 89afd (22:5afd)
+_BeganToNapText::
 	TX_RAM wBattleMonNick
 	text " began"
 	line "to nap!"
 	prompt
 
-_WontObeyText:: ; 89b10 (22:5b10)
+_WontObeyText::
 	TX_RAM wBattleMonNick
 	text " won't"
 	line "obey!"
 	prompt
 
-_TurnedAwayText:: ; 89b20 (22:5b20)
+_TurnedAwayText::
 	TX_RAM wBattleMonNick
 	text " turned"
 	line "away!"
 	prompt
 
-_IgnoredOrdersText:: ; 89b32 (22:5b32)
+_IgnoredOrdersText::
 	TX_RAM wBattleMonNick
 	db $0
 	line "ignored orders!"
 	prompt
 
-_SubstituteTookDamageText:: ; 89b47 (22:5b47)
+_SubstituteTookDamageText::
 	text "The SUBSTITUTE"
 	line "took damage for"
 	cont $59, "!"
 	prompt
 
-_SubstituteBrokeText:: ; 89b6a (22:5b6a)
+_SubstituteBrokeText::
 	text $59, "'s"
 	line "SUBSTITUTE broke!"
 	prompt
 
-_BuildingRageText:: ; 89b80 (22:5b80)
+_BuildingRageText::
 	text $5a, "'s"
 	line "RAGE is building!"
 	prompt
 
-_MirrorMoveFailedText:: ; 89b96 (22:5b96)
+_MirrorMoveFailedText::
 	text "The MIRROR MOVE"
 	next "failed!"
 	prompt
 
-_HitXTimesText:: ; 89baf (22:5baf)
+_HitXTimesText::
 	text "Hit @"
 	TX_NUM wEnemyNumHits, 1, 1
 	text " times!"
 	prompt
 
-_GainedText:: ; 89bc2 (22:5bc2)
+_GainedText::
 	TX_RAM wcd6d
 	text " gained"
 	line "@@"
 
-_WithExpAllText:: ; 89bd0 (22:5bd0)
+_WithExpAllText::
 	text "with EXP.ALL,"
 	cont "@@"
 
-_BoostedText:: ; 89be1 (22:5be1)
+_BoostedText::
 	text "a boosted"
 	cont "@@"
-_ExpPointsText:: ; 89bee (22:5bee)
+_ExpPointsText::
 	TX_NUM wExpAmountGained, 2, 4
 	text " EXP. Points!"
 	prompt
 
-_GrewLevelText:: ; 89c01 (22:5c01)
+_GrewLevelText::
 	TX_RAM wcd6d
 	text " grew"
 	line "to level @"
@@ -1478,7 +1449,7 @@
 	TX_NUM wCurEnemyLVL, 1, 3
 	text "!@@"
 
-_WildMonAppearedText:: ; 89c1d (22:5c1d)
+_WildMonAppearedText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
 	db $0
@@ -1485,7 +1456,7 @@
 	line "appeared!"
 	prompt
 
-_HookedMonAttackedText:: ; 89c33 (22:5c33)
+_HookedMonAttackedText::
 	text "The hooked"
 	line "@"
 	TX_RAM wEnemyMonNick
@@ -1493,76 +1464,76 @@
 	cont "attacked!"
 	prompt
 
-_EnemyAppearedText:: ; 89c4f (22:5c4f)
+_EnemyAppearedText::
 	TX_RAM wEnemyMonNick
 	db $0
 	line "appeared!"
 	prompt
 
-_TrainerWantsToFightText:: ; 89c5e (22:5c5e)
+_TrainerWantsToFightText::
 	TX_RAM wTrainerName
 	text " wants"
 	line "to fight!"
 	prompt
 
-_UnveiledGhostText:: ; 89c73 (22:5c73)
+_UnveiledGhostText::
 	text "SILPH SCOPE"
 	line "unveiled the"
 	cont "GHOST's identity!"
 	prompt
 
-_GhostCantBeIDdText:: ; 89c9e (22:5c9e)
+_GhostCantBeIDdText::
 	text "Darn! The GHOST"
 	line "can't be ID'd!"
 	prompt
 
-_GoText:: ; 89cbc (22:5cbc)
+_GoText::
 	text "Go! @@"
 
-_DoItText:: ; 89cc3 (22:5cc3)
+_DoItText::
 	text "Do it! @@"
 
-_GetmText:: ; 89ccd (22:5ccd)
+_GetmText::
 	text "Get'm! @@"
 
-_EnemysWeakText:: ; 89cd6 (22:5cd6)
+_EnemysWeakText::
 	text "The enemy's weak!"
 	line "Get'm! @@"
 
-_PlayerMon1Text:: ; 89cf0 (22:5cf0)
+_PlayerMon1Text::
 	TX_RAM wBattleMonNick
 	text "!"
 	done
 
-_PlayerMon2Text:: ; 89cf6 (22:5cf6)
+_PlayerMon2Text::
 	TX_RAM wBattleMonNick
 	text " @@"
 
-_EnoughText:: ; 89cfd (22:5cfd)
+_EnoughText::
 	text "enough!@@"
 
-_OKExclamationText:: ; 89d07 (22:5d07)
+_OKExclamationText::
 	text "OK!@@"
 
-_GoodText:: ; 89d0d (22:5d0d)
+_GoodText::
 	text "good!@@"
 
-_ComeBackText:: ; 89d15 (22:5d15)
+_ComeBackText::
 	db $0
 	line "Come back!"
 	done
 
-_SuperEffectiveText:: ; 89d22 (22:5d22)
+_SuperEffectiveText::
 	text "It's super"
 	line "effective!"
 	prompt
 
-_NotVeryEffectiveText:: ; 89d38 (22:5d38)
+_NotVeryEffectiveText::
 	text "It's not very"
 	line "effective..."
 	prompt
 
-_SafariZoneEatingText:: ; 89d53 (22:5d53)
+_SafariZoneEatingText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
 	db $0
@@ -1569,7 +1540,7 @@
 	line "is eating!"
 	prompt
 
-_SafariZoneAngryText:: ; 89d6a (22:5d6a)
+_SafariZoneAngryText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
 	db $0
@@ -1577,7 +1548,7 @@
 	prompt
 
 ; money related
-_PickUpPayDayMoneyText:: ; 89d80 (22:5d80)
+_PickUpPayDayMoneyText::
 	text $52, " picked up"
 	line "¥@"
 	TX_BCD wTotalPayDayMoney, $c3
@@ -1584,52 +1555,41 @@
 	text "!"
 	prompt
 
-_ClearSaveDataText:: ; 89d96 (22:5d96)
+_ClearSaveDataText::
 	text "Clear all saved"
 	line "data?"
 	done
 
-_WhichFloorText:: ; 89dad (22:5dad)
+_WhichFloorText::
 	text "Which floor do"
 	line "you want? "
 	done
 
-IF DEF(_YELLOW)
-_SleepingPikachuText1::
-	text "There isn't any"
-	line "response..."
-	prompt
-ENDC
-
-_PartyMenuNormalText:: ; 89dc8 (22:5dc8)
+_PartyMenuNormalText::
 	text "Choose a #MON."
 	done
 
-_PartyMenuItemUseText:: ; 89dd8 (22:5dd8)
+_PartyMenuItemUseText::
 	text "Use item on which"
 	line "#MON?"
 	done
 
-_PartyMenuBattleText:: ; 89df1 (22:5df1)
+_PartyMenuBattleText::
 	text "Bring out which"
 	line "#MON?"
 	done
 
-_PartyMenuUseTMText:: ; 89e08 (22:5e08)
-IF DEF(_YELLOW)
-	text "Teach to which"
-ELSE
+_PartyMenuUseTMText::
 	text "Use TM on which"
-ENDC
 	line "#MON?"
 	done
 
-_PartyMenuSwapMonText:: ; 89e1f (22:5e1f)
+_PartyMenuSwapMonText::
 	text "Move #MON"
 	line "where?"
 	done
 
-_PotionText:: ; 89e31 (22:5e31)
+_PotionText::
 	TX_RAM wcd6d
 	db $0
 	line "recovered by @"
@@ -1637,49 +1597,49 @@
 	text "!"
 	done
 
-_AntidoteText:: ; 89e4b (22:5e4b)
+_AntidoteText::
 	TX_RAM wcd6d
 	text " was"
 	line "cured of poison!"
 	done
 
-_ParlyzHealText:: ; 89e65 (22:5e65)
+_ParlyzHealText::
 	TX_RAM wcd6d
 	text "'s"
 	line "rid of paralysis!"
 	done
 
-_BurnHealText:: ; 89e7d (22:5e7d)
+_BurnHealText::
 	TX_RAM wcd6d
 	text "'s"
 	line "burn was healed!"
 	done
 
-_IceHealText:: ; 89e94 (22:5e94)
+_IceHealText::
 	TX_RAM wcd6d
 	text " was"
 	line "defrosted!"
 	done
 
-_AwakeningText:: ; 89ea8 (22:5ea8)
+_AwakeningText::
 	TX_RAM wcd6d
 	db $0
 	line "woke up!"
 	done
 
-_FullHealText:: ; 89eb6 (22:5eb6)
+_FullHealText::
 	TX_RAM wcd6d
 	text "'s"
 	line "health returned!"
 	done
 
-_ReviveText:: ; 89ecd (22:5ecd)
+_ReviveText::
 	TX_RAM wcd6d
 	db $0
 	line "is revitalized!"
 	done
 
-_RareCandyText:: ; 89ee2 (22:5ee2)
+_RareCandyText::
 	TX_RAM wcd6d
 	text " grew"
 	line "to level @"
@@ -1686,12 +1646,12 @@
 	TX_NUM wCurEnemyLVL, $1,$3
 	text "!@@"
 
-_TurnedOnPC1Text:: ; 89efe (22:5efe)
+_TurnedOnPC1Text::
 	text $52, " turned on"
 	line "the PC."
 	prompt
 
-_AccessedBillsPCText:: ; 89f13 (22:5f13)
+_AccessedBillsPCText::
 	text "Accessed BILL's"
 	line "PC."
 
@@ -1699,7 +1659,7 @@
 	line "Storage System."
 	prompt
 
-_AccessedSomeonesPCText:: ; 89f45 (22:5f45)
+_AccessedSomeonesPCText::
 	text "Accessed someone's"
 	line "PC."
 
@@ -1707,7 +1667,7 @@
 	line "Storage System."
 	prompt
 
-_AccessedMyPCText:: ; 89f7a (22:5f7a)
+_AccessedMyPCText::
 	text "Accessed my PC."
 
 	para "Accessed Item"
@@ -1714,51 +1674,51 @@
 	line "Storage System."
 	prompt
 
-_TurnedOnPC2Text:: ; 89fa9 (22:5fa9)
+_TurnedOnPC2Text::
 	text $52, " turned on"
 	line "the PC."
 	prompt
 
-_WhatDoYouWantText:: ; 89fbe (22:5fbe)
+_WhatDoYouWantText::
 	text "What do you want"
 	line "to do?"
 	done
 
-_WhatToDepositText:: ; 89fd7 (22:5fd7)
+_WhatToDepositText::
 	text "What do you want"
 	line "to deposit?"
 	done
 
-_DepositHowManyText:: ; 89ff5 (22:5ff5)
+_DepositHowManyText::
 	text "How many?"
 	done
 
-_ItemWasStoredText:: ; 8a000 (22:6000)
+_ItemWasStoredText::
 	TX_RAM wcd6d
 	text " was"
 	line "stored via PC."
 	prompt
 
-_NothingToDepositText:: ; 8a018 (22:6018)
+_NothingToDepositText::
 	text "You have nothing"
 	line "to deposit."
 	prompt
 
-_NoRoomToStoreText:: ; 8a036 (22:6036)
+_NoRoomToStoreText::
 	text "No room left to"
 	line "store items."
 	prompt
 
-_WhatToWithdrawText:: ; 8a054 (22:6054)
+_WhatToWithdrawText::
 	text "What do you want"
 	line "to withdraw?"
 	done
 
-_WithdrawHowManyText:: ; 8a073 (22:6073)
+_WithdrawHowManyText::
 	text "How many?"
 	done
 
-_WithdrewItemText:: ; 8a07e (22:607e)
+_WithdrewItemText::
 	text "Withdrew"
 	line "@"
 	TX_RAM wcd6d
@@ -1765,26 +1725,26 @@
 	text "."
 	prompt
 
-_NothingStoredText:: ; 8a08f (22:608f)
+_NothingStoredText::
 	text "There is nothing"
 	line "stored."
 	prompt
 
-_CantCarryMoreText:: ; 8a0a9 (22:60a9)
+_CantCarryMoreText::
 	text "You can't carry"
 	line "any more items."
 	prompt
 
-_WhatToTossText:: ; 8a0c9 (22:60c9)
+_WhatToTossText::
 	text "What do you want"
 	line "to toss away?"
 	done
 
-_TossHowManyText:: ; 8a0e9 (22:60e9)
+_TossHowManyText::
 	text "How many?"
 	done
 
-_AccessedHoFPCText:: ; 8a0f4 (22:60f4)
+_AccessedHoFPCText::
 	text "Accessed #MON"
 	line "LEAGUE's site."
 
@@ -1792,27 +1752,20 @@
 	line "OF FAME List."
 	prompt
 
-IF DEF(_YELLOW)
-_SleepingPikachuText2::
-	text "There isn't any"
-	line "response..."
-	prompt
-ENDC
-
-_SwitchOnText:: ; 0x8a131
+_SwitchOnText::
 	text "Switch on!"
 	prompt
 
-_WhatText:: ; 0x8a13d
+_WhatText::
 	text "What?"
 	done
 
-_DepositWhichMonText:: ; 0x8a144
+_DepositWhichMonText::
 	text "Deposit which"
 	line "#MON?"
 	done
 
-_MonWasStoredText:: ; 0x8a159
+_MonWasStoredText::
 	TX_RAM wcf4b
 	text " was"
 	line "stored in Box @"
@@ -1820,17 +1773,17 @@
 	text "."
 	prompt
 
-_CantDepositLastMonText:: ; 0x8a177
+_CantDepositLastMonText::
 	text "You can't deposit"
 	line "the last #MON!"
 	prompt
 
-_BoxFullText:: ; 0x8a198
+_BoxFullText::
 	text "Oops! This Box is"
 	line "full of #MON."
 	prompt
 
-_MonIsTakenOutText:: ; 0x8a1b9
+_MonIsTakenOutText::
 	TX_RAM wcf4b
 	text " is"
 	line "taken out."
@@ -1839,12 +1792,12 @@
 	text "."
 	prompt
 
-_NoMonText:: ; 0x8a1d7
+_NoMonText::
 	text "What? There are"
 	line "no #MON here!"
 	prompt
 
-_CantTakeMonText:: ; 0x8a1f6
+_CantTakeMonText::
 	text "You can't take"
 	line "any more #MON."
 
@@ -1852,20 +1805,12 @@
 	line "first."
 	prompt
 
-IF DEF(_YELLOW)
-_PikachuUnhappyText::
-	TX_RAM $cd6d
-	text "looks"
-	line "unhappy about it!"
-	prompt
-ENDC
-
-_ReleaseWhichMonText:: ; 0x8a228
+_ReleaseWhichMonText::
 	text "Release which"
 	line "#MON?"
 	done
 
-_OnceReleasedText:: ; 0x8a23d
+_OnceReleasedText::
 	text "Once released,"
 	line "@"
 	TX_RAM wcf4b
@@ -1873,35 +1818,35 @@
 	cont "gone forever. OK?"
 	done
 
-_MonWasReleasedText:: ; 0x8a268
+_MonWasReleasedText::
 	TX_RAM wcf4b
 	text " was"
 	line "released outside."
 	cont "Bye @"
 
-_CF4BExclamationText:: ; 8a288 (22:6288)
+_CF4BExclamationText::
 	TX_RAM wcf4b
 	text "!"
 	prompt
 
-_RequireCoinCaseText:: ; 8a28e (22:628e)
+_RequireCoinCaseText::
 	text "A COIN CASE is"
 	line "required!@@"
 
-_ExchangeCoinsForPrizesText:: ; 8a2a9 (22:62a9)
+_ExchangeCoinsForPrizesText::
 	text "We exchange your"
 	line "coins for prizes."
 	prompt
 
-_WhichPrizeText:: ; 8a2cd (22:62cd)
+_WhichPrizeText::
 	text "Which prize do"
 	line "you want?"
 	done
 
-_HereYouGoText:: ; 8a2e7 (22:62e7)
+_HereYouGoText::
 	text "Here you go!@@"
 
-_SoYouWantPrizeText:: ; 8a2f6 (22:62f6)
+_SoYouWantPrizeText::
 	text "So, you want"
 	line "@"
 	TX_RAM wcd6d
@@ -1908,27 +1853,27 @@
 	text "?"
 	done
 
-_SorryNeedMoreCoinsText:: ; 8a30b (22:630b)
+_SorryNeedMoreCoinsText::
 	text "Sorry, you need"
 	line "more coins.@@"
 
-_OopsYouDontHaveEnoughRoomText:: ; 8a329 (22:6329)
+_OopsYouDontHaveEnoughRoomText::
 	text "Oops! You don't"
 	line "have enough room.@@"
 
-_OhFineThenText:: ; 8a34c (22:634c)
+_OhFineThenText::
 	text "Oh, fine then.@@"
 
-_GetDexRatedText:: ; 8a35d (22:635d)
+_GetDexRatedText::
 	text "Want to get your"
 	line "#DEX rated?"
 	done
 
-_ClosedOaksPCText:: ; 8a37b (22:637b)
+_ClosedOaksPCText::
 	text "Closed link to"
 	line "PROF.OAK's PC.@@"
 
-_AccessedOaksPCText:: ; 8a39a (22:639a)
+_AccessedOaksPCText::
 	text "Accessed PROF."
 	line "OAK's PC."
 
@@ -1936,17 +1881,17 @@
 	line "Rating System."
 	prompt
 
-_WhereWouldYouLikeText:: ; 8a3d0 (22:63d0)
+_WhereWouldYouLikeText::
 	text "Where would you"
 	line "like to go?"
 	done
 
-_PleaseWaitText:: ; 8a3ed (22:63ed)
+_PleaseWaitText::
 	text "OK, please wait"
 	line "just a moment."
 	done
 
-_LinkCanceledText:: ; 8a40d (22:640d)
+_LinkCanceledText::
 	text "The link was"
 	line "canceled."
 	done
@@ -1953,7 +1898,7 @@
 
 INCLUDE "text/oakspeech.asm"
 
-_DoYouWantToNicknameText:: ; 0x8a605
+_DoYouWantToNicknameText::
 	text "Do you want to"
 	line "give a nickname"
 	cont "to @"
@@ -1961,18 +1906,18 @@
 	text "?"
 	done
 
-_YourNameIsText:: ; 8a62f (22:662f)
+_YourNameIsText::
 	text "Right! So your"
 	line "name is ", $52, "!"
 	prompt
 
-_HisNameIsText:: ; 8a64a (22:664a)
+_HisNameIsText::
 	text "That's right! I"
 	line "remember now! His"
 	cont "name is ", $53, "!"
 	prompt
 
-_WillBeTradedText:: ; 8a677 (22:6677)
+_WillBeTradedText::
 	TX_RAM wNameOfPlayerMonToBeTraded
 	text " and"
 	line "@"
@@ -1981,126 +1926,14 @@
 	cont "be traded."
 	done
 
-IF DEF(_YELLOW)
-_Colosseum3MonsText::
-	text "You need 3 #MON"
-	line "to fight!"
-	prompt
-
-_ColosseumMewText::
-	text "Sorry, MEW can't"
-	line "attend!"
-	prompt
-
-_ColosseumDifferentMonsText::
-	text "Your #MON must"
-	line "all be different!"
-	prompt
-
-_ColosseumMaxL55Text::
-	text "No #MON can"
-	line "exceed L55!"
-	prompt
-
-_ColosseumMinL50Text::
-	text "All #MON must"
-	line "be at least L50!"
-	prompt
-
-_ColosseumTotalL155Text::
-	text "Your total levels"
-	line "exceed 155!"
-	prompt
-
-_ColosseumMaxL30Text::
-	text "No #MON can"
-	line "exceed L30!"
-	prompt
-
-_ColosseumMinL25Text::
-	text "All #MON must"
-	line "be at least L25!"
-	prompt
-
-_ColosseumTotalL80Text::
-	text "Your total levels"
-	line "exceed 80!"
-	prompt
-
-_ColosseumMaxL20Text::
-	text "No #MON can"
-	line "exceed L20!"
-	prompt
-
-_ColosseumMinL15Text::
-	text "All #MON must"
-	line "be at least L15!"
-	prompt
-
-_ColosseumTotalL50Text::
-	text "Your total levels"
-	line "exceed 50!"
-	prompt
-
-_ColosseumHeightText::
-	TX_RAM $CD6D
-	text " is over"
-	line "6′8″ tall!"
-	prompt
-
-_ColosseumWeightText::
-	TX_RAM $CD6D
-	text " weighs"
-	line "over 44 pounds!"
-	prompt
-
-_ColosseumEvolvedText::
-	TX_RAM $CD6D
-	text " is an"
-	line "evolved #MON!"
-	prompt
-
-_ColosseumIneligibleText::
-	text "Your opponent is"
-	line "ineligible."
-	prompt
-
-_ColosseumWhereToText::
-	text "Where would you"
-	line "like to go?"
-	prompt
-
-_ColosseumPleaseWaitText::
-	text "OK, please wait"
-	line "just a moment."
-	prompt
-
-_ColosseumCanceledText::
-	text "The link was"
-	line "canceled."
-	prompt
-
-_ColosseumVersionText::
-	text "The game versions"
-	line "don't match."
-	prompt
-ENDC
-
-_Char00Text:: ; 8a696 (22:6696)
+_Char00Text::
 	TX_NUM hSpriteIndexOrTextID,1,2
 	text " ERROR."
 	done
 
-_Char55Text:: ; 8a6a3 (22:66a3)
+_Char55Text::
 	text $4B,"@@"
 
-IF DEF(_YELLOW)
-_NoPokemonText::
-	text "There are no"
-	line "#MON here!"
-	prompt
-ENDC
-
 INCLUDE "text/maps/digletts_cave_route_2_entrance.asm"
 INCLUDE "text/maps/viridian_forest_exit.asm"
 INCLUDE "text/maps/route_2_house.asm"
@@ -2177,28 +2010,28 @@
 INCLUDE "text/maps/route_24_2.asm"
 INCLUDE "text/maps/route_25.asm"
 
-_FileDataDestroyedText:: ; 945f1 (25:45f1)
+_FileDataDestroyedText::
 	text "The file data is"
 	line "destroyed!"
 	prompt
 
-_WouldYouLikeToSaveText:: ; 9460e (25:460e)
+_WouldYouLikeToSaveText::
 	text "Would you like to"
 	line "SAVE the game?"
 	done
 
-_GameSavedText:: ; 94630 (25:4630)
+_GameSavedText::
 	text $52, " saved"
 	line "the game!"
 	done
 
-_OlderFileWillBeErasedText:: ; 94643 (25:4643)
+_OlderFileWillBeErasedText::
 	text "The older file"
 	line "will be erased to"
 	cont "save. Okay?"
 	done
 
-_WhenYouChangeBoxText:: ; 94671 (25:4671)
+_WhenYouChangeBoxText::
 	text "When you change a"
 	line "#MON BOX, data"
 	cont "will be saved."
@@ -2206,16 +2039,16 @@
 	para "Is that okay?"
 	done
 
-_ChooseABoxText:: ; 946b0 (25:46b0)
+_ChooseABoxText::
 	text "Choose a"
 	line $4a, " BOX.@@"
 
-_EvolvedText:: ; 946c2 (25:46c2)
+_EvolvedText::
 	TX_RAM wcf4b
 	text " evolved"
 	done
 
-_IntoText:: ; 946cf (25:46cf)
+_IntoText::
 	db $0
 	line "into @"
 	TX_RAM wcd6d
@@ -2222,7 +2055,7 @@
 	text "!"
 	done
 
-_StoppedEvolvingText:: ; 946dd (25:46dd)
+_StoppedEvolvingText::
 	text "Huh? @"
 	TX_RAM wcf4b
 	db $0
@@ -2229,7 +2062,7 @@
 	line "stopped evolving!"
 	prompt
 
-_IsEvolvingText:: ; 946fb (25:46fb)
+_IsEvolvingText::
 	text "What? @"
 	TX_RAM wcf4b
 	db $0
@@ -2236,121 +2069,121 @@
 	line "is evolving!"
 	done
 
-_FellAsleepText:: ; 94715 (25:4715)
+_FellAsleepText::
 	text $59
 	line "fell asleep!"
 	prompt
 
-_AlreadyAsleepText:: ; 94725 (25:4725)
+_AlreadyAsleepText::
 	text $59, "'s"
 	line "already asleep!"
 	prompt
 
-_PoisonedText:: ; 94739 (25:4739)
+_PoisonedText::
 	text $59
 	line "was poisoned!"
 	prompt
 
-_BadlyPoisonedText:: ; 9474a (25:474a)
+_BadlyPoisonedText::
 	text $59, "'s"
 	line "badly poisoned!"
 	prompt
 
-_BurnedText:: ; 9475e (25:475e)
+_BurnedText::
 	text $59
 	line "was burned!"
 	prompt
 
-_FrozenText:: ; 9476d (25:476d)
+_FrozenText::
 	text $59
 	line "was frozen solid!"
 	prompt
 
-_FireDefrostedText:: ; 94782 (25:4782)
+_FireDefrostedText::
 	text "Fire defrosted"
 	line $59, "!"
 	prompt
 
-_MonsStatsRoseText:: ; 94795 (25:4795)
+_MonsStatsRoseText::
 	text $5a, "'s"
 	line "@"
 	TX_RAM wcf4b
 	text "@@"
 
-_GreatlyRoseText:: ; 947a0 (25:47a0)
+_GreatlyRoseText::
 	text $4c, "greatly@@"
 
-_RoseText:: ; 947ab (25:47ab)
+_RoseText::
 	text " rose!"
 	prompt
 
-_MonsStatsFellText:: ; 947b3 (25:47b3)
+_MonsStatsFellText::
 	text $59, "'s"
 	line "@"
 	TX_RAM wcf4b
 	text "@@"
 
-_GreatlyFellText:: ; 947be (25:47be)
+_GreatlyFellText::
 	text $4c, "greatly@@"
 
-_FellText:: ; 947c9 (25:47c9)
+_FellText::
 	text " fell!"
 	prompt
 
-_RanFromBattleText:: ; 947d1 (25:47d1)
+_RanFromBattleText::
 	text $5a
 	line "ran from battle!"
 	prompt
 
-_RanAwayScaredText:: ; 947e5 (25:47e5)
+_RanAwayScaredText::
 	text $59
 	line "ran away scared!"
 	prompt
 
-_WasBlownAwayText:: ; 947f9 (25:47f9)
+_WasBlownAwayText::
 	text $59
 	line "was blown away!"
 	prompt
 
-_ChargeMoveEffectText:: ; 9480c (25:480c)
+_ChargeMoveEffectText::
 	text $5a, "@@"
 
-_MadeWhirlwindText:: ; 94810 (25:4810)
+_MadeWhirlwindText::
 	db $0
 	line "made a whirlwind!"
 	prompt
 
-_TookInSunlightText:: ; 94824 (25:4824)
+_TookInSunlightText::
 	db $0
 	line "took in sunlight!"
 	prompt
 
-_LoweredItsHeadText:: ; 94838 (25:4838)
+_LoweredItsHeadText::
 	db $0
 	line "lowered its head!"
 	prompt
 
-_SkyAttackGlowingText:: ; 9484c (25:484c)
+_SkyAttackGlowingText::
 	db $0
 	line "is glowing!"
 	prompt
 
-_FlewUpHighText:: ; 9485a (25:485a)
+_FlewUpHighText::
 	db $0
 	line "flew up high!"
 	prompt
 
-_DugAHoleText:: ; 9486a (25:486a)
+_DugAHoleText::
 	db $0
 	line "dug a hole!"
 	prompt
 
-_BecameConfusedText:: ; 94878 (25:4878)
+_BecameConfusedText::
 	text $59
 	line "became confused!"
 	prompt
 
-_MimicLearnedMoveText:: ; 9488c (25:488c)
+_MimicLearnedMoveText::
 	text $5a
 	line "learned"
 	cont "@"
@@ -2358,7 +2191,7 @@
 	text "!"
 	prompt
 
-_MoveWasDisabledText:: ; 9489e (25:489e)
+_MoveWasDisabledText::
 	text $59, "'s"
 	line "@"
 	TX_RAM wcd6d
@@ -2366,101 +2199,101 @@
 	cont "disabled!"
 	prompt
 
-_NothingHappenedText:: ; 948b6 (25:48b6)
+_NothingHappenedText::
 	text "Nothing happened!"
 	prompt
 
-_NoEffectText:: ; 948c9 (25:48c9)
+_NoEffectText::
 	text "No effect!"
 	prompt
 
-_ButItFailedText:: ; 948d5 (25:48d5)
+_ButItFailedText::
 	text "But, it failed! "
 	prompt
 
-_DidntAffectText:: ; 948e7 (25:48e7)
+_DidntAffectText::
 	text "It didn't affect"
 	line $59, "!"
 	prompt
 
-_IsUnaffectedText:: ; 948fb (25:48fb)
+_IsUnaffectedText::
 	text $59
 	line "is unaffected!"
 	prompt
 
-_ParalyzedMayNotAttackText:: ; 9490d (25:490d)
+_ParalyzedMayNotAttackText::
 	text $59, "'s"
 	line "paralyzed! It may"
 	cont "not attack!"
 	prompt
 
-_SubstituteText:: ; 9492f (25:492f)
+_SubstituteText::
 	text "It created a"
 	line "SUBSTITUTE!"
 	prompt
 
-_HasSubstituteText:: ; 94949 (25:4949)
+_HasSubstituteText::
 	text $5a
 	line "has a SUBSTITUTE!"
 	prompt
 
-_TooWeakSubstituteText:: ; 9495e (25:495e)
+_TooWeakSubstituteText::
 	text "Too weak to make"
 	line "a SUBSTITUTE!"
 	prompt
 
-_CoinsScatteredText:: ; 9497e (25:497e)
+_CoinsScatteredText::
 	text "Coins scattered"
 	line "everywhere!"
 	prompt
 
-_GettingPumpedText:: ; 9499b (25:499b)
+_GettingPumpedText::
 	text $5a, "'s"
 	line "getting pumped!"
 	prompt
 
-_WasSeededText:: ; 949af (25:49af)
+_WasSeededText::
 	text $59
 	line "was seeded!"
 	prompt
 
-_EvadedAttackText:: ; 949be (25:49be)
+_EvadedAttackText::
 	text $59
 	line "evaded attack!"
 	prompt
 
-_HitWithRecoilText:: ; 949d0 (25:49d0)
+_HitWithRecoilText::
 	text $5a, "'s"
 	line "hit with recoil!"
 	prompt
 
-_ConvertedTypeText:: ; 949e5 (25:49e5)
+_ConvertedTypeText::
 	text "Converted type to"
 	line $59, "'s!"
 	prompt
 
-_StatusChangesEliminatedText:: ; 949fc (25:49fc)
+_StatusChangesEliminatedText::
 	text "All STATUS changes"
 	line "are eliminated!"
 	prompt
 
-_StartedSleepingEffect:: ; 94a20 (25:4a20)
+_StartedSleepingEffect::
 	text $5a
 	line "started sleeping!"
 	done
 
-_FellAsleepBecameHealthyText:: ; 94a35 (25:4a35)
+_FellAsleepBecameHealthyText::
 	text $5a
 	line "fell asleep and"
 	cont "became healthy!"
 	done
 
-_RegainedHealthText:: ; 94a58 (25:4a58)
+_RegainedHealthText::
 	text $5a
 	line "regained health!"
 	prompt
 
-_TransformedText:: ; 94a6c (25:4a6c)
+_TransformedText::
 	text $5a
 	line "transformed into"
 	cont "@"
@@ -2468,37 +2301,37 @@
 	text "!"
 	prompt
 
-_LightScreenProtectedText:: ; 94a87 (25:4a87)
+_LightScreenProtectedText::
 	text $5a, "'s"
 	line "protected against"
 	cont "special attacks!"
 	prompt
 
-_ReflectGainedArmorText:: ; 94aae (25:4aae)
+_ReflectGainedArmorText::
 	text $5a
 	line "gained armor!"
 	prompt
 
-_ShroudedInMistText:: ; 94abf (25:4abf)
+_ShroudedInMistText::
 	text $5a, "'s"
 	line "shrouded in mist!"
 	prompt
 
-_SuckedHealthText:: ; 94ad5 (25:4ad5)
+_SuckedHealthText::
 	text "Sucked health from"
 	line $59, "!"
 	prompt
 
-_DreamWasEatenText:: ; 94aec (25:4aec)
+_DreamWasEatenText::
 	text $59, "'s"
 	line "dream was eaten!"
 	prompt
 
-_TradeCenterText1:: ; 94b01 (25:4b01)
+_TradeCenterText1::
 	text "!"
 	done
 
-_ColosseumText1:: ; 94b04 (25:4b04)
+_ColosseumText1::
 	text "!"
 	done
 
@@ -2602,18 +2435,18 @@
 INCLUDE "text/maps/saffron_pokecenter.asm"
 INCLUDE "text/maps/mr_psychics_house.asm"
 
-_PokemartGreetingText:: ; a259c (28:659c)
+_PokemartGreetingText::
 	text "Hi there!"
 	next "May I help you?"
 	done
 
-_PokemonFaintedText:: ; a25b7 (28:65b7)
+_PokemonFaintedText::
 	TX_RAM wcd6d
 	db $0
 	line "fainted!"
 	done
 
-_PlayerBlackedOutText:: ; a25c5 (28:65c5)
+_PlayerBlackedOutText::
 	text $52, " is out of"
 	line "useable #MON!"
 
@@ -2621,16 +2454,16 @@
 	line "out!"
 	prompt
 
-_RepelWoreOffText:: ; a25ef (28:65ef)
+_RepelWoreOffText::
 	text "REPEL's effect"
 	line "wore off."
 	done
 
-_PokemartBuyingGreetingText:: ; a2608 (28:6608)
+_PokemartBuyingGreetingText::
 	text "Take your time."
 	done
 
-_PokemartTellBuyPriceText:: ; a2619 (28:6619)
+_PokemartTellBuyPriceText::
 	TX_RAM wcf4b
 	text "?"
 	line "That will be"
@@ -2639,27 +2472,27 @@
 	text ". OK?"
 	done
 
-_PokemartBoughtItemText:: ; a2639 (28:6639)
+_PokemartBoughtItemText::
 	text "Here you are!"
 	line "Thank you!"
 	prompt
 
-_PokemartNotEnoughMoneyText:: ; a2653 (28:6653)
+_PokemartNotEnoughMoneyText::
 	text "You don't have"
 	line "enough money."
 	prompt
 
-_PokemartItemBagFullText:: ; a2670 (28:6670)
+_PokemartItemBagFullText::
 	text "You can't carry"
 	line "any more items."
 	prompt
 
-_PokemonSellingGreetingText:: ; a2690 (28:6690)
+_PokemonSellingGreetingText::
 	text "What would you"
 	line "like to sell?"
 	done
 
-_PokemartTellSellPriceText:: ; a26ae (28:66ae)
+_PokemartTellSellPriceText::
 	text "I can pay you"
 	line "¥@"
 	TX_BCD hMoney, $c3
@@ -2666,26 +2499,26 @@
 	text " for that."
 	done
 
-_PokemartItemBagEmptyText:: ; a26cf (28:66cf)
+_PokemartItemBagEmptyText::
 	text "You don't have"
 	line "anything to sell."
 	prompt
 
-_PokemartUnsellableItemText:: ; a26f0 (28:66f0)
+_PokemartUnsellableItemText::
 	text "I can't put a"
 	line "price on that."
 	prompt
 
-_PokemartThankYouText:: ; a270d (28:670d)
+_PokemartThankYouText::
 	text "Thank you!"
 	done
 
-_PokemartAnythingElseText:: ; a2719 (28:6719)
+_PokemartAnythingElseText::
 	text "Is there anything"
 	line "else I can do?"
 	done
 
-_LearnedMove1Text:: ; a273b (28:673b)
+_LearnedMove1Text::
 	TX_RAM wLearnMoveMonName
 	text " learned"
 	line "@"
@@ -2692,12 +2525,12 @@
 	TX_RAM wcf4b
 	text "!@@"
 
-_WhichMoveToForgetText:: ; a2750 (28:6750)
+_WhichMoveToForgetText::
 	text "Which move should"
 	next "be forgotten?"
 	done
 
-_AbandonLearningText:: ; a2771 (28:6771)
+_AbandonLearningText::
 	text "Abandon learning"
 	line "@"
 	TX_RAM wcf4b
@@ -2704,7 +2537,7 @@
 	text "?"
 	done
 
-_DidNotLearnText:: ; a278a (28:678a)
+_DidNotLearnText::
 	TX_RAM wLearnMoveMonName
 	db $0
 	line "did not learn"
@@ -2713,7 +2546,7 @@
 	text "!"
 	prompt
 
-_TryingToLearnText:: ; a27a4 (28:67a4)
+_TryingToLearnText::
 	TX_RAM wLearnMoveMonName
 	text " is"
 	line "trying to learn"
@@ -2734,13 +2567,13 @@
 	text "?"
 	done
 
-_OneTwoAndText:: ; a2819 (28:6819)
+_OneTwoAndText::
 	text "1, 2 and...@@"
 
-_PoofText:: ; a2827 (28:6827)
+_PoofText::
 	text " Poof!@@"
 
-_ForgotAndText:: ; a2830 (28:6830)
+_ForgotAndText::
 	db $0
 	para "@"
 	TX_RAM wLearnMoveMonName
@@ -2752,12 +2585,12 @@
 	para "And..."
 	prompt
 
-_HMCantDeleteText:: ; a284d (28:684d)
+_HMCantDeleteText::
 	text "HM techniques"
 	line "can't be deleted!"
 	prompt
 
-_PokemonCenterWelcomeText:: ; a286d (28:686d)
+_PokemonCenterWelcomeText::
 	text "Welcome to our"
 	line "#MON CENTER!"
 
@@ -2766,28 +2599,28 @@
 	cont "perfect health!"
 	prompt
 
-_ShallWeHealYourPokemonText:: ; a28b4 (28:68b4)
+_ShallWeHealYourPokemonText::
 	text "Shall we heal your"
 	line "#MON?"
 	done
 
-_NeedYourPokemonText:: ; a28ce (28:68ce)
+_NeedYourPokemonText::
 	text "OK. We'll need"
 	line "your #MON."
 	done
 
-_PokemonFightingFitText:: ; a28e8 (28:68e8)
+_PokemonFightingFitText::
 	text "Thank you!"
 	line "Your #MON are"
 	cont "fighting fit!"
 	prompt
 
-_PokemonCenterFarewellText:: ; a2910 (28:6910)
+_PokemonCenterFarewellText::
 	text "We hope to see"
 	line "you again!"
 	done
 
-_CableClubNPCAreaReservedFor2FriendsLinkedByCableText:: ; a292b (28:692b)
+_CableClubNPCAreaReservedFor2FriendsLinkedByCableText::
 	text "This area is"
 	line "reserved for 2"
 	cont "friends who are"
@@ -2794,12 +2627,12 @@
 	cont "linked by cable."
 	done
 
-_CableClubNPCWelcomeText:: ; a2969 (28:6969)
+_CableClubNPCWelcomeText::
 	text "Welcome to the"
 	line "Cable Club!"
 	done
 
-_CableClubNPCPleaseApplyHereHaveToSaveText:: ; a2985 (28:6985)
+_CableClubNPCPleaseApplyHereHaveToSaveText::
 	text "Please apply here."
 
 	para "Before opening"
@@ -2807,10 +2640,10 @@
 	cont "to save the game."
 	done
 
-_CableClubNPCPleaseWaitText:: ; a29cc (28:69cc)
+_CableClubNPCPleaseWaitText::
 	text "Please wait.@@"
 
-_CableClubNPCLinkClosedBecauseOfInactivityText:: ; a29db (28:69db)
+_CableClubNPCLinkClosedBecauseOfInactivityText::
 	text "The link has been"
 	line "closed because of"
 	cont "inactivity."
@@ -2823,86 +2656,86 @@
 
 SECTION "Text 10", ROMX, BANK[TEXT_10]
 
-_CableClubNPCPleaseComeAgainText:: ; a4000 (29:4000)
+_CableClubNPCPleaseComeAgainText::
 	text "Please come again!"
 	done
 
-_CableClubNPCMakingPreparationsText:: ; a4014 (29:4014)
+_CableClubNPCMakingPreparationsText::
 	text "We're making"
 	line "preparations."
 	cont "Please wait."
 	done
 
-_UsedStrengthText:: ; a403c (29:403c)
+_UsedStrengthText::
 	TX_RAM wcd6d
 	text " used"
 	line "STRENGTH.@@"
 
-_CanMoveBouldersText:: ; a4051 (29:4051)
+_CanMoveBouldersText::
 	TX_RAM wcd6d
 	text " can"
 	line "move boulders."
 	prompt
 
-_CurrentTooFastText:: ; a4069 (29:4069)
+_CurrentTooFastText::
 	text "The current is"
 	line "much too fast!"
 	prompt
 
-_CyclingIsFunText:: ; a4088 (29:4088)
+_CyclingIsFunText::
 	text "Cycling is fun!"
 	line "Forget SURFing!"
 	prompt
 
-_FlashLightsAreaText:: ; a40a9 (29:40a9)
+_FlashLightsAreaText::
 	text "A blinding FLASH"
 	line "lights the area!"
 	prompt
 
-_WarpToLastPokemonCenterText:: ; a40cc (29:40cc)
+_WarpToLastPokemonCenterText::
 	text "Warp to the last"
 	line "#MON CENTER."
 	done
 
-_CannotUseTeleportNowText:: ; a40eb (29:40eb)
+_CannotUseTeleportNowText::
 	TX_RAM wcd6d
 	text " can't"
 	line "use TELEPORT now."
 	prompt
 
-_CannotFlyHereText:: ; a4107 (29:4107)
+_CannotFlyHereText::
 	TX_RAM wcd6d
 	text " can't"
 	line "FLY here."
 	prompt
 
-_NotHealthyEnoughText:: ; a411b (29:411b)
+_NotHealthyEnoughText::
 	text "Not healthy"
 	line "enough."
 	prompt
 
-_NewBadgeRequiredText:: ; a4130 (29:4130)
+_NewBadgeRequiredText::
 	text "No! A new BADGE"
 	line "is required."
 	prompt
 
-_CannotUseItemsHereText:: ; a414e (29:414e)
+_CannotUseItemsHereText::
 	text "You can't use items"
 	line "here."
 	prompt
 
-_CannotGetOffHereText:: ; a4168 (29:4168)
+_CannotGetOffHereText::
 	text "You can't get off"
 	line "here."
 	prompt
 
-_GotMonText:: ; a4180 (29:4180)
+_GotMonText::
 	text $52, " got"
 	line "@"
 	TX_RAM wcd6d
 	text "!@@"
 
-_SetToBoxText:: ; a418f (29:418f)
+_SetToBoxText::
 	text "There's no more"
 	line "room for #MON!"
 	cont "@"
@@ -2914,7 +2747,7 @@
 	text " on PC!"
 	done
 
-_BoxIsFullText:: ; a41d6 (29:41d6)
+_BoxIsFullText::
 	text "There's no more"
 	line "room for #MON!"
 
@@ -2937,7 +2770,7 @@
 INCLUDE "text/maps/cinnabar_island.asm"
 INCLUDE "text/maps/saffron_city.asm"
 
-_ItemUseBallText00:: ; a6729 (29:6729)
+_ItemUseBallText00::
 	text "It dodged the"
 	line "thrown BALL!"
 
@@ -2945,27 +2778,27 @@
 	line "can't be caught!"
 	prompt
 
-_ItemUseBallText01:: ; a675f (29:675f)
+_ItemUseBallText01::
 	text "You missed the"
 	line "#MON!"
 	prompt
 
-_ItemUseBallText02:: ; a6775 (29:6775)
+_ItemUseBallText02::
 	text "Darn! The #MON"
 	line "broke free!"
 	prompt
 
-_ItemUseBallText03:: ; a6791 (29:6791)
+_ItemUseBallText03::
 	text "Aww! It appeared"
 	line "to be caught! "
 	prompt
 
-_ItemUseBallText04:: ; a67b2 (29:67b2)
+_ItemUseBallText04::
 	text "Shoot! It was so"
 	line "close too!"
 	prompt
 
-_ItemUseBallText05:: ; a67cf (29:67cf)
+_ItemUseBallText05::
 	text "All right!"
 	line "@"
 	TX_RAM wEnemyMonNick
@@ -2972,7 +2805,7 @@
 	text " was"
 	cont "caught!@@"
 
-_ItemUseBallText07:: ; a67ee (29:67ee)
+_ItemUseBallText07::
 	TX_RAM wBoxMonNicks
 	text " was"
 	line "transferred to"
@@ -2979,7 +2812,7 @@
 	cont "BILL's PC!"
 	prompt
 
-_ItemUseBallText08:: ; a6810 (29:6810)
+_ItemUseBallText08::
 	TX_RAM wBoxMonNicks
 	text " was"
 	line "transferred to"
@@ -2986,7 +2819,7 @@
 	cont "someone's PC!"
 	prompt
 
-_ItemUseBallText06:: ; a6835 (29:6835)
+_ItemUseBallText06::
 	text "New #DEX data"
 	line "will be added for"
 	cont "@"
@@ -2993,7 +2826,7 @@
 	TX_RAM wEnemyMonNick
 	text "!@@"
 
-_SurfingGotOnText:: ; a685e (29:685e)
+_SurfingGotOnText::
 	text $52, " got on"
 	line "@"
 	TX_RAM wcd6d
@@ -3000,12 +2833,12 @@
 	text "!"
 	prompt
 
-_SurfingNoPlaceToGetOffText:: ; a686f (29:686f)
+_SurfingNoPlaceToGetOffText::
 	text "There's no place"
 	line "to get off!"
 	prompt
 
-_VitaminStatRoseText:: ; a688c (29:688c)
+_VitaminStatRoseText::
 	TX_RAM wcd6d
 	text "'s"
 	line "@"
@@ -3013,22 +2846,22 @@
 	text " rose."
 	prompt
 
-_VitaminNoEffectText:: ; a689e (29:689e)
+_VitaminNoEffectText::
 	text "It won't have any"
 	line "effect."
 	prompt
 
-_ThrewBaitText:: ; a68b8 (29:68b8)
+_ThrewBaitText::
 	text $52, " threw"
 	line "some BAIT."
 	done
 
-_ThrewRockText:: ; a68cc (29:68cc)
+_ThrewRockText::
 	text $52, " threw a"
 	line "ROCK."
 	done
 
-_PlayedFluteNoEffectText:: ; a68dd (29:68dd)
+_PlayedFluteNoEffectText::
 	text "Played the #"
 	line "FLUTE."
 
@@ -3036,16 +2869,16 @@
 	line "catchy tune!"
 	prompt
 
-_FluteWokeUpText:: ; a690c (29:690c)
+_FluteWokeUpText::
 	text "All sleeping"
 	line "#MON woke up."
 	prompt
 
-_PlayedFluteHadEffectText:: ; a6928 (29:6928)
+_PlayedFluteHadEffectText::
 	text $52, " played the"
 	line "# FLUTE.@@"
 
-_CoinCaseNumCoinsText:: ; a6940 (29:6940)
+_CoinCaseNumCoinsText::
 	text "Coins"
 	line "@"
 	TX_BCD wPlayerCoins, $c2
@@ -3052,52 +2885,52 @@
 	text " "
 	prompt
 
-_ItemfinderFoundItemText:: ; a694f (29:694f)
+_ItemfinderFoundItemText::
 	text "Yes! ITEMFINDER"
 	line "indicates there's"
 	cont "an item nearby."
 	prompt
 
-_ItemfinderFoundNothingText:: ; a6981 (29:6981)
+_ItemfinderFoundNothingText::
 	text "Nope! ITEMFINDER"
 	line "isn't responding."
 	prompt
 
-_RaisePPWhichTechniqueText:: ; a69a4 (29:69a4)
+_RaisePPWhichTechniqueText::
 	text "Raise PP of which"
 	line "technique?"
 	done
 
-_RestorePPWhichTechniqueText:: ; a69c2 (29:69c2)
+_RestorePPWhichTechniqueText::
 	text "Restore PP of"
 	line "which technique?"
 	done
 
-_PPMaxedOutText:: ; a69e2 (29:69e2)
+_PPMaxedOutText::
 	TX_RAM wcf4b
 	text "'s PP"
 	line "is maxed out."
 	prompt
 
-_PPIncreasedText:: ; a69f9 (29:69f9)
+_PPIncreasedText::
 	TX_RAM wcf4b
 	text "'s PP"
 	line "increased."
 	prompt
 
-_PPRestoredText:: ; a6a0d (29:6a0d)
+_PPRestoredText::
 	text "PP was restored."
 	prompt
 
-_BootedUpTMText:: ; a6a1f (29:6a1f)
+_BootedUpTMText::
 	text "Booted up a TM!"
 	prompt
 
-_BootedUpHMText:: ; a6a30 (29:6a30)
+_BootedUpHMText::
 	text "Booted up an HM!"
 	prompt
 
-_TeachMachineMoveText:: ; a6a42 (29:6a42)
+_TeachMachineMoveText::
 	text "It contained"
 	line "@"
 	TX_RAM wcf4b
@@ -3109,7 +2942,7 @@
 	line "to a #MON?"
 	done
 
-_MonCannotLearnMachineMoveText:: ; a6a6e (29:6a6e)
+_MonCannotLearnMachineMoveText::
 	TX_RAM wcd6d
 	text " is not"
 	line "compatible with"
@@ -3123,37 +2956,37 @@
 	text "."
 	prompt
 
-_ItemUseNotTimeText:: ; a6aa6 (29:6aa6)
+_ItemUseNotTimeText::
 	text "OAK: ", $52, "!"
 	line "This isn't the"
 	cont "time to use that! "
 	prompt
 
-_ItemUseNotYoursToUseText:: ; a6ad0 (29:6ad0)
+_ItemUseNotYoursToUseText::
 	text "This isn't yours"
 	line "to use!"
 	prompt
 
-_ItemUseNoEffectText:: ; a6ae9 (29:6ae9)
+_ItemUseNoEffectText::
 	text "It won't have any"
 	line "effect."
 	prompt
 
-_ThrowBallAtTrainerMonText1:: ; a6b03 (29:6b03)
+_ThrowBallAtTrainerMonText1::
 	text "The trainer"
 	line "blocked the BALL!"
 	prompt
 
-_ThrowBallAtTrainerMonText2:: ; a6b22 (29:6b22)
+_ThrowBallAtTrainerMonText2::
 	text "Don't be a thief!"
 	prompt
 
-_NoCyclingAllowedHereText:: ; a6b34 (29:6b34)
+_NoCyclingAllowedHereText::
 	text "No cycling"
 	next "allowed here."
 	prompt
 
-_NoSurfingHereText:: ; a6b4e (29:6b4e)
+_NoSurfingHereText::
 	text "No SURFing on"
 	line "@"
 	TX_RAM wcd6d
@@ -3160,7 +2993,7 @@
 	text " here!"
 	prompt
 
-_BoxFullCannotThrowBallText:: ; a6b69 (29:6b69)
+_BoxFullCannotThrowBallText::
 	text "The #MON BOX"
 	line "is full! Can't"
 	cont "use that item!"
@@ -3169,32 +3002,32 @@
 
 SECTION "Text 11", ROMX, BANK[TEXT_11]
 
-_ItemUseText001:: ; a8000 (2a:4000)
+_ItemUseText001::
 	text $52," used@@"
 
-_ItemUseText002:: ; a8009 (2a:4009)
+_ItemUseText002::
 	TX_RAM wcf4b
 	text "!"
 	done
 
-_GotOnBicycleText1:: ; a800f (2a:400f)
+_GotOnBicycleText1::
 	text $52, " got on the@@"
 
-_GotOnBicycleText2:: ; a801e (2a:401e)
+_GotOnBicycleText2::
 	TX_RAM wcf4b
 	text "!"
 	prompt
 
-_GotOffBicycleText1:: ; a8024 (2a:4024)
+_GotOffBicycleText1::
 	text $52, " got off@@"
 
-_GotOffBicycleText2:: ; a8030 (2a:4030)
+_GotOffBicycleText2::
 	text "the @"
 	TX_RAM wcf4b
 	text "."
 	prompt
 
-_ThrewAwayItemText:: ; a803c (2a:403c)
+_ThrewAwayItemText::
 	text "Threw away"
 	line "@"
 	TX_RAM wcd6d
@@ -3201,7 +3034,7 @@
 	text "."
 	prompt
 
-_IsItOKToTossItemText:: ; a804f (2a:404f)
+_IsItOKToTossItemText::
 	text "Is it OK to toss"
 	line "@"
 	TX_RAM wcf4b
@@ -3208,12 +3041,12 @@
 	text "?"
 	prompt
 
-_TooImportantToTossText:: ; a8068 (2a:4068)
+_TooImportantToTossText::
 	text "That's too impor-"
 	line "tant to toss!"
 	prompt
 
-_AlreadyKnowsText:: ; a8088 (2a:4088)
+_AlreadyKnowsText::
 	TX_RAM wcd6d
 	text " knows"
 	line "@"
@@ -3221,12 +3054,12 @@
 	text "!"
 	prompt
 
-_ConnectCableText:: ; a809a (2a:409a)
+_ConnectCableText::
 	text "Okay, connect the"
 	line "cable like so!"
 	prompt
 
-_TradedForText:: ; a80bc (2a:40bc)
+_TradedForText::
 	text $52, " traded"
 	line "@"
 	TX_RAM wInGameTradeGiveMonName
@@ -3235,7 +3068,7 @@
 	TX_RAM wInGameTradeReceiveMonName
 	text "!@@"
 
-_WannaTrade1Text:: ; a80d8 (2a:40d8)
+_WannaTrade1Text::
 	text "I'm looking for"
 	line "@"
 	TX_RAM wInGameTradeGiveMonName
@@ -3247,12 +3080,12 @@
 	text "? "
 	done
 
-_NoTrade1Text:: ; a810b (2a:410b)
+_NoTrade1Text::
 	text "Awww!"
 	line "Oh well..."
 	done
 
-_WrongMon1Text:: ; a811d (2a:411d)
+_WrongMon1Text::
 	text "What? That's not"
 	line "@"
 	TX_RAM wInGameTradeGiveMonName
@@ -3262,11 +3095,11 @@
 	line "come back here!"
 	done
 
-_Thanks1Text:: ; a8155 (2a:4155)
+_Thanks1Text::
 	text "Hey thanks!"
 	done
 
-_AfterTrade1Text:: ; a8162 (2a:4162)
+_AfterTrade1Text::
 	text "Isn't my old"
 	line "@"
 	TX_RAM wInGameTradeReceiveMonName
@@ -3273,7 +3106,7 @@
 	text " great?"
 	done
 
-_WannaTrade2Text:: ; a817c (2a:417c)
+_WannaTrade2Text::
 	text "Hello there! Do"
 	line "you want to trade"
 
@@ -3285,12 +3118,12 @@
 	text "?"
 	done
 
-_NoTrade2Text:: ; a81b5 (2a:41b5)
+_NoTrade2Text::
 	text "Well, if you"
 	line "don't want to..."
 	done
 
-_WrongMon2Text:: ; a81d3 (2a:41d3)
+_WrongMon2Text::
 	text "Hmmm? This isn't"
 	line "@"
 	TX_RAM wInGameTradeGiveMonName
@@ -3300,18 +3133,11 @@
 	line "you get one."
 	done
 
-_Thanks2Text:: ; a8209 (2a:4209)
+_Thanks2Text::
 	text "Thanks!"
 	done
 
-_AfterTrade2Text:: ; a8212 (2a:4212)
-IF DEF(_YELLOW)
-	text "Hello there! Your"
-	line "old @"
-	TX_RAM wcd13
-	db " is"
-	cont "magnificent!"
-ELSE
+_AfterTrade2Text::
 	text "The @"
 	TX_RAM wInGameTradeGiveMonName
 	text " you"
@@ -3318,10 +3144,9 @@
 	line "traded to me"
 
 	para "went and evolved!"
-ENDC
 	done
 
-_WannaTrade3Text:: ; a8240 (2a:4240)
+_WannaTrade3Text::
 	text "Hi! Do you have"
 	line "@"
 	TX_RAM wInGameTradeGiveMonName
@@ -3333,11 +3158,11 @@
 	text "?"
 	done
 
-_NoTrade3Text:: ; a8274 (2a:4274)
+_NoTrade3Text::
 	text "That's too bad."
 	done
 
-_WrongMon3Text:: ; a8284 (2a:4284)
+_WrongMon3Text::
 	text "...This is no"
 	line "@"
 	TX_RAM wInGameTradeGiveMonName
@@ -3347,15 +3172,11 @@
 	line "trade it with me!"
 	done
 
-_Thanks3Text:: ; a82bc (2a:42bc)
-IF DEF(_YELLOW)
-	text "Thanks, pal!"
-ELSE
+_Thanks3Text::
 	text "Thanks pal!"
-ENDC
 	done
 
-_AfterTrade3Text:: ; a82c9 (2a:42c9)
+_AfterTrade3Text::
 	text "How is my old"
 	line "@"
 	TX_RAM wInGameTradeReceiveMonName
@@ -3367,12 +3188,12 @@
 	line "doing great!"
 	done
 
-_NothingToCutText:: ; a82f8 (2a:42f8)
+_NothingToCutText::
 	text "There isn't"
 	line "anything to CUT!"
 	prompt
 
-_UsedCutText:: ; a8315 (2a:4315)
+_UsedCutText::
 	TX_RAM wcd6d
 	text " hacked"
 	line "away with CUT!"
@@ -3387,4 +3208,3 @@
 SECTION "Move Names", ROMX, BANK[MOVE_NAMES]
 
 INCLUDE "text/move_names.asm"
-