Clean up text, and some bank 3 code.

4 files changed, 223 insertions, 192 deletions

diff --git a/data/text/battle.asm b/data/text/battle.asm
index cccc9421..58fad4a9 100755
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -405,9 +405,8 @@ BecameConfusedText:
 	text "<TARGET>"
 	line "became confused!"
 	prompt
-; ItemHealedConfusion
 
-BattleText_ItemHealedConfusion: ; ItemHealedConfusion
+BattleText_ItemHealedConfusion:
 	text "A @"
 	text_ram wStringBuffer1
 	text " rid"
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index a1c9fdb2..0bea4456 100755
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -27,7 +27,7 @@ _NothingHereText::
 	line "here…"
 	done
 
-UnknownText_0x1bc0a2::
+_RecoveredSomeHPText::
 	text_ram wStringBuffer1
 	text_start
 	line "recovered @"
@@ -35,65 +35,65 @@ UnknownText_0x1bc0a2::
 	text "HP!"
 	done
 
-UnknownText_0x1bc0bb::
+_CuredOfPoisonText::
 	text_ram wStringBuffer1
 	text "'s"
 	line "cured of poison."
 	done
 
-UnknownText_0x1bc0d2::
+_RidOfParalysisText::
 	text_ram wStringBuffer1
 	text "'s"
 	line "rid of paralysis."
 	done
 
-UnknownText_0x1bc0ea::
+_BurnWasHealedText::
 	text_ram wStringBuffer1
 	text "'s"
 	line "burn was healed."
 	done
 
-UnknownText_0x1bc101::
+_WasDefrostedText::
 	text_ram wStringBuffer1
 	text_start
 	line "was defrosted."
 	done
 
-UnknownText_0x1bc115::
+_WokeUpText::
 	text_ram wStringBuffer1
 	text_start
 	line "woke up."
 	done
 
-UnknownText_0x1bc123::
+_HealthReturnedText::
 	text_ram wStringBuffer1
 	text "'s"
 	line "health returned."
 	done
 
-UnknownText_0x1bc13a::
+_RevitalizedText::
 	text_ram wStringBuffer1
 	text_start
 	line "is revitalized."
 	done
 
-UnknownText_0x1bc14f::
+_GrewToLevelText::
 	text_ram wStringBuffer1
 	text " grew to"
 	line "level @"
 	text_decimal wCurPartyLevel, 1, 3
 	text "!@"
-	sound_dex_fanfare_50_79
+	sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP
 	text_promptbutton
-	db "@"
+	text_end
 
-UnknownText_0x1bc16e::
+_CameToItsSensesText::
 	text_ram wStringBuffer1
 	text " came"
 	line "to its senses."
 	done
 
-UnknownText_0x1bc29c::
+_OakTimeWokeUpText::
 	text "<……><……><……><……><……><……>"
 	line "<……><……><……><……><……><……>"
 
@@ -104,48 +104,52 @@ UnknownText_0x1bc29c::
 	line "clock for me?"
 	prompt
 
-UnknownText_0x1bc2eb::
+_OakTimeWhatTimeIsItText::
 	text "What time is it?"
 	done
 
-UnknownText_0x1bc2fd::
-	text "What?@@"
+_OakTimeWhatHoursText::
+	text "What?@"
+	text_end
+
+_OakTimeHoursQuestionMarkText::
 	text "?"
 	done
 
-UnknownText_0x1bc308::
+_OakTimeHowManyMinutesText::
 	text "How many minutes?"
 	done
 
-UnknownText_0x1bc31b::
-	text "Whoa!@@"
+_OakTimeWhoaMinutesText::
+	text "Whoa!@"
+	text_end
 
-UnknownText_0x1bc323::
+_OakTimeMinutesQuestionMarkText::
 	text "?"
 	done
 
-UnknownText_0x1bc326::
+_OakTimeOversleptText::
 	text "!"
 	line "I overslept!"
 	done
 
-UnknownText_0x1bc336::
+_OakTimeYikesText::
 	text "!"
 	line "Yikes! I over-"
 	cont "slept!"
 	done
 
-UnknownText_0x1bc34f::
+_OakTimeSoDarkText::
 	text "!"
 	line "No wonder it's so"
 	cont "dark!"
 	done
 
-UnknownText_0x1bc369::
+_OakTimeWhatDayIsItText::
 	text "What day is it?"
 	done
 
-UnknownText_0x1bc37a::
+_OakTimeIsItText::
 	text ", is it?"
 	done
 
