diff options
| -rw-r--r-- | arm9/modules/26/asm/module_26.s | 51 |
1 files changed, 34 insertions, 17 deletions
diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s index bba03256..12d880aa 100644 --- a/arm9/modules/26/asm/module_26.s +++ b/arm9/modules/26/asm/module_26.s @@ -228,7 +228,7 @@ _0225498A: MOD26_022549DC: ; 0x022549DC push {r4, r5} mov r4, #0 - ldr r5, _02254A00 ; =0x02254DF0 + ldr r5, _02254A00 ; =MOD26_02254DF0 add r2, r4, #0 _022549E4: add r3, r2, #0 @@ -246,7 +246,7 @@ _022549E6: pop {r4, r5} bx lr nop -_02254A00: .word 0x02254DF0 +_02254A00: .word MOD26_02254DF0 thumb_func_end MOD26_022549DC thumb_func_start MOD26_02254A04 @@ -296,7 +296,7 @@ MOD26_02254A4C: ; 0x02254A4C cmp r1, #3 bhs _02254A7C lsl r2, r1, #2 - ldr r1, _02254A80 ; =0x02254DE4 + ldr r1, _02254A80 ; =MOD26_02254DE4 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -313,7 +313,7 @@ MOD26_02254A4C: ; 0x02254A4C _02254A7C: pop {r3, r4, r5, pc} nop -_02254A80: .word 0x02254DE4 +_02254A80: .word MOD26_02254DE4 thumb_func_end MOD26_02254A4C thumb_func_start MOD26_02254A84 @@ -552,13 +552,13 @@ MOD26_02254C10: ; 0x02254C10 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254C30 ; =0x02254FF0 + ldr r0, _02254C30 ; =MOD26_02254FF0 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254C30: .word 0x02254FF0 +_02254C30: .word MOD26_02254FF0 thumb_func_end MOD26_02254C10 thumb_func_start MOD26_02254C34 @@ -599,7 +599,7 @@ MOD26_02254C60: ; 0x02254C60 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254CB8 ; =0x02254FD4 + ldr r2, _02254CB8 ; =MOD26_02254FD4 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -631,7 +631,7 @@ MOD26_02254C60: ; 0x02254C60 bl MOD26_02254C4C pop {r3, r4, r5, pc} .align 2, 0 -_02254CB8: .word 0x02254FD4 +_02254CB8: .word MOD26_02254FD4 _02254CBC: .word 0x04001000 _02254CC0: .word 0xFFFFE0FF thumb_func_end MOD26_02254C60 @@ -762,7 +762,7 @@ MOD26_02254DAC: ; 0x02254DAC mov r1, #6 bl FUN_0201886C mov r5, #0 - ldr r1, _02254DE0 ; =0x02254FD0 + ldr r1, _02254DE0 ; =MOD26_02254FD0 add r0, #0x84 add r2, r5, #0 _02254DBE: @@ -785,12 +785,18 @@ _02254DC2: blt _02254DBE pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254DE0: .word 0x02254FD0 +_02254DE0: .word MOD26_02254FD0 thumb_func_end MOD26_02254DAC .section .rodata - ; 0x02254DE4 - .byte 0xA1, 0x4A, 0x25, 0x02, 0xED, 0x4A, 0x25, 0x02, 0x99, 0x4B, 0x25, 0x02, 0x01, 0x01, 0x01, 0x01 + + .global MOD26_02254DE4 +MOD26_02254DE4: ; 0x02254DE4 + .word MOD26_02254AA0, MOD26_02254AEC, MOD26_02254B98 + + .global MOD26_02254DF0 +MOD26_02254DF0: ; 0x02254DF0 + .byte 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 @@ -820,12 +826,23 @@ _02254DE0: .word 0x02254FD0 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x0F, 0x08, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + + .global MOD26_02254FD0 +MOD26_02254FD0: ; 0x02254FD0 + .byte 0x04, 0x0F, 0x08, 0x01 + + .global MOD26_02254FD4 +MOD26_02254FD4: ; 0x02254FD4 .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 0x61, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x6D, 0x4D, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x91, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 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 MOD26_02254FF0 +MOD26_02254FF0: ; 0x02254FF0 + .word 0x00, MOD26_02254C60, 0x00 + .word 0x01, MOD26_02254D6C, 0x00 + .word 0x02, MOD26_02254D90, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD26_02254840 |