diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-02-06 18:50:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 18:50:47 -0600 |
| commit | 7a264da18b6177d78373568c5110d5c98fb86c0f (patch) | |
| tree | 0a417042fbff57d8e606e84d8d69b74b2e4f4309 /sound | |
| parent | 5563c78798f95130cccf7d5a5c17b02cfb06442b (diff) | |
| parent | 5969695b8bbdab5182d0d651bbd2d256a12c0404 (diff) | |
Merge branch 'master' into german_debug
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/music_player_table.inc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index 6249a30e1..452ee78f5 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -1,15 +1,6 @@ -@ TODO: remove the raw pointers - .align 2 gMPlayTable:: @ 845545C -.if DEBUG - music_player gMPlay_BGM, 0x3000878, 10, 0 - music_player gMPlay_SE1, 0x3000B98, 3, 1 - music_player gMPlay_SE2, 0x3000C88, 9, 1 - music_player gMPlay_SE3, 0x3000F58, 1, 0 -.else - 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 -.endif + 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 |