#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions

1 files changed, 113 insertions, 108 deletions

diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index 5c3686350..a2dbbdb3e 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -153,7 +153,7 @@ _CardFolderOpenText::
 	text "CARD FOLDER open.@"
 	text_end
 
-_OakTimeText1::
+_OakTimeWokeUpText::
 	text "<……><……><……><……><……><……>"
 	line "<……><……><……><……><……><……>"
 
@@ -164,55 +164,57 @@ _OakTimeText1::
 	line "clock for me?"
 	prompt
 
-_OakTimeText2::
+_OakTimeWhatTimeIsItText::
 	text "What time is it?"
 	done
 
-_OakTimeText3::
+_OakTimeWhatHoursText::
 	text "What?@"
 	text_end
 
-_OakTimeText4::
+_OakTimeHoursQuestionMarkText::
 	text "?"
 	done
 
-_OakTimeText5::
+_OakTimeHowManyMinutesText::
 	text "How many minutes?"
 	done
 
-_OakTimeText6::
+_OakTimeWhoaMinutesText::
 	text "Whoa!@"
 	text_end
 
-_OakTimeText7::
+_OakTimeMinutesQuestionMarkText::
 	text "?"
 	done
 
-_OakTimeText8::
+_OakTimeOversleptText::
 	text "!"
 	line "I overslept!"
 	done
 
-_OakTimeText11::
+_OakTimeYikesText::
 	text "!"
 	line "Yikes! I over-"
 	cont "slept!"
 	done
 
-_OakTimeText12::
+_OakTimeSoDarkText::
 	text "!"
 	line "No wonder it's so"
 	cont "dark!"
 	done
 
-_OakTimeText13::
+_OakTimeWhatDayIsItText::
 	text "What day is it?"
 	done
 
-_OakTimeText14::
+_OakTimeIsItText::
 	text ", is it?"
 	done
 
+; Mobile Adapter
+
 UnknownText_0x1bc384::
 	text "There is nothing"
 	line "connected."
@@ -258,6 +260,8 @@ UnknownText_0x1bc44c::
 	line "ID no."
 	done
 
+; Mobile Adapter End
+
 UnknownText_0x1bc45e::
 	text "Enter the"
 	line "amount."
@@ -345,38 +349,38 @@ _LookGiantDecoText::
 	line "fluffy and cuddly."
 	done
 
-_MomShoppingText1::
+_MomHiHowAreYouText::
 	text "Hi, <PLAYER>!"
 	line "How are you?"
 	prompt
 
-_MomShoppingText2::
+_MomFoundAnItemText::
 	text "I found a useful"
 	line "item shopping, so"
 	prompt
 
-_MomShoppingText3::
+_MomBoughtWithYourMoneyText::
 	text "I bought it with"
 	line "your money. Sorry!"
 	prompt
 
-_MomShoppingText4::
+_MomItsInPCText::
 	text "It's in your PC."
 	line "You'll like it!"
 	done
 
-_MomShoppingText5::
+_MomFoundADollText::
 	text "While shopping"
 	line "today, I saw this"
 	cont "adorable doll, so"
 	prompt
 
-_MomShoppingText6::
+_MomItsInYourRoomText::
 	text "It's in your room."
 	line "You'll love it!"
 	done
 
-_TradingText1::
+_MonWasSentToText::
 	text_ram wPlayerTrademonSpeciesName
 	text " was"
 	line "sent to @"
@@ -384,29 +388,29 @@ _TradingText1::
 	text "."
 	done
 
-_TradingText2::
+_MonNameSentToText::
 	text_start
 	done
 
-_TradingText3::
+_BidsFarewellToMonText::
 	text_ram wOTTrademonSenderName
 	text " bids"
 	line "farewell to"
 	done
 
-_TradingText4::
+_MonNameBidsFarewellText::
 	text_ram wOTTrademonSpeciesName
 	text "."
 	done
 
-_TradingText5::
+_TakeGoodCareOfMonText::
 	text "Take good care of"
 	line "@"
 	text_ram wOTTrademonSpeciesName
 	text "."
 	done
 
-_TradingText6::
+_ForYourMonSendsText::
 	text "For @"
 	text_ram wPlayerTrademonSenderName
 	text "'s"
@@ -415,7 +419,7 @@ _TradingText6::
 	text ","
 	done
 
-_TradingText7::
+_OTSendsText::
 	text_ram wOTTrademonSenderName
 	text " sends"
 	line "@"
