#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions

1 files changed, 110 insertions, 144 deletions

diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 35c20db70..96e0e0047 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -218,7 +218,7 @@ PokeBallEffect:
 
 	ld hl, wOptions
 	res NO_TEXT_SCROLL, [hl]
-	ld hl, UsedItemText
+	ld hl, ItemUsedText
 	call PrintText
 
 	ld a, [wEnemyMonCatchRate]
@@ -399,16 +399,16 @@ PokeBallEffect:
 	jr nz, .caught
 	ld a, [wBuffer2]
 	cp $1
-	ld hl, Text_NoShake
+	ld hl, BallBrokeFreeText
 	jp z, .shake_and_break_free
 	cp $2
-	ld hl, Text_OneShake
+	ld hl, BallAppearedCaughtText
 	jp z, .shake_and_break_free
 	cp $3
-	ld hl, Text_TwoShakes
+	ld hl, BallAlmostHadItText
 	jp z, .shake_and_break_free
 	cp $4
-	ld hl, Text_ThreeShakes
+	ld hl, BallSoCloseText
 	jp z, .shake_and_break_free
 .caught
 
@@ -517,7 +517,7 @@ PokeBallEffect:
 	call CheckReceivedDex
 	jr z, .skip_pokedex
 
-	ld hl, Text_AddedToPokedex
+	ld hl, NewDexDataText
 	call PrintText
 
 	call ClearSprites
@@ -562,7 +562,7 @@ PokeBallEffect:
 	ld [hl], a
 
 .SkipPartyMonFriendBall:
-	ld hl, Text_AskNicknameNewlyCaughtMon
+	ld hl, AskGiveNicknameText
 	call PrintText
 
 	ld a, [wCurPartySpecies]
@@ -622,7 +622,7 @@ PokeBallEffect:
 .SkipBoxMonFriendBall:
 	call CloseSRAM
 
-	ld hl, Text_AskNicknameNewlyCaughtMon
+	ld hl, AskGiveNicknameText
 	call PrintText
 
 	ld a, [wCurPartySpecies]
@@ -665,7 +665,7 @@ PokeBallEffect:
 
 	call CloseSRAM
 
-	ld hl, Text_SentToBillsPC
+	ld hl, BallSentToPCText
 	call PrintText
 
 	call RotateThreePalettesRight
@@ -1061,39 +1061,33 @@ LevelBallMultiplier:
 ; These two texts were carried over from gen 1.
 ; They are not used in gen 2, and are dummied out.
 
-Text_RBY_CatchMarowak:
-	; It dodged the thrown BALL! This #MON can't be caught!
-	text_far UnknownText_0x1c5a5a
+BallDodgedText:
+	text_far _BallDodgedText
 	text_end
 
-Text_RBY_NoShake:
-	; You missed the #MON!
-	text_far UnknownText_0x1c5a90
+BallMissedText:
+	text_far _BallMissedText
 	text_end
 
-Text_NoShake:
-	; Oh no! The #MON broke free!
-	text_far UnknownText_0x1c5aa6
+BallBrokeFreeText:
+	text_far _BallBrokeFreeText
 	text_end
 
-Text_OneShake:
-	; Aww! It appeared to be caught!
-	text_far UnknownText_0x1c5ac3
+BallAppearedCaughtText:
+	text_far _BallAppearedCaughtText
 	text_end
 
-Text_TwoShakes:
-	; Aargh! Almost had it!
-	text_far UnknownText_0x1c5ae3
+BallAlmostHadItText:
+	text_far _BallAlmostHadItText
 	text_end
 
-Text_ThreeShakes:
-	; Shoot! It was so close too!
-	text_far UnknownText_0x1c5afa
+BallSoCloseText:
+	text_far _BallSoCloseText
 	text_end
 
 Text_GotchaMonWasCaught:
 	; Gotcha! @ was caught!@ @
-	text_far UnknownText_0x1c5b17
+	text_far Text_BallCaught
 	text_asm
 	call WaitSFX
 	push bc
@@ -1103,27 +1097,23 @@ Text_GotchaMonWasCaught:
 	ld de, MUSIC_CAPTURE
 	call PlayMusic
 	pop bc
-	ld hl, TextJump_Waitbutton
+	ld hl, WaitButtonText
 	ret
 
-TextJump_Waitbutton:
-	; @
-	text_far Text_Waitbutton_2
+WaitButtonText:
+	text_far _WaitButtonText
 	text_end
 
-Text_SentToBillsPC:
-	; was sent to BILL's PC.
-	text_far UnknownText_0x1c5b38
+BallSentToPCText:
+	text_far _BallSentToPCText
 	text_end
 
-Text_AddedToPokedex:
-	; 's data was newly added to the #DEX.@ @
-	text_far UnknownText_0x1c5b53
+NewDexDataText:
+	text_far _NewDexDataText
 	text_end
 
-Text_AskNicknameNewlyCaughtMon:
-	; Give a nickname to @ ?
-	text_far UnknownText_0x1c5b7f
+AskGiveNicknameText:
+	text_far _AskGiveNicknameText
 	text_end
 
 ReturnToBattle_UseBall:
@@ -1204,7 +1194,7 @@ VitaminEffect:
 
 	call Play_SFX_FULL_HEAL
 
-	ld hl, Text_StatRose
+	ld hl, ItemStatRoseText
 	call PrintText
 
 	ld c, HAPPINESS_USEDITEM
@@ -1213,7 +1203,7 @@ VitaminEffect:
 	jp UseDisposableItem
 
 NoEffectMessage:
-	ld hl, WontHaveAnyEffectText
+	ld hl, ItemWontHaveEffectText
 	call PrintText
 	jp ClearPalettes
 
@@ -1232,9 +1222,8 @@ RareCandy_StatBooster_ExitMenu:
 	ld [wItemEffectSucceeded], a
 	jp ClearPalettes
 
-Text_StatRose:
-	; 's @  rose.
-	text_far UnknownText_0x1c5b9a
+ItemStatRoseText:
+	text_far _ItemStatRoseText
 	text_end
 
 StatStrings:
@@ -2055,14 +2044,13 @@ Softboiled_MilkDrinkFunction:
 
 .cant_use
 	push bc
-	ld hl, .Text_CantBeUsed
+	ld hl, .ItemCantUseOnMonText
 	call MenuTextboxBackup
 	pop bc
 	jr .loop
 
-.Text_CantBeUsed:
-	; That can't be used on this #MON.
-	text_far UnknownText_0x1c5bac
+.ItemCantUseOnMonText:
+	text_far _ItemCantUseOnMonText
 	text_end
 
 EscapeRopeEffect:
@@ -2089,16 +2077,15 @@ RepelEffect:
 UseRepel:
 	ld a, [wRepelEffect]
 	and a
-	ld hl, TextJump_RepelUsedEarlierIsStillInEffect
+	ld hl, RepelUsedEarlierIsStillInEffectText
 	jp nz, PrintText
 
 	ld a, b
 	ld [wRepelEffect], a
 	jp UseItemText
 
-TextJump_RepelUsedEarlierIsStillInEffect:
-	; The REPEL used earlier is still in effect.
-	text_far Text_RepelUsedEarlierIsStillInEffect
+RepelUsedEarlierIsStillInEffectText:
+	text_far _RepelUsedEarlierIsStillInEffectText
 	text_end
 
 XAccuracyEffect:
@@ -2205,7 +2192,7 @@ PokeFluteEffect:
 
 	ld a, [wd002]
 	and a
-	ld hl, .CatchyTune
+	ld hl, .PlayedFluteText
 	jp z, PrintText
 	ld hl, .PlayedTheFlute
 	call PrintText
@@ -2214,7 +2201,7 @@ PokeFluteEffect:
 	and 1 << DANGER_ON_F
 	jr nz, .dummy2
 .dummy2
-	ld hl, .AllSleepingMonWokeUp
+	ld hl, .FluteWakeUpText
 	jp PrintText
 
 .CureSleep:
@@ -2237,19 +2224,17 @@ PokeFluteEffect:
 	jr nz, .loop
 	ret
 
-.CatchyTune:
-	; Played the # FLUTE. Now, that's a catchy tune!
-	text_far UnknownText_0x1c5bf9
+.PlayedFluteText:
+	text_far _PlayedFluteText
 	text_end
 
-.AllSleepingMonWokeUp:
-	; All sleeping #MON woke up.
-	text_far UnknownText_0x1c5c28
+.FluteWakeUpText:
+	text_far _FluteWakeUpText
 	text_end
 
 .PlayedTheFlute:
 	; played the # FLUTE.@ @
-	text_far UnknownText_0x1c5c44
+	text_far Text_PlayedPokeFlute
 	text_asm
 	ld a, [wBattleMode]
 	and a
@@ -2265,19 +2250,19 @@ PokeFluteEffect:
 	jp PokeFluteTerminatorCharacter
 
 BlueCardEffect:
-	ld hl, .bluecardtext
+	ld hl, .BlueCardBalanceText
 	jp MenuTextboxWaitButton
 
