diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:55:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:55:50 -0500 |
| commit | c28d691ff2821adcf43600a308d523fd609e12e2 (patch) | |
| tree | 5cfe618a442bb4a67b4aaef0c7f2c27d4bd3eedb /sound | |
| parent | 19b0a0f3e05c73b84e5afaffb83080474774e918 (diff) | |
| parent | 6eaadfc62e89a25c2de674aebf69f077c491580f (diff) | |
Merge branch 'master' into fix_nonmatching
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/music_player_table.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index 35d37fca9..452ee78f5 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -1,4 +1,3 @@ - .align 2 gMPlayTable:: @ 845545C music_player gMPlay_BGM, gUnknown_030007B8 + 0x40, 10, 0 |