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.s24
1 files changed, 9 insertions, 15 deletions
diff --git a/data/sound_data.s b/data/sound_data.s
index a25081360..cd33950e1 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,19 +1,13 @@
.section .rodata
-voicegroup_pokemon_cry:: @ 8675D04
- .incbin "baserom.gba", 0x675D04, 0x27FF0
+ .include "asm/macros/m4a.inc"
+ .include "asm/macros/music_voice.inc"
-gCryTable:: @ 869DCF4
- .incbin "baserom.gba", 0x69dcf4, 0x1230
+ .include "sound/voice_groups.inc"
+ .include "sound/keysplit_tables.inc"
+ .include "sound/programmable_wave_data.inc"
+ .include "sound/music_player_table.inc"
+ .include "sound/song_table.inc"
+ .include "sound/direct_sound_data.inc"
-gCryTable2:: @ 869EF24
- .incbin "baserom.gba", 0x69ef24, 0x1200
-
-gUnknown_086A0124:: @ 86A0124
- .incbin "baserom.gba", 0x6a0124, 0x1489c
-
-gMPlayTable:: @ 86B49C0
- .incbin "baserom.gba", 0x6b49c0, 0x30
-
-gSongTable:: @ 86B49F0
- .incbin "baserom.gba", 0x6b49f0, 0x2ee660
+ .align 2