WIP Battle Tent: win counter on each battle

This commit is contained in:
Thorn Avery 2023-12-18 20:01:57 +11:00
parent 86ede20d97
commit 12b5fb8f8e

View file

@ -626,7 +626,6 @@ BattleTentGuy2:
ld a, [wBTCont] ; The streak counter is still used for message continuity.
cp $FF ; very first initial battle
jr z, .init
ld hl, BattleTentGuy2_Streak ; The message has been changed appropriately down below.
xor a ; The D-Pad is locked at this point, so blank out wJoyIgnore to allow manual option selection.
ld [wJoyIgnore], a
ld hl, BattleTentGuy2_Continue ; Continue prompt.
@ -635,6 +634,8 @@ BattleTentGuy2:
ld a, [wCurrentMenuItem]
and a
jr nz, .refused ; If 0, move to refused.
ld hl, BattleTentGuy2_Streak ; The message has been changed appropriately down below.
jr .done
.init
ld hl, BattleTentGuy2_Init ; Load the next battle.
call PrintText
@ -815,7 +816,7 @@ BattleTentGuy2_Init:
; Cut in favour of a different system.
BattleTentGuy2_Streak:
; text "Opponent No.@" ; could be a №?
; text_decimal wBTStreakCnt, 1, 2
; text_decimal wBTStreakCnt, 1, 3
; text_start
; line "is up next."
; para "Good luck!"
@ -827,6 +828,11 @@ BattleTentGuy2_Streak:
BattleTentGuy2_Continue:
text "Congratulations!"
para "You're at"
line "@"
text_decimal wBTStreakCnt, 1, 3
text " win(s)!"
para "Do you want to"
line "continue?"
prompt
@ -835,10 +841,10 @@ BattleTentGuy2_Win:
;text "Congratulations!"
text "Well done!"
para "You have defeated"
para "You defeated"
line "@"
text_decimal wBTStreakCnt, 1, 3
text " opponents!"
text " opponent(s)!"
para "Please go back to"
line "the counter to"