-.bluecardtext
-	text_far UnknownText_0x1c5c5e
+.BlueCardBalanceText:
+	text_far _BlueCardBalanceText
 	text_end
 
 CoinCaseEffect:
-	ld hl, .coincasetext
+	ld hl, .CoinCaseCountText
 	jp MenuTextboxWaitButton
 
-.coincasetext
-	text_far UnknownText_0x1c5c7b
+.CoinCaseCountText:
+	text_far _CoinCaseCountText
 	text_end
 
 OldRodEffect:
@@ -2317,11 +2302,11 @@ RestorePPEffect:
 	cp ELIXER
 	jp z, Elixer_RestorePPofAllMoves
 
-	ld hl, TextJump_RaiseThePPOfWhichMove
+	ld hl, RaiseThePPOfWhichMoveText
 	ld a, [wd002]
 	cp PP_UP
 	jr z, .ppup
-	ld hl, TextJump_RestoreThePPOfWhichMove
+	ld hl, RestoreThePPOfWhichMoveText
 
 .ppup
 	call PrintText
@@ -2365,7 +2350,7 @@ RestorePPEffect:
 
 .CantUsePPUpOnSketch:
 .pp_is_maxed_out
-	ld hl, TextJump_PPIsMaxedOut
+	ld hl, PPIsMaxedOutText
 	call PrintText
 	jr .loop2
 
@@ -2378,7 +2363,7 @@ RestorePPEffect:
 	call ApplyPPUp
 	call Play_SFX_FULL_HEAL
 
-	ld hl, TextJump_PPsIncreased
+	ld hl, PPsIncreasedText
 	call PrintText
 
 FinishPPRestore:
@@ -2401,7 +2386,7 @@ BattleRestorePP:
 
 .not_in_battle
 	call Play_SFX_FULL_HEAL
-	ld hl, UnknownText_0xf739
+	ld hl, PPRestoredText
 	call PrintText
 	jr FinishPPRestore
 
@@ -2530,29 +2515,24 @@ RestorePP:
 	xor a
 	ret
 
-TextJump_RaiseThePPOfWhichMove:
-	; Raise the PP of which move?
-	text_far Text_RaiseThePPOfWhichMove
+RaiseThePPOfWhichMoveText:
+	text_far _RaiseThePPOfWhichMoveText
 	text_end
 
-TextJump_RestoreThePPOfWhichMove:
-	; Restore the PP of which move?
-	text_far Text_RestoreThePPOfWhichMove
+RestoreThePPOfWhichMoveText:
+	text_far _RestoreThePPOfWhichMoveText
 	text_end
 
-TextJump_PPIsMaxedOut:
-	; 's PP is maxed out.
-	text_far Text_PPIsMaxedOut
+PPIsMaxedOutText:
+	text_far _PPIsMaxedOutText
 	text_end
 
-TextJump_PPsIncreased:
-	; 's PP increased.
-	text_far Text_PPsIncreased
+PPsIncreasedText:
+	text_far _PPsIncreasedText
 	text_end
 
-UnknownText_0xf739:
-	; PP was restored.
-	text_far UnknownText_0x1c5cf1
+PPRestoredText:
+	text_far _PPRestoredText
 	text_end
 
 SquirtbottleEffect:
@@ -2584,14 +2564,13 @@ GorgeousBoxEffect:
 OpenBox:
 	farcall SetSpecificDecorationFlag
 
-	ld hl, .text
+	ld hl, .SentTrophyHomeText
 	call PrintText
 
 	jp UseDisposableItem
 
-.text
-	; There was a trophy inside!
-	text_far UnknownText_0x1c5d03
+.SentTrophyHomeText:
+	text_far _SentTrophyHomeText
 	text_end
 
 NoEffect:
@@ -2605,7 +2584,7 @@ Play_SFX_FULL_HEAL:
 	ret
 
 UseItemText:
-	ld hl, UsedItemText
+	ld hl, ItemUsedText
 	call PrintText
 	call Play_SFX_FULL_HEAL
 	call WaitPressAorB_BlinkCursor
@@ -2627,14 +2606,14 @@ UseBallInTrainerBattle:
 	ldh [hBattleTurn], a
 	ld [wNumHits], a
 	predef PlayBattleAnim
-	ld hl, BlockedTheBallText
+	ld hl, BallBlockedText
 	call PrintText
-	ld hl, DontBeAThiefText
+	ld hl, BallDontBeAThiefText
 	call PrintText
 	jr UseDisposableItem
 
 WontHaveAnyEffect_NotUsedMessage:
-	ld hl, WontHaveAnyEffectText
+	ld hl, ItemWontHaveEffectText
 	call PrintText
 
 	; Item wasn't used.
