diff options
| -rw-r--r-- | arm9/modules/42/asm/module_42.s | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index f13fb22c..b4e4e4d8 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -239,7 +239,7 @@ MOD42_02254A04: ; 0x02254A04 cmp r1, #4 bhs _02254A30 lsl r2, r1, #2 - ldr r1, _02254A34 ; =0x022550CC + ldr r1, _02254A34 ; =MOD42_022550CC add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -254,7 +254,7 @@ MOD42_02254A04: ; 0x02254A04 _02254A30: pop {r3, r4, r5, pc} nop -_02254A34: .word 0x022550CC +_02254A34: .word MOD42_022550CC thumb_func_end MOD42_02254A04 thumb_func_start MOD42_02254A38 @@ -914,13 +914,13 @@ MOD42_02254EEC: ; 0x02254EEC str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254F0C ; =0x022550F8 + ldr r0, _02254F0C ; =MOD42_022550F8 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254F0C: .word 0x022550F8 +_02254F0C: .word MOD42_022550F8 thumb_func_end MOD42_02254EEC thumb_func_start MOD42_02254F10 @@ -962,7 +962,7 @@ MOD42_02254F3C: ; 0x02254F3C bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254FC0 ; =0x022550DC + ldr r2, _02254FC0 ; =MOD42_022550DC mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -1014,7 +1014,7 @@ MOD42_02254F3C: ; 0x02254F3C add sp, #0x14 pop {r4, r5, pc} nop -_02254FC0: .word 0x022550DC +_02254FC0: .word MOD42_022550DC _02254FC4: .word 0x04001000 _02254FC8: .word 0xFFFFE0FF thumb_func_end MOD42_02254F3C @@ -1149,9 +1149,18 @@ _022550C8: thumb_func_end MOD42_02254FE8 .section .rodata - ; 0x022550CC - .byte 0x55, 0x4A, 0x25, 0x02, 0x95, 0x4A, 0x25, 0x02, 0x29, 0x4B, 0x25, 0x02, 0x81, 0x4B, 0x25, 0x02 + + .global MOD42_022550CC +MOD42_022550CC: ; 0x022550CC + .word MOD42_02254A54, MOD42_02254A94, MOD42_02254B28, MOD42_02254B80 + + .global MOD42_022550DC +MOD42_022550DC: ; 0x022550DC .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x3D, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xCD, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD42_022550F8 +MOD42_022550F8: ; 0x022550F8 + .word 0x00, MOD42_02254F3C, 0x00 + .word 0x01, MOD42_02254FCC, 0x00 + .word 0x00, 0x00000000, 0x00 |