diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-14 21:41:29 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-14 21:41:29 -0600 |
| commit | 11cb3275cc53c2bcea4fdcfe11d9d9d429ee9c02 (patch) | |
| tree | eeac196360a94773ce50b7c7c2f5204e89a8610d /sound | |
| parent | 404c415ef69f527adc3e795f4fd65f15c83402c4 (diff) | |
| parent | 59680b2a73bbe18566a2051102fd6424f7f13c8c (diff) | |
Merge remote-tracking branch 'Diego/master'
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/music_player_table.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index 7c9fd5397..de987c978 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -1,6 +1,6 @@ .align 2 gMPlayTable:: @ 86B49C0 - music_player gMPlay_BGM, 0x3001340, 10, 0 - music_player gMPlay_SE1, 0x3001660, 3, 1 - music_player gMPlay_SE2, 0x3001750, 9, 1 - music_player gMPlay_SE3, 0x3001A20, 1, 0 + music_player gMPlayInfo_BGM, gMPlayTrack_BGM, 10, 0 + music_player gMPlayInfo_SE1, gMPlayTrack_SE1, 3, 1 + music_player gMPlayInfo_SE2, gMPlayTrack_SE2, 9, 1 + music_player gMPlayInfo_SE3, gMPlayTrack_SE3, 1, 0 |