sub_80EE294

2 files changed, 49 insertions, 152 deletions

diff --git a/asm/pokenav.s b/asm/pokenav.s
index 13ec84baf..076175847 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -6,158 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80EE294
-sub_80EE294: @ 80EE294
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r1, _080EE2B4 @ =0x02000000
-	movs r2, 0xC1
-	lsls r2, 2
-	adds r0, r1, r2
-	ldrh r0, [r0]
-	adds r4, r1, 0
-	cmp r0, 0x8
-	bls _080EE2AA
-	b _080EE3C6
-_080EE2AA:
-	lsls r0, 2
-	ldr r1, _080EE2B8 @ =_080EE2BC
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080EE2B4: .4byte 0x02000000
-_080EE2B8: .4byte _080EE2BC
-	.align 2, 0
-_080EE2BC:
-	.4byte _080EE2E0
-	.4byte _080EE2FE
-	.4byte _080EE324
-	.4byte _080EE33C
-	.4byte _080EE34C
-	.4byte _080EE370
-	.4byte _080EE37A
-	.4byte _080EE39A
-	.4byte _080EE3B4
-_080EE2E0:
-	movs r1, 0xC2
-	lsls r1, 2
-	adds r0, r4, r1
-	ldr r0, [r0]
-	movs r1, 0x1
-	negs r1, r1
-	movs r2, 0
-	str r2, [sp]
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	movs r2, 0xC1
-	lsls r2, 2
-	adds r1, r4, r2
-	b _080EE3A8
-_080EE2FE:
-	ldr r0, _080EE320 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080EE3C6
-	movs r0, 0
-	bl SetVBlankCallback
-	bl sub_80EED0C
-	bl sub_80F3C2C
-	bl sub_80EEE08
-	b _080EE3A0
-	.align 2, 0
-_080EE320: .4byte gPaletteFade
-_080EE324:
-	bl sub_80F6134
-	movs r0, 0x1
-	bl sub_80F0264
-	ldr r1, _080EE348 @ =0x02000000
-	movs r2, 0xC1
-	lsls r2, 2
-	adds r1, r2
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-_080EE33C:
-	bl sub_80F02A0
-	lsls r0, 24
-	cmp r0, 0
-	bne _080EE3C6
-	b _080EE3A0
-	.align 2, 0
-_080EE348: .4byte 0x02000000
-_080EE34C:
-	movs r0, 0x4
-	bl sub_80EEFBC
-	movs r0, 0x1
-	bl sub_80F3008
-	ldr r0, _080EE368 @ =sub_80EBD18
-	bl SetVBlankCallback
-	ldr r1, _080EE36C @ =0x02000000
-	movs r2, 0xC1
-	lsls r2, 2
-	adds r1, r2
-	b _080EE3A8
-	.align 2, 0
-_080EE368: .4byte sub_80EBD18
-_080EE36C: .4byte 0x02000000
-_080EE370:
-	bl sub_8055870
-	cmp r0, 0
-	bne _080EE3C6
-	b _080EE3A0
-_080EE37A:
-	movs r1, 0xC2
-	lsls r1, 2
-	adds r0, r4, r1
-	ldr r0, [r0]
-	movs r1, 0x1
-	negs r1, r1
-	movs r2, 0
-	str r2, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	movs r2, 0xC1
-	lsls r2, 2
-	adds r1, r4, r2
-	b _080EE3A8
-_080EE39A:
-	movs r0, 0x4
-	bl sub_80EED2C
-_080EE3A0:
-	ldr r1, _080EE3B0 @ =0x02000000
-	movs r0, 0xC1
-	lsls r0, 2
-	adds r1, r0
-_080EE3A8:
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	b _080EE3C6
-	.align 2, 0
-_080EE3B0: .4byte 0x02000000
-_080EE3B4:
-	ldr r0, _080EE3D0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080EE3C6
-	ldr r0, _080EE3D4 @ =sub_80EDDBC
-	bl sub_80EBDBC
-_080EE3C6:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080EE3D0: .4byte gPaletteFade
-_080EE3D4: .4byte sub_80EDDBC
-	thumb_func_end sub_80EE294
-
 	thumb_func_start sub_80EE3D8
 sub_80EE3D8: @ 80EE3D8
 	push {r4,lr}
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index ba2e22b0b..12bbf5aba 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -2092,3 +2092,52 @@ label2:
 		break;
 	}
 }
+
+void sub_80F3C2C();
+
+void sub_80EE294() {
+	switch (ewram0.var304) {
+	case 0:
+		BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0);
+		ewram0.var304++;
+		break;
+	case 1:
+		if (gPaletteFade.active) return;
+		SetVBlankCallback(NULL);
+		sub_80EED0C();
+		sub_80F3C2C();
+		sub_80EEE08();
+		ewram0.var304++;
+		break;
+	case 2:
+		sub_80F6134();
+		sub_80F0264(0x1);
+		ewram0.var304++;
+	case 3:
+		if (sub_80F02A0()) return;
+		ewram0.var304++;
+		break;
+	case 4:
+		sub_80EEFBC(0x4);
+		sub_80F3008(0x1);
+		SetVBlankCallback(&sub_80EBD18);
+		ewram0.var304++;
+		break;
+	case 5:
+		if (sub_8055870()) return;
+		ewram0.var304++;
+		break;
+	case 6:
+		BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0);
+		ewram0.var304++;
+		break;
+	case 7:
+		sub_80EED2C(0x4);
+		ewram0.var304++;
+		break;
+	case 8:
+		if (gPaletteFade.active) return;
+		sub_80EBDBC(&sub_80EDDBC);
+		break;
+	}
+}