From dc26469aba64975407175b542ae5275deda71268 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 9 Mar 2020 17:50:24 +1000
Subject: [PATCH] Decompile fadeCancel

---
 src/game/game_167ae0.c         | 26 +++++++++-----------------
 src/include/game/game_167ae0.h |  2 +-
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c
index cebfe62f1..88d810398 100644
--- a/src/game/game_167ae0.c
+++ b/src/game/game_167ae0.c
@@ -392,7 +392,7 @@ glabel func0f167c88
 
 void func0f167e7c(s32 stagenum)
 {
-	func0f1688c8();
+	fadeCancel();
 
 	var80084014 = 0;
 	var80084010 = 0;
@@ -845,22 +845,14 @@ bool fadeIsActive(void)
 	return fade80084058 >= 0;
 }
 
-GLOBAL_ASM(
-glabel func0f1688c8
-/*  f1688c8:	3c018008 */ 	lui	$at,0x8008
-/*  f1688cc:	a4204054 */ 	sh	$zero,0x4054($at)
-/*  f1688d0:	3c01bf80 */ 	lui	$at,0xbf80
-/*  f1688d4:	44812000 */ 	mtc1	$at,$f4
-/*  f1688d8:	3c018008 */ 	lui	$at,0x8008
-/*  f1688dc:	e4244058 */ 	swc1	$f4,0x4058($at)
-/*  f1688e0:	3c018008 */ 	lui	$at,0x8008
-/*  f1688e4:	ac20405c */ 	sw	$zero,0x405c($at)
-/*  f1688e8:	3c018008 */ 	lui	$at,0x8008
-/*  f1688ec:	ac204060 */ 	sw	$zero,0x4060($at)
-/*  f1688f0:	3c018008 */ 	lui	$at,0x8008
-/*  f1688f4:	03e00008 */ 	jr	$ra
-/*  f1688f8:	a4204064 */ 	sh	$zero,0x4064($at)
-);
+void fadeCancel(void)
+{
+	g_FadeNumFrames = 0;
+	fade80084058 = -1;
+	g_FadePrevColor = 0;
+	g_FadeColor = 0;
+	fade80084064 = 0;
+}
 
 GLOBAL_ASM(
 glabel func0f1688fc
diff --git a/src/include/game/game_167ae0.h b/src/include/game/game_167ae0.h
index bd4f2db7e..a93bd4942 100644
--- a/src/include/game/game_167ae0.h
+++ b/src/include/game/game_167ae0.h
@@ -11,7 +11,7 @@ u32 func0f167b84(void);
 u32 func0f167c88(void);
 void func0f167e7c(s32 stagenum);
 u32 func0f1685d8(void);
-void func0f1688c8(void);
+void fadeCancel(void);
 u32 func0f1688fc(void);
 u32 func0f168b4c(void);
 u32 func0f168f24(void);