From b1462a2a9ebdb8ee4ac715a4719a3a2d43304fe9 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 18 Dec 2019 17:37:10 +1000
Subject: [PATCH] Decompile chrFadeOut

---
 src/game/chr/chr.c           | 21 +++++++--------------
 src/game/chr/chraicommands.c |  2 +-
 src/include/game/chr/chr.h   |  4 ++--
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 9ea7661cd..a1f9c6f67 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -33245,20 +33245,13 @@ glabel func0f03a9b8
 /*  f03aa08:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f03aa0c
-/*  f03aa0c:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f03aa10:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f03aa14:	0fc0c467 */ 	jal	func0f03119c
-/*  f03aa18:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f03aa1c:	0fc0f337 */ 	jal	func0f03ccdc
-/*  f03aa20:	8fa40018 */ 	lw	$a0,0x18($sp)
-/*  f03aa24:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f03aa28:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f03aa2c:	24020001 */ 	addiu	$v0,$zero,0x1
-/*  f03aa30:	03e00008 */ 	jr	$ra
-/*  f03aa34:	00000000 */ 	sll	$zero,$zero,0x0
-);
+bool chrFadeOut(struct chrdata *chr)
+{
+	func0f03119c();
+	func0f03ccdc(chr);
+
+	return true;
+}
 
 GLOBAL_ASM(
 glabel func0f03aa38
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 6421ccf0e..2caf4af25 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -1223,7 +1223,7 @@ bool aiSurrender(void)
  */
 bool aiFadeOut(void)
 {
-	func0f03aa0c(g_Vars.chrdata);
+	chrFadeOut(g_Vars.chrdata);
 	g_Vars.aioffset += 2;
 
 	return false;
diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h
index 2eb04fc76..8ae130cdf 100644
--- a/src/include/game/chr/chr.h
+++ b/src/include/game/chr/chr.h
@@ -250,7 +250,7 @@ u32 func0f03a7e8(struct chrdata *chr, u32 thingtype, u32 thingid);
 u32 func0f03a894(struct chrdata *chr, s32 pad, s32 arg2);
 u32 func0f03a968(struct chrdata *chr);
 u32 func0f03a9b8(struct chrdata *chr);
-u32 func0f03aa0c(struct chrdata *chr);
+bool chrFadeOut(struct chrdata *chr);
 u32 func0f03aa38(struct chrdata *chr, u32 arg1);
 bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 speed);
 bool func0f03ab74(struct chrdata *chr, struct position *pos, s32 arg2);
@@ -274,7 +274,7 @@ u32 func0f03c138(void);
 u32 func0f03c8b4(void);
 u32 func0f03c91c(void);
 u32 func0f03cb74(void);
-u32 func0f03ccdc(void);
+void func0f03ccdc(struct chrdata *chr);
 u32 func0f03cd04(void);
 u32 func0f03cd24(void);
 u32 func0f03ce8c(void);