From d7cfe0cfdc2a93f475fced5af163b8d78531441d Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 19 Oct 2019 13:39:58 +1000
Subject: [PATCH] Decompile aiAddMorale

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

diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 2a06fd418..f66123965 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -5087,29 +5087,14 @@ bool aiSetMorale(void)
 /**
  * @cmd 0085
  */
-GLOBAL_ASM(
-glabel ai0085
-/*  f053338:	3c03800a */ 	lui	$v1,0x800a
-/*  f05333c:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f053340:	8c6e0434 */ 	lw	$t6,0x434($v1)
-/*  f053344:	8c6f0438 */ 	lw	$t7,0x438($v1)
-/*  f053348:	8c640424 */ 	lw	$a0,0x424($v1)
-/*  f05334c:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f053350:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f053354:	01cf1021 */ 	addu	$v0,$t6,$t7
-/*  f053358:	90450002 */ 	lbu	$a1,0x2($v0)
-/*  f05335c:	0fc1289f */ 	jal	incrementByte
-/*  f053360:	24840112 */ 	addiu	$a0,$a0,0x112
-/*  f053364:	3c03800a */ 	lui	$v1,0x800a
-/*  f053368:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f05336c:	8c780438 */ 	lw	$t8,0x438($v1)
-/*  f053370:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f053374:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f053378:	27190003 */ 	addiu	$t9,$t8,0x3
-/*  f05337c:	ac790438 */ 	sw	$t9,0x438($v1)
-/*  f053380:	03e00008 */ 	jr	$ra
-/*  f053384:	00001025 */ 	or	$v0,$zero,$zero
-);
+bool aiAddMorale(void)
+{
+	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
+	incrementByte(&g_Vars.chrdata->morale, cmd[2]);
+	g_Vars.aioffset += 3;
+
+	return false;
+}
 
 /**
  * @cmd 0086
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index 4f660f685..15f9414c4 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -135,7 +135,7 @@
 /*0x0082*/ bool ai0082(void);
 /*0x0083*/ bool ai0083(void);
 /*0x0084*/ bool aiSetMorale(void);
-/*0x0085*/ bool ai0085(void);
+/*0x0085*/ bool aiAddMorale(void);
 /*0x0086*/ bool ai0086(void);
 /*0x0087*/ bool ai0087(void);
 /*0x0088*/ bool ai0088(void);
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index c82d21650..8b6074031 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -14086,7 +14086,7 @@ bool (*command_pointers[])(void) = {
 	/*0x0082*/ ai0082,
 	/*0x0083*/ ai0083,
 	/*0x0084*/ aiSetMorale,
-	/*0x0085*/ ai0085,
+	/*0x0085*/ aiAddMorale,
 	/*0x0086*/ ai0086,
 	/*0x0087*/ ai0087,
 	/*0x0088*/ ai0088,