@@ -445,7 +449,9 @@ _WillTradeText::
 	text " will"
 	line "trade @"
 	text_ram wOTTrademonSpeciesName
-	db "@@"
+	text_end
+
+	text_end ; unused
 
 _ForYourMonWillTradeText::
 	text "for @"
@@ -477,7 +483,9 @@ _OPT_OakText1::
 	text_start
 	line "OAK: @"
 	text_ram wMonOrItemNameBuffer
-	db "@@"
+	text_end
+
+	text_end ; unused
 
 _OPT_OakText2::
 	text_start
@@ -618,7 +626,7 @@ _OPT_ExcitingText::
 	line "exciting."
 	done
 
-_OPT_GroovyText::
+_OPT_NowText::
 	text_start
 	line "now!"
 	done
@@ -666,7 +674,7 @@ _PokedexShowText::
 	text_start
 	line "@"
 	text_ram wStringBuffer1
-	db "@"
+	text_end
 
 ; Pokémon Music Channel / Pokémusic
 
@@ -815,7 +823,9 @@ _PnP_Text4::
 	text_ram wStringBuffer2
 	text " @"
 	text_ram wStringBuffer1
-	db "@@"
+	text_end
+
+	text_end ; unused
 
 _PnP_CuteText::
 	text_start
@@ -901,7 +911,9 @@ _PnP_Text5::
 	text_start
 	line "@"
 	text_ram wStringBuffer1
-	db "@@"
+	text_end
+
+	text_end ; unused
 
 _RocketRadioText1::
 	text_start
@@ -1020,7 +1032,7 @@ _ReceiveItemText::
 	text "!@"
 	sound_item
 	text_promptbutton
-	db "@"
+	text_end
 
 _NoCoinsText::
 	text "You have no coins."
@@ -1031,26 +1043,27 @@ _NoCoinCaseText::
 	line "COIN CASE."
 	prompt
 
-UnknownText_0x1bd407::
+_NPCTradeCableText::
 	text "OK, connect the"
 	line "Game Link Cable."
 	prompt
 
-UnknownText_0x1bd429::
+Text_NPCTraded::
 	text "<PLAYER> traded"
 	line "@"
 	text_ram wStringBuffer2
 	text " for"
 	cont "@"
 	text_ram wMonOrItemNameBuffer
-	text ".@@"
+	text ".@"
+	text_end
 
-UnknownText_0x1bd445::
+_NPCTradeFanfareText::
 	sound_dex_fanfare_80_109
 	text_pause
-	db "@"
+	text_end
 
-UnknownText_0x1bd449::
+_NPCTradeIntroText1::
 	text "I collect #MON."
 	line "Do you have"
 	cont "@"
@@ -1063,12 +1076,12 @@ UnknownText_0x1bd449::
 	text "?"
 	done
 
-UnknownText_0x1bd48c::
+_NPCTradeCancelText1::
 	text "You don't want to"
 	line "trade? Aww…"
 	done
 
-UnknownText_0x1bd4aa::
+_NPCTradeWrongText1::
 	text "Huh? That's not"
 	line "@"
 	text_ram wStringBuffer1
@@ -1076,7 +1089,7 @@ UnknownText_0x1bd4aa::
 	cont "What a letdown…"
 	done
 
-UnknownText_0x1bd4d2::
+_NPCTradeCompleteText1::
 	text "Yay! I got myself"
 	line "@"
 	text_ram wStringBuffer1
@@ -1084,14 +1097,14 @@ UnknownText_0x1bd4d2::
 	cont "Thanks!"
 	done
 
-UnknownText_0x1bd4f4::
+_NPCTradeAfterText1::
 	text "Hi, how's my old"
 	line "@"
 	text_ram wStringBuffer2
 	text " doing?"
 	done
 
-UnknownText_0x1bd512::
+_NPCTradeIntroText2::
 	text "Hi, I'm looking"
 	line "for this #MON."
 
@@ -1106,7 +1119,7 @@ UnknownText_0x1bd512::
 	text "?"
 	done
 
-UnknownText_0x1bd565::
+_NPCTradeCancelText2::
 	text "You don't have"
 	line "one either?"
 
@@ -1114,7 +1127,7 @@ UnknownText_0x1bd565::
 	line "disappointing…"
 	done
 
-UnknownText_0x1bd5a1::
+_NPCTradeWrongText2::
 	text "You don't have"
 	line "@"
 	text_ram wStringBuffer1
@@ -1122,7 +1135,7 @@ UnknownText_0x1bd5a1::
 	cont "too bad, then."
 	done
 
-UnknownText_0x1bd5cc::
+_NPCTradeCompleteText2::
 	text "Great! Thank you!"
 
 	para "I finally got"
@@ -1131,7 +1144,7 @@ UnknownText_0x1bd5cc::
 	text "."
 	done
 
-UnknownText_0x1bd5f4::
+_NPCTradeAfterText2::
 	text "Hi! The @"
 	text_ram wMonOrItemNameBuffer
 	text_start
@@ -1139,7 +1152,7 @@ UnknownText_0x1bd5f4::
 	cont "doing great!"
 	done
 
-UnknownText_0x1bd621::
+_NPCTradeIntroText3::
 	text_ram wMonOrItemNameBuffer
 	text "'s cute,"
 	line "but I don't have"
@@ -1155,12 +1168,12 @@ UnknownText_0x1bd621::
 	text "?"
 	done
 
-UnknownText_0x1bd673::
+_NPCTradeCancelText3::
 	text "You don't want to"
 	line "trade? Oh, darn…"
 	done
 
-UnknownText_0x1bd696::
+_NPCTradeWrongText3::
 	text "That's not"
 	line "@"
 	text_ram wStringBuffer1
@@ -1170,7 +1183,7 @@ UnknownText_0x1bd696::
 	line "me if you get one."
 	done
 
-UnknownText_0x1bd6cd::
+_NPCTradeCompleteText3::
 	text "Wow! Thank you!"
 	line "I always wanted"
 	cont "@"
@@ -1178,7 +1191,7 @@ UnknownText_0x1bd6cd::
 	text "!"
 	done
 
-UnknownText_0x1bd6f5::
+_NPCTradeAfterText3::
 	text "How is that"
 	line "@"
 	text_ram wStringBuffer2
@@ -1377,7 +1390,7 @@ _OnlyOneMonText::
 	line "just one #MON."
 	prompt
 
-_CantRaiseEggText::
+_CantAcceptEggText::
 	text "Sorry, but I can't"
 	line "accept an EGG."
 	prompt
@@ -1461,7 +1474,7 @@ _HaveNoRoomText::
 	line "for it."
 	prompt
 
-_DCNotEnoughMoneyText::
+_NotEnoughMoneyText::
 	text "You don't have"
 	line "enough money."
 	prompt
@@ -1507,7 +1520,7 @@ _TakeGoodCareOfEggText::
 	line "it."
 	done
 
-_RefuseEggText::
+_IllKeepItThanksText::
 	text "Well then, I'll"
 	line "keep it. Thanks!"
 	done
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index b2ff0450..42ed8df5 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -160,6 +160,7 @@ _RodNothingText::
 	text "Not even a nibble!"
 	prompt
 
+; unused
 _UnusedNothingHereText::
 	text "Looks like there's"
 	line "nothing here."
@@ -228,13 +229,13 @@ _ItemfinderNopeText::
 	line "isn't responding."
 	prompt
 
-UnknownText_0x1c0acc::
+_PoisonFaintText::
 	text_ram wStringBuffer3
 	text_start
 	line "fainted!"
 	prompt
 
-UnknownText_0x1c0ada::
+_PoisonWhiteoutText::
 	text "<PLAYER> is out of"
 	line "useable #MON!"
 
@@ -242,18 +243,18 @@ UnknownText_0x1c0ada::
 	line "out!"
 	prompt
 
-UnknownText_0x1c0b03::
+_UseSweetScentText::
 	text_ram wStringBuffer3
 	text " used"
 	line "SWEET SCENT!"
 	done
 
-UnknownText_0x1c0b1a::
+_SweetScentNothingText::
 	text "Looks like there's"
 	line "nothing here…"
 	done
 
-UnknownText_0x1c0b3b::
+_SquirtbottleNothingText::
 	text "<PLAYER> sprinkled"
 	line "water."
 
@@ -261,26 +262,26 @@ UnknownText_0x1c0b3b::
 	line "happened…"
 	done
 
-UnknownText_0x1c0b65::
+_UseSacredAshText::
 	text "<PLAYER>'s #MON"
 	line "were all healed!"
 	done
 
-Text_AnEGGCantHoldAnItem::
+_AnEggCantHoldAnItemText::
 	text "An EGG can't hold"
 	line "an item."
 	prompt
 
-Text_PackNoItems_::
+_PackNoItemText::
 	text "No items."
 	done
 
-Text_ThrowAwayHowMany_::
+_AskThrowAwayText::
 	text "Throw away how"
 	line "many?"
 	done
 
-Text_ConfirmThrowAway_::
+_AskQuantityThrowAwayText::
 	text "Throw away @"
 	text_decimal wItemQuantityChangeBuffer, 1, 2
 	text_start
@@ -289,46 +290,46 @@ Text_ConfirmThrowAway_::
 	text "(S)?"
 	done
 
-Text_ThrewAway_::
+_ThrewAwayText::
 	text "Threw away"
 	line "@"
 	text_ram wStringBuffer2
 	text "(S)."
 	prompt
 
-Text_ThisIsntTheTime_::
+_OakThisIsntTheTimeText::
 	text "OAK: <PLAYER>!"
 	line "This isn't the"
 	cont "time to use that!"
 	prompt
 
-Text_YouDontHaveAMon::
+_YouDontHaveAMonText::
 	text "You don't have a"
 	line "#MON!"
 	prompt
 
-Text_RegisteredTheItem_::
+_RegisteredItemText::
 	text "Registered the"
 	line "@"
 	text_ram wStringBuffer2
 	text "."
 	prompt
 
-Text_CantRegisterThatItem_::
+_CantRegisterText::
 	text "You can't register"
 	line "that item."
 	prompt
 
-Text_MoveItemWhere_::
+_AskItemMoveText::
 	text "Where should this"
 	line "be moved to?"
 	done
 
-Text_PackEmptyString_::
+_PackEmptyText::
 	text_start
 	done
 
-Text_YouCantUseItInABattle::
+_YouCantUseItInABattleText::
 	text "You can't use it"
 	line "in a battle."
 	prompt
@@ -376,7 +377,9 @@ Text_BattleEffectActivate::
 	text "<USER>'s"
 	line "@"
 	text_ram wStringBuffer2
-	db "@@"
+	text_end
+
+	text_end ; unused
 
 _BattleStatWentWayUpText::
 	text_pause
@@ -391,7 +394,9 @@ Text_BattleFoeEffectActivate::
 	text "<TARGET>'s"
 	line "@"
 	text_ram wStringBuffer2
-	db "@@"
+	text_end
+
+	text_end ; unused
 
 _BattleStatSharplyFellText::
 	text_pause
@@ -403,7 +408,8 @@ _BattleStatFellText::
 	prompt
 
 Text_BattleUser::
-	text "<USER>@@"
+	text "<USER>@"
+	text_end
 
 _BattleMadeWhirlwindText::
 	text_start
@@ -438,7 +444,8 @@ _BattleDugText::
 Text_BreedHuh::
 	text "Huh?"
 
-	para "@@"
+	para "@"
+	text_end
 
 _BreedClearboxText::
 	text_start
@@ -450,7 +457,7 @@ _BreedEggHatchText::
 	line "out of its EGG!@"
 	sound_caught_mon
 	text_promptbutton
-	db "@"
+	text_end
 
 _BreedAskNicknameText::
 	text "Give a nickname to"
@@ -469,7 +476,7 @@ _LeftWithDayCareLadyText::
 
 _LeftWithDayCareManText::
 	text "It's @"
-	text_ram wDayCareMan + 1
+	text_ram wBreedMon1Nick
 	text_start
 	line "that was left with"
 	cont "the DAY-CARE MAN."
@@ -513,51 +520,51 @@ _EmptyMailboxText::
 	line "here."
 	prompt
 
-ClearedMailPutAwayText::
+_MailClearedPutAwayText::
 	text "The cleared MAIL"
 	line "was put away."
 	prompt
 
-MailPackFullText::
+_MailPackFullText::
 	text "The PACK is full."
 	prompt
 
-MailMessageLostText::
+_MailMessageLostText::
 	text "The MAIL's message"
 	line "will be lost. OK?"
 	done
 
-MailAlreadyHoldingItemText::
+_MailAlreadyHoldingItemText::
 	text "It's already hold-"
 	line "ing an item."
 	prompt
 
-MailEggText::
+_MailEggText::
 	text "An EGG can't hold"
 	line "any MAIL."
 	prompt
 
-MailMovedFromBoxText::
+_MailMovedFromBoxText::
 	text "The MAIL was moved"
 	line "from the MAILBOX."
 	prompt
 