@@ -423,7 +427,7 @@ _TradingText7::
 	text "."
 	done
 
-_TradingText8::
+_WillTradeText::
 	text_ram wOTTrademonSenderName
 	text " will"
 	line "trade @"
@@ -432,7 +436,7 @@ _TradingText8::
 
 	text_end ; unused
 
-_TradingText9::
+_ForYourMonWillTradeText::
 	text "for @"
 	text_ram wPlayerTrademonSenderName
 	text "'s"
@@ -441,7 +445,7 @@ _TradingText9::
 	text "."
 	done
 
-_TradingText10::
+_MobilePlayerWillTradeMonText::
 	text_ram wPlayerTrademonSenderName
 	text " will"
 	line "trade @"
@@ -450,7 +454,7 @@ _TradingText10::
 
 	text_end ; unused
 
-_TradingText11::
+_MobileForPartnersMonText::
 	text "for @"
 	text_ram wOTTrademonSenderName
 	text "'s"
@@ -459,7 +463,8 @@ _TradingText11::
 	text "."
 	done
 
-_TradingText12::
+; unused
+_MobilePlayersMonTradeText::
 	text_ram wPlayerTrademonSenderName
 	text "'s"
 	line "@"
@@ -467,14 +472,14 @@ _TradingText12::
 	text " trade…"
 	done
 
-_TradingText13::
+_MobileTakeGoodCareOfMonText::
 	text "Take good care of"
 	line "@"
 	text_ram wOTTrademonSpeciesName
 	text "."
 	done
 
-_TradingText14::
+_MobilePlayersMonTrade2Text::
 	text_ram wPlayerTrademonSenderName
 	text "'s"
 	line "@"
@@ -482,14 +487,14 @@ _TradingText14::
 	text " trade…"
 	done
 
-_TradingText15::
+_MobileTakeGoodCareOfText::
 	text "Take good care of"
 	line "@"
 	text_ram wOTTrademonSpeciesName
 	text "."
 	done
 
-_TradingText16::
+_MobileTradeCameBackText::
 	text_ram wOTTrademonSpeciesName
 	text " came"
 	line "back!"
@@ -539,162 +544,162 @@ _OPT_MaryText1::
 	text "'s"
 	done
 
-OPT_SweetAdorably::
+_OPT_SweetAdorablyText::
 	text_start
 	line "sweet and adorably"
 	done
 
-OPT_WigglySlickly::
+_OPT_WigglySlicklyText::
 	text_start
 	line "wiggly and slickly"
 	done
 
-OPT_AptlyNamed::
+_OPT_AptlyNamedText::
 	text_start
 	line "aptly named and"
 	done
 
-OPT_UndeniablyKindOf::
+_OPT_UndeniablyKindOfText::
 	text_start
 	line "undeniably kind of"
 	done
 
-OPT_Unbearably::
+_OPT_UnbearablyText::
 	text_start
 	line "so, so unbearably"
 	done
 
-OPT_WowImpressively::
+_OPT_WowImpressivelyText::
 	text_start
 	line "wow, impressively"
 	done
 
-OPT_AlmostPoisonously::
+_OPT_AlmostPoisonouslyText::
 	text_start
 	line "almost poisonously"
 	done
 
-OPT_Sensually::
+_OPT_SensuallyText::
 	text_start
 	line "ooh, so sensually"
 	done
 
-OPT_Mischievously::
+_OPT_MischievouslyText::
 	text_start
 	line "so mischievously"
 	done
 
-OPT_Topically::
+_OPT_TopicallyText::
 	text_start
 	line "so very topically"
 	done
 
-OPT_Addictively::
+_OPT_AddictivelyText::
 	text_start
 	line "sure addictively"
 	done
 
-OPT_LooksInWater::
+_OPT_LooksInWaterText::
 	text_start
 	line "looks in water is"
 	done
 
-OPT_EvolutionMustBe::
+_OPT_EvolutionMustBeText::
 	text_start
 	line "evolution must be"
 	done
 
-OPT_Provocatively::
+_OPT_ProvocativelyText::
 	text_start
 	line "provocatively"
 	done
 
-OPT_FlippedOut::
+_OPT_FlippedOutText::
 	text_start
 	line "so flipped out and"
 	done
 
-OPT_HeartMeltingly::
+_OPT_HeartMeltinglyText::
 	text_start
 	line "heart-meltingly"
 	done
 
-OPT_Cute::
+_OPT_CuteText::
 	text_start
 	line "cute."
 	done
 
