diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-18 20:42:51 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-18 20:42:51 -0400 |
commit | f8fda972f8cbcf2793d41798c2d233d14838d6ae (patch) | |
tree | fa814dd4035023ece43a213cecd0271436c13916 /asm | |
parent | 1276184621c83e39c368374cbe7e1ef77ad70c41 (diff) |
Dump mplaytable and song ptrs
Diffstat (limited to 'asm')
-rw-r--r-- | asm/m4a_1.s | 27 | ||||
-rw-r--r-- | asm/macros.inc | 1 | ||||
-rw-r--r-- | asm/overworld.s | 4 |
3 files changed, 28 insertions, 4 deletions
diff --git a/asm/m4a_1.s b/asm/m4a_1.s index e78c3e69b..db8476382 100644 --- a/asm/m4a_1.s +++ b/asm/m4a_1.s @@ -4,8 +4,6 @@ .syntax unified - .lcomm gUnknown_030007B8, 0x770 - .text thumb_func_start umul3232H32 @@ -1909,3 +1907,28 @@ _081DDD90: thumb_func_end ply_mod .align 2, 0 @ Don't pad with nop. + + .bss +gUnknown_030007B8: + .space 0x40 + .size gUnknown_030007B8, .-gUnknown_030007B8 + + .global gMPlayTrack_BGM +gMPlayTrack_BGM: + .space 0x320 + .size gMPlayTrack_BGM, .-gMPlayTrack_BGM + + .global gMPlayTrack_SE1 +gMPlayTrack_SE1: + .space 0xF0 + .size gMPlayTrack_SE1, .-gMPlayTrack_SE1 + + .global gMPlayTrack_SE2 +gMPlayTrack_SE2: + .space 0x2D0 + .size gMPlayTrack_SE2, .-gMPlayTrack_SE2 + + .global gMPlayTrack_SE3 +gMPlayTrack_SE3: + .space 0x50 + .size gMPlayTrack_SE3, .-gMPlayTrack_SE3 diff --git a/asm/macros.inc b/asm/macros.inc index 324a8de02..e6813d319 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -4,6 +4,7 @@ .include "asm/macros/pokemon_data.inc" .include "asm/macros/ec.inc" .include "asm/macros/map.inc" + .include "asm/macros/m4a.inc" .macro region_map_location x, y, width, height, name .byte \x diff --git a/asm/overworld.s b/asm/overworld.s index e44855b46..0efea9307 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -2411,7 +2411,7 @@ _08055DDC: bgt _08055E24 ldr r0, _08055E1C @ =gMPlayInfo_BGM ldr r1, [r0] - ldr r0, _08055E20 @ =gUnknown_86E6B0C + ldr r0, _08055E20 @ =gSong_86E6B0C cmp r1, r0 bne _08055E24 movs r0, 0x4 @@ -2421,7 +2421,7 @@ _08055DDC: _08055E14: .4byte gSaveBlock1Ptr _08055E18: .4byte 0x00004f01 _08055E1C: .4byte gMPlayInfo_BGM -_08055E20: .4byte gUnknown_86E6B0C +_08055E20: .4byte gSong_86E6B0C _08055E24: bl sub_8055D8C lsls r0, 16 |