diff options
Diffstat (limited to 'modes')
| -rw-r--r-- | modes/dialoguemenu.gbasm | 17 | ||||
| -rw-r--r-- | modes/dungeon.gbasm | 14 |
2 files changed, 30 insertions, 1 deletions
diff --git a/modes/dialoguemenu.gbasm b/modes/dialoguemenu.gbasm index 76d7470..2585260 100644 --- a/modes/dialoguemenu.gbasm +++ b/modes/dialoguemenu.gbasm @@ -61,7 +61,24 @@ Dialogue_VBLANK_Entrypoint: INC A LD $mem_loop_frame_timer, A + LD A, $mem_sound_flags + BIT 6, A + JR Z, =.Music_Play + LD A, $mem_display_flag + BIT 2, A + JR NZ, =.Sound_Effects_Play + BIT 4, A + JR NZ, =.Sound_Effects_Play + LD A, $mem_sound_flags + RES 6, A + SET 0, A + LD $mem_sound_flags, A + CALL =Start_Music + JR =.Sound_Effects_Play + + .Music_Play: CALL =Play_Music + .Sound_Effects_Play: CALL =Play_Sound_Effect .ENABLE_VBLANK_INTERRUPTS diff --git a/modes/dungeon.gbasm b/modes/dungeon.gbasm index ae9d052..2962913 100644 --- a/modes/dungeon.gbasm +++ b/modes/dungeon.gbasm @@ -59,13 +59,25 @@ Update_Animation_Steps: LD A, $mem_current_mode CP $enum_dead_mode RET Z + LD A, $mem_map_loading_flags + BIT 3, A + JR Z, =.Can_Check_Dead_mode + LD A, $mem_moving_animation_step + CP $00 + RET Z + .Can_Check_Dead_mode: LD A, $00 LD $mem_bunny_direction, A LD A, $02 LD $mem_bunny_animation, A .LOAD_MUSIC =_music_GameOver - CALL =Start_Music + + LD A, $mem_sound_flags + AND 0b10111110 + SET 6, A + LD $mem_sound_flags, A + LD A, $enum_dead_mode LD $mem_requested_mode, A LD $mem_current_mode, A |