4 files changed, 17 insertions, 17 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s
index 20fc2752..78c16fd0 100644
--- a/arm9/modules/05/asm/mod05_021E1AD8.s
+++ b/arm9/modules/05/asm/mod05_021E1AD8.s
@@ -290,7 +290,7 @@ _021E1CA8:
 	add r0, #8
 	mov r1, #1
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	add r0, r4, #0
 	bl MOD05_021E1DE4
 	add r1, r4, #0
@@ -541,7 +541,7 @@ MOD05_021E1ECC: ; 0x021E1ECC
 	add r0, #0xa8
 	ldr r0, [r0]
 	mov r1, #0
-	bl FUN_0200CCF8
+	bl ClearFrameAndWindow1
 	add r0, r6, #0
 	add r0, #0xa8
 	ldr r0, [r0]
@@ -727,7 +727,7 @@ _021E2032:
 	add r0, #8
 	mov r1, #1
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	add r0, r4, #0
 	bl MOD05_021E2170
 	add r2, r4, #0
@@ -1139,7 +1139,7 @@ MOD05_021E2368: ; 0x021E2368
 	lsl r0, r0, #4
 	ldr r0, [r6, r0]
 	mov r1, #0
-	bl FUN_0200CCF8
+	bl ClearFrameAndWindow1
 	add r0, r6, #0
 	add r0, #8
 	bl RemoveWindow
@@ -1307,7 +1307,7 @@ _021E2496:
 	add r0, #8
 	mov r1, #1
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	lsl r0, r4, #0x13
 	lsr r0, r0, #0x10
 	str r0, [sp]
@@ -1407,7 +1407,7 @@ MOD05_021E25A4: ; 0x021E25A4
 	add r0, #0xa8
 	ldr r0, [r0]
 	mov r1, #0
-	bl FUN_0200CCF8
+	bl ClearFrameAndWindow1
 	add r0, r6, #0
 	add r0, #0xa8
 	ldr r0, [r0]
@@ -1642,7 +1642,7 @@ _021E270A:
 	add r0, #8
 	mov r1, #1
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	add r0, r5, #0
 	add r1, r6, #0
 	add r2, r4, #0
@@ -1747,7 +1747,7 @@ MOD05_021E27E8: ; 0x021E27E8
 	add r0, r4, #0
 	mov r1, #1
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	add r0, r4, #0
 	mov r1, #0xf
 	bl FillWindowPixelBuffer
@@ -1788,7 +1788,7 @@ MOD05_021E288C: ; 0x021E288C
 	push {r4, lr}
 	add r4, r0, #0
 	mov r1, #0
-	bl FUN_0200CCF8
+	bl ClearFrameAndWindow1
 	add r0, r4, #0
 	mov r1, #1
 	bl WindowArray_dtor
@@ -1907,7 +1907,7 @@ MOD05_021E2950: ; 0x021E2950
 	add r0, r4, #0
 	mov r1, #1
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	add r0, r5, #0
 	add r1, r4, #0
 	bl MOD05_021E29C8
@@ -1922,7 +1922,7 @@ MOD05_021E29B4: ; 0x021E29B4
 	push {r4, lr}
 	add r4, r0, #0
 	mov r1, #0
-	bl FUN_0200CCF8
+	bl ClearFrameAndWindow1
 	add r0, r4, #0
 	mov r1, #1
 	bl WindowArray_dtor
@@ -2036,7 +2036,7 @@ MOD05_021E2A70: ; 0x021E2A70
 	add r0, r4, #0
 	mov r1, #1
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	add r0, r5, #0
 	add r1, r4, #0
 	bl MOD05_021E2AD4
diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s
index 6c9c422b..d6f55205 100644
--- a/arm9/modules/05/asm/mod05_021E8310.s
+++ b/arm9/modules/05/asm/mod05_021E8310.s
@@ -286,7 +286,7 @@ MOD05_021E84F4: ; 0x021E84F4
 	ldr r2, _021E8568 ; =0x000003D9
 	mov r1, #0
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	add sp, #0x14
 	pop {r3, r4, pc}
 	.balign 4, 0
@@ -299,7 +299,7 @@ MOD05_021E856C: ; 0x021E856C
 	add r4, r0, #0
 	ldr r0, [r4, #0x10]
 	mov r1, #0
-	bl FUN_0200CCF8
+	bl ClearFrameAndWindow1
 	ldr r0, [r4, #0x10]
 	bl RemoveWindow
 	ldr r0, [r4, #0x10]
diff --git a/arm9/modules/05/asm/mod05_021EFBF8.s b/arm9/modules/05/asm/mod05_021EFBF8.s
index 3437ee91..5f6b0a3b 100644
--- a/arm9/modules/05/asm/mod05_021EFBF8.s
+++ b/arm9/modules/05/asm/mod05_021EFBF8.s
@@ -413,7 +413,7 @@ MOD05_021EFEDC: ; 0x021EFEDC
 	add r0, #0x20
 	mov r1, #1
 	mov r3, #0xb
-	bl FUN_0200CCA4
+	bl DrawFrameAndWindow1
 	mov r4, #0
 _021EFF2E:
 	add r0, r6, #0
@@ -551,7 +551,7 @@ _021F0056:
 	add r0, r5, #0
 	add r0, #0x20
 	mov r1, #0
-	bl FUN_0200CCF8
+	bl ClearFrameAndWindow1
 	add r0, r5, #0
 	add r0, #0x20
 	bl RemoveWindow
diff --git a/arm9/modules/05/asm/mod05_021F5C44.s b/arm9/modules/05/asm/mod05_021F5C44.s
index 15d94fbb..5bf30612 100644
--- a/arm9/modules/05/asm/mod05_021F5C44.s
+++ b/arm9/modules/05/asm/mod05_021F5C44.s
@@ -724,7 +724,7 @@ MOD05_021F617C: ; 0x021F617C
 	add r0, r4, #0
 	add r0, #0x38
 	mov r1, #0
-	bl FUN_0200D0E0
+	bl ClearFrameAndWindow2
 	add r4, #0x38
 	add r0, r4, #0
 	bl RemoveWindow