summaryrefslogtreecommitdiff
path: root/data/sound_data.s
diff options
context:
space:
mode:
Diffstat (limited to 'data/sound_data.s')
-rw-r--r--data/sound_data.s14
1 files changed, 4 insertions, 10 deletions
diff --git a/data/sound_data.s b/data/sound_data.s
index 451e7b1c8..abecaea86 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,19 +1,13 @@
.section .rodata
+ .include "asm/macros/m4a.s"
.include "asm/macros/music_voice.s"
- .include "data/music/voice_groups.s"
+ .include "sound/voice_groups.s"
.include "data/music/keysplit_tables.s"
.include "data/music/programmable_wave_data.s"
-gMPlayTable:: @ 845545C
- .incbin "baserom.gba", 0x0045545c, 0x30
-
- .include "data/music/music_pointers.s" @ 845548C
-
-BlankMusic_Header: @ 845632C
- .byte 0 @ number of tracks
- .byte 0, 0, 0 @ unknown
+ .include "sound/music_player_table.s"
+ .include "sound/song_table.s"
.include "data/music/direct_sound_data.s"
- .include "data/music/music_headers.s"