diff options
| -rw-r--r-- | arm9/arm9.lsf | 3 | ||||
| -rw-r--r-- | arm9/global.inc | 7 | ||||
| -rw-r--r-- | arm9/modules/50/asm/mod50_02254854.s | 213 | ||||
| -rw-r--r-- | arm9/modules/50/asm/mod50_022549AC.s (renamed from arm9/modules/50/asm/module_50.s) | 207 |
4 files changed, 222 insertions, 208 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 98efa645..3f9b8806 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -1029,7 +1029,8 @@ Overlay MODULE_50 { After MODULE_20 Object module_50_sinit.o - Object module_50.o + Object mod50_02254854.o + Object mod50_022549AC.o } Overlay MODULE_51 diff --git a/arm9/global.inc b/arm9/global.inc index 9a0d051e..077162c4 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -7456,6 +7456,13 @@ .extern MOD46_022549E8 .extern MOD46_02254A0C .extern MOD46_02254A18 +.extern MOD50_022549AC +.extern MOD50_022549E0 +.extern MOD50_022549F8 +.extern MOD50_02254A1C +.extern MOD50_02254A28 +.extern MOD50_02254A48 +.extern MOD50_02254AE8 .extern MOD51_02254A68 .extern MOD51_02254AB8 .extern MOD52_021D76C8 diff --git a/arm9/modules/50/asm/mod50_02254854.s b/arm9/modules/50/asm/mod50_02254854.s new file mode 100644 index 00000000..aeca2cc0 --- /dev/null +++ b/arm9/modules/50/asm/mod50_02254854.s @@ -0,0 +1,213 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + .balign 4, 0 + + thumb_func_start MOD50_02254854 +MOD50_02254854: ; 0x02254854 + push {r3, r4, r5, r6, r7, lr} + add r6, r0, #0 + add r7, r1, #0 + mov r0, #8 + mov r1, #0x10 + str r2, [sp] + add r5, r3, #0 + bl AllocFromHeap + add r4, r0, #0 + beq _02254894 + ldr r2, [sp] + add r1, r7, #0 + add r3, r5, #0 + bl MOD50_0225489C + cmp r0, #0 + beq _0225488E + ldr r0, _02254898 ; =MOD50_022548D4 + add r1, r4, #0 + mov r2, #1 + bl FUN_0200CA44 + cmp r0, #0 + beq _0225488E + str r4, [r6] + str r5, [r4, #4] + mov r0, #1 + pop {r3, r4, r5, r6, r7, pc} +_0225488E: + add r0, r4, #0 + bl FreeToHeap +_02254894: + mov r0, #0 + pop {r3, r4, r5, r6, r7, pc} + .align 2, 0 +_02254898: .word MOD50_022548D4 + thumb_func_end MOD50_02254854 + + thumb_func_start MOD50_0225489C +MOD50_0225489C: ; 0x0225489C + push {r3, r4, r5, lr} + add r5, r0, #0 + add r4, r1, #0 + add r0, #8 + add r1, r5, #4 + bl MOD50_022549AC + cmp r0, #0 + beq _022548BC + mov r0, #0 + strb r0, [r5] + strb r0, [r5, #1] + strb r0, [r5, #2] + str r4, [r5, #0xc] + mov r0, #1 + pop {r3, r4, r5, pc} +_022548BC: + mov r0, #0 + pop {r3, r4, r5, pc} + thumb_func_end MOD50_0225489C + + thumb_func_start MOD50_022548C0 +MOD50_022548C0: ; 0x022548C0 + push {r4, lr} + add r4, r0, #0 + ldr r0, [r4, #8] + bl MOD50_022549E0 + add r0, r4, #0 + bl FreeToHeap + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD50_022548C0 + + thumb_func_start MOD50_022548D4 +MOD50_022548D4: ; 0x022548D4 + push {r3, r4, r5, lr} + add r4, r1, #0 + ldrb r1, [r4] + add r5, r0, #0 + cmp r1, #3 + bhs _02254900 + lsl r2, r1, #2 + ldr r1, _02254904 ; =MOD50_02254B04 + add r0, r4, #0 + ldr r1, [r1, r2] + blx r1 + cmp r0, #0 + beq _02254900 + add r0, r4, #0 + bl MOD50_022548C0 + add r0, r5, #0 + bl FUN_0200CAB4 + ldr r0, [r4, #0xc] + bl MOD20_022529A0 +_02254900: + pop {r3, r4, r5, pc} + nop +_02254904: .word MOD50_02254B04 + thumb_func_end MOD50_022548D4 + + thumb_func_start MOD50_02254908 +MOD50_02254908: ; 0x02254908 + mov r1, #1 + strb r1, [r0, #2] + bx lr + .align 2, 0 + thumb_func_end MOD50_02254908 + + thumb_func_start MOD50_02254910 +MOD50_02254910: ; 0x02254910 + ldrb r2, [r0, #2] + cmp r2, #0 + bne _02254918 + b _0225491A +_02254918: + mov r1, #2 +_0225491A: + strb r1, [r0] + mov r1, #0 + strb r1, [r0, #1] + bx lr + .align 2, 0 + thumb_func_end MOD50_02254910 + + thumb_func_start MOD50_02254924 +MOD50_02254924: ; 0x02254924 + push {r4, lr} + add r4, r0, #0 + ldrb r0, [r4, #1] + cmp r0, #0 + beq _02254934 + cmp r0, #1 + beq _02254944 + b _0225495E +_02254934: + ldr r0, [r4, #8] + mov r1, #0 + bl MOD50_022549F8 + ldrb r0, [r4, #1] + add r0, r0, #1 + strb r0, [r4, #1] + b _0225495E +_02254944: + ldr r0, [r4, #8] + mov r1, #0 + bl MOD50_02254A1C + cmp r0, #0 + beq _0225495E + ldr r0, [r4, #0xc] + bl MOD20_0225298C + add r0, r4, #0 + mov r1, #1 + bl MOD50_02254910 +_0225495E: + mov r0, #0 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD50_02254924 + + thumb_func_start MOD50_02254964 +MOD50_02254964: ; 0x02254964 + push {r3, lr} + ldrb r1, [r0, #2] + cmp r1, #0 + beq _02254972 + mov r1, #2 + bl MOD50_02254910 +_02254972: + mov r0, #0 + pop {r3, pc} + .align 2, 0 + thumb_func_end MOD50_02254964 + + thumb_func_start MOD50_02254978 +MOD50_02254978: ; 0x02254978 + push {r4, lr} + add r4, r0, #0 + ldrb r0, [r4, #1] + cmp r0, #0 + beq _02254988 + cmp r0, #1 + beq _02254998 + b _022549A6 +_02254988: + ldr r0, [r4, #8] + mov r1, #1 + bl MOD50_022549F8 + ldrb r0, [r4, #1] + add r0, r0, #1 + strb r0, [r4, #1] + b _022549A6 +_02254998: + ldr r0, [r4, #8] + bl MOD50_02254A28 + cmp r0, #0 + beq _022549A6 + mov r0, #1 + pop {r4, pc} +_022549A6: + mov r0, #0 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD50_02254978 + + .section .rodata + + .global MOD50_02254B04 +MOD50_02254B04: ; 0x02254B04 + .word MOD50_02254924, MOD50_02254964, MOD50_02254978 diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/mod50_022549AC.s index fc52f7fa..8051918a 100644 --- a/arm9/modules/50/asm/module_50.s +++ b/arm9/modules/50/asm/mod50_022549AC.s @@ -3,209 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD50_02254854 -MOD50_02254854: ; 0x02254854 - push {r3, r4, r5, r6, r7, lr} - add r6, r0, #0 - add r7, r1, #0 - mov r0, #8 - mov r1, #0x10 - str r2, [sp] - add r5, r3, #0 - bl AllocFromHeap - add r4, r0, #0 - beq _02254894 - ldr r2, [sp] - add r1, r7, #0 - add r3, r5, #0 - bl MOD50_0225489C - cmp r0, #0 - beq _0225488E - ldr r0, _02254898 ; =MOD50_022548D4 - add r1, r4, #0 - mov r2, #1 - bl FUN_0200CA44 - cmp r0, #0 - beq _0225488E - str r4, [r6] - str r5, [r4, #4] - mov r0, #1 - pop {r3, r4, r5, r6, r7, pc} -_0225488E: - add r0, r4, #0 - bl FreeToHeap -_02254894: - mov r0, #0 - pop {r3, r4, r5, r6, r7, pc} - .align 2, 0 -_02254898: .word MOD50_022548D4 - thumb_func_end MOD50_02254854 - - thumb_func_start MOD50_0225489C -MOD50_0225489C: ; 0x0225489C - push {r3, r4, r5, lr} - add r5, r0, #0 - add r4, r1, #0 - add r0, #8 - add r1, r5, #4 - bl MOD50_022549AC - cmp r0, #0 - beq _022548BC - mov r0, #0 - strb r0, [r5] - strb r0, [r5, #1] - strb r0, [r5, #2] - str r4, [r5, #0xc] - mov r0, #1 - pop {r3, r4, r5, pc} -_022548BC: - mov r0, #0 - pop {r3, r4, r5, pc} - thumb_func_end MOD50_0225489C - - thumb_func_start MOD50_022548C0 -MOD50_022548C0: ; 0x022548C0 - push {r4, lr} - add r4, r0, #0 - ldr r0, [r4, #8] - bl MOD50_022549E0 - add r0, r4, #0 - bl FreeToHeap - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD50_022548C0 - - thumb_func_start MOD50_022548D4 -MOD50_022548D4: ; 0x022548D4 - push {r3, r4, r5, lr} - add r4, r1, #0 - ldrb r1, [r4] - add r5, r0, #0 - cmp r1, #3 - bhs _02254900 - lsl r2, r1, #2 - ldr r1, _02254904 ; =MOD50_02254B04 - add r0, r4, #0 - ldr r1, [r1, r2] - blx r1 - cmp r0, #0 - beq _02254900 - add r0, r4, #0 - bl MOD50_022548C0 - add r0, r5, #0 - bl FUN_0200CAB4 - ldr r0, [r4, #0xc] - bl MOD20_022529A0 -_02254900: - pop {r3, r4, r5, pc} - nop -_02254904: .word MOD50_02254B04 - thumb_func_end MOD50_022548D4 - - thumb_func_start MOD50_02254908 -MOD50_02254908: ; 0x02254908 - mov r1, #1 - strb r1, [r0, #2] - bx lr - .align 2, 0 - thumb_func_end MOD50_02254908 - - thumb_func_start MOD50_02254910 -MOD50_02254910: ; 0x02254910 - ldrb r2, [r0, #2] - cmp r2, #0 - bne _02254918 - b _0225491A -_02254918: - mov r1, #2 -_0225491A: - strb r1, [r0] - mov r1, #0 - strb r1, [r0, #1] - bx lr - .align 2, 0 - thumb_func_end MOD50_02254910 - - thumb_func_start MOD50_02254924 -MOD50_02254924: ; 0x02254924 - push {r4, lr} - add r4, r0, #0 - ldrb r0, [r4, #1] - cmp r0, #0 - beq _02254934 - cmp r0, #1 - beq _02254944 - b _0225495E -_02254934: - ldr r0, [r4, #8] - mov r1, #0 - bl MOD50_022549F8 - ldrb r0, [r4, #1] - add r0, r0, #1 - strb r0, [r4, #1] - b _0225495E -_02254944: - ldr r0, [r4, #8] - mov r1, #0 - bl MOD50_02254A1C - cmp r0, #0 - beq _0225495E - ldr r0, [r4, #0xc] - bl MOD20_0225298C - add r0, r4, #0 - mov r1, #1 - bl MOD50_02254910 -_0225495E: - mov r0, #0 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD50_02254924 - - thumb_func_start MOD50_02254964 -MOD50_02254964: ; 0x02254964 - push {r3, lr} - ldrb r1, [r0, #2] - cmp r1, #0 - beq _02254972 - mov r1, #2 - bl MOD50_02254910 -_02254972: - mov r0, #0 - pop {r3, pc} - .align 2, 0 - thumb_func_end MOD50_02254964 - - thumb_func_start MOD50_02254978 -MOD50_02254978: ; 0x02254978 - push {r4, lr} - add r4, r0, #0 - ldrb r0, [r4, #1] - cmp r0, #0 - beq _02254988 - cmp r0, #1 - beq _02254998 - b _022549A6 -_02254988: - ldr r0, [r4, #8] - mov r1, #1 - bl MOD50_022549F8 - ldrb r0, [r4, #1] - add r0, r0, #1 - strb r0, [r4, #1] - b _022549A6 -_02254998: - ldr r0, [r4, #8] - bl MOD50_02254A28 - cmp r0, #0 - beq _022549A6 - mov r0, #1 - pop {r4, pc} -_022549A6: - mov r0, #0 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD50_02254978 - thumb_func_start MOD50_022549AC MOD50_022549AC: ; 0x022549AC push {r4, r5, r6, lr} @@ -391,10 +188,6 @@ MOD50_02254AE8: ; 0x02254AE8 .section .rodata - .global MOD50_02254B04 -MOD50_02254B04: ; 0x02254B04 - .word MOD50_02254924, MOD50_02254964, MOD50_02254978 - .global MOD50_02254B10 MOD50_02254B10: ; 0x02254B10 .byte 0x00, 0x00, 0x00, 0x00 |