diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 22:19:26 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 22:19:26 +0100 |
| commit | 05aba58d5d5783cb3942349b0a1cc7a19a871d8d (patch) | |
| tree | 8d7e4308d231420bdceb40a565af2fe10b4f58f6 /data/sound_data.s | |
| parent | bc1a957674e84daf181c508afd2b623304de121d (diff) | |
| parent | d1630d481a0ff611fda2d70a100eed5046982cec (diff) | |
fix battle transition conflicts
Diffstat (limited to 'data/sound_data.s')
| -rw-r--r-- | data/sound_data.s | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/data/sound_data.s b/data/sound_data.s index f5470dda5..cd33950e1 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,14 +1,13 @@ .section .rodata .include "asm/macros/m4a.inc" + .include "asm/macros/music_voice.inc" .include "sound/voice_groups.inc" - - @ keysplit tables, programmable wave data - .incbin "baserom.gba", 0x6b4698, 0x328 - + .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" - @ direct sound data - .incbin "baserom.gba", 0x6b5d04, 0x246338 + .align 2 |