From 967addefb6d0b65e80479bb4ae2587a3d6d30cbc Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 7 Oct 2019 22:32:28 +1000
Subject: [PATCH] Decompile aiSurrender

---
 src/game/chr/chraicommands.c         | 24 +++++++-----------------
 src/include/game/chr/chraicommands.h |  2 +-
 src/setup/setup_000000.c             |  2 +-
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index ce1f575b9..332aaba49 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -1147,23 +1147,13 @@ bool ai001c(void)
 /**
  * @cmd 0024
  */
-GLOBAL_ASM(
-glabel ai0024
-/*  f04f17c:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f04f180:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f04f184:	3c04800a */ 	lui	$a0,0x800a
-/*  f04f188:	0fc0ea6e */ 	jal	func0f03a9b8
-/*  f04f18c:	8c84a3e4 */ 	lw	$a0,-0x5c1c($a0)
-/*  f04f190:	3c03800a */ 	lui	$v1,0x800a
-/*  f04f194:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f04f198:	8c6e0438 */ 	lw	$t6,0x438($v1)
-/*  f04f19c:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f04f1a0:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f04f1a4:	25cf0002 */ 	addiu	$t7,$t6,0x2
-/*  f04f1a8:	ac6f0438 */ 	sw	$t7,0x438($v1)
-/*  f04f1ac:	03e00008 */ 	jr	$ra
-/*  f04f1b0:	00001025 */ 	or	$v0,$zero,$zero
-);
+bool aiSurrender(void)
+{
+	func0f03a9b8(g_Vars.chrdata);
+	g_Vars.aioffset += 2;
+
+	return false;
+}
 
 /**
  * @cmd 0025
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index d75f9c1e9..efde4872b 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -39,7 +39,7 @@
 /*0x0021*/ bool ai0021(void);
 /*0x0022*/ bool ai0022(void);
 /*0x0023*/ bool ai0023(void);
-/*0x0024*/ bool ai0024(void);
+/*0x0024*/ bool aiSurrender(void);
 /*0x0025*/ bool ai0025(void);
 /*0x0026*/ bool ai0026(void);
 /*0x0027*/ bool ai0027(void);
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index 3411c52e9..b83b51c2d 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -13985,7 +13985,7 @@ bool (*command_pointers[])(void) = {
 	/*0x0021*/ ai0021,
 	/*0x0022*/ ai0022,
 	/*0x0023*/ ai0023,
-	/*0x0024*/ ai0024,
+	/*0x0024*/ aiSurrender,
 	/*0x0025*/ ai0025,
 	/*0x0026*/ ai0026,
 	/*0x0027*/ ai0027,