#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
This commit is contained in:
mid-kid
2019-10-20 22:24:17 +00:00
committed by Rangi
parent 3fc2ba41f7
commit e3e0bcd653
203 changed files with 4077 additions and 4598 deletions

View File

@@ -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: