From 12b5fb8f8ea4a91a8e00f9cb99b83f6878fb911a Mon Sep 17 00:00:00 2001 From: Thorn Avery Date: Mon, 18 Dec 2023 20:01:57 +1100 Subject: [PATCH] WIP Battle Tent: win counter on each battle --- scripts/BattleTent.asm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/BattleTent.asm b/scripts/BattleTent.asm index f90f91cd..de140d0c 100644 --- a/scripts/BattleTent.asm +++ b/scripts/BattleTent.asm @@ -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!" @@ -826,6 +827,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?" @@ -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"