-Text_WasSentToBillsPC::
+_WasSentToBillsPCText::
 	text_ram wStringBuffer1
 	text " was"
 	line "sent to BILL's PC."
 	prompt
 
-Text_GottaHavePokemon_::
+_PCGottaHavePokemonText::
 	text "You gotta have"
 	line "#MON to call!"
 	prompt
 
-Text_BillsPCWhat_::
+_PCWhatText::
 	text "What?"
 	done
 
-Text_PleaseRemoveMailBeforeMovePkmnWOMail_::
+_PCMonHoldingMailText::
 	text "There is a #MON"
 	line "holding MAIL."
 
@@ -565,17 +572,17 @@ Text_PleaseRemoveMailBeforeMovePkmnWOMail_::
 	line "MAIL."
 	prompt
 
-Text_YouDontHaveASinglePokemon_::
+_PCNoSingleMonText::
 	text "You don't have a"
 	line "single #MON!"
 	prompt
 
-Text_ItsYourLastPokemon_::
+_PCCantDepositLastMonText::
 	text "You can't deposit"
 	line "your last #MON!"
 	prompt
 
-Text_CantTakeAnyMorePokemon_::
+_PCCantTakeText::
 	text "You can't take any"
 	line "more #MON."
 	prompt
@@ -586,11 +593,11 @@ _ContestCaughtMonText::
 	text "!"
 	prompt
 
-UnknownText_0x1c10cf::
+_ContestAskSwitchText::
 	text "Switch #MON?"
 	done
 
-UnknownText_0x1c10dd::
+_ContestAlreadyCaughtText::
 	text "You already caught"
 	line "a @"
 	text_ram wStringBuffer1
@@ -609,7 +616,8 @@ _ContestJudging_FirstPlaceText::
 	line "who caught a"
 	cont "@"
 	text_ram wStringBuffer1
-	text "!@@"
+	text "!@"
+	text_end
 
 _ContestJudging_FirstPlaceScoreText::
 	text_start
@@ -629,7 +637,8 @@ _ContestJudging_SecondPlaceText::
 	para "who caught a"
 	line "@"
 	text_ram wStringBuffer1
-	text "!@@"
+	text "!@"
+	text_end
 
 _ContestJudging_SecondPlaceScoreText::
 	text_start
@@ -649,7 +658,8 @@ _ContestJudging_ThirdPlaceText::
 	para "who caught a"
 	line "@"
 	text_ram wStringBuffer1
-	text "!@@"
+	text "!@"
+	text_end
 
 _ContestJudging_ThirdPlaceScoreText::
 	text_start
@@ -660,7 +670,7 @@ _ContestJudging_ThirdPlaceScoreText::
 	text " points!"
 	prompt
 
-UnknownText_0x1c1203::
+_MagikarpGuruMeasureText::
 	text "Let me measure"
 	line "that MAGIKARP."
 
@@ -670,7 +680,7 @@ UnknownText_0x1c1203::
 	text "."
 	prompt
 
-UnknownText_0x1c123a::
+_KarpGuruRecordText::
 	text "CURRENT RECORD"
 
 	para "@"
@@ -679,9 +689,9 @@ UnknownText_0x1c123a::
 	line "@"
 	text_ram wMagikarpRecordHoldersName
 	text_promptbutton
-	db "@"
+	text_end
 
-UnknownText_0x1c1261::
+_LuckyNumberMatchPartyText::
 	text "Congratulations!"
 
 	para "We have a match"
@@ -693,7 +703,7 @@ UnknownText_0x1c1261::
 	line "your party."
 	prompt
 
-UnknownText_0x1c12ae::
+_LuckyNumberMatchPCText::
 	text "Congratulations!"
 
 	para "We have a match"
@@ -705,7 +715,7 @@ UnknownText_0x1c12ae::
 	line "your PC BOX."
 	prompt
 
-UnknownText_0x1c12fc::
+_CaughtAskNicknameText::
 	text "Give a nickname to"
 	line "the @"
 	text_ram wStringBuffer1
@@ -973,11 +983,11 @@ _OakPCText4::
 	line "OAK's PC closed."
 	done
 
-UnknownText_0x1c1a5b::
+_DummyGameYeahText::
 	text " , yeah!"
 	done
 
-UnknownText_0x1c1a65::
+_DummyGameDarnText::
 	text "Darn…"
 	done
 
@@ -1149,11 +1159,12 @@ _OakText2::
 	text "This world is in-"
 	line "habited by crea-"
 	cont "tures that we call"
