diff options
-rw-r--r-- | arm9/arm9.lcf | 26 | ||||
-rw-r--r-- | arm9/asm/unk_02083B84.s | 6 | ||||
-rw-r--r-- | arm9/global.inc | 13 | ||||
-rw-r--r-- | arm9/modules/71/asm/module_71.s | 30 |
4 files changed, 55 insertions, 20 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index a37ac0d3..ebc8e2b1 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -729,6 +729,32 @@ SECTIONS { SDK_STATIC_DATA_START = .; unk_02003B98.o (.data) + filesystem.o (.data) + unk_02006D98.o (.data) + unk_0200E850.o (.data) + unk_0200E850.o (.data) + math_util.o (.data) + unk_0201BCBC.o (.data) + unk_0201E7D8.o (.data) + unk_0201F06C.o (.data) + unk_02023AC4.o (.data) + unk_02025954.o (.data) + unk_02029FB0.o (.data) + unk_0202C198.o (.data) + unk_0202F150.o (.data) + unk_02031734.o (.data) + unk_02033B68.o (.data) + unk_020377F0.o (.data) + scrcmd_2.o (.data) + unk_0204CB20.o (.data) + unk_0204FBA8.o (.data) + unk_02053750.o (.data) + unk_02058EE8.o (.data) + unk_0205F7A0.o (.data) + unk_02060CCC.o (.data) + unk_02066978.o (.data) + unk_02073710.o (.data) + unk_020772F0.o (.data) rom2_3.o (.data) GX.o (.data) OS_irqHandler.o (.data) diff --git a/arm9/asm/unk_02083B84.s b/arm9/asm/unk_02083B84.s index 151802e7..a0e5d7ca 100644 --- a/arm9/asm/unk_02083B84.s +++ b/arm9/asm/unk_02083B84.s @@ -77,21 +77,21 @@ FUN_02083BAC: ; 0x02083BAC add r0, r4, #0x0 mov r1, #0x1b mov r2, #0x0 - bl MOD70_0222F440 + bl MOD71_0222F440 b _02083C14 _02083BF6: bl FUN_02031190 ldr r1, _02083C20 ; =0x00002218 ldr r2, [r4, #0x50] ldr r1, [r4, r1] - bl MOD70_0222F480 + bl MOD71_0222F480 b _02083C14 _02083C06: bl FUN_02031190 ldr r1, _02083C20 ; =0x00002218 ldr r2, [r4, #0x50] ldr r1, [r4, r1] - bl MOD70_0222F480 + bl MOD71_0222F480 _02083C14: ldr r0, [r4, #0x50] add r0, r0, #0x1 diff --git a/arm9/global.inc b/arm9/global.inc index 2117f570..f65a64db 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -7019,8 +7019,8 @@ .extern MOD65_021D8A40
.extern MOD65_021D8BBC
.extern MOD69_0222EC60
-.extern MOD70_0222F440
-.extern MOD70_0222F480
+.extern MOD71_0222F440
+.extern MOD71_0222F480
.extern MOD73_021D8EA8
.extern MOD73_021D8EB4
.extern MOD73_021D8EC0
@@ -7716,3 +7716,12 @@ .extern FUN_020889B0
.extern FUN_02088A00
.extern FUN_02088A78
+.extern MOD71_0222D5C0
+.extern MOD71_0222D9C8
+.extern MOD71_0222E438
+.extern MOD17_021DDB58
+.extern MOD17_021DDC30
+.extern MOD17_021DDCF4
+.extern MOD17_021D83E4
+.extern MOD17_021D84F0
+.extern MOD17_021D8738
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 5bc5cb22..9287c9c8 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1047,7 +1047,7 @@ _0222DE86: ldr r1, _0222E0F8 ; =0x00002218 ldr r2, [r4, #0x50] ldr r1, [r4, r1] - bl MOD70_0222F480 + bl MOD71_0222F480 ldr r0, [r4, #0x50] add r0, r0, #1 str r0, [r4, #0x50] @@ -1618,7 +1618,7 @@ _0222E33C: add r4, #0x88 ldr r2, [r4] mov r1, #0x17 - bl MOD70_0222F440 + bl MOD71_0222F440 mov r0, #1 add sp, #4 pop {r3, r4, pc} @@ -3664,8 +3664,8 @@ MOD70_0222F42C: ; 0x0222F42C .align 2, 0 thumb_func_end MOD70_0222F42C - thumb_func_start MOD70_0222F440 -MOD70_0222F440: ; 0x0222F440 + thumb_func_start MOD71_0222F440 +MOD71_0222F440: ; 0x0222F440 push {r4, r5, r6, lr} add r5, r0, #0 ldr r0, _0222F470 ; =0x000036A0 @@ -3691,7 +3691,7 @@ _0222F46C: pop {r4, r5, r6, pc} nop _0222F470: .word 0x000036A0 - thumb_func_end MOD70_0222F440 + thumb_func_end MOD71_0222F440 thumb_func_start MOD70_0222F474 MOD70_0222F474: ; 0x0222F474 @@ -3703,8 +3703,8 @@ MOD70_0222F474: ; 0x0222F474 .align 2, 0 thumb_func_end MOD70_0222F474 - thumb_func_start MOD70_0222F480 -MOD70_0222F480: ; 0x0222F480 + thumb_func_start MOD71_0222F480 +MOD71_0222F480: ; 0x0222F480 push {r3, r4, r5, lr} lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -3723,7 +3723,7 @@ MOD70_0222F480: ; 0x0222F480 bl FUN_02030A78 _0222F4A6: pop {r3, r4, r5, pc} - thumb_func_end MOD70_0222F480 + thumb_func_end MOD71_0222F480 thumb_func_start MOD70_0222F4A8 MOD70_0222F4A8: ; 0x0222F4A8 @@ -4038,7 +4038,7 @@ _0222F6EE: add r0, r4, #0 mov r1, #0x18 mov r2, #1 - bl MOD70_0222F440 + bl MOD71_0222F440 ldr r1, _0222F780 ; =MOD70_0222FD9C ldr r0, _0222F784 ; =0x00002214 str r1, [r4, r0] @@ -5149,7 +5149,7 @@ MOD70_02230020: ; 0x02230020 add r0, r4, #0 mov r1, #0x18 mov r2, #2 - bl MOD70_0222F440 + bl MOD71_0222F440 ldr r1, _02230074 ; =MOD70_0223007C ldr r0, _02230078 ; =0x00002214 str r1, [r4, r0] @@ -5805,7 +5805,7 @@ _0223056E: str r1, [r4, r0] add r0, r4, #0 mov r1, #0x18 - bl MOD70_0222F440 + bl MOD71_0222F440 mov r0, #1 str r0, [r4, #0x5c] b _02230632 @@ -5816,7 +5816,7 @@ _022305D4: str r1, [r4, r0] add r0, r4, #0 mov r1, #0x18 - bl MOD70_0222F440 + bl MOD71_0222F440 b _02230632 _022305E6: ldr r1, _0223064C ; =MOD70_02230650 @@ -5854,7 +5854,7 @@ _022305EE: str r1, [r4, r0] add r0, r4, #0 mov r1, #0x18 - bl MOD70_0222F440 + bl MOD71_0222F440 _02230632: mov r0, #0 add sp, #0x10 @@ -5960,7 +5960,7 @@ _022306CA: str r1, [r4, r0] add r0, r4, #0 mov r1, #0x18 - bl MOD70_0222F440 + bl MOD71_0222F440 mov r0, #1 str r0, [r4, #0x5c] b _02230758 @@ -5995,7 +5995,7 @@ _02230714: str r1, [r4, r0] add r0, r4, #0 mov r1, #0x18 - bl MOD70_0222F440 + bl MOD71_0222F440 _02230758: mov r0, #0 add sp, #0x10 |