@@ -2643,11 +2622,11 @@ WontHaveAnyEffect_NotUsedMessage:
 	ret
 
 LooksBitterMessage:
-	ld hl, LooksBitterText
+	ld hl, ItemLooksBitterText
 	jp PrintText
 
 Ball_BoxIsFullMessage:
-	ld hl, Ball_BoxIsFullText
+	ld hl, BallBoxFullText
 	call PrintText
 
 	; Item wasn't used.
@@ -2656,27 +2635,27 @@ Ball_BoxIsFullMessage:
 	ret
 
 CantUseOnEggMessage:
-	ld hl, CantUseOnEggText
+	ld hl, ItemCantUseOnEggText
 	jr CantUseItemMessage
 
 IsntTheTimeMessage:
-	ld hl, IsntTheTimeText
+	ld hl, ItemOakWarningText
 	jr CantUseItemMessage
 
 WontHaveAnyEffectMessage:
-	ld hl, WontHaveAnyEffectText
+	ld hl, ItemWontHaveEffectText
 	jr CantUseItemMessage
 
 BelongsToSomeoneElseMessage:
-	ld hl, BelongsToSomeoneElseText
+	ld hl, ItemBelongsToSomeoneElseText
 	jr CantUseItemMessage
 
 CyclingIsntAllowedMessage:
-	ld hl, CyclingIsntAllowedText
+	ld hl, NoCyclingText
 	jr CantUseItemMessage
 
 CantGetOnYourBikeMessage:
-	ld hl, CantGetOnYourBikeText
+	ld hl, ItemCantGetOnText
 
 CantUseItemMessage:
 ; Item couldn't be used.
@@ -2684,69 +2663,56 @@ CantUseItemMessage:
 	ld [wItemEffectSucceeded], a
 	jp PrintText
 
-LooksBitterText:
-	; It looks bitter…
-	text_far UnknownText_0x1c5d3e
+ItemLooksBitterText:
+	text_far _ItemLooksBitterText
 	text_end
 
-CantUseOnEggText:
-	; That can't be used on an EGG.
-	text_far UnknownText_0x1c5d50
+ItemCantUseOnEggText:
+	text_far _ItemCantUseOnEggText
 	text_end
 
-IsntTheTimeText:
-	; OAK:  ! This isn't the time to use that!
-	text_far UnknownText_0x1c5d6e
+ItemOakWarningText:
+	text_far _ItemOakWarningText
 	text_end
 
-BelongsToSomeoneElseText:
-	; That belongs to someone else!
-	text_far UnknownText_0x1c5d97
+ItemBelongsToSomeoneElseText:
+	text_far _ItemBelongsToSomeoneElseText
 	text_end
 
-WontHaveAnyEffectText:
-	; It won't have any effect.
-	text_far UnknownText_0x1c5db6
+ItemWontHaveEffectText:
+	text_far _ItemWontHaveEffectText
 	text_end
 
-BlockedTheBallText:
-	; The trainer blocked the BALL!
-	text_far UnknownText_0x1c5dd0
+BallBlockedText:
+	text_far _BallBlockedText
 	text_end
 
-DontBeAThiefText:
-	; Don't be a thief!
-	text_far UnknownText_0x1c5def
+BallDontBeAThiefText:
+	text_far _BallDontBeAThiefText
 	text_end
 
-CyclingIsntAllowedText:
-	; Cycling isn't allowed here.
-	text_far UnknownText_0x1c5e01
+NoCyclingText:
+	text_far _NoCyclingText
 	text_end
 
-CantGetOnYourBikeText:
-	; Can't get on your @  now.
-	text_far UnknownText_0x1c5e1d
+ItemCantGetOnText:
+	text_far _ItemCantGetOnText
 	text_end
 
-Ball_BoxIsFullText:
-	; The #MON BOX is full. That can't be used now.
-	text_far UnknownText_0x1c5e3a
+BallBoxFullText:
+	text_far _BallBoxFullText
 	text_end
 
-UsedItemText:
-	; used the@ .
-	text_far UnknownText_0x1c5e68
+ItemUsedText:
+	text_far _ItemUsedText
 	text_end
 
-GotOnTheItemText:
-	; got on the@ .
-	text_far UnknownText_0x1c5e7b
+ItemGotOnText:
+	text_far _ItemGotOnText
 	text_end
 
-GotOffTheItemText:
-	; got off@ the @ .
-	text_far UnknownText_0x1c5e90
+ItemGotOffText:
+	text_far _ItemGotOffText
 	text_end
 
 ApplyPPUp: