diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-02-03 22:15:54 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-02-03 22:15:54 -0600 |
| commit | f1f6c7337f4f2f002b456468b0ccc327fc494d02 (patch) | |
| tree | 83c45413925475f8316c869a8e129abf17a490e9 | |
| parent | f1584e69c307427516d2c180ab92e28bc3786326 (diff) | |
get rid of raw addresses in music_player_table.inc
| -rw-r--r-- | sound/music_player_table.inc | 9 | ||||
| -rw-r--r-- | src/libs/m4a_1.s | 6 |
2 files changed, 10 insertions, 5 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 diff --git a/src/libs/m4a_1.s b/src/libs/m4a_1.s index be8b44488..8dbcf7efd 100644 --- a/src/libs/m4a_1.s +++ b/src/libs/m4a_1.s @@ -4,7 +4,11 @@ .syntax unified - .lcomm gUnknown_030007B8, 0x770 + .bss + + .global gUnknown_030007B8 +gUnknown_030007B8: + .space 0x770 .text |