-	cont "#MON.@@"
+	cont "#MON.@"
+	text_end
 
 _OakText3::
 	text_promptbutton
-	db "@"
+	text_end
 
 _OakText4::
 	text "People and #MON"
diff --git a/data/text/common_3.asm b/data/text/common_3.asm
index 520326dd..4064b0f4 100644
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@@ -1,116 +1,117 @@
-UnknownText_0x1c505e::
+_SlotsStartText::
 	text "Start!"
 	done
 
-UnknownText_0x1c5066::
+_SlotsNotEnoughCoinsText::
 	text "Not enough"
 	line "coins."
 	prompt
 
-UnknownText_0x1c5079::
+_SlotsRanOutOfCoinsText::
 	text "Darn… Ran out of"
 	line "coins…"
 	done
 
-UnknownText_0x1c5092::
+_SlotsPlayAgainText::
 	text "Play again?"
 	done
 
-UnknownText_0x1c509f::
+_SlotsLinedUpText::
 	text "lined up!"
 	line "Won @"
 	text_ram wStringBuffer2
 	text " coins!"
 	done
 
-UnknownText_0x1c50bb::
+_SlotsDarnText::
 	text "Darn!"
 	done
 
-UnknownText_0x1c5821::
+_GearTodayText::
 	text_today
-	db "@"
+	text_end
 
-UnknownText_0x1c5824::
+_GearEllipseText::
 	text "<……>"
 	done
 
-UnknownText_0x1c5827::
+_GearOutOfServiceText::
 	text "You're out of the"
 	line "service area."
 	prompt
 
-UnknownText_0x1c5847::
+_PokegearAskWhoCallText::
 	text "Whom do you want"
 	line "to call?"
 	done
 
-UnknownText_0x1c5862::
+_PokegearPressButtonText::
 	text "Press any button"
 	line "to exit."
 	done
 
-UnknownText_0x1c587d::
+_PokegearAskDeleteText::
 	text "Delete this stored"
 	line "phone number?"
 	done
 
-UnknownText_0x1c5565::
+_PhoneWrongNumberText::
 	text "Huh? Sorry, wrong"
 	line "number!"
 	done
 
-UnknownText_0x1c5580::
+_PhoneClickText::
 	text "Click!"
 	done
 
-UnknownText_0x1c5588::
+_PhoneEllipseText::
 	text "<……>"
 	done
 
-UnknownText_0x1c558b::
+_PhoneOutOfAreaText::
 	text "That number is out"
 	line "of the area."
 	done
 
-UnknownText_0x1c55ac::
+_PhoneJustTalkToThemText::
 	text "Just go talk to"
 	line "that person!"
 	done
 
-UnknownText_0x1c55ca::
+_PhoneThankYouText::
 	text "Thank you!"
 	done
 
+; unused
 UnknownText_0x1c55d6::
 	text "  :"
 	done
 
-UnknownText_0x1c55db::
+_PasswordAskResetText::
 	text "Password OK."
 	line "Select CONTINUE &"
 	cont "reset settings."
 	prompt
 
-UnknownText_0x1c560b::
+_PasswordWrongText::
 	text "Wrong password!"
 	prompt
 
-UnknownText_0x1c561c::
+_PasswordAskResetClockText::
 	text "Reset the clock?"
 	done
 
-UnknownText_0x1c562e::
+_PasswordAskEnterText::
 	text "Please enter the"
 	line "password."
 	done
 
-UnknownText_0x1c564a::
+_ClearAllSaveDataText::
 	text "Clear all save"
 	line "data area?"
 	done
 
-Text_LearnedMove_::
+_LearnedMoveText::
 	text_ram wMonOrItemNameBuffer
 	text " learned"
 	line "@"
@@ -118,21 +119,21 @@ Text_LearnedMove_::
 	text "!@"
 	sound_dex_fanfare_50_79
 	text_promptbutton
-	db "@"
+	text_end
 
-Text_ForgetWhich_::
+_MoveAskForgetText::
 	text "Which move should"
 	next "be forgotten?"
 	done
 
-Text_StopLearning_::
+_StopLearningMoveText::
 	text "Stop learning"
 	line "@"
 	text_ram wStringBuffer2
 	text "?"
 	done
 
-Text_DidNotLearn_::
+_DidNotLearnMoveText::
 	text_ram wMonOrItemNameBuffer
 	text_start
 	line "did not learn"
@@ -141,7 +142,7 @@ Text_DidNotLearn_::
 	text "."
 	prompt
 
