diff options
Diffstat (limited to 'map')
| -rw-r--r-- | map/dungeons/morningforest.gbasm | 6 | ||||
| -rw-r--r-- | map/objects.gbasm | 20 |
2 files changed, 20 insertions, 6 deletions
diff --git a/map/dungeons/morningforest.gbasm b/map/dungeons/morningforest.gbasm index af59699..3ee08e3 100644 --- a/map/dungeons/morningforest.gbasm +++ b/map/dungeons/morningforest.gbasm @@ -22,12 +22,6 @@ Morning_Forest: .max_floor: .DB 0x0a, inv(0x0a) .spawning_patterns: - ; DBG - .DB $entity_frog_index, $entity_frog_index, $entity_frog_index, $entity_frog_index, $ff - .DB $entity_frog_index, $entity_frog_index, $entity_frog_index, $entity_frog_index, $ff - .DB $entity_frog_index, $entity_frog_index, $entity_frog_index, $entity_frog_index, $ff - .DB $entity_frog_index, $entity_frog_index, $entity_frog_index, $entity_frog_index, $ff - .DB $entity_cat_index, $entity_cat_index, $entity_cat_index, $entity_fimsh_index, 0b00000010 .DB $entity_cat_index, $entity_cat_index, $entity_penguin_index, $entity_fimsh_index, 0b00100011 .DB $entity_cat_index, $entity_cat_index, $entity_fox_index, $entity_fimsh_index, 0b00100111 diff --git a/map/objects.gbasm b/map/objects.gbasm index 4fdc195..0bfc20f 100644 --- a/map/objects.gbasm +++ b/map/objects.gbasm @@ -221,6 +221,26 @@ Stairs_Action: .skip_update_floor_count: + LD A, $mem_sound_flags + BIT 1, A + CALL NZ, =Reset_Music_Channel1 + LD A, $mem_sound_flags + BIT 2, A + CALL NZ, =Reset_Music_Channel2 + LD A, $mem_sound_flags + BIT 3, A + CALL NZ, =Reset_Music_Channel3 + LD A, $mem_sound_flags + BIT 4, A + CALL NZ, =Reset_Music_Channel4 + LD A, $mem_sound_flags + AND 0b11000001 + LD $mem_sound_flags, A + LD A, $00 + LD $mem_sound_effect_frame_count, A + LD A, $ff + LD ($mem_sound_effect_pc), A + .SET_SOUND_EFFECT =_sound_effect_Next_Floor RET |