From bde2622b36a8caa9496b8a3ef3c32a9863027f92 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 2 Nov 2019 16:33:07 +1000
Subject: [PATCH] Decompile chrUnsetFlagsById

---
 src/game/chr/chraicommands.c |  2 +-
 src/game/game_000000.c       | 26 ++++++++------------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 98fab59ec..27d8fc5ae 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -5685,7 +5685,7 @@ bool aiChrUnsetFlag(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24);
-	func0f049eb0(g_Vars.chrdata, cmd[2], flags, cmd[7]);
+	chrUnsetFlagsById(g_Vars.chrdata, cmd[2], flags, cmd[7]);
 	g_Vars.aioffset += 8;
 
 	return false;
diff --git a/src/game/game_000000.c b/src/game/game_000000.c
index ba8d48b9a..7e9d9d9cb 100644
--- a/src/game/game_000000.c
+++ b/src/game/game_000000.c
@@ -84658,24 +84658,14 @@ void chrSetFlagsById(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank)
 	}
 }
 
-GLOBAL_ASM(
-glabel func0f049eb0
-/*  f049eb0:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f049eb4:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f049eb8:	afa60020 */ 	sw	$a2,0x20($sp)
-/*  f049ebc:	0fc126d1 */ 	jal	chrFindById
-/*  f049ec0:	afa70024 */ 	sw	$a3,0x24($sp)
-/*  f049ec4:	10400004 */ 	beqz	$v0,.L0f049ed8
-/*  f049ec8:	00402025 */ 	or	$a0,$v0,$zero
-/*  f049ecc:	8fa50020 */ 	lw	$a1,0x20($sp)
-/*  f049ed0:	0fc12782 */ 	jal	chrUnsetFlags
-/*  f049ed4:	93a60027 */ 	lbu	$a2,0x27($sp)
-.L0f049ed8:
-/*  f049ed8:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f049edc:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f049ee0:	03e00008 */ 	jr	$ra
-/*  f049ee4:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void chrUnsetFlagsById(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank)
+{
+	struct chrdata *chr = chrFindById(ref, chrnum);
+
+	if (chr) {
+		chrUnsetFlags(chr, flags, bank);
+	}
+}
 
 GLOBAL_ASM(
 glabel func0f049ee8