summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/unk_020372D4.s22
-rw-r--r--arm9/asm/unk_0206C700.s6
-rw-r--r--arm9/asm/unk_0206F3FC.s10
-rw-r--r--arm9/asm/unk_020772F0.s20
-rw-r--r--arm9/asm/unk_02079C70.s10
-rw-r--r--arm9/asm/unk_020854E0.s20
-rw-r--r--arm9/asm/unk_020859C0.s10
-rw-r--r--arm9/asm/unk_02086084.s10
-rw-r--r--arm9/asm/unk_02087D00.s24
-rw-r--r--arm9/asm/unk_02088858.s2
-rw-r--r--arm9/asm/unk_0208898C.s18
-rw-r--r--arm9/asm/unk_02088AAC.s6
-rw-r--r--arm9/asm/unk_02089498.s10
-rw-r--r--arm9/asm/unk_02089960.s12
14 files changed, 90 insertions, 90 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