diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-16 14:53:47 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-16 14:53:47 -0400 |
commit | fa6e6ac6f716f0dc606b06c75918e8042581ef6f (patch) | |
tree | 0109531267cad968974e1653f3b45d3b159622e5 | |
parent | 133a7967098a49cebc68c395df88d87485328175 (diff) |
Rename overlay manager routines
59 files changed, 499 insertions, 499 deletions
diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index abbd1d7e..cb831ada 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -15,7 +15,7 @@ UNK_021C5A08: ; 0x021C5A08 FUN_020372D4: ; 0x020372D4 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02037400 @@ -51,7 +51,7 @@ _02037318: .word UNK_021C5A08 thumb_func_start FUN_0203731C FUN_0203731C: ; 0x0203731C push {r3, lr} - bl FUN_02006278 + bl OverlayManager_GetData bl FUN_02037524 cmp r0, #0x0 beq _0203732E @@ -68,7 +68,7 @@ FUN_02037334: ; 0x02037334 bl FUN_020374B0 ldr r0, _02037348 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _0203734C ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #0x1 pop {r3, pc} nop @@ -101,7 +101,7 @@ _0203736C: str r1, [r0, #0x8] ldr r0, _02037390 ; =UNK05_021F64C8 add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new ldr r1, [r4, #0x0] str r0, [r1, #0x0] pop {r4, pc} @@ -173,7 +173,7 @@ _020373E8: add r0, r4, #0x0 add r1, r6, #0x0 mov r2, #0xb - bl FUN_02006234 + bl OverlayManager_new ldr r1, [r5, #0x0] str r0, [r1, #0x4] pop {r4-r6, pc} @@ -200,7 +200,7 @@ FUN_02037400: ; 0x02037400 add r0, r5, #0x0 mov r1, #0xb8 mov r2, #0xb - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0xb8 add r4, r0, #0x0 @@ -218,7 +218,7 @@ FUN_02037400: ; 0x02037400 ldr r0, [r4, #0x0] str r1, [r0, #0xc] add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #0x8] str r0, [r4, #0xc] mov r0, #0x0 @@ -259,7 +259,7 @@ FUN_02037400: ; 0x02037400 FUN_020374B0: ; 0x020374B0 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [r4, #0x28] bl FUN_020344D0 @@ -280,7 +280,7 @@ FUN_020374B0: ; 0x020374B0 ldr r0, [r4, #0x0] bl FreeToHeap add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x5b bl FUN_020168D0 mov r0, #0xb @@ -296,11 +296,11 @@ FUN_02037504: ; 0x02037504 ldr r0, [r4, #0x0] cmp r0, #0x0 beq _02037520 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 beq _02037520 ldr r0, [r4, #0x0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x0 str r0, [r4, #0x0] _02037520: diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 7387f701..a11f74e3 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -1425,14 +1425,14 @@ _0206D260: pop {r3-r4, pc} _0206D2E2: ldr r0, [r4, #0x38] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 bne _0206D2EE _0206D2EC: b _0206D806 _0206D2EE: ldr r0, [r4, #0x38] - bl FUN_02006260 + bl OverlayManager_delete ldr r1, [r4, #0x0] add r0, r4, #0x0 bl FUN_0206D9B4 @@ -2743,7 +2743,7 @@ FUN_0206DE0C: ; 0x0206DE0C ldr r0, _0206DE20 ; =UNK_020FA6E8 ldr r1, [r4, #0x3c] ldr r2, [r4, #0x5c] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x38] pop {r4, pc} nop diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 5c8bbf31..7a1729d2 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -307,7 +307,7 @@ _0206F5A8: .word FUN_0206FB58 FUN_0206F5AC: ; 0x0206F5AC push {r3-r5, lr} add r4, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4, #0x0] add r5, r0, #0x0 cmp r1, #0x1c @@ -960,7 +960,7 @@ _0206FAA0: .word 0x000006A4 FUN_0206FAA4: ; 0x0206FAA4 push {r3-r7, lr} str r0, [sp, #0x0] - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 @@ -1017,7 +1017,7 @@ _0206FAFC: bl FUN_0206BB74 _0206FB30: ldr r0, [sp, #0x0] - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0xc bl FUN_020168D0 mov r0, #0x1 @@ -1395,13 +1395,13 @@ FUN_0206FE74: ; 0x0206FE74 ldr r1, _0206FF50 ; =0x00000B38 mov r2, #0xc add r4, r0, #0x0 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0206FF50 ; =0x00000B38 mov r1, #0x0 add r6, r0, #0x0 bl memset add r0, r4, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, _0206FF54 ; =0x000005A4 str r0, [r6, r1] mov r0, #0xc diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 5c572392..32c718a6 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -410,7 +410,7 @@ _020772FE: add r0, r6, #0x0 lsl r1, r1, #0x4 mov r2, #0x12 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x5d mov r1, #0x0 lsl r2, r2, #0x4 @@ -459,7 +459,7 @@ _020772FE: ldr r0, [r4, r0] bl FUN_02077B44 add r0, r6, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02077B08 @@ -527,7 +527,7 @@ _020772FE: str r0, [r5, #0x0] b _02077490 _02077456: - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [r4, #0x0] cmp r0, #0x1 @@ -599,7 +599,7 @@ FUN_020774EC: ; 0x020774EC sub sp, #0x10 add r5, r1, #0x0 add r6, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r4, r0, #0x0 cmp r1, #0x3 @@ -1065,10 +1065,10 @@ FUN_02077894: ; 0x02077894 push {r4-r7, lr} sub sp, #0x14 str r0, [sp, #0x10] - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [sp, #0x10] - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0x0 mov r0, #0x56 lsl r0, r0, #0x2 @@ -1253,7 +1253,7 @@ _02077A0C: ldr r0, [r4, r0] bl FUN_0200AB18 ldr r0, [sp, #0x10] - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F10 @@ -1564,7 +1564,7 @@ FUN_02077CD4: ; 0x02077CD4 sub sp, #0x10 add r4, r0, #0x0 add r0, r1, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r7, r0, #0x0 ldr r0, _02077E7C ; =0x0000045C mov r1, #0x4 @@ -1772,7 +1772,7 @@ FUN_02077E90: ; 0x02077E90 sub sp, #0x14 add r5, r0, #0x0 add r0, r1, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0x0 ldr r0, [r4, #0x44] cmp r0, #0x0 @@ -3265,7 +3265,7 @@ _02078A90: add r0, r5, r0 bl FUN_02078894 add r0, r6, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x46 lsl r1, r1, #0x2 ldrh r2, [r5, r1] diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 5dd4a4a5..c49c2d67 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -96,13 +96,13 @@ FUN_02079C7C: ; 0x02079C7C ldr r1, _02079DAC ; =0x0000069C add r0, r4, #0x0 mov r2, #0x13 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _02079DAC ; =0x0000069C mov r1, #0x0 add r5, r0, #0x0 bl memset add r0, r4, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x93 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -176,7 +176,7 @@ _02079DB0: .word FUN_02079F24 FUN_02079DB4: ; 0x02079DB4 push {r3-r5, lr} add r4, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4, #0x0] add r5, r0, #0x0 cmp r1, #0x13 @@ -314,7 +314,7 @@ _02079EC8: .word 0x00000404 FUN_02079ECC: ; 0x02079ECC push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 @@ -337,7 +337,7 @@ FUN_02079ECC: ; 0x02079ECC mov r1, #0x0 strh r1, [r0, #0x0] add r0, r4, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x13 bl FUN_020168D0 mov r0, #0x1 diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index b783b730..86ea2fee 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -395,11 +395,11 @@ FUN_020857D4: ; 0x020857D4 ldr r0, [r4, #0x0] cmp r0, #0x0 beq _020857F4 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 beq _020857F4 ldr r0, [r4, #0x0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -412,7 +412,7 @@ _020857F4: FUN_020857F8: ; 0x020857F8 push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #0x1 add r5, r0, #0x0 mov r0, #0x3 @@ -422,7 +422,7 @@ FUN_020857F8: ; 0x020857F8 add r0, r4, #0x0 mov r1, #0x1c mov r2, #0x28 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -462,10 +462,10 @@ FUN_0208585C: ; 0x0208585C push {r4-r6, lr} add r6, r0, #0x0 add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0x0 ldr r0, [r5, #0x0] cmp r0, #0x4 @@ -491,7 +491,7 @@ _0208588E: ldr r0, _02085994 ; =UNK_020FCAA8 ldr r1, [r4, #0x10] ldr r2, [r4, #0x0] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0xc] mov r0, #0x1 str r0, [r5, #0x0] @@ -582,7 +582,7 @@ _02085942: ldr r0, _0208599C ; =UNK_020FCAB8 ldr r1, [r4, #0x8] ldr r2, [r4, #0x0] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0xc] mov r0, #0x4 str r0, [r5, #0x0] @@ -622,12 +622,12 @@ _0208599C: .word UNK_020FCAB8 FUN_020859A0: ; 0x020859A0 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [r4, #0x10] bl FUN_0208578C add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4, #0x0] bl FUN_020168D0 mov r0, #0x1 diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 8f1aa043..efd11044 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -100,7 +100,7 @@ FUN_020859C0: ; 0x020859C0 ldr r1, _02085BA0 ; =0x0000042C add r0, r5, #0x0 mov r2, #0x35 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _02085BA0 ; =0x0000042C mov r1, #0x0 add r4, r0, #0x0 @@ -110,7 +110,7 @@ FUN_020859C0: ; 0x020859C0 lsl r1, r1, #0x4 str r0, [r4, r1] add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #0x0] mov r0, #0x35 bl AllocMonZeroed @@ -304,7 +304,7 @@ _02085BAC: .word MOD62_022310CC FUN_02085BB0: ; 0x02085BB0 push {r3-r5, lr} add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r4, r0, #0x0 cmp r1, #0x0 @@ -350,7 +350,7 @@ _02085C02: FUN_02085C08: ; 0x02085C08 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 mov r0, #0x1 mov r1, #0x0 @@ -476,7 +476,7 @@ FUN_02085C08: ; 0x02085C08 mov r0, #0x35 bl MOD62_02230F70 add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData bl FUN_0201CD04 mov r0, #0x35 bl FUN_020168D0 diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 4945183c..c83c9aff 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -27,13 +27,13 @@ FUN_02086084: ; 0x02086084 add r0, r5, #0x0 mov r1, #0x80 mov r2, #0x47 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x80 add r4, r0, #0x0 bl memset add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #0x0] ldr r0, [r0, #0x10] bl FUN_02024FF4 @@ -105,7 +105,7 @@ _02086164: .word FUN_02086664 FUN_02086168: ; 0x02086168 push {r3-r5, lr} add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r4, r0, #0x0 cmp r1, #0x0 @@ -165,7 +165,7 @@ _020861D8: .word 0x000001EA FUN_020861DC: ; 0x020861DC push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 ldr r0, [r4, #0x38] bl FUN_020223BC @@ -217,7 +217,7 @@ FUN_020861DC: ; 0x020861DC add r0, r4, #0x4 bl FUN_02086ED4 add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x47 bl FUN_020168D0 mov r0, #0x1 diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 5676baf3..bf502fa3 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -183,11 +183,11 @@ FUN_02087E1C: ; 0x02087E1C ldr r0, [r4, #0x0] cmp r0, #0x0 beq _02087E3C - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 beq _02087E3C ldr r0, [r4, #0x0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -200,7 +200,7 @@ _02087E3C: FUN_02087E40: ; 0x02087E40 push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #0x1 add r5, r0, #0x0 mov r0, #0x3 @@ -210,7 +210,7 @@ FUN_02087E40: ; 0x02087E40 add r0, r4, #0x0 mov r1, #0x18 mov r2, #0x2c - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x18 add r4, r0, #0x0 @@ -225,7 +225,7 @@ FUN_02087E40: ; 0x02087E40 FUN_02087E74: ; 0x02087E74 push {r4, lr} add r4, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4, #0x0] cmp r1, #0x8 bhi _02087EE4 @@ -288,11 +288,11 @@ _02087EE4: FUN_02087EE8: ; 0x02087EE8 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 bl FUN_02087F08 add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4, #0x0] bl FUN_020168D0 mov r0, #0x1 @@ -347,7 +347,7 @@ FUN_02087F50: ; 0x02087F50 ldr r0, _02087F64 ; =UNK_020FD15C ldr r1, [r4, #0xc] ldr r2, [r4, #0x0] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x14] mov r0, #0x1 pop {r4, pc} @@ -401,7 +401,7 @@ _02087F86: str r0, [r4, #0xc] ldr r0, _02087FD0 ; =UNK_020F96DC ldr r2, [r5, #0x0] - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x14] str r4, [r5, #0x10] mov r0, #0x2 @@ -465,7 +465,7 @@ _02087FFE: ldr r0, _02088058 ; =UNK_020FA6E8 ldr r2, [r5, #0x0] add r1, r7, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x14] str r4, [r5, #0x10] mov r0, #0x3 @@ -553,7 +553,7 @@ FUN_020880A0: ; 0x020880A0 ldr r0, _02088108 ; =UNK_020FD16C ldr r2, [r5, #0x0] add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x14] str r4, [r5, #0x10] mov r0, #0x5 @@ -628,7 +628,7 @@ FUN_02088130: ; 0x02088130 ldr r0, _020881A8 ; =UNK_020FA6E8 ldr r2, [r5, #0x0] add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x14] str r4, [r5, #0x10] mov r0, #0x7 diff --git a/arm9/asm/unk_02088858.s b/arm9/asm/unk_02088858.s index dfc20769..5f71517a 100644 --- a/arm9/asm/unk_02088858.s +++ b/arm9/asm/unk_02088858.s @@ -91,7 +91,7 @@ FUN_020888DC: ; 0x020888DC lsl r2, r2, #0xc bl FUN_0201681C add r0, r4, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #0x8] mov r1, #0x31 bl FUN_02088898 diff --git a/arm9/asm/unk_0208898C.s b/arm9/asm/unk_0208898C.s index e2243e5e..6fef7584 100644 --- a/arm9/asm/unk_0208898C.s +++ b/arm9/asm/unk_0208898C.s @@ -10,11 +10,11 @@ FUN_0208898C: ; 0x0208898C ldr r0, [r4, #0x0] cmp r0, #0x0 beq _020889AC - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0x0 beq _020889AC ldr r0, [r4, #0x0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -27,7 +27,7 @@ _020889AC: FUN_020889B0: ; 0x020889B0 push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #0x1 add r5, r0, #0x0 mov r0, #0x3 @@ -37,7 +37,7 @@ FUN_020889B0: ; 0x020889B0 add r0, r4, #0x0 mov r1, #0x24 mov r2, #0x37 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x24 add r4, r0, #0x0 @@ -67,10 +67,10 @@ FUN_02088A00: ; 0x02088A00 push {r4-r6, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r5, [r4, #0x0] cmp r5, #0x4 bhi _02088A6A @@ -131,10 +131,10 @@ _02088A74: FUN_02088A78: ; 0x02088A78 push {r4-r6, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r4, #0xc] ldr r6, [r4, #0x0] bl FreeToHeap @@ -143,7 +143,7 @@ FUN_02088A78: ; 0x02088A78 mov r2, #0x24 bl MI_CpuFill8 add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r6, #0x0 bl FUN_020168D0 mov r0, #0x1 diff --git a/arm9/asm/unk_02088AAC.s b/arm9/asm/unk_02088AAC.s index 30ea796e..65ce7a60 100644 --- a/arm9/asm/unk_02088AAC.s +++ b/arm9/asm/unk_02088AAC.s @@ -83,7 +83,7 @@ FUN_02088AFC: ; 0x02088AFC add r0, r2, #0x0 ldr r2, [r4, #0x0] add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x1c] mov r0, #0x2 add sp, #0x10 @@ -153,7 +153,7 @@ _02088B7C: ldr r2, [r5, #0x0] add r0, sp, #0x0 add r1, r4, #0x0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x1c] str r4, [r5, #0x18] mov r0, #0x1 @@ -304,7 +304,7 @@ _02088C9A: ldr r1, [r5, #0x18] ldr r2, [r5, #0x0] add r0, sp, #0x8 - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x1c] mov r0, #0x3 add sp, #0x18 diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 20b958ad..3962942c 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -46,7 +46,7 @@ FUN_02089498: ; 0x02089498 add r0, r5, #0x0 mov r1, #0x38 mov r2, #0x58 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x38 add r4, r0, #0x0 @@ -56,7 +56,7 @@ FUN_02089498: ; 0x02089498 mov r0, #0x0 str r0, [r4, #0x4] add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #0x8] str r0, [r4, #0x30] mov r0, #0x1 @@ -68,7 +68,7 @@ FUN_020894D4: ; 0x020894D4 push {r3-r6, lr} sub sp, #0xc add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r4, r0, #0x0 mov r6, #0x0 @@ -192,10 +192,10 @@ _020895EC: .word FUN_02089610 FUN_020895F0: ; 0x020895F0 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r4, [r0, #0x0] add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0x0 bl FUN_020168D0 mov r0, #0x0 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index d7d6fc47..2154cdf9 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -42,7 +42,7 @@ FUN_02089960: ; 0x02089960 add r0, r5, #0x0 mov r1, #0x3c mov r2, #0x58 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0x0 mov r2, #0x3c add r4, r0, #0x0 @@ -52,7 +52,7 @@ FUN_02089960: ; 0x02089960 mov r0, #0x0 str r0, [r4, #0x4] add r0, r5, #0x0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #0x8] str r0, [r4, #0x34] mov r0, #0x1 @@ -63,7 +63,7 @@ FUN_02089960: ; 0x02089960 FUN_0208999C: ; 0x0208999C push {r4-r6, lr} add r5, r1, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5, #0x0] add r6, r0, #0x0 mov r4, #0x0 @@ -136,15 +136,15 @@ _02089A3C: .word 0x04001000 FUN_02089A40: ; 0x02089A40 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r4, [r0, #0x0] add r0, r5, #0x0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0x0 bl FUN_020168D0 ldr r0, _02089A64 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _02089A68 ; =MOD83_0223A360 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #0x1 pop {r3-r5, pc} nop diff --git a/arm9/global.inc b/arm9/global.inc index 1fd91f17..4fdc7064 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -184,7 +184,7 @@ .extern FSi_TranslateCommand .extern FUNRTC_Init .extern FUN_02000DF4 -.extern FUN_02000E7C +.extern RegisterMainOverlay .extern FUN_02000EE8 .extern FUN_02000F18 .extern HandleDSLidAction @@ -375,13 +375,13 @@ .extern FUN_02005F14 .extern FUN_020061E8 .extern FUN_0200621C -.extern FUN_02006234 -.extern FUN_02006260 -.extern FUN_02006268 -.extern FUN_02006278 -.extern FUN_0200627C -.extern FUN_0200628C -.extern FUN_02006290 +.extern OverlayManager_new +.extern OverlayManager_delete +.extern OverlayManager_CreateAndGetData +.extern OverlayManager_GetData +.extern OverlayManager_FreeData +.extern OverlayManager_GetField18 +.extern OverlayManager_Run .extern AllocAtEndAndReadWholeNarcMemberByIdPair .extern ReadFromNarcMemberByIdPair .extern AllocAndReadFromNarcMemberByIdPair diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 047e643f..ad9d0939 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -23,7 +23,7 @@ MOD05_021D7504: ; 0x021D7504 push {r4, r5, r6, lr} add r5, r1, #0 mov r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r5] add r4, r0, #0 cmp r1, #3 @@ -179,7 +179,7 @@ _021D7678: .word SDK_OVERLAY_MODULE_06_ID thumb_func_start MOD05_021D767C MOD05_021D767C: ; 0x021D767C push {r4, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 bl MOD05_021D7864 cmp r0, #0 @@ -212,7 +212,7 @@ _021D76BA: MOD05_021D76C0: ; 0x021D76C0 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 ldr r1, [r4, #0x24] bl MOD05_021EE52C diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index a5298ae9..c24d5e86 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -9,7 +9,7 @@ MOD11_0222D5C0: ; 0x0222D5C0 sub sp, #0x28 add r4, r1, #0 add r6, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r4] add r5, r0, #0 cmp r1, #0xf @@ -655,7 +655,7 @@ _0222DB4C: .word MOD11_0222F01C MOD11_0222DB50: ; 0x0222DB50 push {r3, r4, r5, r6, r7, lr} sub sp, #0x30 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_020222F0 add r5, r0, #0 @@ -1076,7 +1076,7 @@ _0222DF48: .word 0x00002434 thumb_func_start MOD11_0222DF4C MOD11_0222DF4C: ; 0x0222DF4C push {r4, r5, r6, lr} - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, _0222DF9C ; =0x000023F8 add r4, r0, #0 ldrb r1, [r4, r1] @@ -1122,10 +1122,10 @@ _0222DFA0: .word 0x000023FA MOD11_0222DFA4: ; 0x0222DFA4 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r7, r0, #0 mov r0, #0 add r1, r0, #0 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index ab70294a..1154f46d 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -10,7 +10,7 @@ MOD11_0222F29C: ; 0x0222F29C add r4, r1, #0 ldr r1, _0222F4C0 ; =0x00001028 mov r2, #5 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r5, r0, #0 ldr r0, _0222F4C4 ; =0x00001020 str r4, [r5] @@ -255,7 +255,7 @@ _0222F4E0: .word 0x00001024 MOD11_0222F4E4: ; 0x0222F4E4 push {r4, r5, r6, r7, lr} sub sp, #0xc - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, [r4, #4] mov r0, #5 @@ -795,7 +795,7 @@ _0222F938: .word 0x00001024 thumb_func_start MOD11_0222F93C MOD11_0222F93C: ; 0x0222F93C push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #0 add r1, r0, #0 @@ -829,10 +829,10 @@ MOD11_0222F988: ; 0x0222F988 ldr r1, _0222FAB4 ; =0x00002444 add r5, r0, #0 mov r2, #5 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 bl FUN_02031190 lsl r0, r0, #0x18 @@ -979,7 +979,7 @@ _0222FAB8: .word SDK_OVERLAY_MODULE_07_ID thumb_func_start MOD11_0222FABC MOD11_0222FABC: ; 0x0222FABC push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 mov r0, #7 lsl r0, r0, #6 @@ -1019,10 +1019,10 @@ _0222FAFE: MOD11_0222FB04: ; 0x0222FB04 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 bl FUN_02031190 lsl r0, r0, #0x18 lsr r7, r0, #0x18 @@ -1165,7 +1165,7 @@ _0222FC2A: thumb_func_start MOD11_0222FC38 MOD11_0222FC38: ; 0x0222FC38 push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 mov r0, #7 lsl r0, r0, #6 @@ -1205,7 +1205,7 @@ _0222FC7A: MOD11_0222FC80: ; 0x0222FC80 push {r3, r4, r5, r6, r7, lr} sub sp, #0x10 - bl FUN_0200628C + bl OverlayManager_GetField18 add r7, r0, #0 bl FUN_02031190 lsl r0, r0, #0x18 @@ -1434,7 +1434,7 @@ _0222FE54: .word SDK_OVERLAY_MODULE_07_ID thumb_func_start MOD11_0222FE58 MOD11_0222FE58: ; 0x0222FE58 push {r4, r5, r6, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x66 lsl r1, r1, #2 ldr r6, [r0, r1] @@ -25682,7 +25682,7 @@ _0223BBEE: ldr r0, _0223BF18 ; =UNK_020FA5FC add r1, r5, #0 mov r2, #5 - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x50] mov r0, #0x15 str r0, [r4, #0x28] @@ -25697,7 +25697,7 @@ _0223BBEE: pop {r3, r4, r5, r6, r7, pc} _0223BC38: ldr r0, [r4, #0x50] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _0223BC88 ldr r2, [r4, #4] @@ -25718,7 +25718,7 @@ _0223BC62: add r0, r5, #0 bl FUN_02077AC4 ldr r0, [r4, #0x50] - bl FUN_02006260 + bl OverlayManager_delete ldr r0, [r4] mov r1, #2 bl MOD11_02231338 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 122cd442..2d42f701 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -44,7 +44,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 ldr r1, _0222D868 ; =0x00001658 add r0, r5, #0 mov r2, #0x15 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0222D868 ; =0x00001658 mov r1, #0 add r4, r0, #0 @@ -53,7 +53,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 bl MOD12_022312D8 str r0, [r4, #8] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x5b str r0, [r4] lsl r1, r1, #2 @@ -299,7 +299,7 @@ MOD12_0222D89C: ; 0x0222D89C push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4] bl FUN_02082878 @@ -430,7 +430,7 @@ _0222D9AC: .word 0x00001650 MOD12_0222D9B0: ; 0x0222D9B0 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02012EAC ldr r0, [r4, #0x2c] @@ -515,7 +515,7 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl MOD12_02231378 bl FUN_0201CD04 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -3179,7 +3179,7 @@ MOD12_0222EF04: ; 0x0222EF04 ldr r1, _0222F168 ; =0x00000F68 add r0, r4, #0 mov r2, #0x16 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0222F168 ; =0x00000F68 mov r1, #0 add r5, r0, #0 @@ -3188,7 +3188,7 @@ MOD12_0222EF04: ; 0x0222EF04 bl MOD12_022312D8 str r0, [r5, #8] add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x5b str r0, [r5] lsl r1, r1, #2 @@ -3405,7 +3405,7 @@ MOD12_0222F19C: ; 0x0222F19C push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4] bl FUN_02082878 @@ -3588,7 +3588,7 @@ _0222F320: .word 0x00000F1C MOD12_0222F324: ; 0x0222F324 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02012EAC add r0, r4, #0 @@ -3680,7 +3680,7 @@ _0222F3AE: bl MOD12_02231378 bl FUN_0201CD04 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -5019,7 +5019,7 @@ MOD12_0222FE4C: ; 0x0222FE4C ldr r1, _022300EC ; =0x00001BF4 add r0, r4, #0 mov r2, #0x17 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _022300EC ; =0x00001BF4 mov r1, #0 add r5, r0, #0 @@ -5028,7 +5028,7 @@ MOD12_0222FE4C: ; 0x0222FE4C bl MOD12_022312D8 str r0, [r5, #0x10] add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x5b str r0, [r5] lsl r1, r1, #2 @@ -5272,7 +5272,7 @@ MOD12_02230128: ; 0x02230128 push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4] bl FUN_02082878 @@ -5402,7 +5402,7 @@ _02230238: .word 0x00001BF0 MOD12_0223023C: ; 0x0223023C push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0xc] bl FUN_020133C8 @@ -5524,7 +5524,7 @@ _02230296: bl MOD12_02231378 bl FUN_0201CD04 add r0, r7, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -41107,7 +41107,7 @@ MOD12_02241210: ; 0x02241210 add r0, r4, #0 lsl r1, r1, #6 mov r2, #0x18 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x4a mov r1, #0 lsl r2, r2, #6 @@ -41117,7 +41117,7 @@ MOD12_02241210: ; 0x02241210 bl MOD12_022312D8 str r0, [r5, #0xc] add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x5b str r0, [r5] lsl r1, r1, #2 @@ -41326,7 +41326,7 @@ MOD12_02241490: ; 0x02241490 push {r3, r4, r5, lr} sub sp, #8 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4] bl FUN_02082878 @@ -41456,7 +41456,7 @@ _022415A4: .word 0x0000127C MOD12_022415A8: ; 0x022415A8 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02012EAC add r0, r4, #0 @@ -41561,7 +41561,7 @@ _022415D4: bl MOD12_02231378 bl FUN_0201CD04 add r0, r7, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index e1232e0b..ff3ae9eb 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -21,11 +21,11 @@ MOD14_021D74E0: ; 0x021D74E0 add r0, r5, #0 lsl r1, r1, #2 mov r2, #9 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 beq _021D7544 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r0, #0 add r0, r4, #0 bl MOD14_021DB220 @@ -56,7 +56,7 @@ _021D7548: .word MOD14_021D7680 thumb_func_start MOD14_021D754C MOD14_021D754C: ; 0x021D754C push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData mov r1, #0x6b add r4, r0, #0 lsl r1, r1, #2 @@ -110,7 +110,7 @@ _021D75B4: .word gMain thumb_func_start MOD14_021D75B8 MOD14_021D75B8: ; 0x021D75B8 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData mov r1, #0x49 add r4, r0, #0 lsl r1, r1, #2 @@ -5564,7 +5564,7 @@ _021DA1FE: ldr r0, _021DA2C0 ; =MOD14_020FA5FC ldr r1, [r4, r1] mov r2, #9 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x21 lsl r1, r1, #4 str r0, [r4, r1] @@ -5576,7 +5576,7 @@ _021DA256: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021DA2BC mov r0, #0x12 @@ -5587,7 +5587,7 @@ _021DA256: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02006260 + bl OverlayManager_delete mov r2, #0xf mov r0, #3 mov r1, #0xa @@ -5666,7 +5666,7 @@ _021DA2F2: ldr r0, _021DA394 ; =UNK_020FA6E8 add r1, r5, r1 mov r2, #9 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x21 lsl r1, r1, #4 str r0, [r5, r1] @@ -5678,7 +5678,7 @@ _021DA334: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021DA390 mov r0, #0x12 @@ -5688,7 +5688,7 @@ _021DA334: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006260 + bl OverlayManager_delete mov r2, #0xf mov r0, #3 mov r1, #0xa @@ -5828,7 +5828,7 @@ _021DA41E: ldr r0, _021DA5E0 ; =MOD75_021EC68C ldr r1, [r4, r1] mov r2, #9 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x21 lsl r1, r1, #4 str r0, [r4, r1] @@ -5840,7 +5840,7 @@ _021DA488: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 bne _021DA498 _021DA496: @@ -5855,7 +5855,7 @@ _021DA498: mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02006260 + bl OverlayManager_delete mov r0, #0x85 lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index ea50637f..bd0ca04e 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -39,7 +39,7 @@ _021D74F2: str r0, [r4] b _021D7552 _021D752A: - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x14] bl MOD15_021D8958 @@ -66,7 +66,7 @@ _021D7552: thumb_func_start MOD15_021D7558 MOD15_021D7558: ; 0x021D7558 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _021D7594 ; =gMain ldr r1, [r0, #0x48] @@ -166,7 +166,7 @@ _021D7604: MOD15_021D7608: ; 0x021D7608 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r1, r4, #0 bl MOD15_021D7774 mov r0, #0x22 @@ -183,10 +183,10 @@ MOD15_021D7628: ; 0x021D7628 add r5, r0, #0 mov r1, #0x68 mov r2, #0x22 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4] bl FUN_0208540C str r0, [r4, #4] @@ -352,7 +352,7 @@ MOD15_021D7774: ; 0x021D7774 ldr r0, [r5, #0x18] bl FUN_02088F4C add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData pop {r3, r4, r5, pc} thumb_func_start MOD15_021D7794 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 386eea1e..515f1d08 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -20,7 +20,7 @@ MOD16_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #4 mov r2, #0x25 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 bne _021D750E bl ErrorHandling @@ -34,7 +34,7 @@ _021D750E: mov r1, #0x25 bl FUN_0201C24C add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r0, _021D7584 ; =MOD16_021D7650 add r1, r4, #0 @@ -83,7 +83,7 @@ _021D7584: .word MOD16_021D7650 MOD16_021D7588: ; 0x021D7588 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #3 @@ -154,7 +154,7 @@ _021D7610: .word 0x04001050 MOD16_021D7614: ; 0x021D7614 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -166,7 +166,7 @@ _021D7630: bl MOD16_021D7A10 bl FUN_0201C29C add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x25 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index e258bcc9..52bc0583 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -2051,7 +2051,7 @@ MOD17_021D83E4: ; 0x021D83E4 ldr r1, _021D84D8 ; =0x000006D8 add r0, r4, #0 mov r2, #0xd - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D84D8 ; =0x000006D8 mov r1, #0 add r5, r0, #0 @@ -2061,7 +2061,7 @@ MOD17_021D83E4: ; 0x021D83E4 bl FUN_02015F10 bl FUN_02015F1C add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 ldr r1, [r4, #0xc] ldr r0, _021D84E0 ; =0x000006C8 @@ -2150,11 +2150,11 @@ MOD17_021D84F0: ; 0x021D84F0 sub sp, #0xc add r7, r0, #0 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r7, #0 mov r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r5] cmp r1, #0xc bhi _021D85BA @@ -2433,10 +2433,10 @@ _021D8734: .word 0x0000048C MOD17_021D8738: ; 0x021D8738 push {r4, r5, r6, lr} add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r0, _021D8808 ; =0x000006AC ldr r0, [r4, r0] @@ -2509,7 +2509,7 @@ _021D8780: bl ErrorHandling _021D87F0: add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0xd bl FUN_020168D0 mov r0, #0xe @@ -2541,7 +2541,7 @@ MOD17_021D8818: ; 0x021D8818 ldr r1, _021D897C ; =0x000006D8 add r0, r5, #0 mov r2, #0xd - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D897C ; =0x000006D8 mov r1, #0 add r4, r0, #0 @@ -2551,7 +2551,7 @@ MOD17_021D8818: ; 0x021D8818 bl FUN_02015F10 bl FUN_02015F1C add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r0, [r5, #0xc] ldr r1, _021D8984 ; =0x000006B4 @@ -2692,7 +2692,7 @@ MOD17_021D8998: ; 0x021D8998 push {r3, r4, r5, r6, lr} sub sp, #0xc add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 mov r6, #0 @@ -3061,10 +3061,10 @@ _021D8C98: .word 0xFFFF1FFF MOD17_021D8C9C: ; 0x021D8C9C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r2, _021D8D50 ; =0x000006B4 add r3, r0, #0 mov r1, #0xfa @@ -3117,7 +3117,7 @@ MOD17_021D8C9C: ; 0x021D8C9C bl ErrorHandling _021D8D30: add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0xd bl FUN_020168D0 mov r0, #0xe @@ -13790,7 +13790,7 @@ MOD17_021DDB58: ; 0x021DDB58 add r0, r5, #0 lsl r1, r1, #2 mov r2, #0xd - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x65 mov r1, #0 lsl r2, r2, #2 @@ -13801,7 +13801,7 @@ MOD17_021DDB58: ; 0x021DDB58 bl FUN_02015F10 bl FUN_02015F1C add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r0, [r5, #8] cmp r0, #0 @@ -13872,7 +13872,7 @@ MOD17_021DDC30: ; 0x021DDC30 push {r4, r5, lr} sub sp, #0xc add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 bl FUN_020222AC bl FUN_020B02C8 @@ -13971,7 +13971,7 @@ _021DDCF0: .word gMain MOD17_021DDCF4: ; 0x021DDCF4 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x10] bl MOD17_021DD540 @@ -13988,7 +13988,7 @@ MOD17_021DDCF4: ; 0x021DDCF4 bl FUN_02015F10 bl FUN_02015F1C add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0xd bl FUN_020168D0 mov r0, #0xe diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 6858197f..55bb6ed3 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -20,7 +20,7 @@ MOD52_021D74E0: ; 0x021D74E0 thumb_func_start MOD52_021D74F8 MOD52_021D74F8: ; 0x021D74F8 push {r3, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r0, #8] mov r0, #0x4d bl MOD52_021D769C @@ -37,7 +37,7 @@ MOD52_021D750C: ; 0x021D750C mov r0, #0 ldr r1, _021D7524 ; =UNK_020FD144 mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r3, pc} nop @@ -61,7 +61,7 @@ MOD52_021D7528: ; 0x021D7528 thumb_func_start MOD52_021D7540 MOD52_021D7540: ; 0x021D7540 push {r4, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r4, [r0, #8] mov r0, #0x4d add r1, r4, #0 @@ -82,7 +82,7 @@ MOD52_021D7560: ; 0x021D7560 mov r0, #0 ldr r1, _021D7578 ; =UNK_020F2B7C mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r3, pc} nop @@ -106,7 +106,7 @@ MOD52_021D757C: ; 0x021D757C thumb_func_start MOD52_021D7594 MOD52_021D7594: ; 0x021D7594 push {r3, r4, r5, lr} - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r4, [r0, #8] add r0, r4, #0 bl FUN_02023788 @@ -148,7 +148,7 @@ MOD52_021D75E8: ; 0x021D75E8 mov r0, #0 ldr r1, _021D7600 ; =UNK_020F2B8C mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r3, pc} nop diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 23ad97c5..5b38d781 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -41,7 +41,7 @@ _021D74F6: ldr r1, _021D7640 ; =0x0000940C add r0, r6, #0 mov r2, #0x27 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D7640 ; =0x0000940C mov r1, #0 add r4, r0, #0 @@ -82,7 +82,7 @@ _021D74F6: add r3, r0, #0 bl FUN_0200E1D0 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #8] add r0, r4, #0 bl MOD53_021D7B60 @@ -136,7 +136,7 @@ _021D761A: str r0, [r5] b _021D7630 _021D7622: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -160,7 +160,7 @@ _021D7650: .word 0xFFFF7FFF MOD53_021D7654: ; 0x021D7654 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02031190 cmp r0, #0 @@ -292,10 +292,10 @@ MOD53_021D7764: ; 0x021D7764 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 add r7, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 ldr r0, [r7] cmp r0, #3 @@ -412,7 +412,7 @@ _021D786E: ldr r0, [r6, #8] bl FreeToHeap add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index cc365fa2..5dd265c7 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -42,7 +42,7 @@ _021D74F6: ldr r1, _021D7638 ; =0x00004A60 add r0, r6, #0 mov r2, #0x33 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D7638 ; =0x00004A60 mov r1, #0 add r4, r0, #0 @@ -51,7 +51,7 @@ _021D74F6: bl FUN_02016B94 str r0, [r4] add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #8] ldr r1, [r0] ldr r0, _021D763C ; =0x00004A38 @@ -133,7 +133,7 @@ _021D75F4: str r0, [r5] b _021D7628 _021D761A: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -157,7 +157,7 @@ _021D7648: .word MOD54_021D77E8 MOD54_021D764C: ; 0x021D764C push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_02031190 cmp r0, #0 @@ -276,7 +276,7 @@ _021D773C: .word 0x00010300 MOD54_021D7740: ; 0x021D7740 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 ldr r0, [r6, #0x20] bl FUN_0200CAB4 @@ -321,7 +321,7 @@ _021D776C: add r0, r6, #0 bl MOD54_021D7A34 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData ldr r2, _021D77E4 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index e0ada2b4..d6b9b522 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -93,13 +93,13 @@ _021D7580: ldr r1, _021D7610 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D7610 ; =0x0000041C mov r1, #0 add r4, r0, #0 bl MI_CpuFill8 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #8] add r0, r4, #0 bl MOD55_021D7994 @@ -127,7 +127,7 @@ _021D7580: str r0, [r5] b _021D760A _021D75FC: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -168,13 +168,13 @@ _021D7628: ldr r1, _021D76B8 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D76B8 ; =0x0000041C mov r1, #0 add r4, r0, #0 bl MI_CpuFill8 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #8] add r0, r4, #0 bl MOD55_021D7994 @@ -204,7 +204,7 @@ _021D7628: str r0, [r5] b _021D76B2 _021D76A4: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -222,7 +222,7 @@ _021D76B8: .word 0x0000041C MOD55_021D76BC: ; 0x021D76BC push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0 @@ -341,13 +341,13 @@ MOD55_021D778C: ; 0x021D778C MOD55_021D77AC: ; 0x021D77AC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD55_021D778C add r0, r4, #0 bl MOD55_021D7A38 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x34 bl FUN_020168D0 mov r0, #1 @@ -1780,7 +1780,7 @@ MOD55_021D8320: ; 0x021D8320 ldr r0, _021D836C ; =UNK_020FA5FC ldr r1, [r5] mov r2, #0x34 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x3d lsl r1, r1, #4 str r0, [r5, r1] @@ -1803,13 +1803,13 @@ MOD55_021D8370: ; 0x021D8370 lsl r0, r0, #4 ldr r0, [r5, r0] add r4, r1, #0 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021D83FC mov r0, #0x3d lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006260 + bl OverlayManager_delete ldr r1, [r5] ldr r0, [r1, #0x14] cmp r0, #0 @@ -1880,7 +1880,7 @@ MOD55_021D8404: ; 0x021D8404 ldr r0, _021D843C ; =UNK_020FA5FC ldr r1, [r5] mov r2, #0x34 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x3d lsl r1, r1, #4 str r0, [r5, r1] @@ -1902,13 +1902,13 @@ MOD55_021D8440: ; 0x021D8440 lsl r0, r0, #4 ldr r0, [r5, r0] add r4, r1, #0 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021D84C2 mov r0, #0x3d lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006260 + bl OverlayManager_delete add r0, r5, #0 ldr r1, [r5] add r0, #0xd8 @@ -5068,7 +5068,7 @@ MOD55_021D9E40: ; 0x021D9E40 ldr r0, _021D9EC4 ; =UNK_020FA5FC ldr r1, [r4] mov r2, #0x34 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x3d lsl r1, r1, #4 str r0, [r4, r1] @@ -5112,13 +5112,13 @@ MOD55_021D9EC8: ; 0x021D9EC8 lsl r0, r0, #4 ldr r0, [r5, r0] add r4, r1, #0 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021D9F68 mov r0, #0x3d lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02006260 + bl OverlayManager_delete ldr r1, [r5] ldr r0, [r1, #0x14] cmp r0, #0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 197bf84c..5bf21ef0 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -331,7 +331,7 @@ MOD56_02212084: ; 0x02212084 beq _0221214E b _0221215C _02212098: - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 ldr r0, [r6, #4] cmp r0, #1 @@ -353,7 +353,7 @@ _022120BE: add r0, r4, #0 lsl r1, r1, #4 mov r2, #0x36 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x3f mov r1, #0 lsl r2, r2, #4 @@ -413,7 +413,7 @@ _02212146: str r0, [r5] b _0221215C _0221214E: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -430,7 +430,7 @@ _0221215C: MOD56_02212164: ; 0x02212164 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0 @@ -537,11 +537,11 @@ _022121EC: MOD56_02212240: ; 0x02212240 push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD56_022121C4 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 mov r0, #0xed lsl r0, r0, #2 @@ -562,7 +562,7 @@ _02212274: add r0, r4, #0 bl MOD56_022124E4 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x36 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index f317d49f..64319ede 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -37,13 +37,13 @@ MOD57_021D74E0: ; 0x021D74E0 ldr r1, _021D76F0 ; =0x00003320 add r0, r5, #0 mov r2, #0x19 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D76F0 ; =0x00003320 mov r1, #0 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r4, #0 add r1, #0xb4 str r0, [r1] @@ -259,7 +259,7 @@ MOD57_021D7714: ; 0x021D7714 push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #4 @@ -536,7 +536,7 @@ _021D7940: .word 0x000030E4 MOD57_021D7944: ; 0x021D7944 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD57_021D8588 add r0, r4, #0 @@ -556,7 +556,7 @@ MOD57_021D7944: ; 0x021D7944 bl MOD57_021D7EDC bl FUN_0201CD04 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 625039e7..5f477c7b 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -47,7 +47,7 @@ _021D9A36: ldr r1, _021D9B74 ; =0x00005CB0 add r0, r6, #0 mov r2, #0x27 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D9B74 ; =0x00005CB0 mov r1, #0 add r4, r0, #0 @@ -81,17 +81,17 @@ _021D9A36: add r3, r0, #0 bl FUN_0200E1D0 add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 bl FUN_02029ABC bl FUN_02029AC8 ldr r1, _021D9B7C ; =0x00005B98 str r0, [r4, r1] add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 bl FUN_02029FC8 str r0, [r4, #8] add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r4, #0 @@ -129,7 +129,7 @@ _021D9A36: str r0, [r5] b _021D9B64 _021D9B56: - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0 str r0, [r5] add sp, #0xc @@ -154,7 +154,7 @@ _021D9B88: .word 0xFFFF7FFF MOD58_021D9B8C: ; 0x021D9B8C push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0 @@ -207,7 +207,7 @@ _021D9BEC: .word 0x00004318 MOD58_021D9BF0: ; 0x021D9BF0 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 ldr r0, _021D9CAC ; =0x00005B98 mov r1, #0x2d @@ -264,7 +264,7 @@ _021D9C40: add r0, r6, #0 bl MOD58_021D9EA0 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData ldr r2, _021D9CB0 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index a06b384c..8e652086 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -15,7 +15,7 @@ MOD59_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0xb4 mov r2, #0x52 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0xb4 add r4, r0, #0 @@ -23,7 +23,7 @@ MOD59_021D74E0: ; 0x021D74E0 mov r0, #0x52 str r0, [r4] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #4] bl Sav2_PlayerData_GetOptionsAddr @@ -71,7 +71,7 @@ MOD59_021D7564: ; 0x021D7564 push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r6, #0 @@ -201,11 +201,11 @@ _021D7668: b _021D76AC _021D7690: ldr r0, [r4, #0x14] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #1 bne _021D76AC ldr r0, [r4, #0x14] - bl FUN_02006260 + bl OverlayManager_delete add r0, r6, #0 str r0, [r4, #0x14] mov r0, #5 @@ -227,7 +227,7 @@ _021D76BC: .word MOD59_021D7724 MOD59_021D76C0: ; 0x021D76C0 push {r4, r5, r6, lr} add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #4] ldr r5, [r4] @@ -250,12 +250,12 @@ MOD59_021D76C0: ; 0x021D76C0 ldr r0, [r4, #0x74] bl FUN_02077AC4 add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r5, #0 bl FUN_020168D0 ldr r0, _021D771C ; =SDK_OVERLAY_MODULE_52_ID ldr r1, _021D7720 ; =MOD52_021D76D8 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r4, r5, r6, pc} nop @@ -3903,7 +3903,7 @@ _021D945C: ldr r0, _021D9778 ; =UNK_020FA5FC ldr r1, [r4, #0x70] ldr r2, [r4] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x14] mov r0, #0x4d str r0, [r4, #0xc] @@ -4179,7 +4179,7 @@ _021D9684: ldr r0, _021D9778 ; =UNK_020FA5FC ldr r1, [r4, #0x74] ldr r2, [r4] - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x14] mov r0, #0x5d str r0, [r4, #0xc] @@ -4396,7 +4396,7 @@ _021D9848: ldr r0, _021D9864 ; =0x021D9DDC ldr r2, [r4] add r1, r5, #0 - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x14] mov r0, #0x6d str r0, [r4, #0xc] @@ -4423,7 +4423,7 @@ MOD59_021D9868: ; 0x021D9868 add r0, r4, #0 mov r1, #0x28 mov r2, #0x53 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0x28 add r4, r0, #0 @@ -4441,7 +4441,7 @@ MOD59_021D9898: ; 0x021D9898 push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r6, #0 @@ -4603,10 +4603,10 @@ _021D99F4: .word 0x00000406 MOD59_021D99F8: ; 0x021D99F8 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r4, [r0] add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 58961d48..6c2094b1 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -7,7 +7,7 @@ MOD60_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #1 add r5, r0, #0 mov r0, #3 @@ -18,7 +18,7 @@ MOD60_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x26 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0xad mov r1, #0 lsl r2, r2, #2 @@ -104,7 +104,7 @@ _021D75AC: .word 0xFFFF83FF MOD60_021D75B0: ; 0x021D75B0 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x10] lsl r0, r0, #0x1e @@ -213,7 +213,7 @@ _021D7680: bl FUN_02024F9C _021D769A: add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4] bl FUN_020168D0 mov r0, #1 @@ -228,7 +228,7 @@ _021D76B4: .word 0xFFFF83FF MOD60_021D76B8: ; 0x021D76B8 push {r3, r4, lr} sub sp, #0xc - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, [r4, #4] cmp r1, #4 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index ec5a0d99..ac07287d 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -7,7 +7,7 @@ MOD61_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData mov r2, #2 mov r0, #3 mov r1, #0x29 @@ -16,7 +16,7 @@ MOD61_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0xbc mov r2, #0x29 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0xbc add r4, r0, #0 @@ -24,7 +24,7 @@ MOD61_021D74E0: ; 0x021D74E0 mov r0, #0x29 str r0, [r4] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #0x1c] ldrh r0, [r0] ldr r1, _021D754C ; =0x0000FFFF @@ -59,7 +59,7 @@ _021D754C: .word 0x0000FFFF thumb_func_start MOD61_021D7550 MOD61_021D7550: ; 0x021D7550 push {r3, lr} - bl FUN_02006278 + bl OverlayManager_GetData bl MOD61_021D78D4 cmp r0, #0 beq _021D7562 @@ -75,10 +75,10 @@ _021D7562: MOD61_021D7568: ; 0x021D7568 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r4, [r0] add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index 8d172847..09884c1e 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -47,7 +47,7 @@ MOD63_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x1e - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x79 mov r1, #0 lsl r2, r2, #2 @@ -86,7 +86,7 @@ MOD63_021D759C: ; 0x021D759C push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r5] cmp r0, #6 @@ -347,7 +347,7 @@ _021D77B0: .word 0x00007FFF MOD63_021D77B4: ; 0x021D77B4 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 mov r0, #0x1d lsl r0, r0, #4 @@ -361,7 +361,7 @@ MOD63_021D77B4: ; 0x021D77B4 add r0, r6, #0 bl MOD63_021D7B9C add r0, r7, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0 bl FUN_020168D0 cmp r5, #1 @@ -374,20 +374,20 @@ _021D77F2: mov r0, #0 ldr r1, _021D781C ; =UNK_020FF3D4 mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay b _021D7818 _021D77FE: mov r0, #0 ldr r1, _021D7820 ; =UNK_020FF368 mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay b _021D7818 _021D780A: mov r0, #0 bl FUN_0200415C ldr r0, _021D7824 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _021D7828 ; =MOD63_021DBE18 - bl FUN_02000E7C + bl RegisterMainOverlay _021D7818: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index c6b8180b..7940564f 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -591,7 +591,7 @@ MOD63_021D8D10: ; 0x021D8D10 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x4c - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0xab mov r1, #0 lsl r2, r2, #2 @@ -622,7 +622,7 @@ _021D8D94: .word gUnk021C4918 MOD63_021D8D98: ; 0x021D8D98 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 mov r0, #0xaa lsl r0, r0, #2 @@ -731,18 +731,18 @@ _021D8E64: .word 0x00000A8C MOD63_021D8E68: ; 0x021D8E68 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl FUN_0200E31C ldr r0, [r4, #0x14] bl SetLCRNGSeed add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x4c bl FUN_020168D0 ldr r0, _021D8E94 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _021D8E98 ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 3f68cd7c..6ece5b85 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -16,7 +16,7 @@ MOD64_021D74E0: ; 0x021D74E0 ldr r1, _021D7630 ; =0x000006B4 add r0, r4, #0 mov r2, #0x2f - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r5, r0, #0 bne _021D7504 bl ErrorHandling @@ -32,7 +32,7 @@ _021D7504: mov r2, #0x20 bl FUN_02016B20 add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 ldr r0, [r4, #4] bl FUN_02025084 @@ -152,7 +152,7 @@ MOD64_021D7640: ; 0x021D7640 push {r3, r4, r5, r6, lr} sub sp, #4 add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r2, _021D76F0 ; =0x000008C3 add r1, sp, #0 strh r2, [r1] @@ -238,10 +238,10 @@ _021D76F0: .word 0x000008C3 MOD64_021D76F4: ; 0x021D76F4 push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 mov r0, #0 add r1, r0, #0 @@ -297,7 +297,7 @@ _021D7726: bl MOD64_021D7828 bl FUN_0201C29C add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x2f bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 748c1b41..d6b9d89f 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -7,7 +7,7 @@ MOD65_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #2 add r5, r0, #0 mov r0, #3 @@ -18,7 +18,7 @@ MOD65_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #8 mov r2, #0x2d - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #2 mov r1, #0 lsl r2, r2, #8 @@ -40,7 +40,7 @@ _021D7520: .word 0x0000FFFF thumb_func_start MOD65_021D7524 MOD65_021D7524: ; 0x021D7524 push {r3, lr} - bl FUN_02006278 + bl OverlayManager_GetData bl MOD65_021D757C cmp r0, #0 beq _021D7536 @@ -56,7 +56,7 @@ _021D7536: MOD65_021D753C: ; 0x021D753C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldrb r1, [r4, #0x1a] ldr r0, [r4, #0x20] @@ -78,7 +78,7 @@ MOD65_021D753C: ; 0x021D753C ldr r0, [r4, #0x20] strh r1, [r0, #6] add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4] bl FUN_020168D0 mov r0, #1 @@ -2704,7 +2704,7 @@ MOD65_021D89C4: ; 0x021D89C4 MOD65_021D8A08: ; 0x021D8A08 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #1 add r5, r0, #0 mov r0, #3 @@ -2715,7 +2715,7 @@ MOD65_021D8A08: ; 0x021D8A08 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x2e - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x6f mov r1, #0 lsl r2, r2, #2 @@ -2733,7 +2733,7 @@ MOD65_021D8A40: ; 0x021D8A40 push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r5] cmp r0, #2 @@ -2916,10 +2916,10 @@ _021D8BB8: .word MOD65_021D8C88 MOD65_021D8BBC: ; 0x021D8BBC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4] bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 50786029..2967b0c9 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -7,7 +7,7 @@ MOD66_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #2 add r5, r0, #0 mov r0, #3 @@ -17,7 +17,7 @@ MOD66_021D74E0: ; 0x021D74E0 add r0, r4, #0 mov r1, #0xe4 mov r2, #0x11 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0xe4 add r4, r0, #0 @@ -51,7 +51,7 @@ _021D7534: .word 0x00000139 thumb_func_start MOD66_021D7538 MOD66_021D7538: ; 0x021D7538 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, [r4, #8] cmp r1, #8 @@ -115,9 +115,9 @@ _021D75AA: MOD66_021D75B0: ; 0x021D75B0 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x11 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index e00635fe..4c85f4ff 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -37,12 +37,12 @@ MOD67_021D74E0: ; 0x021D74E0 lsl r2, r2, #0x10 bl FUN_0201681C add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 ldr r1, _021D75C8 ; =0x00001068 add r0, r4, #0 mov r2, #0x2a - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D75C8 ; =0x00001068 mov r1, #0 add r4, r0, #0 @@ -102,7 +102,7 @@ _021D75CC: .word MOD67_021D7660 MOD67_021D75D0: ; 0x021D75D0 push {r4, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] cmp r1, #4 bhi _021D7620 @@ -149,7 +149,7 @@ _021D7620: MOD67_021D7624: ; 0x021D7624 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #0 add r1, r0, #0 @@ -163,7 +163,7 @@ MOD67_021D7624: ; 0x021D7624 mov r0, #0 bl FUN_02002CC0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x2a bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 953d3b63..ff21b695 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -37,14 +37,14 @@ MOD68_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x24 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x81 mov r1, #0 lsl r2, r2, #2 add r5, r0, #0 bl memset add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0x7e lsl r1, r1, #2 str r0, [r5, r1] @@ -106,7 +106,7 @@ _021D75D4: .word MOD68_021D7680 MOD68_021D75D8: ; 0x021D75D8 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #3 @@ -152,7 +152,7 @@ _021D7620: MOD68_021D762C: ; 0x021D762C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r4, #4 bl MOD68_021D78EC @@ -168,7 +168,7 @@ MOD68_021D762C: ; 0x021D762C ldr r0, [r4, r0] bl FreeToHeap add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index e9c2015c..74cfe028 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -17,10 +17,10 @@ HOF_OverlayInit: ; 0x0222D5C0 ldr r1, _0222D70C ; =0x00001B60 add r0, r5, #0 mov r2, #0x3f - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #0x4e str r0, [r4, #0xc] mov r0, #0 @@ -181,7 +181,7 @@ HOF_OverlayTeardown: ; 0x0222D750 beq _0222D7C6 b _0222D7D2 _0222D762: - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222D7D8 ; =0x00001B34 ldr r0, [r4, r0] @@ -211,7 +211,7 @@ _0222D762: ldr r0, [r4, r0] bl DestroyMsgData add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x3f bl FUN_020168D0 ldr r0, [r5] @@ -240,7 +240,7 @@ _0222D7F0: .word 0x00001B5C HOF_OverlayRun: ; 0x0222D7F4 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #5 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index e2e99a1f..f18bda67 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -20,11 +20,11 @@ MOD70_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0xdc mov r2, #0x3c - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 beq _021D7558 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r4, #0 add r1, #0xcc str r0, [r1] @@ -66,7 +66,7 @@ _021D7558: MOD70_021D755C: ; 0x021D755C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0xc8 ldr r0, [r0] @@ -74,7 +74,7 @@ MOD70_021D755C: ; 0x021D755C add r0, r4, #0 bl MOD70_021D7760 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x3d bl FUN_020168D0 mov r0, #0x3c @@ -88,7 +88,7 @@ MOD70_021D755C: ; 0x021D755C MOD70_021D758C: ; 0x021D758C push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0xd8 ldr r0, [r0] diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index c5d9cbbc..c3249b66 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -31,7 +31,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 ldr r1, _0222D738 ; =0x000036B4 add r0, r5, #0 mov r2, #0x1a - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 ldr r2, _0222D738 ; =0x000036B4 mov r0, #0 @@ -444,7 +444,7 @@ MOD71_0222D9C8: ; 0x0222D9C8 push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r6, #0 @@ -555,11 +555,11 @@ _0222DA72: b _0222DB32 _0222DAAE: ldr r0, [r4, #0x40] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _0222DB32 ldr r0, [r4, #0x40] - bl FUN_02006260 + bl OverlayManager_delete add r0, r4, #0 bl MOD71_0222D820 add r0, r6, #0 @@ -1722,10 +1722,10 @@ _0222E434: .word 0x000007A8 MOD71_0222E438: ; 0x0222E438 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r4, #0x5c] str r1, [r0, #0x28] add r0, r4, #0 @@ -1772,7 +1772,7 @@ MOD71_0222E438: ; 0x0222E438 ldr r0, [r4, r0] bl String_dtor add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -2088,7 +2088,7 @@ MOD71_0222E76C: ; 0x0222E76C push {r4, r5, r6, lr} add r5, r0, #0 add r0, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 mov r2, #6 ldr r0, _0222E830 ; =0x00000668 @@ -3937,7 +3937,7 @@ _0222F606: ldr r0, _0222F670 ; =UNK_020FA6E8 add r1, #0xc mov r2, #0x1a - bl FUN_02006234 + bl OverlayManager_new str r0, [r5, #0x40] str r4, [r5, #0x3c] pop {r3, r4, r5, pc} diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 4a1e86bf..d46ff721 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -17,7 +17,7 @@ MOD73_021D74E0: ; 0x021D74E0 MOD73_021D74F0: ; 0x021D74F0 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #2 add r4, r0, #0 mov r0, #3 @@ -27,7 +27,7 @@ MOD73_021D74F0: ; 0x021D74F0 ldr r1, _021D757C ; =0x000015E8 add r0, r5, #0 mov r2, #0x38 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D757C ; =0x000015E8 add r5, r0, #0 mov r1, #0 @@ -87,10 +87,10 @@ MOD73_021D758C: ; 0x021D758C push {r3, r4, r5, r6, r7, lr} add r4, r0, #0 add r5, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r7, r0, #0 add r0, r4, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0xc] ldr r1, _021D763C ; =0x021DBC9C @@ -180,10 +180,10 @@ _021D763C: .word MOD73_021DBC9C MOD73_021D7640: ; 0x021D7640 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r6, r0, #0 add r0, r5, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r7, r0, #0 ldr r4, [r7] bl MOD73_021D8E90 @@ -197,7 +197,7 @@ MOD73_021D7640: ; 0x021D7640 mov r1, #0 bl MI_CpuFill8 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 str r0, [r6, #0x18] add r0, r4, #0 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index e843de0d..1aca7c52 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -7,7 +7,7 @@ MOD74_021D74E0: ; 0x021D74E0 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r2, #1 add r5, r0, #0 mov r0, #3 @@ -18,7 +18,7 @@ MOD74_021D74E0: ; 0x021D74E0 add r0, r4, #0 lsl r1, r1, #2 mov r2, #0x4a - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0xad mov r1, #0 lsl r2, r2, #2 @@ -51,10 +51,10 @@ MOD74_021D74E0: ; 0x021D74E0 MOD74_021D7540: ; 0x021D7540 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData ldr r0, [r4] bl FUN_020168D0 mov r0, #1 @@ -67,7 +67,7 @@ MOD74_021D755C: ; 0x021D755C push {r4, r5, lr} sub sp, #0xc add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #4 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index ec4049ab..f2852678 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -36,13 +36,13 @@ MOD75_021E6BA0: ; 0x021E6BA0 ldr r1, _021E6D60 ; =0x000004A4 add r0, r5, #0 mov r2, #6 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021E6D60 ; =0x000004A4 mov r1, #0 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r1, r4, #0 add r1, #0xc4 str r0, [r1] @@ -196,7 +196,7 @@ _021E6D68: .word MOD75_021E700C MOD75_021E6D6C: ; 0x021E6D6C push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #0x18 @@ -406,7 +406,7 @@ _021E6EE0: MOD75_021E6F00: ; 0x021E6F00 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD75_021EBFE4 add r0, r4, #0 @@ -455,7 +455,7 @@ MOD75_021E6F00: ; 0x021E6F00 ldr r0, [r4] bl NARC_dtor add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 028319f9..c062f14a 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -16,14 +16,14 @@ MOD76_021D74E0: ; 0x021D74E0 add r0, r5, #0 lsl r1, r1, #2 mov r2, #0x43 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x62 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4] add r0, r4, #0 bl MOD76_021D7638 @@ -67,7 +67,7 @@ _021D7564: .word MOD76_021D76E8 MOD76_021D7568: ; 0x021D7568 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r4] add r5, r0, #0 cmp r1, #0xc @@ -161,10 +161,10 @@ _021D7606: MOD76_021D761C: ; 0x021D761C push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData bl MOD76_021D76B8 add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x43 bl FUN_020168D0 mov r0, #1 @@ -3165,7 +3165,7 @@ MOD76_021D8D5C: ; 0x021D8D5C ldr r0, _021D8DE8 ; =UNK_020FA6E8 add r1, r4, r1 mov r2, #0x43 - bl FUN_02006234 + bl OverlayManager_new mov r1, #0x5f lsl r1, r1, #2 str r0, [r4, r1] @@ -3184,13 +3184,13 @@ MOD76_021D8DEC: ; 0x021D8DEC mov r0, #0x5f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _021D8E3E mov r0, #0x5f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02006260 + bl OverlayManager_delete add r0, r4, #0 bl MOD76_021D7638 ldr r1, [r4] diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 3d646524..7219a909 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -32,7 +32,7 @@ MOD77_021D74E0: ; 0x021D74E0 ldr r1, _021D75DC ; =0x0000C32C add r0, r4, #0 mov r2, #0x32 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _021D75DC ; =0x0000C32C mov r1, #0 add r5, r0, #0 @@ -51,7 +51,7 @@ _021D7540: ldr r0, _021D75E4 ; =0x0000C2F0 str r1, [r5, r0] add r0, r4, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r4, r0, #0 bl FUN_02029AFC str r0, [r5, #4] @@ -125,7 +125,7 @@ MOD77_021D7604: ; 0x021D7604 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r7, #0 @@ -800,7 +800,7 @@ _021D7BA8: .word 0x0000C060 MOD77_021D7BAC: ; 0x021D7BAC push {r4, r5, r6, lr} add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #4 mov r1, #0 @@ -829,7 +829,7 @@ MOD77_021D7BAC: ; 0x021D7BAC add r1, r0, #0 bl FUN_02015F10 add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r5, #0 bl FUN_020168D0 ldr r0, _021D7C20 ; =gUnk021C4918 diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 1e9df5e9..60412019 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -16,13 +16,13 @@ MOD78_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0xa0 mov r2, #0x48 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0xa0 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 add r5, r0, #0 add r0, r4, #0 ldrb r1, [r5] @@ -138,7 +138,7 @@ _021D75DE: str r0, [r1, #4] str r0, [r1, #8] add r0, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r5] cmp r0, #0 @@ -231,7 +231,7 @@ _021D76B4: .word 0x000006DC MOD78_021D76B8: ; 0x021D76B8 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 add r7, r6, #0 mov r4, #0 @@ -256,7 +256,7 @@ _021D76C8: ldr r0, [r6] bl FUN_0201EB70 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData bl FUN_0201B398 mov r0, #0x48 bl FUN_020168D0 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 6f1d2bbe..9fa71b61 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1395,7 +1395,7 @@ _0222DFE4: ldr r1, _0222E108 ; =0x00001044 add r0, r6, #0 mov r2, #0x3e - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0222E108 ; =0x00001044 mov r1, #0 add r4, r0, #0 @@ -1511,7 +1511,7 @@ _0222E130: .word 0x00020020 MOD80_0222E134: ; 0x0222E134 push {r4, r5, r6, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD04_021DD984 bl MOD80_0222D5DC @@ -1651,7 +1651,7 @@ _0222E258: .word 0x00000B84 MOD80_0222E25C: ; 0x0222E25C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x48] bl FreeToHeap @@ -1684,7 +1684,7 @@ MOD80_0222E25C: ; 0x0222E25C ldr r0, [r4] bl FreeToHeap add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -1751,7 +1751,7 @@ MOD80_0222E338: ; 0x0222E338 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0 str r0, [r4] add r0, r4, #0 @@ -17146,7 +17146,7 @@ MOD80_02235D34: ; 0x02235D34 ldr r0, _02235DD0 ; =UNK_020FA6E8 add r1, #0x60 mov r2, #0x3e - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x5c] mov r0, #1 add r4, #0xac @@ -17164,11 +17164,11 @@ MOD80_02235DD4: ; 0x02235DD4 add r5, r0, #0 ldr r0, [r5, #0x5c] mov r4, #3 - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 beq _02235DF6 ldr r0, [r5, #0x5c] - bl FUN_02006260 + bl OverlayManager_delete ldr r2, [r5, #0x24] add r0, r5, #0 mov r1, #5 @@ -17392,7 +17392,7 @@ _02235F94: add r1, r4, #0 ldr r0, _02235FB8 ; =0x022375F0 add r1, #0x90 - bl FUN_02006234 + bl OverlayManager_new str r0, [r4, #0x5c] mov r0, #1 add r4, #0xac @@ -17419,13 +17419,13 @@ _02235FD0: b _0223617E _02235FD2: ldr r0, [r4, #0x5c] - bl FUN_02006290 + bl OverlayManager_Run cmp r0, #0 bne _02235FDE b _0223617E _02235FDE: ldr r0, [r4, #0x5c] - bl FUN_02006260 + bl OverlayManager_delete ldr r1, [r4, #0x24] cmp r1, #9 bne _02236060 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 6b04578f..2153f93f 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -30,13 +30,13 @@ _02237E50: add r0, r5, #0 lsl r1, r1, #2 mov r2, #0x39 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 bne _02237E84 b _02237FC2 _02237E84: add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4] mov r0, #0 str r0, [r4, #4] @@ -216,7 +216,7 @@ MOD81_02238004: ; 0x02238004 bl OS_DisableInterrupts add r6, r0, #0 add r0, r5, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #0x51 lsl r0, r0, #2 @@ -235,7 +235,7 @@ MOD81_02238004: ; 0x02238004 bl FUN_0201FD58 bl FUN_02009FA0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x39 bl FUN_020168D0 mov r0, #0x3a @@ -251,7 +251,7 @@ MOD81_02238004: ; 0x02238004 MOD81_02238064: ; 0x02238064 push {r4, r5, r6, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r3, [r4, #4] cmp r3, #7 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 1427108d..cc15c1dc 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -645,7 +645,7 @@ _0222DA48: ldr r1, _0222DB58 ; =0x00000EC8 add r0, r6, #0 mov r2, #0x44 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0222DB58 ; =0x00000EC8 mov r1, #0 add r4, r0, #0 @@ -751,7 +751,7 @@ _0222DB78: .word 0x00020020 MOD82_0222DB7C: ; 0x0222DB7C push {r4, r5, r6, lr} add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 bl MOD04_021DD984 bl MOD82_0222D5DC @@ -855,7 +855,7 @@ _0222DC4C: .word MOD82_0222FA14 MOD82_0222DC50: ; 0x0222DC50 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x24] bl FreeToHeap @@ -882,7 +882,7 @@ MOD82_0222DC50: ; 0x0222DC50 ldr r0, [r4, #4] bl FreeToHeap add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -938,7 +938,7 @@ MOD82_0222DD04: ; 0x0222DD04 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 mov r1, #0 str r0, [r4] add r0, r4, #0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 4e81fd4b..8204f46d 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -1805,7 +1805,7 @@ _0222E38E: thumb_func_start MOD83_0222E3B8 MOD83_0222E3B8: ; 0x0222E3B8 push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData mov r1, #0x15 add r7, r0, #0 lsl r1, r1, #4 @@ -1921,7 +1921,7 @@ MOD83_0222E48C: ; 0x0222E48C add r0, r5, #0 lsl r1, r1, #2 mov r2, #0x51 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r2, #0x57 mov r1, #0 lsl r2, r2, #2 @@ -1937,7 +1937,7 @@ MOD83_0222E48C: ; 0x0222E48C mov r1, #0 bl FUN_0200E3A0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #4] bl FUN_0202251C @@ -1991,7 +1991,7 @@ MOD83_0222E540: ; 0x0222E540 push {r4, r5, r6, lr} add r6, r0, #0 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x18] add r0, r0, #1 @@ -2310,27 +2310,27 @@ _0222E7C0: ; jump table _0222E7D0: ldr r0, _0222E824 ; =SDK_OVERLAY_MODULE_52_ID ldr r1, _0222E828 ; =MOD52_021D76C8 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E7DA: ldr r0, _0222E824 ; =SDK_OVERLAY_MODULE_52_ID ldr r1, _0222E82C ; =MOD52_021D76E8 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E7E4: ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _0222E834 ; =MOD83_0223A434 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E7EE: ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _0222E838 ; =MOD83_0223A4FC - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E7F8: ldr r0, _0222E830 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _0222E83C ; =MOD83_0223A3A8 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E802: ldr r0, _0222E840 ; =MOD83_0223A8C4 @@ -2341,12 +2341,12 @@ _0222E80A: mov r0, #0 ldr r1, _0222E844 ; =UNK_020FD6D4 mvn r0, r0 - bl FUN_02000E7C + bl RegisterMainOverlay pop {r3, pc} _0222E81A: ldr r0, _0222E848 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _0222E84C ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay _0222E822: pop {r3, pc} .align 2, 0 @@ -2367,10 +2367,10 @@ _0222E84C: .word MOD63_021DBAB8 MOD83_0222E850: ; 0x0222E850 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData bl MOD83_0222E7AC add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x51 bl FUN_020168D0 mov r0, #0 @@ -2989,7 +2989,7 @@ _0222ED84: .word 0x00000172 thumb_func_start MOD83_0222ED88 MOD83_0222ED88: ; 0x0222ED88 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02238E48 add r0, r4, #0 @@ -3048,7 +3048,7 @@ MOD83_0222EDF8: ; 0x0222EDF8 bl FUN_02016B94 str r0, [r4, #4] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #8] bl Sav2_PlayerData_GetProfileAddr @@ -3104,7 +3104,7 @@ MOD83_0222EE8C: ; 0x0222EE8C sub sp, #4 add r5, r1, #0 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0xd @@ -3315,9 +3315,9 @@ MOD83_0222F048: ; 0x0222F048 bl FUN_020168D0 ldr r0, _0222F06C ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _0222F070 ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x55 bl FUN_020168D0 mov r0, #1 @@ -4408,7 +4408,7 @@ MOD83_0222F900: ; 0x0222F900 cmp r0, #0 bne _0222F92C bl MOD83_02231364 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] add r1, r4, #0 bl FUN_02031CA8 @@ -4603,7 +4603,7 @@ _0222FA48: .word MOD83_0222FA0C thumb_func_start MOD83_0222FA4C MOD83_0222FA4C: ; 0x0222FA4C push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r7, r0, #0 bl MOD83_02238E48 ldr r0, [r7, #0x7c] @@ -4740,7 +4740,7 @@ _0222FB5A: MOD83_0222FB5C: ; 0x0222FB5C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222FBB0 ; =0x000015D4 ldr r0, [r4, r0] @@ -4785,7 +4785,7 @@ _0222FBB8: .word 0x00000434 MOD83_0222FBBC: ; 0x0222FBBC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0x80 ldr r1, [r0] @@ -4852,7 +4852,7 @@ _0222FC3C: .word 0x00000438 thumb_func_start MOD83_0222FC40 MOD83_0222FC40: ; 0x0222FC40 push {r3, r4, r5, r6, r7, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222FCA4 ; =0x000015D4 add r5, r4, #0 @@ -4936,14 +4936,14 @@ MOD83_0222FCE4: ; 0x0222FCE4 push {r3, r4, r5, r6, r7, lr} sub sp, #0x18 add r7, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 add r4, r6, #0 add r5, r6, #0 add r0, r7, #0 add r4, #0x8c add r5, #0xdc - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [sp] add r0, r4, #0 @@ -5016,7 +5016,7 @@ MOD83_0222FD84: ; 0x0222FD84 sub sp, #0x14 add r6, r0, #0 add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData cmp r4, #0 bne _0222FD98 mov r5, #4 @@ -5067,7 +5067,7 @@ _0222FDE4: .word MOD83_0223ADD8 MOD83_0222FDE8: ; 0x0222FDE8 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0x48 mov r1, #0 @@ -5097,7 +5097,7 @@ MOD83_0222FE24: ; 0x0222FE24 push {r3, r4, r5, r6, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 bl MOD83_02238700 cmp r0, #0 @@ -5158,7 +5158,7 @@ MOD83_0222FEA0: ; 0x0222FEA0 push {r3, r4, r5, r6, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222FF08 ; =0x000015D4 mov r1, #4 @@ -5213,7 +5213,7 @@ MOD83_0222FF10: ; 0x0222FF10 push {r3, r4, r5, r6, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _0222FF78 ; =0x000015D4 mov r1, #3 @@ -5268,7 +5268,7 @@ MOD83_0222FF80: ; 0x0222FF80 push {r4, r5, lr} sub sp, #0x14 add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, [r0, #0x48] add r4, #0x48 @@ -5312,7 +5312,7 @@ _0222FFD4: .word MOD83_0223ADB8 MOD83_0222FFD8: ; 0x0222FFD8 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0x48 mov r1, #0 @@ -5339,7 +5339,7 @@ _0223000C: .word 0x000015D4 MOD83_02230010: ; 0x02230010 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r1, r4, #0 add r0, r5, #0 @@ -5366,7 +5366,7 @@ _02230044: .word MOD83_0223B888 MOD83_02230048: ; 0x02230048 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r0, #0x80 ldr r0, [r0] @@ -5422,7 +5422,7 @@ _022300A8: .word MOD83_0223B888 MOD83_022300AC: ; 0x022300AC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 add r1, r4, #0 add r0, r5, #0 @@ -5457,7 +5457,7 @@ _022300F4: .word 0x00002620 MOD83_022300F8: ; 0x022300F8 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r0, #0x38 mov r1, #0 bl MOD83_0222FB44 @@ -5475,7 +5475,7 @@ MOD83_02230118: ; 0x02230118 push {r3, r4, r5, r6, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 ldr r0, [r5, #4] bl FUN_0202251C @@ -5537,7 +5537,7 @@ _02230198: .word MOD83_0223AE20 thumb_func_start MOD83_0223019C MOD83_0223019C: ; 0x0223019C push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, _022301CC ; =0x000005C8 add r4, r0, #0 ldr r2, [r4, r1] @@ -5565,7 +5565,7 @@ _022301D0: .word 0x000015D8 thumb_func_start MOD83_022301D4 MOD83_022301D4: ; 0x022301D4 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, _02230204 ; =0x000005C8 ldr r1, [r4, r0] @@ -5807,7 +5807,7 @@ MOD83_022303B0: ; 0x022303B0 add r5, r1, #0 add r7, r2, #0 str r3, [sp, #4] - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #0x7c] cmp r0, #0 @@ -5895,7 +5895,7 @@ MOD83_02230464: ; 0x02230464 str r0, [sp, #0x14] str r1, [sp, #0x1c] str r2, [sp, #0x18] - bl FUN_02006278 + bl OverlayManager_GetData add r7, r0, #0 ldr r0, [r7, #4] mov r5, #0 @@ -5977,7 +5977,7 @@ MOD83_0223050C: ; 0x0223050C sub sp, #0x10 add r5, r1, #0 add r7, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r2, _0223059C ; =0x00000172 mov r0, #1 @@ -6046,7 +6046,7 @@ MOD83_022305A4: ; 0x022305A4 sub sp, #0x10 add r5, r1, #0 add r6, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData mov r0, #0x25 mov r1, #0x56 bl String_ctor @@ -6090,7 +6090,7 @@ MOD83_02230604: ; 0x02230604 add r7, r0, #0 add r5, r1, #0 add r6, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r0, [r0, #0x78] bl FUN_02001204 add r4, r0, #0 @@ -6220,7 +6220,7 @@ MOD83_02230714: ; 0x02230714 push {r4, r5, r6, lr} add r6, r0, #0 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r1, _022307A4 ; =0x000015DC add r0, r6, #0 @@ -6363,7 +6363,7 @@ _02230848: .word 0x00000265 MOD83_0223084C: ; 0x0223084C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r1, r0, #0 add r0, #0x80 ldr r0, [r0] @@ -6413,7 +6413,7 @@ MOD83_0223089C: ; 0x0223089C add r6, r1, #0 add r5, r2, #0 str r3, [sp, #4] - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 cmp r6, #0 beq _022308F8 @@ -6509,7 +6509,7 @@ MOD83_02230954: ; 0x02230954 ldr r1, _022309FC ; =0x00002998 add r0, r5, #0 mov r2, #0x56 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _022309FC ; =0x00002998 mov r1, #0 add r4, r0, #0 @@ -6550,7 +6550,7 @@ _022309D0: mov r1, #0x1d str r1, [r4, r0] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #4] bl Sav2_PlayerData_GetOptionsAddr @@ -6578,7 +6578,7 @@ MOD83_02230A10: ; 0x02230A10 sub sp, #0x14 add r6, r0, #0 add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl CTRDG_IsExisting ldr r0, _02230D5C ; =0x000005C8 @@ -7676,7 +7676,7 @@ _02231378: .word MOD83_0223B888 MOD83_0223137C: ; 0x0223137C push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 mov r0, #0x11 lsl r0, r0, #6 @@ -7685,19 +7685,19 @@ MOD83_0223137C: ; 0x0223137C bne _0223139A ldr r0, _022313D0 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _022313D4 ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay b _022313A6 _0223139A: cmp r0, #1 bne _022313A6 ldr r0, _022313D8 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _022313DC ; =MOD83_0223A444 - bl FUN_02000E7C + bl RegisterMainOverlay _022313A6: mov r0, #0x5b bl FUN_020168D0 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x56 bl FUN_020168D0 ldr r0, _022313E0 ; =0x000015D4 @@ -8344,7 +8344,7 @@ MOD83_02231820: ; 0x02231820 thumb_func_start MOD83_022318B0 MOD83_022318B0: ; 0x022318B0 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02231A00 ldr r0, _022318DC ; =0x00002B70 @@ -8368,7 +8368,7 @@ _022318DC: .word 0x00002B70 thumb_func_start MOD83_022318E0 MOD83_022318E0: ; 0x022318E0 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02231A00 mov r1, #0xad @@ -8407,7 +8407,7 @@ _0223192C: .word 0x00002B70 thumb_func_start MOD83_02231930 MOD83_02231930: ; 0x02231930 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02231A00 ldr r0, _022319C0 ; =0x00002B70 @@ -8476,7 +8476,7 @@ _022319CC: .word 0x00002B60 thumb_func_start MOD83_022319D0 MOD83_022319D0: ; 0x022319D0 push {r4, lr} - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl MOD83_02231A00 ldr r0, _022319FC ; =0x00002B70 @@ -9526,7 +9526,7 @@ MOD83_02232208: ; 0x02232208 add r7, r0, #0 add r5, r1, #0 add r6, r2, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, _02232270 ; =0x00002B68 ldr r0, [r0, r1] bl FUN_02001204 @@ -9730,7 +9730,7 @@ MOD83_022323A8: ; 0x022323A8 ldr r1, _0223240C ; =0x00003CF4 add r0, r4, #0 mov r2, #0x57 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _0223240C ; =0x00003CF4 mov r1, #0 add r4, r0, #0 @@ -10226,7 +10226,7 @@ MOD83_02232788: ; 0x02232788 sub sp, #8 add r5, r1, #0 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 cmp r1, #0x1d @@ -10272,7 +10272,7 @@ _022327AA: ; jump table .short _02232CF4 - _022327AA - 2 ; case 29 _022327E6: add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r0, #8] ldr r0, _02232B54 ; =0x00002B44 str r1, [r4, r0] @@ -11300,7 +11300,7 @@ _022330A0: .word 0x00002BE0 MOD83_022330A4: ; 0x022330A4 push {r3, r4, r5, r6, r7, lr} str r0, [sp] - bl FUN_02006278 + bl OverlayManager_GetData add r7, r0, #0 ldr r0, _02233154 ; =0x000029A8 mov r6, #0 @@ -11364,11 +11364,11 @@ _02233104: bl FreeToHeap ldr r0, _02233160 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _02233164 ; =MOD83_0223A434 - bl FUN_02000E7C + bl RegisterMainOverlay mov r0, #0x5b bl FUN_020168D0 ldr r0, [sp] - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x57 bl FUN_020168D0 mov r0, #1 @@ -18513,7 +18513,7 @@ MOD83_02236764: ; 0x02236764 ldr r1, _022367F0 ; =0x00012608 add r0, r5, #0 mov r2, #0x4e - bl FUN_02006268 + bl OverlayManager_CreateAndGetData ldr r2, _022367F0 ; =0x00012608 mov r1, #0 add r4, r0, #0 @@ -18532,7 +18532,7 @@ MOD83_02236764: ; 0x02236764 mov r1, #0 bl FUN_0200E3A0 add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r0, [r0, #8] str r0, [r4, #0x10] bl Sav2_PlayerData_GetProfileAddr @@ -18570,7 +18570,7 @@ _02236800: .word MOD83_0223BB14 MOD83_02236804: ; 0x02236804 push {r4, r5, r6, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 bl CTRDG_IsExisting bl CTRDG_IsPulledOut @@ -19278,14 +19278,14 @@ _02236DCC: .word gMain MOD83_02236DD0: ; 0x02236DD0 push {r4, lr} add r4, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r0, [r0, #0x20] bl FreeToHeap ldr r0, _02236DFC ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _02236E00 ; =MOD63_021DBAB8 - bl FUN_02000E7C + bl RegisterMainOverlay add r0, r4, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x4e bl FUN_020168D0 mov r0, #0 @@ -22831,7 +22831,7 @@ MOD83_022387A0: ; 0x022387A0 add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 add r2, r4, #0 add r5, r0, #0 @@ -25955,7 +25955,7 @@ _02239F30: .word MOD83_0223CADC MOD83_02239F34: ; 0x02239F34 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, _0223A24C ; =0x0000260C add r4, r0, #0 ldr r1, [r4, r1] diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index a00ea88f..0a2c3e1b 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -29,7 +29,7 @@ _021D74FC: ldr r1, _021D7670 ; =0x00001244 add r0, r6, #0 mov r2, #0x4b - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 bne _021D7516 b _021D7618 @@ -51,7 +51,7 @@ _021D7516: and r0, r1 str r0, [r2] add r0, r6, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4, #0x18] mov r0, #0 str r0, [r4, #0x1c] @@ -149,7 +149,7 @@ _021D7618: str r0, [r5] b _021D7668 _021D7620: - bl FUN_02006278 + bl OverlayManager_GetData ldr r2, _021D7684 ; =0x021DA6C8 ldr r1, _021D768C ; =0x0000122C add r4, r0, #0 @@ -208,7 +208,7 @@ MOD84_021D76A4: ; 0x021D76A4 push {r4, r5, r6, lr} add r4, r1, #0 add r6, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r5, r0, #0 ldr r0, [r4] cmp r0, #3 @@ -267,7 +267,7 @@ _021D771A: b _021D773E _021D772E: add r0, r6, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x4b bl FUN_020168D0 mov r0, #1 @@ -284,7 +284,7 @@ MOD84_021D7748: ; 0x021D7748 push {r4, r5, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r4, r0, #0 ldr r0, [r4, #8] mov r1, #1 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index c40d4f3b..e7e4e431 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -22,7 +22,7 @@ MOD85_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #8 mov r2, #0x4f - bl FUN_02006268 + bl OverlayManager_CreateAndGetData add r4, r0, #0 mov r0, #0 strb r0, [r4] @@ -34,7 +34,7 @@ MOD85_021D74E0: ; 0x021D74E0 strb r0, [r4, #6] strb r0, [r4, #7] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 str r0, [r4] bl MOD85_021D76CC add r5, r0, #0 @@ -86,7 +86,7 @@ MOD85_021D75A0: ; 0x021D75A0 push {r4, r5, lr} sub sp, #0xc add r4, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r5, [r0, #4] ldr r0, [r4] cmp r0, #3 @@ -167,7 +167,7 @@ _021D7640: .word 0x0000044C MOD85_021D7644: ; 0x021D7644 push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 mov r0, #0 ldr r4, [r6, #4] @@ -191,7 +191,7 @@ MOD85_021D7644: ; 0x021D7644 add r0, r4, #0 bl MOD85_021D76F4 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData mov r0, #0x4f bl FUN_020168D0 mov r0, #1 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 37b0b5f6..28089fba 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -15,7 +15,7 @@ MOD86_021D74E0: ; 0x021D74E0 add r0, r5, #0 mov r1, #0x44 mov r2, #0x54 - bl FUN_02006268 + bl OverlayManager_CreateAndGetData mov r1, #0 mov r2, #0x44 add r4, r0, #0 @@ -23,7 +23,7 @@ MOD86_021D74E0: ; 0x021D74E0 mov r0, #0x54 str r0, [r4] add r0, r5, #0 - bl FUN_0200628C + bl OverlayManager_GetField18 ldr r1, [r0] str r1, [r4, #8] ldr r0, [r0, #4] @@ -79,7 +79,7 @@ MOD86_021D758C: ; 0x021D758C push {r3, r4, r5, r6, lr} sub sp, #0xc add r5, r1, #0 - bl FUN_02006278 + bl OverlayManager_GetData ldr r1, [r5] add r4, r0, #0 mov r6, #0 @@ -221,7 +221,7 @@ _021D76AC: .word UNK_021C48F8 MOD86_021D76B0: ; 0x021D76B0 push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_02006278 + bl OverlayManager_GetData add r6, r0, #0 ldr r4, [r6] bl MOD86_021D7964 @@ -231,7 +231,7 @@ MOD86_021D76B0: ; 0x021D76B0 add r1, r0, #0 bl FUN_02015F10 add r0, r5, #0 - bl FUN_0200627C + bl OverlayManager_FreeData add r0, r4, #0 bl FUN_020168D0 mov r0, #1 diff --git a/arm9/src/main.c b/arm9/src/main.c index a81db33d..050aa5f0 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -16,9 +16,9 @@ FS_EXTERN_OVERLAY(MODULE_63); struct Unk2106FA0 gBacklightTop; -extern BOOL FUN_02006234(struct Unk21DBE18 *, s32 *, int); -extern BOOL FUN_02006290(int); -extern void FUN_02006260(int); +extern BOOL OverlayManager_new(struct Unk21DBE18 *, s32 *, int); +extern BOOL OverlayManager_Run(int); +extern void OverlayManager_delete(int); extern BOOL FUN_02033678(void); extern u32 FUN_020335B8(void); extern BOOL FUN_0202FB80(void); @@ -89,12 +89,12 @@ THUMB_FUNC void NitroMain(void) case 0: // Title Demo gBacklightTop.unk1C = 0; - FUN_02000E7C(FS_OVERLAY_ID(MODULE_63), &MOD63_021DBE18); + RegisterMainOverlay(FS_OVERLAY_ID(MODULE_63), &MOD63_021DBE18); break; case 1: // Reset transition? gBacklightTop.unk1C = 1; - FUN_02000E7C(FS_OVERLAY_ID(MODULE_52), &MOD52_021D76C8); + RegisterMainOverlay(FS_OVERLAY_ID(MODULE_52), &MOD52_021D76C8); break; default: GF_ASSERT(0); @@ -118,7 +118,7 @@ THUMB_FUNC void NitroMain(void) } if (FUN_0202FB80()) { - FUN_02000E0C(); + Main_RunOverlayManager(); FUN_0201B5CC(gMain.unk18); FUN_0201B5CC(gMain.unk24); if (!gMain.unk30) @@ -151,7 +151,7 @@ THUMB_FUNC void FUN_02000DF4(void) gBacklightTop.unk14 = NULL; } -THUMB_FUNC void FUN_02000E0C(void) +THUMB_FUNC void Main_RunOverlayManager(void) { if (!gBacklightTop.unkC) { @@ -160,20 +160,20 @@ THUMB_FUNC void FUN_02000E0C(void) if (gBacklightTop.unk10 != SDK_OVERLAY_INVALID_ID) HandleLoadOverlay(gBacklightTop.unk10, 0); gBacklightTop.unk8 = gBacklightTop.unk10; - gBacklightTop.unkC = FUN_02006234(gBacklightTop.unk14, &gBacklightTop.unk18, 0); + gBacklightTop.unkC = OverlayManager_new(gBacklightTop.unk14, &gBacklightTop.unk18, 0); gBacklightTop.unk10 = SDK_OVERLAY_INVALID_ID; gBacklightTop.unk14 = NULL; } - if (FUN_02006290(gBacklightTop.unkC)) + if (OverlayManager_Run(gBacklightTop.unkC)) { - FUN_02006260(gBacklightTop.unkC); + OverlayManager_delete(gBacklightTop.unkC); gBacklightTop.unkC = 0; if (gBacklightTop.unk8 != SDK_OVERLAY_INVALID_ID) UnloadOverlayByID(gBacklightTop.unk8); } } -THUMB_FUNC void FUN_02000E7C(FSOverlayID id, struct Unk21DBE18 * arg1) +THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, struct Unk21DBE18 * arg1) { if (gBacklightTop.unk14 != NULL) ErrorHandling(); diff --git a/arm9/src/unk_02006234.c b/arm9/src/unk_02006234.c index af93ed3e..a493311d 100644 --- a/arm9/src/unk_02006234.c +++ b/arm9/src/unk_02006234.c @@ -3,15 +3,15 @@ #include "poke_overlay.h" #include "heap.h" -struct UnkStruct_02006234 * FUN_02006234(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id); //todo header? -void FUN_02006260(struct UnkStruct_02006234 * a0); -void * FUN_02006268(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id); -void * FUN_02006278(struct UnkStruct_02006234 * a0); -void FUN_0200627C(struct UnkStruct_02006234 * a0); -int * FUN_0200628C(struct UnkStruct_02006234 * a0); -BOOL FUN_02006290(struct UnkStruct_02006234 * a0); +struct UnkStruct_02006234 * OverlayManager_new(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id); //todo header? +void OverlayManager_delete(struct UnkStruct_02006234 * a0); +void * OverlayManager_CreateAndGetData(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id); +void * OverlayManager_GetData(struct UnkStruct_02006234 * a0); +void OverlayManager_FreeData(struct UnkStruct_02006234 * a0); +int * OverlayManager_GetField18(struct UnkStruct_02006234 * a0); +BOOL OverlayManager_Run(struct UnkStruct_02006234 * a0); -THUMB_FUNC struct UnkStruct_02006234 * FUN_02006234(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id) +THUMB_FUNC struct UnkStruct_02006234 * OverlayManager_new(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id) { struct UnkStruct_02006234 * ret = (struct UnkStruct_02006234 *)AllocFromHeap(heap_id, sizeof(struct UnkStruct_02006234)); ret->ovly_mgr = *ovly_mgr; @@ -24,33 +24,33 @@ THUMB_FUNC struct UnkStruct_02006234 * FUN_02006234(struct Unk21DBE18 * ovly_mgr return ret; } -THUMB_FUNC void FUN_02006260(struct UnkStruct_02006234 * a0) +THUMB_FUNC void OverlayManager_delete(struct UnkStruct_02006234 * a0) { FreeToHeap(a0); } -THUMB_FUNC void * FUN_02006268(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id) +THUMB_FUNC void * OverlayManager_CreateAndGetData(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id) { return a0->unk1C = AllocFromHeap(heap_id, size); } -THUMB_FUNC void * FUN_02006278(struct UnkStruct_02006234 * a0) +THUMB_FUNC void * OverlayManager_GetData(struct UnkStruct_02006234 * a0) { return a0->unk1C; } -THUMB_FUNC void FUN_0200627C(struct UnkStruct_02006234 * a0) +THUMB_FUNC void OverlayManager_FreeData(struct UnkStruct_02006234 * a0) { FreeToHeap(a0->unk1C); a0->unk1C = NULL; } -THUMB_FUNC int * FUN_0200628C(struct UnkStruct_02006234 * a0) +THUMB_FUNC int * OverlayManager_GetField18(struct UnkStruct_02006234 * a0) { return a0->unk18; } -THUMB_FUNC BOOL FUN_02006290(struct UnkStruct_02006234 * a0) +THUMB_FUNC BOOL OverlayManager_Run(struct UnkStruct_02006234 * a0) { switch (a0->unk10) { diff --git a/include/main.h b/include/main.h index a01f06ce..fa31953c 100644 --- a/include/main.h +++ b/include/main.h @@ -97,8 +97,8 @@ void NitroMain(void); extern struct Unk21C48B8 gMain; void FUN_02000DF4(void); -void FUN_02000E0C(void); -void FUN_02000E7C(FSOverlayID id, struct Unk21DBE18 * arg1); +void Main_RunOverlayManager(void); +void RegisterMainOverlay(FSOverlayID id, struct Unk21DBE18 * arg1); void FUN_02000E9C(void); void FUN_02000EC8(u32 parameter); void FUN_02000EE8(void); |