diff options
| -rw-r--r-- | arm9/modules/48/asm/module_48.s | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index 661529fd..42f3adb7 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -106,7 +106,7 @@ _022548C8: strb r0, [r7, #2] mov r0, #8 str r0, [sp] - ldr r0, _02254930 ; =0x02254F60 + ldr r0, _02254930 ; =MOD48_02254F60 ldr r2, _02254934 ; =MOD48_02254994 mov r1, #3 add r3, r7, #0 @@ -125,7 +125,7 @@ _0225492A: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_02254930: .word 0x02254F60 +_02254930: .word MOD48_02254F60 _02254934: .word MOD48_02254994 thumb_func_end MOD48_0225489C @@ -156,7 +156,7 @@ MOD48_02254950: ; 0x02254950 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254988 ; =0x02254F6C + ldr r1, _02254988 ; =MOD48_02254F6C ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -170,7 +170,7 @@ MOD48_02254950: ; 0x02254950 _02254986: pop {r3, r4, r5, pc} .align 2, 0 -_02254988: .word 0x02254F6C +_02254988: .word MOD48_02254F6C thumb_func_end MOD48_02254950 thumb_func_start MOD48_0225498C @@ -384,13 +384,13 @@ MOD48_02254AE0: ; 0x02254AE0 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254B00 ; =0x02254F94 + ldr r0, _02254B00 ; =MOD48_02254F94 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254B00: .word 0x02254F94 +_02254B00: .word MOD48_02254F94 thumb_func_end MOD48_02254AE0 thumb_func_start MOD48_02254B04 @@ -435,7 +435,7 @@ MOD48_02254B30: ; 0x02254B30 bl MOD20_022538A4 add r6, r0, #0 ldr r0, [r4, #4] - ldr r2, _02254BBC ; =0x02254F78 + ldr r2, _02254BBC ; =MOD48_02254F78 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -487,7 +487,7 @@ MOD48_02254B30: ; 0x02254B30 add sp, #0x14 pop {r3, r4, r5, r6, pc} nop -_02254BBC: .word 0x02254F78 +_02254BBC: .word MOD48_02254F78 _02254BC0: .word 0x04001000 _02254BC4: .word 0xFFFFE0FF thumb_func_end MOD48_02254B30 @@ -750,7 +750,7 @@ _02254DD2: add r1, r1, #4 cmp r2, #0x10 blt _02254DD2 - ldr r0, _02254EBC ; =0x02254FD0 + ldr r0, _02254EBC ; =MOD48_02254FD0 str r4, [sp, #0x20] str r0, [sp, #0x24] ldr r0, [sp, #0x10] @@ -779,7 +779,7 @@ _02254DF2: str r0, [sp, #0x2c] _02254E16: add r7, r5, r6 - ldr r1, _02254EBC ; =0x02254FD0 + ldr r1, _02254EBC ; =MOD48_02254FD0 lsl r2, r7, #4 add r1, r1, r2 ldr r0, [r4, #0x20] @@ -861,7 +861,7 @@ _02254E8E: add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254EBC: .word 0x02254FD0 +_02254EBC: .word MOD48_02254FD0 thumb_func_end MOD48_02254D2C thumb_func_start MOD48_02254EC0 @@ -953,14 +953,31 @@ _02254F5C: .word 0x000003E7 thumb_func_end MOD48_02254EF4 .section .rodata - ; 0x02254F60 - .byte 0x3E, 0x62, 0x58, 0x88, 0x4E, 0x72, 0x98, 0xC8, 0x56, 0x7A, 0x18, 0x48, 0xB1, 0x49, 0x25, 0x02 - .byte 0xF1, 0x49, 0x25, 0x02, 0x6D, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD48_02254F60 +MOD48_02254F60: ; 0x02254F60 + .byte 0x3E, 0x62, 0x58, 0x88, 0x4E, 0x72, 0x98, 0xC8, 0x56, 0x7A, 0x18, 0x48 + + .global MOD48_02254F6C +MOD48_02254F6C: ; 0x02254F6C + .word MOD48_022549B0, MOD48_022549F0, MOD48_02254A6C + + .global MOD48_02254F78 +MOD48_02254F78: ; 0x02254F78 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0xC9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x61, 0x4C, 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 MOD48_02254F94 +MOD48_02254F94: ; 0x02254F94 + .word 0x00, MOD48_02254B30, 0x00 + .word 0x01, MOD48_02254BC8, 0x00 + .word 0x02, MOD48_02254BE8, 0x00 + .word 0x03, MOD48_02254C60, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD48_02254FD0 +MOD48_02254FD0: ; 0x02254FD0 .byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0A, 0x01, 0x00, 0x00 .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00 .byte 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x02, 0x01, 0x01, 0x00, 0x00 |