diff options
| -rw-r--r-- | arm9/modules/36/asm/module_36.s | 80 |
1 files changed, 53 insertions, 27 deletions
diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index d5ba87c7..528f376a 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -83,7 +83,7 @@ MOD36_022548A0: ; 0x022548A0 bl MOD36_02254E10 mov r0, #8 str r0, [sp] - ldr r0, _02254908 ; =0x022553E8 + ldr r0, _02254908 ; =MOD36_022553E8 ldr r2, _0225490C ; =MOD36_02254980 mov r1, #3 add r3, r5, #0 @@ -104,7 +104,7 @@ _022548FC: pop {r3, r4, r5, r6, pc} nop _02254904: .word 0x00005B78 -_02254908: .word 0x022553E8 +_02254908: .word MOD36_022553E8 _0225490C: .word MOD36_02254980 _02254910: .word 0x00005B84 thumb_func_end MOD36_022548A0 @@ -143,7 +143,7 @@ MOD36_02254938: ; 0x02254938 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _0225497C ; =0x022553F4 + ldr r1, _0225497C ; =MOD36_022553F4 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -159,7 +159,7 @@ _02254974: pop {r3, r4, r5, pc} nop _02254978: .word 0x00005B80 -_0225497C: .word 0x022553F4 +_0225497C: .word MOD36_022553F4 thumb_func_end MOD36_02254938 thumb_func_start MOD36_02254980 @@ -892,7 +892,7 @@ MOD36_02254E8C: ; 0x02254E8C add r0, r7, #0 str r0, [sp, #0xc] add r0, #0x34 - ldr r4, _02254EE0 ; =0x02255440 + ldr r4, _02254EE0 ; =MOD36_02255440 mov r6, #0 add r5, r7, #0 str r0, [sp, #0xc] @@ -910,7 +910,7 @@ _02254EC6: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254EE0: .word 0x02255440 +_02254EE0: .word MOD36_02255440 thumb_func_end MOD36_02254E8C thumb_func_start MOD36_02254EE4 @@ -948,13 +948,13 @@ MOD36_02254F0C: ; 0x02254F0C str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254F2C ; =0x02255480 + ldr r0, _02254F2C ; =MOD36_02255480 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254F2C: .word 0x02255480 +_02254F2C: .word MOD36_02255480 thumb_func_end MOD36_02254F0C thumb_func_start MOD36_02254F30 @@ -1002,12 +1002,12 @@ _02254F70: bl MOD20_022538A0 add r4, r0, #0 ldr r0, [r4, #4] - ldr r2, _0225502C ; =0x02255408 + ldr r2, _0225502C ; =MOD36_02255408 mov r1, #6 mov r3, #0 bl FUN_02016C18 ldr r0, [r4, #4] - ldr r2, _02255030 ; =0x02255424 + ldr r2, _02255030 ; =MOD36_02255424 mov r1, #7 mov r3, #0 bl FUN_02016C18 @@ -1081,8 +1081,8 @@ _02255028: add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 -_0225502C: .word 0x02255408 -_02255030: .word 0x02255424 +_0225502C: .word MOD36_02255408 +_02255030: .word MOD36_02255424 _02255034: .word 0x04001000 _02255038: .word 0xFFFFE0FF thumb_func_end MOD36_02254F5C @@ -1091,7 +1091,7 @@ _02255038: .word 0xFFFFE0FF MOD36_0225503C: ; 0x0225503C push {r3, r4, r5, lr} sub sp, #8 - ldr r3, _02255098 ; =0x02255400 + ldr r3, _02255098 ; =MOD36_02255400 add r4, r0, #0 ldrh r5, [r3] add r0, sp, #0 @@ -1131,7 +1131,7 @@ _02255082: add sp, #8 pop {r3, r4, r5, pc} nop -_02255098: .word 0x02255400 +_02255098: .word MOD36_02255400 thumb_func_end MOD36_0225503C thumb_func_start MOD36_0225509C @@ -1559,21 +1559,47 @@ _022553E4: .word 0x0000066A thumb_func_end MOD36_0225539C .section .rodata - ; 0x022553E8 - .byte 0x22, 0x42, 0xA7, 0xCF, 0x50, 0x70, 0xA7, 0xCF, 0x7E, 0x9E, 0xA7, 0xCF, 0xAD, 0x49, 0x25, 0x02 - .byte 0xF9, 0x49, 0x25, 0x02, 0xD5, 0x4D, 0x25, 0x02, 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x00, 0x00 + + .global MOD36_022553E8 +MOD36_022553E8: ; 0x022553E8 + .byte 0x22, 0x42, 0xA7, 0xCF, 0x50, 0x70, 0xA7, 0xCF, 0x7E, 0x9E, 0xA7, 0xCF + + .global MOD36_022553F4 +MOD36_022553F4: ; 0x022553F4 + .word MOD36_022549AC, MOD36_022549F8, MOD36_02254DD4 + + .global MOD36_02255400 +MOD36_02255400: ; 0x02255400 + .byte 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x00, 0x00 + + .global MOD36_02255408 +MOD36_02255408: ; 0x02255408 .byte 0x00, 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD36_02255424 +MOD36_02255424: ; 0x02255424 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00 - .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00 + .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD36_02255440 +MOD36_02255440: ; 0x02255440 + .byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00 .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0x20, 0x03, 0x00 .byte 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00 .byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0xE0, 0x08, 0x00 - .byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x9D, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0xF5, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x0D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x65, 0x51, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x7D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0xE1, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 - .byte 0x0D, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x9D, 0x53, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD36_02255480 +MOD36_02255480: ; 0x02255480 + .word 0x00, MOD36_02254F5C, 0x00 + .word 0x01, MOD36_0225509C, 0x00 + .word 0x02, MOD36_022550F4, 0x00 + .word 0x03, MOD36_0225510C, 0x00 + .word 0x04, MOD36_02255164, 0x00 + .word 0x05, MOD36_0225517C, 0x00 + .word 0x06, MOD36_022551E0, 0x00 + .word 0x07, MOD36_0225520C, 0x00 + .word 0x08, MOD36_0225539C, 0x00 + .word 0x00, 0x00000000, 0x00 |