From d72febf1ce9a72cdfb3cb822d74456a387897672 Mon Sep 17 00:00:00 2001 From: Astatin Date: Tue, 26 Aug 2025 14:29:01 +0200 Subject: Add Game Over music & dialogue box + button press after music end restarts --- music/game-over.fur | Bin 0 -> 444 bytes music/game-over.vgm | Bin 0 -> 1759 bytes music/load.gbasm | 32 ++++++++++++++++++++++++++++++++ music/morning-forest.fur | Bin 773 -> 785 bytes music/morning-forest.vgm | Bin 7022 -> 6962 bytes music/title-screen.vgm | Bin 6137 -> 6128 bytes 6 files changed, 32 insertions(+) create mode 100644 music/game-over.fur create mode 100644 music/game-over.vgm (limited to 'music') diff --git a/music/game-over.fur b/music/game-over.fur new file mode 100644 index 0000000..f3100e7 Binary files /dev/null and b/music/game-over.fur differ diff --git a/music/game-over.vgm b/music/game-over.vgm new file mode 100644 index 0000000..0be20e4 Binary files /dev/null and b/music/game-over.vgm differ diff --git a/music/load.gbasm b/music/load.gbasm index 1632233..5e2caf8 100644 --- a/music/load.gbasm +++ b/music/load.gbasm @@ -101,18 +101,32 @@ Loop_Music: LD B, A LD A, (HL) + LD $tmp_var_1, A CALL =Inc_HL_Fix_Bank ADD C LD C, A LD A, (HL) + LD $tmp_var_2, A CALL =Inc_HL_Fix_Bank ADC B LD B, A LD A, (HL) + LD $tmp_var_3, A CALL =Inc_HL_Fix_Bank ADC E LD E, A + LD A, $tmp_var_1 + CP $00 + JR NZ, =.end_check_empty + LD A, $tmp_var_2 + CP $00 + JR NZ, =.end_check_empty + LD A, $tmp_var_2 + CP $00 + JR Z, =Stop_music + .end_check_empty: + LD A, $00 SLA B RL A @@ -132,6 +146,24 @@ Loop_Music: LD ($mem_current_vgm_pc+2), A RET +Stop_Music: + LD A, $mem_sound_flags + RES 0, A + LD $mem_sound_flags, A + LD A, $mem_sound_flags + BIT 1, A + CALL Z, =Reset_Music_Channel1 + LD A, $mem_sound_flags + BIT 2, A + CALL Z, =Reset_Music_Channel2 + LD A, $mem_sound_flags + BIT 3, A + CALL Z, =Reset_Music_Channel3 + LD A, $mem_sound_flags + BIT 4, A + CALL Z, =Reset_Music_Channel4 + RET + Inc_HL_Fix_Bank: PUSH AF INC HL diff --git a/music/morning-forest.fur b/music/morning-forest.fur index bb9b8d4..0fafa84 100644 Binary files a/music/morning-forest.fur and b/music/morning-forest.fur differ diff --git a/music/morning-forest.vgm b/music/morning-forest.vgm index b3f423d..4292ff2 100644 Binary files a/music/morning-forest.vgm and b/music/morning-forest.vgm differ diff --git a/music/title-screen.vgm b/music/title-screen.vgm index 342011a..9b133e1 100644 Binary files a/music/title-screen.vgm and b/music/title-screen.vgm differ -- cgit v1.2.3-70-g09d2