diff options
| -rw-r--r-- | arm9/modules/35/asm/module_35.s | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index dfdc8530..48953e9f 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -106,7 +106,7 @@ MOD35_022548F0: ; 0x022548F0 cmp r1, #3 bhs _0225491C lsl r2, r1, #2 - ldr r1, _02254920 ; =0x022550B8 + ldr r1, _02254920 ; =MOD35_022550B8 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -121,7 +121,7 @@ MOD35_022548F0: ; 0x022548F0 _0225491C: pop {r3, r4, r5, pc} nop -_02254920: .word 0x022550B8 +_02254920: .word MOD35_022550B8 thumb_func_end MOD35_022548F0 thumb_func_start MOD35_02254924 @@ -474,7 +474,7 @@ MOD35_02254B54: ; 0x02254B54 mov r4, #0 str r0, [sp, #0x18] add r0, #0x64 - ldr r6, _02254C14 ; =0x02255110 + ldr r6, _02254C14 ; =MOD35_02255110 add r5, r7, #0 str r4, [sp, #0x10] str r0, [sp, #0x18] @@ -517,7 +517,7 @@ _02254BEE: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop -_02254C14: .word 0x02255110 +_02254C14: .word MOD35_02255110 thumb_func_end MOD35_02254B54 thumb_func_start MOD35_02254C18 @@ -558,13 +558,13 @@ MOD35_02254C48: ; 0x02254C48 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254C68 ; =0x022550E0 + ldr r0, _02254C68 ; =MOD35_022550E0 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254C68: .word 0x022550E0 +_02254C68: .word MOD35_022550E0 thumb_func_end MOD35_02254C48 thumb_func_start MOD35_02254C6C @@ -606,7 +606,7 @@ MOD35_02254C98: ; 0x02254C98 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254D24 ; =0x022550C4 + ldr r2, _02254D24 ; =MOD35_022550C4 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -662,7 +662,7 @@ MOD35_02254C98: ; 0x02254C98 add sp, #0x14 pop {r4, r5, pc} nop -_02254D24: .word 0x022550C4 +_02254D24: .word MOD35_022550C4 _02254D28: .word 0x0400104C _02254D2C: .word 0xFFFFE0FF thumb_func_end MOD35_02254C98 @@ -1135,13 +1135,27 @@ _022550B0: thumb_func_end MOD35_02255094 .section .rodata - ; 0x022550B8 - .byte 0x41, 0x49, 0x25, 0x02, 0x81, 0x49, 0x25, 0x02, 0xD5, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD35_022550B8 +MOD35_022550B8: ; 0x022550B8 + .word MOD35_02254940, MOD35_02254980, MOD35_022549D4 + + .global MOD35_022550C4 +MOD35_022550C4: ; 0x022550C4 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x4C, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x85, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + + .global MOD35_022550E0 +MOD35_022550E0: ; 0x022550E0 + .word 0x00, MOD35_02254C98, 0x00 + .word 0x01, MOD35_02254D30, 0x00 + .word 0x02, MOD35_02254D84, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD35_02255110 +MOD35_02255110: ; 0x02255110 + .byte 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x07, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x06, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x08, 0x00 .byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x02, 0x00 |