-Text_TryingToLearn_::
+_AskForgetMoveText::
 	text_ram wMonOrItemNameBuffer
 	text " is"
 	line "trying to learn"
@@ -162,12 +163,14 @@ Text_TryingToLearn_::
 	text "?"
 	done
 
-Text_1_2_and_Poof_::
+Text_MoveForgetCount::
 	text "1, 2 and…@"
 	text_pause
-	db "@@"
+	text_end
 
-Text_PoofForgot_::
+	text_end ; unused
+
+_MoveForgotText::
 	text " Poof!@"
 	text_pause
 	text_start
@@ -182,47 +185,47 @@ Text_PoofForgot_::
 	para "And…"
 	prompt
 
-Text_CantForgetHM_::
+_MoveCantForgetHMText::
 	text "HM moves can't be"
 	line "forgotten now."
 	prompt
 
-UnknownText_0x1c5793::
+_CardFlipPlayWithThreeCoinsText::
 	text "Play with three"
 	line "coins?"
 	done
 
-UnknownText_0x1c57ab::
+_CardFlipNotEnoughCoinsText::
 	text "Not enough coins…"
 	prompt
 
-UnknownText_0x1c57be::
+_CardFlipChooseACardText::
 	text "Choose a card."
 	done
 
-UnknownText_0x1c57ce::
+_CardFlipPlaceYourBetText::
 	text "Place your bet."
 	done
 
-UnknownText_0x1c57df::
+_CardFlipPlayAgainText::
 	text "Want to play"
 	line "again?"
 	done
 
-UnknownText_0x1c57f4::
+_CardFlipShuffledText::
 	text "The cards have"
 	line "been shuffled."
 	prompt
 
-UnknownText_0x1c5813::
+_CardFlipYeahText::
 	text "Yeah!"
 	done
 
-UnknownText_0x1c581a::
+_CardFlipDarnText::
 	text "Darn…"
 	done
 
-Text_ThisMonCantBeCaught_::
+_BallDodgedText::
 	text "It dodged the"
 	line "thrown BALL!"
 
@@ -230,66 +233,68 @@ Text_ThisMonCantBeCaught_::
 	line "can't be caught!"
 	prompt
 
-Text_YouMissedThePokemon_::
+_BallMissedText::
 	text "You missed the"
 	line "#MON!"
 	prompt
 
-Text_ThePokemonBrokeFree_::
+_BallBrokeFreeText::
 	text "Oh no! The #MON"
 	line "broke free!"
 	prompt
 
-Text_AppearedToBeCaught_::
+_BallAppearedCaughtText::
 	text "Aww! It appeared"
 	line "to be caught!"
 	prompt
 
-Text_AarghAlmostHadIt_::
+_BallAlmostHadItText::
 	text "Aargh!"
 	line "Almost had it!"
 	prompt
 
-Text_ShootItWasSoCloseToo_::
+_BallSoCloseText::
 	text "Shoot! It was so"
 	line "close too!"
 	prompt
 
-Text_GotchaMonWasCaught_::
+Text_BallCaught::
 	text "Gotcha! @"
 	text_ram wEnemyMonNick
 	text_start
 	line "was caught!@"
 	sound_caught_mon
-	db "@@"
+	text_end
+
+	text_end ; unused
 
-Text_Promptbutton_2::
+_WaitButtonText::
 	text_promptbutton
-	db "@"
+	text_end
 
-Text_SentToBillsPC_::
+_BallSentToPCText::
 	text_ram wMonOrItemNameBuffer
 	text " was"
 	line "sent to BILL's PC."
 	prompt
 
-Text_MonNewlyAddedToPokedex_::
+_NewDexDataText::
 	text_ram wEnemyMonNick
 	text "'s data"
 	line "was newly added to"
 	cont "the #DEX.@"
 	sound_slot_machine_start
 	text_promptbutton
-	db "@"
+	text_end
 
-Text_AskNicknameNewlyCaughtMon_::
+_AskGiveNicknameText::
 	text "Give a nickname to"
 	line "@"
 	text_ram wStringBuffer1
 	text "?"
 	done
 
-Text_StatRoseFromVitamin_::
+_ItemStatRoseText::
 	text_ram wStringBuffer1
 	text "'s"
 	line "@"
@@ -297,18 +302,18 @@ Text_StatRoseFromVitamin_::
 	text " rose."
 	prompt
 
-Text_MilkDrinkCantBeUsed_::
+_ItemCantUseOnMonText::
 	text "That can't be used"
 	line "on this #MON."
 	prompt
 
