diff options
| -rw-r--r-- | arm9/modules/43/asm/module_43.s | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index b4667463..51f11701 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -143,7 +143,7 @@ MOD43_0225493C: ; 0x0225493C cmp r1, #3 bhs _0225496A lsl r2, r1, #2 - ldr r1, _0225496C ; =0x022550A8 + ldr r1, _0225496C ; =MOD43_022550A8 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -159,7 +159,7 @@ MOD43_0225493C: ; 0x0225493C _0225496A: pop {r3, r4, r5, pc} .align 2, 0 -_0225496C: .word 0x022550A8 +_0225496C: .word MOD43_022550A8 thumb_func_end MOD43_0225493C thumb_func_start MOD43_02254970 @@ -346,9 +346,9 @@ _02254A9E: bl FUN_02025238 cmp r0, #5 bne _02254AEA - ldr r1, _02254AF4 ; =0x022550B4 + ldr r1, _02254AF4 ; =MOD43_022550B4 lsl r0, r4, #1 - ldr r2, _02254AF4 ; =0x022550B4 + ldr r2, _02254AF4 ; =MOD43_022550B4 add r1, r1, r0 ldrb r0, [r2, r0] strb r0, [r5, #0x10] @@ -383,7 +383,7 @@ _02254AF0: add r0, r7, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254AF4: .word 0x022550B4 +_02254AF4: .word MOD43_022550B4 thumb_func_end MOD43_02254A88 thumb_func_start MOD43_02254AF8 @@ -519,13 +519,13 @@ MOD43_02254BD8: ; 0x02254BD8 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254BF8 ; =0x022551BC + ldr r0, _02254BF8 ; =MOD43_022551BC ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254BF8: .word 0x022551BC +_02254BF8: .word MOD43_022551BC thumb_func_end MOD43_02254BD8 thumb_func_start MOD43_02254BFC @@ -571,7 +571,7 @@ MOD43_02254C28: ; 0x02254C28 strb r3, [r0] strb r3, [r0, #1] ldr r0, [r5, #4] - ldr r2, _02254CC4 ; =0x022551A0 + ldr r2, _02254CC4 ; =MOD43_022551A0 mov r1, #6 bl FUN_02016C18 mov r0, #0 @@ -629,7 +629,7 @@ MOD43_02254C28: ; 0x02254C28 pop {r3, r4, r5, r6, pc} .align 2, 0 _02254CC0: .word 0x0400104C -_02254CC4: .word 0x022551A0 +_02254CC4: .word MOD43_022551A0 _02254CC8: .word 0x04001000 _02254CCC: .word 0xFFFFE0FF thumb_func_end MOD43_02254C28 @@ -1128,8 +1128,14 @@ _022550A2: thumb_func_end MOD43_02255078 .section .rodata - ; 0x022550A8 - .byte 0x8D, 0x49, 0x25, 0x02, 0xD9, 0x49, 0x25, 0x02, 0x51, 0x4A, 0x25, 0x02, 0x05, 0x14, 0x05, 0x14 + + .global MOD43_022550A8 +MOD43_022550A8: ; 0x022550A8 + .word MOD43_0225498C, MOD43_022549D8, MOD43_02254A50 + + .global MOD43_022550B4 +MOD43_022550B4: ; 0x022550B4 + .byte 0x05, 0x14, 0x05, 0x14 .byte 0x06, 0x14, 0x06, 0x14, 0x06, 0x13, 0x06, 0x13, 0x07, 0x11, 0x07, 0x11, 0x07, 0x11, 0x07, 0x11 .byte 0x05, 0x12, 0x05, 0x12, 0x05, 0x12, 0x05, 0x12, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10 .byte 0x09, 0x13, 0x09, 0x13, 0x09, 0x15, 0x09, 0x15, 0x09, 0x16, 0x09, 0x16, 0x09, 0x16, 0x09, 0x16 @@ -1144,9 +1150,17 @@ _022550A2: .byte 0x13, 0x0D, 0x14, 0x0D, 0x14, 0x0D, 0x14, 0x0D, 0x13, 0x0A, 0x13, 0x0A, 0x13, 0x0A, 0x13, 0x0A .byte 0x15, 0x0A, 0x15, 0x0A, 0x15, 0x0A, 0x15, 0x0A, 0x18, 0x0C, 0x18, 0x0C, 0x18, 0x0C, 0x18, 0x0C .byte 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0E, 0x19, 0x0E, 0x19, 0x0E, 0x19, 0x0E - .byte 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D + + .global MOD43_022551A0 +MOD43_022551A0: ; 0x022551A0 + .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 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x4D, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0xA9, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00 + + .global MOD43_022551BC +MOD43_022551BC: ; 0x022551BC + .word 0x00, MOD43_02254C28, 0x00 + .word 0x01, MOD43_02254D4C, 0x00 + .word 0x02, MOD43_02254DA8, 0x00 + .word 0x00, 0x00000000, 0x00 |