From 4b9e50adfc58a8dbaa52b205e6b479332d22a26c Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 19 Oct 2019 18:49:08 +1000
Subject: [PATCH] Decompile aiHideChr

---
 src/game/chr/chraicommands.c         | 55 ++++++++--------------------
 src/include/game/chr/chraicommands.h |  2 +-
 src/setup/setup_000000.c             |  2 +-
 3 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 0cd6de263..d4bd75417 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -9260,46 +9260,21 @@ bool aiShowChr(void)
 /**
  * @cmd 0115
  */
-GLOBAL_ASM(
-glabel ai0115
-/*  f057254:	3c03800a */ 	lui	$v1,0x800a
-/*  f057258:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f05725c:	8c6e0434 */ 	lw	$t6,0x434($v1)
-/*  f057260:	8c6f0438 */ 	lw	$t7,0x438($v1)
-/*  f057264:	27bdffe0 */ 	addiu	$sp,$sp,-32
-/*  f057268:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f05726c:	01cf1021 */ 	addu	$v0,$t6,$t7
-/*  f057270:	90450002 */ 	lbu	$a1,0x2($v0)
-/*  f057274:	0fc126d1 */ 	jal	chrFindById
-/*  f057278:	8c640424 */ 	lw	$a0,0x424($v1)
-/*  f05727c:	10400010 */ 	beqz	$v0,.L0f0572c0
-/*  f057280:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f057284:	8c58001c */ 	lw	$t8,0x1c($v0)
-/*  f057288:	1300000d */ 	beqz	$t8,.L0f0572c0
-/*  f05728c:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f057290:	8c590020 */ 	lw	$t9,0x20($v0)
-/*  f057294:	1320000a */ 	beqz	$t9,.L0f0572c0
-/*  f057298:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f05729c:	8c44001c */ 	lw	$a0,0x1c($v0)
-/*  f0572a0:	0fc19711 */ 	jal	func0f065c44
-/*  f0572a4:	afa20018 */ 	sw	$v0,0x18($sp)
-/*  f0572a8:	8fa80018 */ 	lw	$t0,0x18($sp)
-/*  f0572ac:	0fc18171 */ 	jal	func0f0605c4
-/*  f0572b0:	8d04001c */ 	lw	$a0,0x1c($t0)
-/*  f0572b4:	8fa90018 */ 	lw	$t1,0x18($sp)
-/*  f0572b8:	0fc180c0 */ 	jal	func0f060300
-/*  f0572bc:	8d24001c */ 	lw	$a0,0x1c($t1)
-.L0f0572c0:
-/*  f0572c0:	3c03800a */ 	lui	$v1,0x800a
-/*  f0572c4:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f0572c8:	8c6a0438 */ 	lw	$t2,0x438($v1)
-/*  f0572cc:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f0572d0:	27bd0020 */ 	addiu	$sp,$sp,0x20
-/*  f0572d4:	254b0003 */ 	addiu	$t3,$t2,0x3
-/*  f0572d8:	ac6b0438 */ 	sw	$t3,0x438($v1)
-/*  f0572dc:	03e00008 */ 	jr	$ra
-/*  f0572e0:	00001025 */ 	or	$v0,$zero,$zero
-);
+bool aiHideChr(void)
+{
+	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
+	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
+
+	if (chr && chr->pos && chr->unk020) {
+		func0f065c44(chr->pos);
+		func0f0605c4(chr->pos);
+		func0f060300(chr->pos);
+	}
+
+	g_Vars.aioffset += 3;
+
+	return false;
+}
 
 /**
  * @cmd 0116
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index edca06c52..459f18ddd 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -277,7 +277,7 @@
 /*0x0112*/ bool ai0112(void);
 /*0x0113*/ bool aiIfInCutscene(void);
 /*0x0114*/ bool aiShowChr(void);
-/*0x0115*/ bool ai0115(void);
+/*0x0115*/ bool aiHideChr(void);
 /*0x0116*/ bool ai0116(void);
 /*0x0117*/ bool ai0117(void);
 /*0x0118*/ bool ai0118(void);
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index 6eceab92f..cf1e29819 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -14230,7 +14230,7 @@ bool (*command_pointers[])(void) = {
 	/*0x0112*/ ai0112,
 	/*0x0113*/ aiIfInCutscene,
 	/*0x0114*/ aiShowChr,
-	/*0x0115*/ ai0115,
+	/*0x0115*/ aiHideChr,
 	/*0x0116*/ ai0116,
 	/*0x0117*/ ai0117,
 	/*0x0118*/ ai0118,