#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions

3 files changed, 51 insertions, 66 deletions

diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm
index 17fd2d493..54d729dfa 100644
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -102,7 +102,7 @@ _CardFlip:
 	ret
 
 .AskPlayWithThree:
-	ld hl, .PlayWithThreeCoinsText
+	ld hl, .CardFlipPlayWithThreeCoinsText
 	call CardFlip_UpdateCoinBalanceDisplay
 	call YesNoBox
 	jr c, .SaidNo
@@ -115,9 +115,8 @@ _CardFlip:
 	ld [wJumptableIndex], a
 	ret
 
-.PlayWithThreeCoinsText:
-	; Play with three coins?
-	text_far UnknownText_0x1c5793
+.CardFlipPlayWithThreeCoinsText:
+	text_far _CardFlipPlayWithThreeCoinsText
 	text_end
 
 .DeductCoins:
@@ -131,7 +130,7 @@ _CardFlip:
 	ld a, l
 	cp 3
 	jr nc, .deduct ; You have at least 3 coins.
-	ld hl, .NotEnoughCoinsText
+	ld hl, .CardFlipNotEnoughCoinsText
 	call CardFlip_UpdateCoinBalanceDisplay
 	ld a, 7
 	ld [wJumptableIndex], a
@@ -155,9 +154,8 @@ _CardFlip:
 	call .Increment
 	ret
 
-.NotEnoughCoinsText:
-	; Not enough coins…
-	text_far UnknownText_0x1c57ab
+.CardFlipNotEnoughCoinsText:
+	text_far _CardFlipNotEnoughCoinsText
 	text_end
 
 .ChooseACard:
@@ -184,7 +182,7 @@ _CardFlip:
 	hlcoord 2, 6
 	call PlaceCardFaceDown
 	call WaitBGMap
-	ld hl, .ChooseACardText
+	ld hl, .CardFlipChooseACardText
 	call CardFlip_UpdateCoinBalanceDisplay
 	xor a
 	ld [wCardFlipWhichCard], a
@@ -232,13 +230,12 @@ _CardFlip:
 	call .Increment
 	ret
 
-.ChooseACardText:
-	; Choose a card.
-	text_far UnknownText_0x1c57be
+.CardFlipChooseACardText:
+	text_far _CardFlipChooseACardText
 	text_end
 
 .PlaceYourBet:
-	ld hl, .PlaceYourBetText
+	ld hl, .CardFlipPlaceYourBetText
 	call CardFlip_UpdateCoinBalanceDisplay
 .betloop
 	call JoyTextDelay
@@ -254,9 +251,8 @@ _CardFlip:
 	call .Increment
 	ret
 
-.PlaceYourBetText:
-	; Place your bet.
-	text_far UnknownText_0x1c57ce
+.CardFlipPlaceYourBetText:
+	text_far _CardFlipPlaceYourBetText
 	text_end
 
 .CheckTheCard:
@@ -296,7 +292,7 @@ _CardFlip:
 
 .PlayAgain:
 	call ClearSprites
-	ld hl, .PlayAgainText
+	ld hl, .CardFlipPlayAgainText
 	call CardFlip_UpdateCoinBalanceDisplay
 	call YesNoBox
 	jr nc, .Continue
@@ -313,7 +309,7 @@ _CardFlip:
 	ld a, $1
 	ldh [hBGMapMode], a
 	call CardFlip_ShuffleDeck
-	ld hl, .CardsShuffledText
+	ld hl, .CardFlipShuffledText
 	call PrintText
 	jr .LoopAround
 
@@ -325,14 +321,12 @@ _CardFlip:
 	ld [wJumptableIndex], a
 	ret
 
-.PlayAgainText:
-	; Want to play again?
-	text_far UnknownText_0x1c57df
+.CardFlipPlayAgainText:
+	text_far _CardFlipPlayAgainText
 	text_end
 
-.CardsShuffledText:
-	; The cards have been shuffled.
-	text_far UnknownText_0x1c57f4
+.CardFlipShuffledText:
+	text_far _CardFlipShuffledText
 	text_end
 
 .Quit:
@@ -1085,7 +1079,7 @@ CardFlip_CheckWinCondition:
 .Lose:
 	ld de, SFX_WRONG
 	call PlaySFX
-	ld hl, .Text_Darn
+	ld hl, .CardFlipDarnText
 	call CardFlip_UpdateCoinBalanceDisplay
 	call WaitSFX
 	ret
@@ -1093,7 +1087,7 @@ CardFlip_CheckWinCondition:
 .Payout:
 	push bc
 	push de
-	ld hl, .Text_Yeah
+	ld hl, .CardFlipYeahText
 	call CardFlip_UpdateCoinBalanceDisplay
 	pop de
 	call PlaySFX
@@ -1114,14 +1108,12 @@ CardFlip_CheckWinCondition:
 	jr nz, .loop
 	ret
 
-.Text_Yeah:
-	; Yeah!
-	text_far UnknownText_0x1c5813
+.CardFlipYeahText:
+	text_far _CardFlipYeahText
 	text_end
 
-.Text_Darn:
-	; Darn…
-	text_far UnknownText_0x1c581a
+.CardFlipDarnText:
+	text_far _CardFlipDarnText
 	text_end
 
 .AddCoinPlaySFX:
diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm
index 582ae67f6..6e435191b 100644
--- a/engine/games/dummy_game.asm
+++ b/engine/games/dummy_game.asm
@@ -304,7 +304,7 @@ DummyGame_CheckMatch:
 	call DummyGame_Card2Coord
 	call DummyGame_PlaceCard
 
-	ld hl, DummyGameText_Darn
+	ld hl, DummyGameDarnText
 	call PrintText
 	ret
 
@@ -313,21 +313,19 @@ DummyGame_CheckMatch:
 	push bc
 	hlcoord 2, 13
 	call DummyGame_PlaceCard
-	ld hl, DummyGameText_Yeah
+	ld hl, DummyGameYeahText
 	pop bc
 	inc bc
 	inc bc
 	inc bc
 	ret
 
-DummyGameText_Yeah:
-	; , yeah!
-	text_far UnknownText_0x1c1a5b
+DummyGameYeahText:
+	text_far _DummyGameYeahText
 	text_end
 
-DummyGameText_Darn:
-	; Darn…
-	text_far UnknownText_0x1c1a65
+DummyGameDarnText:
+	text_far _DummyGameDarnText
 	text_end
 
 DummyGame_InitBoard:
diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm
index 202aca20b..25f9166ee 100644
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -1707,7 +1707,7 @@ Slots_TurnLightsOnOrOff:
 
 Slots_AskBet:
 .loop
-	ld hl, .Text_BetHowManyCoins
+	ld hl, .SlotsBetHowManyCoinsText
 	call PrintText
 	ld hl, .MenuHeader
 	call LoadMenuHeader
@@ -1727,7 +1727,7 @@ Slots_AskBet:
 	ld a, [hl]
 	cp c
 	jr nc, .Start
-	ld hl, .Text_NotEnoughCoins
+	ld hl, .SlotsNotEnoughCoinsText
 	call PrintText
 	jr .loop
 
@@ -1742,24 +1742,21 @@ Slots_AskBet:
 	call WaitSFX
 	ld de, SFX_PAY_DAY
 	call PlaySFX
-	ld hl, .Text_Start
+	ld hl, .SlotsStartText
 	call PrintText
 	and a
 	ret
 
-.Text_BetHowManyCoins:
-	; Bet how many coins?
-	text_far UnknownText_0x1c5049
+.SlotsBetHowManyCoinsText:
+	text_far _SlotsBetHowManyCoinsText
 	text_end
 
-.Text_Start:
-	; Start!
-	text_far UnknownText_0x1c505e
+.SlotsStartText:
+	text_far _SlotsStartText
 	text_end
 
-.Text_NotEnoughCoins:
-	; Not enough coins.
-	text_far UnknownText_0x1c5066
+.SlotsNotEnoughCoinsText:
+	text_far _SlotsNotEnoughCoinsText
 	text_end
 
 .MenuHeader:
@@ -1780,14 +1777,14 @@ Slots_AskPlayAgain:
 	ld a, [hli]
 	or [hl]
 	jr nz, .you_have_coins
-	ld hl, .Text_OutOfCoins
+	ld hl, .SlotsRanOutOfCoinsText
 	call PrintText
 	ld c, 60
 	call DelayFrames
 	jr .exit_slots
 
 .you_have_coins
-	ld hl, .Text_PlayAgain
+	ld hl, .SlotsPlayAgainText
 	call PrintText
 	call LoadMenuTextbox
 	lb bc, 14, 12
@@ -1804,12 +1801,12 @@ Slots_AskPlayAgain:
 	scf
 	ret
 
-.Text_OutOfCoins:
-	text_far UnknownText_0x1c5079
+.SlotsRanOutOfCoinsText:
+	text_far _SlotsRanOutOfCoinsText
 	text_end
 
-.Text_PlayAgain:
-	text_far UnknownText_0x1c5092
+.SlotsPlayAgainText:
+	text_far _SlotsPlayAgainText
 	text_end
 
 Slots_GetPayout:
@@ -1849,7 +1846,7 @@ Slots_PayoutText:
 	ld a, [wSlotMatched]
 	cp SLOTS_NO_MATCH
 	jr nz, .MatchedSomething
-	ld hl, .Text_Darn
+	ld hl, .SlotsDarnText
 	call PrintText
 	farcall StubbedTrainerRankings_EndSlotsWinStreak
 	ret
@@ -1899,20 +1896,18 @@ Slots_PayoutText:
 	ldcoord_a 3, 14
 	hlcoord 18, 17
 	ld [hl], "▼"
-	ld hl, .Text_LinedUpWonCoins
+	ld hl, .SlotsLinedUpText
 rept 4
 	inc bc
 endr
 	ret
 
-.Text_LinedUpWonCoins:
-	; lined up! Won @  coins!
-	text_far UnknownText_0x1c509f
+.SlotsLinedUpText:
+	text_far _SlotsLinedUpText
 	text_end
 
-.Text_Darn:
-	; Darn!
-	text_far UnknownText_0x1c50bb
+.SlotsDarnText:
+	text_far _SlotsDarnText
 	text_end
 
 .LinedUpSevens: