summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/unk_02001B80.s4
-rw-r--r--arm9/asm/unk_02035068.s12
-rw-r--r--arm9/asm/unk_02048120.s2
-rw-r--r--arm9/asm/unk_02048904.s4
-rw-r--r--arm9/asm/unk_02050E48.s14
-rw-r--r--arm9/asm/unk_0205CE48.s2
-rw-r--r--arm9/asm/unk_020625EC.s12
-rw-r--r--arm9/asm/unk_020653EC.s16
-rw-r--r--arm9/asm/unk_0206C700.s4
-rw-r--r--arm9/asm/unk_0206F3FC.s18
-rw-r--r--arm9/asm/unk_02072548.s10
-rw-r--r--arm9/asm/unk_02073DA8.s36
-rw-r--r--arm9/asm/unk_0207550C.s14
-rw-r--r--arm9/asm/unk_020772F0.s4
-rw-r--r--arm9/asm/unk_0207D5BC.s2
-rw-r--r--arm9/asm/unk_02086414.s6
-rw-r--r--arm9/asm/unk_02089498.s2
-rw-r--r--arm9/asm/unk_02089960.s2
-rw-r--r--arm9/asm/unk_0208A338.s16
19 files changed, 90 insertions, 90 deletions
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s
index 5ddfa9ab..cd5a4010 100644
--- a/arm9/asm/unk_02001B80.s
+++ b/arm9/asm/unk_02001B80.s
@@ -809,7 +809,7 @@ CreateYesNoMenu: ; 0x020020EC
ldr r2, [sp, #0xc]
ldr r3, [sp, #0x10]
mov r1, #0x1
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
lsl r0, r5, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x0]
@@ -881,7 +881,7 @@ FUN_020021EC: ; 0x020021EC
ldr r0, [r5, #0x4]
add r4, r1, #0x0
mov r1, #0x0
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
ldr r0, [r5, #0x4]
bl RemoveWindow
ldr r1, [r5, #0x4]
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index 94c65983..d0bddd04 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -550,7 +550,7 @@ _02035440:
bl FUN_02035718
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
add r0, r4, #0x0
bl RemoveWindow
add r0, r6, #0x0
@@ -630,7 +630,7 @@ FUN_0203549C: ; 0x0203549C
add r0, r4, #0x0
mov r1, #0x1
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
ldr r2, _02035660 ; =0x00000143
mov r0, #0x0
mov r1, #0x1a
@@ -962,7 +962,7 @@ _0203576C:
add r0, #0x10
mov r1, #0x1
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
add r0, r5, #0x0
add r0, #0x10
mov r1, #0xf
@@ -1090,7 +1090,7 @@ _020358CE:
add r0, r5, #0x0
add r0, #0x10
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
add r5, #0x10
add r0, r5, #0x0
bl RemoveWindow
@@ -2654,7 +2654,7 @@ FUN_020365BC: ; 0x020365BC
bl FUN_02035718
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
ldrb r1, [r4, #0x4]
ldr r0, [r4, #0x0]
bl ScheduleBgTilemapBufferTransfer
@@ -2924,7 +2924,7 @@ FUN_020367E8: ; 0x020367E8
bl FUN_02035718
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
ldrb r1, [r4, #0x4]
ldr r0, [r4, #0x0]
bl ScheduleBgTilemapBufferTransfer
diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s
index 74cfef32..55ee967c 100644
--- a/arm9/asm/unk_02048120.s
+++ b/arm9/asm/unk_02048120.s
@@ -218,7 +218,7 @@ _020482B2:
add r0, r4, #0x0
add r0, #0xc
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
add r0, #0xc
bl RemoveWindow
diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s
index 54d87433..6c2c53b9 100644
--- a/arm9/asm/unk_02048904.s
+++ b/arm9/asm/unk_02048904.s
@@ -2061,7 +2061,7 @@ _0204992E:
add r0, r4, #0x0
add r0, #0x24
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
add r0, #0x24
bl RemoveWindow
@@ -2072,7 +2072,7 @@ _02049946:
add r0, r4, #0x0
add r0, #0x24
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
add r0, #0x24
bl RemoveWindow
diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s
index ae7380b7..e7a0de7c 100644
--- a/arm9/asm/unk_02050E48.s
+++ b/arm9/asm/unk_02050E48.s
@@ -1180,7 +1180,7 @@ _02051798:
add r0, r4, #0x0
add r0, #0x14
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
mov r0, #0x0
ldr r2, [r4, #0x8]
add r1, r0, #0x0
@@ -1245,7 +1245,7 @@ FUN_02051810: ; 0x02051810
add r0, r5, #0x0
add r0, #0x14
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r5, #0x0
add r0, #0x14
bl ClearWindowTilemapAndCopyToVram
@@ -1782,7 +1782,7 @@ _02051C34:
mov r1, #0x0
mov r2, #0x1
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
add r1, r5, #0x0
ldr r0, [sp, #0x14]
add r1, #0x81
@@ -1891,7 +1891,7 @@ _02051D0A:
mov r1, #0x0
mov r2, #0x1
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
add sp, #0x18
pop {r3-r7, pc}
.balign 4
@@ -2006,12 +2006,12 @@ _02051E20: .word 0x000005DC
thumb_func_start FUN_02051E24
FUN_02051E24: ; 0x02051E24
- ldr r3, _02051E2C ; =FUN_0200CCF8
+ ldr r3, _02051E2C ; =ClearFrameAndWindow1
ldr r0, [r0, #0x7c]
mov r1, #0x1
bx r3
.balign 4
-_02051E2C: .word FUN_0200CCF8
+_02051E2C: .word ClearFrameAndWindow1
thumb_func_start FUN_02051E30
FUN_02051E30: ; 0x02051E30
@@ -2202,7 +2202,7 @@ _02051F7C:
add r0, r4, #0x0
add r0, #0x8
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
add r0, #0x8
bl RemoveWindow
diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s
index ccff7b32..43f1137e 100644
--- a/arm9/asm/unk_0205CE48.s
+++ b/arm9/asm/unk_0205CE48.s
@@ -1462,7 +1462,7 @@ _0205D95C:
beq _0205D9A0
add r0, r4, #0x0
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
ldrh r0, [r4, #0x16]
add r0, r0, #0x1
strh r0, [r4, #0x16]
diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s
index 2813b999..f09d524b 100644
--- a/arm9/asm/unk_020625EC.s
+++ b/arm9/asm/unk_020625EC.s
@@ -1188,7 +1188,7 @@ FUN_02062EC4: ; 0x02062EC4
add r4, r0, #0x0
add r0, #0xe4
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
add r0, #0xe4
bl ClearWindowTilemapAndCopyToVram
@@ -1464,13 +1464,13 @@ _02063094:
add r0, #0xd4
mov r1, #0x0
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
add r0, r5, #0x0
ldr r2, _02063170 ; =0x000003E2
add r0, #0xe4
mov r1, #0x1
mov r3, #0xa
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
add r0, r5, #0x0
add r0, #0xe4
mov r1, #0xff
@@ -1526,7 +1526,7 @@ FUN_02063178: ; 0x02063178
add r0, r4, #0x0
add r0, #0xd4
mov r1, #0x0
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
add r0, r4, #0x0
add r0, #0xd4
bl RemoveWindow
@@ -1872,7 +1872,7 @@ FUN_02063430: ; 0x02063430
add r0, #0xd4
mov r1, #0x1
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
add r0, r4, #0x0
mov r1, #0x0
bl FUN_020632A4
@@ -1933,7 +1933,7 @@ FUN_020634DC: ; 0x020634DC
add r0, r4, #0x0
add r0, #0xd4
mov r1, #0x0
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
add r0, r4, #0x0
add r0, #0xd4
bl RemoveWindow
diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s
index 8fa3df67..1094df5d 100644
--- a/arm9/asm/unk_020653EC.s
+++ b/arm9/asm/unk_020653EC.s
@@ -1119,7 +1119,7 @@ _02065C64:
ldr r2, _02065CF4 ; =0x000003D9
mov r1, #0x0
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r1, #0x0
str r1, [sp, #0x0]
mov r2, #0x65
@@ -1139,7 +1139,7 @@ _02065C64:
add r0, r5, r0
mov r1, #0x0
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r0, #0x17
lsl r0, r0, #0x4
ldr r0, [r5, r0]
@@ -1371,7 +1371,7 @@ _02065E14:
ldr r2, _02065EDC ; =0x000003D9
mov r1, #0x0
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r0, #0x17
lsl r0, r0, #0x4
ldr r0, [r5, r0]
@@ -1431,7 +1431,7 @@ FUN_02065EF8: ; 0x02065EF8
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x0
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
mov r0, #0x65
lsl r0, r0, #0x2
add r0, r4, r0
@@ -1444,7 +1444,7 @@ FUN_02065EF8: ; 0x02065EF8
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x0
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
mov r0, #0x5d
lsl r0, r0, #0x2
add r0, r4, r0
@@ -1488,7 +1488,7 @@ FUN_02065F8C: ; 0x02065F8C
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x0
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
mov r0, #0x16
lsl r0, r0, #0x4
add r1, sp, #0x0
@@ -2055,7 +2055,7 @@ FUN_02066404: ; 0x02066404
add r0, r5, r0
mov r1, #0x1
mov r3, #0xa
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
_02066426:
mov r1, #0xd8
str r1, [sp, #0x0]
@@ -2147,7 +2147,7 @@ FUN_020664D8: ; 0x020664D8
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
mov r0, #0x61
lsl r0, r0, #0x2
add r0, r4, r0
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 90e19c61..345ecae1 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -152,7 +152,7 @@ FUN_0206C700: ; 0x0206C700
mov r1, #0x0
mov r2, #0x1
mov r3, #0xa
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
add r0, r5, #0x0
bl FUN_02006D98
str r0, [r4, #0x18]
@@ -1440,7 +1440,7 @@ _0206D2EE:
mov r1, #0x0
mov r2, #0x1
mov r3, #0xa
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
ldr r0, [r4, #0x1c]
mov r1, #0x6
mov r2, #0x0
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index c504af1a..07679fac 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -765,12 +765,12 @@ _0206F914:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
mov r0, #0x8d
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
mov r0, #0x8d
lsl r0, r0, #0x2
add r0, r4, r0
@@ -3665,7 +3665,7 @@ FUN_020710C4: ; 0x020710C4
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
mov r0, #0xc
mov r1, #0x8
bl AllocFromHeap
@@ -4734,7 +4734,7 @@ _020718EC:
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r5, #0x0
bl FUN_02073DB4
ldr r0, _02071940 ; =0x000005A4
@@ -4992,7 +4992,7 @@ _02071ADE:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
ldr r0, _02071C28 ; =0x000005C8
mov r1, #0x0
ldr r0, [r4, r0]
@@ -5112,7 +5112,7 @@ _02071BE0:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
ldr r0, _02071C28 ; =0x000005C8
mov r1, #0x0
ldr r0, [r4, r0]
@@ -5642,7 +5642,7 @@ _02072054:
mov r1, #0x1
mov r2, #0xa
mov r3, #0xf
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
add r0, r5, r7
mov r1, #0xf
bl FillWindowPixelBuffer
@@ -5936,7 +5936,7 @@ FUN_020722B8: ; 0x020722B8
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
mov r1, #0x1d
mov r2, #0x1
@@ -6061,7 +6061,7 @@ _020723D6:
mov r1, #0x1
mov r2, #0xa
mov r3, #0xf
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
mov r0, #0x89
lsl r0, r0, #0x2
add r0, r5, r0
diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s
index 92121142..521570bf 100644
--- a/arm9/asm/unk_02072548.s
+++ b/arm9/asm/unk_02072548.s
@@ -540,7 +540,7 @@ _0207291E:
add r0, r5, r0
add r2, r1, #0x0
mov r3, #0xe
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r0, #0xc
str r0, [sp, #0x0]
mov r0, #0x2
@@ -1559,7 +1559,7 @@ FUN_02073160: ; 0x02073160
mov r1, #0x1
mov r2, #0xa
mov r3, #0xf
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
_0207317A:
add r0, r4, #0x0
mov r1, #0xf
@@ -1630,7 +1630,7 @@ FUN_020731E8: ; 0x020731E8
mov r1, #0x1
mov r2, #0xa
mov r3, #0xf
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
_02073202:
add r0, r5, r6
mov r1, #0xf
@@ -2041,7 +2041,7 @@ FUN_020734C0: ; 0x020734C0
add r0, r5, r0
add r2, r1, #0x0
mov r3, #0xe
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r0, #0x95
lsl r0, r0, #0x2
add r0, r5, r0
@@ -2236,7 +2236,7 @@ FUN_020736F4: ; 0x020736F4
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x0
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
mov r0, #0x95
lsl r0, r0, #0x2
add r0, r4, r0
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index 8a959bef..f3d54fee 100644
--- a/arm9/asm/unk_02073DA8.s
+++ b/arm9/asm/unk_02073DA8.s
@@ -35,7 +35,7 @@ FUN_02073DB4: ; 0x02073DB4
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
mov r0, #0x95
lsl r0, r0, #0x2
add r0, r4, r0
@@ -124,7 +124,7 @@ FUN_02073DF4: ; 0x02073DF4
strb r6, [r2, #0xb]
add r2, r1, #0x0
mov r3, #0xe
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r0, #0xc
str r0, [sp, #0x0]
mov r0, #0x2
@@ -179,7 +179,7 @@ FUN_02073EEC: ; 0x02073EEC
add r4, r1, #0x0
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
ldr r0, _02074044 ; =0x000006FC
mov r1, #0x0
ldr r0, [r5, r0]
@@ -311,7 +311,7 @@ _02074018:
mov r1, #0x1
mov r2, #0xa
mov r3, #0xf
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
mov r0, #0x89
lsl r0, r0, #0x2
add r0, r5, r0
@@ -349,7 +349,7 @@ FUN_0207405C: ; 0x0207405C
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
mov r1, #0x1d
mov r2, #0x1
@@ -436,7 +436,7 @@ FUN_020740AC: ; 0x020740AC
strb r6, [r2, #0xb]
add r2, r1, #0x0
mov r3, #0xe
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r0, #0xc
str r0, [sp, #0x0]
mov r0, #0x2
@@ -490,7 +490,7 @@ FUN_020741A4: ; 0x020741A4
add r4, r1, #0x0
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
ldr r0, _020741EC ; =0x000006FC
mov r1, #0x0
ldr r0, [r5, r0]
@@ -679,7 +679,7 @@ FUN_02074340: ; 0x02074340
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
mov r1, #0x1d
mov r2, #0x1
@@ -706,7 +706,7 @@ FUN_0207436C: ; 0x0207436C
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
mov r1, #0x1d
mov r2, #0x1
@@ -810,7 +810,7 @@ FUN_02074454: ; 0x02074454
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
mov r1, #0x1d
mov r2, #0x1
@@ -889,7 +889,7 @@ FUN_02074480: ; 0x02074480
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r5, #0x0
bl FUN_02073DB4
add r0, r5, #0x0
@@ -2049,7 +2049,7 @@ FUN_02074E74: ; 0x02074E74
add r6, r1, #0x0
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r5, #0x0
bl FUN_02073DB4
ldr r0, _02074F5C ; =0x000005A4
@@ -2177,7 +2177,7 @@ FUN_02074F6C: ; 0x02074F6C
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
mov r1, #0x22
mov r2, #0x1
@@ -2288,7 +2288,7 @@ _02075046:
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r5, #0x0
bl FUN_02073DB4
add r0, r5, #0x0
@@ -2368,7 +2368,7 @@ FUN_020750F8: ; 0x020750F8
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r5, #0x0
bl FUN_02075118
str r0, [r4, #0x0]
@@ -2502,7 +2502,7 @@ _0207520A:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
bl FUN_02073DB4
add r0, r4, #0x0
@@ -2733,7 +2733,7 @@ FUN_020753B4: ; 0x020753B4
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
bl FUN_02073DB4
ldr r0, _020754A8 ; =0x00000B25
@@ -2861,7 +2861,7 @@ FUN_020754D0: ; 0x020754D0
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
mov r1, #0x1d
mov r2, #0x1
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index 0ad8aad2..eec999c6 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -1729,7 +1729,7 @@ _02076360:
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
add r0, r4, #0x0
add r1, r5, #0x0
bl FUN_020709FC
@@ -3276,7 +3276,7 @@ _020770DC:
add r0, r4, r0
add r2, r1, #0x0
mov r3, #0xe
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r0, #0xc
str r0, [sp, #0x0]
mov r0, #0x2
@@ -3316,12 +3316,12 @@ _02077130:
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
mov r0, #0x91
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
ldr r0, _0207722C ; =0x000006FC
mov r1, #0x0
ldr r0, [r5, r0]
@@ -3341,12 +3341,12 @@ _0207716A:
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
mov r0, #0x91
lsl r0, r0, #0x2
add r0, r5, r0
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
ldr r0, _0207722C ; =0x000006FC
mov r1, #0x0
ldr r0, [r5, r0]
@@ -3441,7 +3441,7 @@ FUN_02077248: ; 0x02077248
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x1
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
ldr r0, _020772BC ; =0x00000B25
ldr r2, _020772C0 ; =0x0000070C
ldrb r1, [r4, r0]
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 90334793..00a42326 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -1020,7 +1020,7 @@ _02077594:
mov r1, #0x0
lsl r2, r2, #0x8
mov r3, #0xa
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
mov r3, #0x0
mov r2, #0x6
ldr r0, _020776B0 ; =0x00000448
@@ -3328,7 +3328,7 @@ FUN_02078894: ; 0x02078894
lsl r2, r2, #0x8
mov r3, #0xa
add r5, r0, #0x0
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
mov r3, #0x0
str r3, [sp, #0x0]
str r3, [sp, #0x4]
diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s
index 3d3fd3fe..ea1b0029 100644
--- a/arm9/asm/unk_0207D5BC.s
+++ b/arm9/asm/unk_0207D5BC.s
@@ -3095,7 +3095,7 @@ _0207EF10:
add r0, r6, #0x0
mov r1, #0x1
mov r3, #0xd
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
add r0, r6, #0x0
mov r1, #0xf
bl FillWindowPixelBuffer
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index f5e751fa..66073837 100644
--- a/arm9/asm/unk_02086414.s
+++ b/arm9/asm/unk_02086414.s
@@ -549,7 +549,7 @@ FUN_02086784: ; 0x02086784
mov r1, #0x1
mov r2, #0x14
mov r3, #0xc
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
add r0, r5, #0x0
mov r1, #0xf
bl FillWindowPixelBuffer
@@ -711,7 +711,7 @@ _020868DE:
ldr r0, [sp, #0x14]
mov r2, #0x32
mov r3, #0xd
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
mov r0, #0x47
str r0, [sp, #0x0]
mov r0, #0x2
@@ -733,7 +733,7 @@ FUN_02086960: ; 0x02086960
add r4, r0, #0x0
add r0, #0x28
mov r1, #0x1
- bl FUN_0200CCF8
+ bl ClearFrameAndWindow1
add r0, r4, #0x0
add r0, #0x28
bl ClearWindowTilemapAndCopyToVram
diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s
index b6b6ec25..ee6d24c9 100644
--- a/arm9/asm/unk_02089498.s
+++ b/arm9/asm/unk_02089498.s
@@ -545,7 +545,7 @@ _020898B8:
add r0, #0x1c
add r1, r6, #0x0
mov r3, #0x2
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
mov r0, #0x1
ldr r1, [r5, #0x0]
lsl r0, r0, #0xa
diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s
index 7af6109f..d6f9c061 100644
--- a/arm9/asm/unk_02089960.s
+++ b/arm9/asm/unk_02089960.s
@@ -472,7 +472,7 @@ _02089CE8:
add r0, #0x20
add r1, r6, #0x0
mov r3, #0x2
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
mov r0, #0x1
ldr r1, [r5, #0x0]
lsl r0, r0, #0xa
diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s
index 8cc2030f..1b590bf4 100644
--- a/arm9/asm/unk_0208A338.s
+++ b/arm9/asm/unk_0208A338.s
@@ -477,7 +477,7 @@ _0208A722:
add r0, r4, #0x0
mov r1, #0x0
mov r3, #0xa
- bl FUN_0200D0BC
+ bl DrawFrameAndWindow2
_0208A734:
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
@@ -513,7 +513,7 @@ FUN_0208A760: ; 0x0208A760
beq _0208A778
add r0, r4, #0x0
mov r1, #0x0
- bl FUN_0200D0E0
+ bl ClearFrameAndWindow2
_0208A778:
pop {r4, pc}
.balign 4
@@ -593,18 +593,18 @@ _0208A808:
add r0, r7, #0x0
mov r2, #0xa5
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
add sp, #0x14
pop {r4-r7, pc}
thumb_func_start FUN_0208A820
FUN_0208A820: ; 0x0208A820
- ldr r3, _0208A828 ; =FUN_0200CCF8
+ ldr r3, _0208A828 ; =ClearFrameAndWindow1
add r0, #0x28
mov r1, #0x1
bx r3
.balign 4
-_0208A828: .word FUN_0200CCF8
+_0208A828: .word ClearFrameAndWindow1
thumb_func_start FUN_0208A82C
FUN_0208A82C: ; 0x0208A82C
@@ -681,18 +681,18 @@ _0208A8B8:
add r0, r7, #0x0
mov r2, #0xa5
mov r3, #0xb
- bl FUN_0200CCA4
+ bl DrawFrameAndWindow1
add sp, #0x14
pop {r4-r7, pc}
thumb_func_start FUN_0208A8D0
FUN_0208A8D0: ; 0x0208A8D0
- ldr r3, _0208A8D8 ; =FUN_0200CCF8
+ ldr r3, _0208A8D8 ; =ClearFrameAndWindow1
add r0, #0x38
mov r1, #0x1
bx r3
.balign 4
-_0208A8D8: .word FUN_0200CCF8
+_0208A8D8: .word ClearFrameAndWindow1
thumb_func_start FUN_0208A8DC
FUN_0208A8DC: ; 0x0208A8DC