From c71e1f8519068ea39795bda6414058e4a697aa71 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 21 Oct 2019 23:14:48 +1000
Subject: [PATCH] Decompile aiRemoveWeaponFromInventory

---
 src/game/chr/chraicommands.c         | 29 ++++++++--------------------
 src/include/game/chr/chraicommands.h |  2 +-
 src/setup/setup_000000.c             |  2 +-
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index b0a71c690..3601f0721 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -18186,27 +18186,14 @@ bool aiChrKill(void)
 /**
  * @cmd 01dc
  */
-GLOBAL_ASM(
-glabel ai01dc
-/*  f05ff58:	3c03800a */ 	lui	$v1,0x800a
-/*  f05ff5c:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f05ff60:	8c6e0434 */ 	lw	$t6,0x434($v1)
-/*  f05ff64:	8c6f0438 */ 	lw	$t7,0x438($v1)
-/*  f05ff68:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f05ff6c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f05ff70:	01cf1021 */ 	addu	$v0,$t6,$t7
-/*  f05ff74:	0fc447a9 */ 	jal	func0f111ea4
-/*  f05ff78:	90440002 */ 	lbu	$a0,0x2($v0)
-/*  f05ff7c:	3c03800a */ 	lui	$v1,0x800a
-/*  f05ff80:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f05ff84:	8c780438 */ 	lw	$t8,0x438($v1)
-/*  f05ff88:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f05ff8c:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f05ff90:	27190003 */ 	addiu	$t9,$t8,0x3
-/*  f05ff94:	ac790438 */ 	sw	$t9,0x438($v1)
-/*  f05ff98:	03e00008 */ 	jr	$ra
-/*  f05ff9c:	00001025 */ 	or	$v0,$zero,$zero
-);
+bool aiRemoveWeaponFromInventory(void)
+{
+	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
+	func0f111ea4(cmd[2]);
+	g_Vars.aioffset += 3;
+
+	return false;
+}
 
 /**
  * @cmd 01dd
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index e8f2c7761..976ce8a25 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -439,7 +439,7 @@
 /*0x01d9*/ bool ai01d9(void);
 /*0x01da*/ bool ai01da(void);
 /*0x01db*/ bool aiChrKill(void);
-/*0x01dc*/ bool ai01dc(void);
+/*0x01dc*/ bool aiRemoveWeaponFromInventory(void);
 /*0x01dd*/ bool ai01dd(void);
 /*0x01de*/ bool ai01de(void);
 /*0x01df*/ bool ai01df(void);
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index 2e1f9c9fe..3b1c407b0 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -14429,7 +14429,7 @@ bool (*command_pointers[])(void) = {
 	/*0x01d9*/ ai01d9,
 	/*0x01da*/ ai01da,
 	/*0x01db*/ aiChrKill,
-	/*0x01dc*/ ai01dc,
+	/*0x01dc*/ aiRemoveWeaponFromInventory,
 	/*0x01dd*/ ai01dd,
 	/*0x01de*/ ai01de,
 	/*0x01df*/ ai01df,