-OPT_Weird::
+_OPT_WeirdText::
 	text_start
 	line "weird."
 	done
 
-OPT_Pleasant::
+_OPT_PleasantText::
 	text_start
 	line "pleasant."
 	done
 
-OPT_BoldSortOf::
+_OPT_BoldSortOfText::
 	text_start
 	line "bold, sort of."
 	done
 
-OPT_Frightening::
+_OPT_FrighteningText::
 	text_start
 	line "frightening."
 	done
 
-OPT_SuaveDebonair::
+_OPT_SuaveDebonairText::
 	text_start
 	line "suave & debonair!"
 	done
 
-OPT_Powerful::
+_OPT_PowerfulText::
 	text_start
 	line "powerful."
 	done
 
-OPT_Exciting::
+_OPT_ExcitingText::
 	text_start
 	line "exciting."
 	done
 
-OPT_Groovy::
+_OPT_GroovyText::
 	text_start
 	line "groovy!"
 	done
 
-OPT_Inspiring::
+_OPT_InspiringText::
 	text_start
 	line "inspiring."
 	done
 
-OPT_Friendly::
+_OPT_FriendlyText::
 	text_start
 	line "friendly."
 	done
 
-OPT_HotHotHot::
+_OPT_HotHotHotText::
 	text_start
 	line "hot, hot, hot!"
 	done
 
-OPT_Stimulating::
+_OPT_StimulatingText::
 	text_start
 	line "stimulating."
 	done
 
-OPT_Guarded::
+_OPT_GuardedText::
 	text_start
 	line "guarded."
 	done
 
-OPT_Lovely::
+_OPT_LovelyText::
 	text_start
 	line "lovely."
 	done
 
-OPT_Speedy::
+_OPT_SpeedyText::
 	text_start
 	line "speedy."
 	done
@@ -862,82 +867,82 @@ _PnP_Text4::
 
 	text_end ; unused
 
-_PnP_cute::
+_PnP_CuteText::
 	text_start
 	line "is cute."
 	done
 
-_PnP_lazy::
+_PnP_LazyText::
 	text_start
 	line "is sort of lazy."
 	done
 
-_PnP_happy::
+_PnP_HappyText::
 	text_start
 	line "is always happy."
 	done
 
-_PnP_noisy::
+_PnP_NoisyText::
 	text_start
 	line "is quite noisy."
 	done
 
-_PnP_precocious::
+_PnP_PrecociousText::
 	text_start
 	line "is precocious."
 	done
 
-_PnP_bold::
+_PnP_BoldText::
 	text_start
 	line "is somewhat bold."
 	done
 
-_PnP_picky::
+_PnP_PickyText::
 	text_start
 	line "is too picky!"
 	done
 
-_PnP_sortofok::
+_PnP_SortOfOKText::
 	text_start
 	line "is sort of OK."
 	done
 
-_PnP_soso::
+_PnP_SoSoText::
 	text_start
 	line "is just so-so."
 	done
 
-_PnP_great::
+_PnP_GreatText::
 	text_start
 	line "is actually great."
 	done
 
-_PnP_mytype::
+_PnP_MyTypeText::
 	text_start
 	line "is just my type."
 	done
 
-_PnP_cool::
+_PnP_CoolText::
 	text_start
 	line "is so cool, no?"
 	done
 
-_PnP_inspiring::
+_PnP_InspiringText::
 	text_start
 	line "is inspiring!"
 	done
 
-_PnP_weird::
+_PnP_WeirdText::
 	text_start
 	line "is kind of weird."
 	done
 
-_PnP_rightforme::
+_PnP_RightForMeText::
 	text_start
 	line "is right for me?"
 	done
 
-_PnP_odd::
+_PnP_OddText::
 	text_start
 	line "is definitely odd!"
 	done
@@ -1098,7 +1103,7 @@ _BuenaOffTheAirText::
 	line ""
 	done
 
-Text_EnemyWithdrew::
+_EnemyWithdrewText::
 	text "<ENEMY>"
 	line "withdrew"
 	cont "@"
@@ -1106,7 +1111,7 @@ Text_EnemyWithdrew::
 	text "!"
 	prompt
 
-Text_EnemyUsedOn::
+_EnemyUsedOnText::
 	text "<ENEMY>"
 	line "used @"
 	text_ram wMonOrItemNameBuffer
