diff options
author | YamaArashi <shadow962@live.com> | 2016-08-29 21:30:01 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-08-29 23:45:09 -0700 |
commit | 61601293b2e4b8978b60744b9fcb9d79f59a9b29 (patch) | |
tree | d93ae908571567c3afffef9eea933442a8549f17 /asm | |
parent | 31c8226f6076d703c0e2a39ac4a0d31c5ad90498 (diff) |
dump songs
Diffstat (limited to 'asm')
-rw-r--r-- | asm/macros/m4a.s | 13 | ||||
-rw-r--r-- | asm/rom5.s | 16 | ||||
-rw-r--r-- | asm/rom_8074BAC.s | 16 |
3 files changed, 29 insertions, 16 deletions
diff --git a/asm/macros/m4a.s b/asm/macros/m4a.s new file mode 100644 index 000000000..6c5abc09b --- /dev/null +++ b/asm/macros/m4a.s @@ -0,0 +1,13 @@ + .macro song label, music_player, unknown + .4byte \label + .2byte \music_player + .2byte \unknown + .endm + + .macro music_player info_struct, track_struct, unknown_1, unknown_2 + .4byte \info_struct + .4byte \track_struct + .byte \unknown_1 + .space 1 + .2byte \unknown_2 + .endm diff --git a/asm/rom5.s b/asm/rom5.s index 881f6ddaa..81c369f8d 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -131013,7 +131013,7 @@ _080BABF2: b _080BAC98 .align 2, 0 _080BAC04: .4byte 0x020387d8 -_080BAC08: .4byte gUnknown_084537C0 +_080BAC08: .4byte voicegroup_84537C0 _080BAC0C: lsls r0, r1, 1 adds r0, r1 @@ -131021,7 +131021,7 @@ _080BAC0C: ldr r1, _080BAC18 b _080BAC98 .align 2, 0 -_080BAC18: .4byte gUnknown_08452590 +_080BAC18: .4byte voicegroup_8452590 _080BAC1C: ldr r0, _080BAC30 ldrb r0, [r0] @@ -131034,7 +131034,7 @@ _080BAC1C: b _080BAC98 .align 2, 0 _080BAC30: .4byte 0x020387d8 -_080BAC34: .4byte gUnknown_08453DC0 +_080BAC34: .4byte voicegroup_8453DC0 _080BAC38: lsls r0, r1, 1 adds r0, r1 @@ -131042,7 +131042,7 @@ _080BAC38: ldr r1, _080BAC44 b _080BAC98 .align 2, 0 -_080BAC44: .4byte gUnknown_08452B90 +_080BAC44: .4byte voicegroup_8452B90 _080BAC48: ldr r0, _080BAC5C ldrb r0, [r0] @@ -131055,7 +131055,7 @@ _080BAC48: b _080BAC98 .align 2, 0 _080BAC5C: .4byte 0x020387d8 -_080BAC60: .4byte gUnknown_084543C0 +_080BAC60: .4byte voicegroup_84543C0 _080BAC64: lsls r0, r1, 1 adds r0, r1 @@ -131063,7 +131063,7 @@ _080BAC64: ldr r1, _080BAC70 b _080BAC98 .align 2, 0 -_080BAC70: .4byte gUnknown_08453190 +_080BAC70: .4byte voicegroup_8453190 _080BAC74: ldr r0, _080BAC88 ldrb r0, [r0] @@ -131076,7 +131076,7 @@ _080BAC74: b _080BAC98 .align 2, 0 _080BAC88: .4byte 0x020387d8 -_080BAC8C: .4byte gUnknown_084549C0 +_080BAC8C: .4byte voicegroup_84549C0 _080BAC90: lsls r0, r1, 1 adds r0, r1 @@ -131110,7 +131110,7 @@ _080BACC6: pop {r0} bx r0 .align 2, 0 -_080BACCC: .4byte gUnknown_08453790 +_080BACCC: .4byte voicegroup_8453790 _080BACD0: .4byte 0x03005d30 _080BACD4: .4byte 0x020387b1 _080BACD8: .4byte 0x020387b2 diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s index c1bba49ea..050708c5a 100644 --- a/asm/rom_8074BAC.s +++ b/asm/rom_8074BAC.s @@ -947,7 +947,7 @@ _080752C6: ldr r1, _080752D8 b _08075350 .align 2, 0 -_080752D8: .4byte gUnknown_084537C0 +_080752D8: .4byte voicegroup_84537C0 _080752DC: lsls r0, r1, 1 adds r0, r1 @@ -955,7 +955,7 @@ _080752DC: ldr r1, _080752E8 b _08075350 .align 2, 0 -_080752E8: .4byte gUnknown_08452590 +_080752E8: .4byte voicegroup_8452590 _080752EC: mov r2, r9 cmp r2, 0 @@ -966,7 +966,7 @@ _080752EC: ldr r1, _080752FC b _08075350 .align 2, 0 -_080752FC: .4byte gUnknown_08453DC0 +_080752FC: .4byte voicegroup_8453DC0 _08075300: lsls r0, r1, 1 adds r0, r1 @@ -974,7 +974,7 @@ _08075300: ldr r1, _0807530C b _08075350 .align 2, 0 -_0807530C: .4byte gUnknown_08452B90 +_0807530C: .4byte voicegroup_8452B90 _08075310: mov r0, r9 cmp r0, 0 @@ -985,7 +985,7 @@ _08075310: ldr r1, _08075320 b _08075350 .align 2, 0 -_08075320: .4byte gUnknown_084543C0 +_08075320: .4byte voicegroup_84543C0 _08075324: lsls r0, r1, 1 adds r0, r1 @@ -993,7 +993,7 @@ _08075324: ldr r1, _08075330 b _08075350 .align 2, 0 -_08075330: .4byte gUnknown_08453190 +_08075330: .4byte voicegroup_8453190 _08075334: mov r2, r9 cmp r2, 0 @@ -1004,7 +1004,7 @@ _08075334: ldr r1, _08075344 b _08075350 .align 2, 0 -_08075344: .4byte gUnknown_084549C0 +_08075344: .4byte voicegroup_84549C0 _08075348: lsls r0, r1, 1 adds r0, r1 @@ -1025,7 +1025,7 @@ _0807535A: pop {r0} bx r0 .align 2, 0 -_0807536C: .4byte gUnknown_08453790 +_0807536C: .4byte voicegroup_8453790 _08075370: .4byte 0x0202f79c thumb_func_end sub_80751C0 |