From 9f2e8811898bda349b4371836888f503791569f0 Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Sat, 21 Oct 2023 19:46:30 +0200 Subject: [PATCH] Add ready-go countdown. --- src/sfx.asm | 6 ------ src/state_gameplay.asm | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/sfx.asm b/src/sfx.asm index 0bdc009..5b7183a 100644 --- a/src/sfx.asm +++ b/src/sfx.asm @@ -1089,8 +1089,6 @@ sSFXReadyGo:: db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF, $FF db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF - db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF - db $FF db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F8, REG_NR13_CH1_FRQLO, $16 db REG_NR14_CH1_FRQHI, $84, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $68 @@ -1154,8 +1152,6 @@ sSFXReadyGo:: db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF, $FF db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF - db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF - db $FF db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F8, REG_NR13_CH1_FRQLO, $16 db REG_NR14_CH1_FRQHI, $84, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $68 @@ -1219,8 +1215,6 @@ sSFXReadyGo:: db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF, $FF db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF - db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF - db $FF db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F8, REG_NR13_CH1_FRQLO, $39 db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $68 diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm index fd67bf6..a93e4be 100644 --- a/src/state_gameplay.asm +++ b/src/state_gameplay.asm @@ -134,7 +134,12 @@ GamePlayEventLoopHandler:: ; Draw "READY" and wait a bit. leadyMode: ld a, [wModeCounter] - dec a + cp a, 90 + jr nz, :+ + call SFXKill + ld a, SFX_READY_GO + call SFXEnqueue +: dec a jr nz, :+ ld a, MODE_GO ld [wMode], a