@@ -1280,17 +1285,17 @@ UnknownText_0x1bd2a0::
 	line "VOLTORBBADGE!"
 	done
 
-UnknownText_0x1bd2bc::
+_AskFloorElevatorText::
 	text "Which floor?"
 	done
 
-UnknownText_0x1bd2ca::
+_BugCatchingContestTimeUpText::
 	text "ANNOUNCER: BEEEP!"
 
 	para "Time's up!"
 	done
 
-UnknownText_0x1bd2e7::
+_BugCatchingContestIsOverText::
 	text "ANNOUNCER: The"
 	line "Contest is over!"
 	done
@@ -1352,12 +1357,12 @@ _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 wMonOrItemNameBuffer
@@ -1367,7 +1372,7 @@ UnknownText_0x1bd429::
 	text ".@"
 	text_end
 
-UnknownText_0x1bd445::
+_NPCTradeFanfareText::
 	sound_dex_fanfare_80_109
 	text_pause
 	text_end
@@ -1408,7 +1413,7 @@ _NPCTradeCompleteText1::
 	cont "Thanks!"
 	done
 
-_NPCTradeAFterText1::
+_NPCTradeAfterText1::
 	text "Hi, how's my old"
 	line "@"
 	text_ram wStringBuffer2
@@ -1571,7 +1576,7 @@ _MomLeavingText3::
 	para "Now, go on!"
 	done
 
-_MomVisitingText1::
+_MomIsThisAboutYourMoneyText::
 	text "Hi! Welcome home!"
 	line "You're trying very"
 	cont "hard, I see."
@@ -1583,47 +1588,47 @@ _MomVisitingText1::
 	line "your money?"
 	done
 
-_MomVisitingText2::
+_MomBankWhatDoYouWantToDoText::
 	text "What do you want"
 	line "to do?"
 	done
 
-_MomVisitingText3::
+_MomStoreMoneyText::
 	text "How much do you"
 	line "want to save?"
 	done
 
-_MomVisitingText4::
+_MomTakeMoneyText::
 	text "How much do you"
 	line "want to take?"
 	done
 
-_MomVisitingText5::
+_MomSaveMoneyText::
 	text "Do you want to"
 	line "save some money?"
 	done
 
-_MomVisitingText6::
+_MomHaventSavedThatMuchText::
 	text "You haven't saved"
 	line "that much."
 	prompt
 
-_MomVisitingText7::
+_MomNotEnoughRoomInWalletText::
 	text "You can't take"
 	line "that much."
 	prompt
 
-_MomVisitingText8::
+_MomInsufficientFundsInWalletText::
 	text "You don't have"
 	line "that much."
 	prompt
 
-_MomVisitingText9::
+_MomNotEnoughRoomInBankText::
 	text "You can't save"
 	line "that much."
 	prompt
 
-_MomVisitingText10::
+_MomStartSavingMoneyText::
 	text "OK, I'll save your"
 	line "money. Trust me!"
 
@@ -1631,17 +1636,17 @@ _MomVisitingText10::
 	line "with it!"
 	done
 
-_MomVisitingText11::
+_MomStoredMoneyText::
 	text "Your money's safe"
 	line "here! Get going!"
 	done
 
-_MomVisitingText12::
+_MomTakenMoneyText::
 	text "<PLAYER>, don't"
 	line "give up!"
 	done
 
-_MomVisitingText13::
+_MomJustDoWhatYouCanText::
 	text "Just do what"
 	line "you can."
 	done
@@ -1712,7 +1717,7 @@ _OnlyOneMonText::
 	line "just one #MON."
 	prompt
 
-_CantRaiseEggText::
+_CantAcceptEggText::
 	text "Sorry, but I can't"
 	line "accept an EGG."
 	prompt
@@ -1796,7 +1801,7 @@ _HaveNoRoomText::
 	line "for it."
 	prompt
 
-_DCNotEnoughMoneyText::
+_NotEnoughMoneyText::
 	text "You don't have"
 	line "enough money."
 	prompt
@@ -1842,7 +1847,7 @@ _TakeGoodCareOfEggText::
 	line "it."
 	done
 
-_RefuseEggText::
+_IllKeepItThanksText::
 	text "Well then, I'll"
 	line "keep it. Thanks!"
 	done
@@ -1859,7 +1864,7 @@ _WhichMonPhotoText::
 	cont "graph?"
 	prompt
 
-_HoldOnText::
+_HoldStillText::
 	text "All righty. Hold"
 	line "still for a bit."
 	prompt