diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
| commit | ecfdc57e1cff1fa34ff7edcf7524aeadbc265b69 (patch) | |
| tree | 123155f492599caf4597b6fc812a0a064d3962bd /sound | |
| parent | 9776f51f0643a8d988fcd5fc2ac404a7ea285235 (diff) | |
| parent | f1f6c7337f4f2f002b456468b0ccc327fc494d02 (diff) | |
Merge branch 'master' into fix_nonmatching
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/music_player_table.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index eadcfc90a..35d37fca9 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -1,6 +1,7 @@ + .align 2 gMPlayTable:: @ 845545C - music_player gMPlay_BGM, 0x30007F8, 10, 0 - music_player gMPlay_SE1, 0x3000B18, 3, 1 - music_player gMPlay_SE2, 0x3000C08, 9, 1 - music_player gMPlay_SE3, 0x3000ED8, 1, 0 + music_player gMPlay_BGM, gUnknown_030007B8 + 0x40, 10, 0 + music_player gMPlay_SE1, gUnknown_030007B8 + 0x360, 3, 1 + music_player gMPlay_SE2, gUnknown_030007B8 + 0x450, 9, 1 + music_player gMPlay_SE3, gUnknown_030007B8 + 0x720, 1, 0 |