diff options
| -rw-r--r-- | arm9/modules/41/asm/module_41.s | 61 |
1 files changed, 40 insertions, 21 deletions
diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s index 0e9851e2..13762a02 100644 --- a/arm9/modules/41/asm/module_41.s +++ b/arm9/modules/41/asm/module_41.s @@ -219,7 +219,7 @@ MOD41_02254990: ; 0x02254990 strb r0, [r5, #3] mov r0, #8 str r0, [sp] - ldr r0, _02254A30 ; =0x022557B0 + ldr r0, _02254A30 ; =MOD41_022557B0 ldr r2, _02254A34 ; =MOD41_02254A58 mov r1, #0xb add r3, r5, #0 @@ -268,7 +268,7 @@ _02254A28: add sp, #4 pop {r3, r4, r5, r6, pc} nop -_02254A30: .word 0x022557B0 +_02254A30: .word MOD41_022557B0 _02254A34: .word MOD41_02254A58 thumb_func_end MOD41_02254990 @@ -339,7 +339,7 @@ _02254AAE: ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254AD4 ; =0x02255794 + ldr r1, _02254AD4 ; =MOD41_02255794 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -353,7 +353,7 @@ _02254AAE: _02254AD0: pop {r3, r4, r5, pc} nop -_02254AD4: .word 0x02255794 +_02254AD4: .word MOD41_02255794 thumb_func_end MOD41_02254A88 thumb_func_start MOD41_02254AD8 @@ -1429,7 +1429,7 @@ MOD41_022552A0: ; 0x022552A0 add r0, r7, #0 str r0, [sp, #0x10] add r0, #0x8c - ldr r6, _02255370 ; =0x02255864 + ldr r6, _02255370 ; =MOD41_02255864 mov r4, #0 add r5, r7, #0 str r0, [sp, #0x10] @@ -1481,7 +1481,7 @@ _0225535E: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop -_02255370: .word 0x02255864 +_02255370: .word MOD41_02255864 thumb_func_end MOD41_022552A0 thumb_func_start MOD41_02255374 @@ -1522,13 +1522,13 @@ MOD41_022553A4: ; 0x022553A4 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _022553C4 ; =0x022557F8 + ldr r0, _022553C4 ; =MOD41_022557F8 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_022553C4: .word 0x022557F8 +_022553C4: .word MOD41_022557F8 thumb_func_end MOD41_022553A4 thumb_func_start MOD41_022553C8 @@ -1570,7 +1570,7 @@ MOD41_022553F4: ; 0x022553F4 bl MOD20_022538A0 add r4, r0, #0 ldr r0, [r4, #4] - ldr r2, _022554CC ; =0x022557DC + ldr r2, _022554CC ; =MOD41_022557DC mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -1662,7 +1662,7 @@ _022554C0: add sp, #0x14 pop {r4, r5, pc} nop -_022554CC: .word 0x022557DC +_022554CC: .word MOD41_022557DC _022554D0: .word 0x04001000 _022554D4: .word 0xFFFFE0FF thumb_func_end MOD41_022553F4 @@ -2020,20 +2020,39 @@ MOD41_0225578C: ; 0x0225578C thumb_func_end MOD41_0225578C .section .rodata - ; 0x02255794 - .byte 0x59, 0x4B, 0x25, 0x02, 0x99, 0x4B, 0x25, 0x02, 0x21, 0x4D, 0x25, 0x02, 0x0D, 0x4E, 0x25, 0x02 - .byte 0xB9, 0x4E, 0x25, 0x02, 0x61, 0x4F, 0x25, 0x02, 0x19, 0x50, 0x25, 0x02, 0x90, 0xB0, 0x10, 0x50 + + .global MOD41_02255794 +MOD41_02255794: ; 0x02255794 + .word MOD41_02254B58, MOD41_02254B98, MOD41_02254D20, MOD41_02254E0C + .word MOD41_02254EB8, MOD41_02254F60, MOD41_02255018 + + .global MOD41_022557B0 +MOD41_022557B0: ; 0x022557B0 + .byte 0x90, 0xB0, 0x10, 0x50 .byte 0x90, 0xB0, 0x50, 0x90, 0x90, 0xB0, 0x90, 0xD0, 0x50, 0x60, 0x48, 0x58, 0x50, 0x60, 0x58, 0x68 .byte 0x80, 0x90, 0x48, 0x58, 0x80, 0x90, 0x58, 0x68, 0x50, 0x60, 0x78, 0x88, 0x50, 0x60, 0x88, 0x98 - .byte 0x80, 0x90, 0x78, 0x88, 0x80, 0x90, 0x88, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x80, 0x90, 0x78, 0x88, 0x80, 0x90, 0x88, 0x98 + + .global MOD41_022557DC +MOD41_022557DC: ; 0x022557DC + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF5, 0x53, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0xD9, 0x54, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x25, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x59, 0x55, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x8D, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0xB1, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0xD5, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x91, 0x56, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD41_022557F8 +MOD41_022557F8: ; 0x022557F8 + .word 0x00, MOD41_022553F4, 0x00 + .word 0x01, MOD41_022554D8, 0x00 + .word 0x02, MOD41_02255524, 0x00 + .word 0x03, MOD41_02255558, 0x00 + .word 0x04, MOD41_0225558C, 0x00 + .word 0x05, MOD41_022555B0, 0x00 + .word 0x06, MOD41_022555D4, 0x00 + .word 0x07, MOD41_02255690, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD41_02255864 +MOD41_02255864: ; 0x02255864 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x0B, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 |