diff options
| -rw-r--r-- | arm9/modules/25/asm/module_25.s | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index cf57dc32..ba331a34 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -94,7 +94,7 @@ _022548E6: strb r0, [r5, #5] mov r0, #8 str r0, [sp] - ldr r0, _02254914 ; =0x02254CF8 + ldr r0, _02254914 ; =MOD25_02254CF8 mov r1, #1 add r3, r5, #0 bl MOD20_02254130 @@ -112,7 +112,7 @@ _0225490A: pop {r3, r4, r5, pc} nop _02254910: .word MOD25_02254974 -_02254914: .word 0x02254CF8 +_02254914: .word MOD25_02254CF8 thumb_func_end MOD25_0225489C thumb_func_start MOD25_02254918 @@ -142,7 +142,7 @@ MOD25_02254930: ; 0x02254930 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254968 ; =0x02254CFC + ldr r1, _02254968 ; =MOD25_02254CFC ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -156,7 +156,7 @@ MOD25_02254930: ; 0x02254930 _02254966: pop {r3, r4, r5, pc} .align 2, 0 -_02254968: .word 0x02254CFC +_02254968: .word MOD25_02254CFC thumb_func_end MOD25_02254930 thumb_func_start MOD25_0225496C @@ -389,13 +389,13 @@ MOD25_02254AE4: ; 0x02254AE4 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254B04 ; =0x02254D44 + ldr r0, _02254B04 ; =MOD25_02254D44 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254B04: .word 0x02254D44 +_02254B04: .word MOD25_02254D44 thumb_func_end MOD25_02254AE4 thumb_func_start MOD25_02254B08 @@ -437,7 +437,7 @@ MOD25_02254B34: ; 0x02254B34 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254BBC ; =0x02254D08 + ldr r2, _02254BBC ; =MOD25_02254D08 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -491,7 +491,7 @@ MOD25_02254B34: ; 0x02254B34 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 -_02254BBC: .word 0x02254D08 +_02254BBC: .word MOD25_02254D08 _02254BC0: .word 0x04001000 _02254BC4: .word 0xFFFFE0FF thumb_func_end MOD25_02254B34 @@ -613,7 +613,7 @@ MOD25_02254C74: ; 0x02254C74 add r0, r7, #0 str r0, [sp, #0xc] add r0, #0x34 - ldr r4, _02254CD4 ; =0x02254D24 + ldr r4, _02254CD4 ; =MOD25_02254D24 mov r6, #0 add r5, r7, #0 str r0, [sp, #0xc] @@ -636,7 +636,7 @@ _02254CCE: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254CD4: .word 0x02254D24 +_02254CD4: .word MOD25_02254D24 thumb_func_end MOD25_02254C74 thumb_func_start MOD25_02254CD8 @@ -659,16 +659,33 @@ _02254CE6: thumb_func_end MOD25_02254CD8 .section .rodata - ; 0x02254CF8 - .byte 0x10, 0xAF, 0x10, 0xCF, 0xA5, 0x49, 0x25, 0x02, 0xE5, 0x49, 0x25, 0x02, 0x39, 0x4A, 0x25, 0x02 + + .global MOD25_02254CF8 +MOD25_02254CF8: ; 0x02254CF8 + .byte 0x10, 0xAF, 0x10, 0xCF + + .global MOD25_02254CFC +MOD25_02254CFC: ; 0x02254CFC + .word MOD25_022549A4, MOD25_022549E4, MOD25_02254A38 + + .global MOD25_02254D08 +MOD25_02254D08: ; 0x02254D08 .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, 0x40, 0x07, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD25_02254D24 +MOD25_02254D24: ; 0x02254D24 + .byte 0x00, 0x40, 0x07, 0x00 .byte 0x00, 0x40, 0x06, 0x00, 0x3C, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x40, 0x07, 0x00 - .byte 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x35, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC9, 0x4B, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00 + + .global MOD25_02254D44 +MOD25_02254D44: ; 0x02254D44 + .word 0x00, MOD25_02254B34, 0x00 + .word 0x01, MOD25_02254BC8, 0x00 + .word 0x02, MOD25_02254BE8, 0x00 + .word 0x03, MOD25_02254C14, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD25_02254840 |