-Text_RepelUsedEarlierIsStillInEffect::
+_RepelUsedEarlierIsStillInEffectText::
 	text "The REPEL used"
 	line "earlier is still"
 	cont "in effect."
 	prompt
 
-Text_NowThatsACatchyTune_::
+_PlayedFluteText::
 	text "Played the #"
 	line "FLUTE."
 
@@ -316,50 +321,53 @@ Text_NowThatsACatchyTune_::
 	line "catchy tune!"
 	prompt
 
-Text_AllSleepingMonWokeUp_::
+_FluteWakeUpText::
 	text "All sleeping"
 	line "#MON woke up."
 	prompt
 
-Text_PlayedThePokeFlute_::
+Text_PlayedPokeFlute::
 	text "<PLAYER> played the"
 	line "# FLUTE.@"
 	text_promptbutton
-	db "@@"
+	text_end
+
+	text_end ; unused
 
-Text_CoinCase_::
+; BUG: "done" is not a valid terminator here, needs to change to "text_end"
+_CoinCaseCountText::
 	text "Coins:"
 	line "@"
 	text_decimal wCoins, 2, 4
 	done
 
-Text_RaiseThePPOfWhichMove_::
+_RaiseThePPOfWhichMoveText::
 	text "Raise the PP of"
 	line "which move?"
 	done
 
-Text_RestoreThePPOfWhichMove_::
+_RestoreThePPOfWhichMoveText::
 	text "Restore the PP of"
 	line "which move?"
 	done
 
-Text_PPIsMaxedOut_::
+_PPIsMaxedOutText::
 	text_ram wStringBuffer2
 	text "'s PP"
 	line "is maxed out."
 	prompt
 
-Text_PPsIncreased_::
+_PPsIncreasedText::
 	text_ram wStringBuffer2
 	text "'s PP"
 	line "increased."
 	prompt
 
-Text_PPWasRestored_::
+_PPRestoredText::
 	text "PP was restored."
 	prompt
 
-Text_TrophyInside_::
+_SentTrophyHomeText::
 	text "There was a trophy"
 	line "inside!@"
 	sound_dex_fanfare_50_79
@@ -371,73 +379,73 @@ Text_TrophyInside_::
 	line "trophy home."
 	prompt
 
-Text_LooksBitter_::
+_ItemLooksBitterText::
 	text "It looks bitter…"
 	prompt
 
-Text_CantUseOnEgg_::
+_ItemCantUseOnEggText::
 	text "That can't be used"
 	line "on an EGG."
 	prompt
 
-Text_IsntTheTimeToUseThat_::
+_ItemOakWarningText::
 	text "OAK: <PLAYER>!"
 	line "This isn't the"
 	cont "time to use that!"
 	prompt
 
-Text_BelongsToSomeoneElse_::
+_ItemBelongsToSomeoneElseText::
 	text "That belongs to"
 	line "someone else!"
 	prompt
 
-Text_WontHaveAnyEffect_::
+_ItemWontHaveEffectText::
 	text "It won't have any"
 	line "effect."
 	prompt
 
-Text_BlockedTheBall_::
+_BallBlockedText::
 	text "The trainer"
 	line "blocked the BALL!"
 	prompt
 
-Text_DontBeAThief_::
+_BallDontBeAThiefText::
 	text "Don't be a thief!"
 	prompt
 
-Text_CyclingIsntAllowed_::
+_NoCyclingText::
 	text "Cycling isn't"
 	line "allowed here."
 	prompt
 
-Text_CantGetOnYourItemNow_::
+_ItemCantGetOnText::
 	text "Can't get on your"
 	line "@"
 	text_ram wStringBuffer1
 	text " now."
 	prompt
 
-Text_CantUseBallBoxIsFull_::
+_BallBoxFullText::
 	text "The #MON BOX"
 	line "is full. That"
 	cont "can't be used now."
 	prompt
 
-Text_UsedItem_::
+_ItemUsedText::
 	text "<PLAYER> used the"
 	line "@"
 	text_ram wStringBuffer2
 	text "."
 	done
 
-Text_GotOnItem_::
+_ItemGotOnText::
 	text "<PLAYER> got on the@"
 	text_low
 	text_ram wStringBuffer2
 	text "."
 	prompt
 
-Text_GotOffItem_::
+_ItemGotOffText::
 	text "<PLAYER> got off@"
 	text_low
 	text "the @"