diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-09-10 13:01:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-10 13:01:39 -0700 |
| commit | f20d0afa16e2a2cd18692bc90ab79a5d5ce10a8e (patch) | |
| tree | 5727cace0a27b535a773b03366f56b21559c611d /data | |
| parent | 61e860247e5489e6d7dec67176ec52ef86b7869f (diff) | |
| parent | f7351a803bd5a3f00d326641579b049f573dbce4 (diff) | |
Merge pull request #31 from huderlem/master
Dump and label music data
Diffstat (limited to 'data')
| -rw-r--r-- | data/sound_data.s | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/data/sound_data.s b/data/sound_data.s index cc9c7fbc3..f97288a99 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,12 +1,11 @@ .section .rodata .include "asm/macros/m4a.s" + .include "asm/macros/music_voice.s" .include "sound/voice_groups.s" - - .incbin "baserom.gba", 0x455224, 0x238 - + .include "sound/keysplit_tables.s" + .include "sound/programmable_wave_data.s" .include "sound/music_player_table.s" .include "sound/song_table.s" - - .incbin "baserom.gba", 0x456330, 0x655FF0 - 0x456330 + .include "sound/direct_sound_data.s" |