From 1a932821c24bf817b136c5435cdba5044bb8ab04 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 7 Oct 2019 22:43:41 +1000
Subject: [PATCH] Decompile aiActivateAlarm

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

diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 2b0196d60..e1ce58e93 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -1204,22 +1204,13 @@ bool ai0027(void)
 /**
  * @cmd 0028
  */
-GLOBAL_ASM(
-glabel ai0028
-/*  f04f2e0:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f04f2e4:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f04f2e8:	0fc240ec */ 	jal	func0f0903b0
-/*  f04f2ec:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f04f2f0:	3c03800a */ 	lui	$v1,0x800a
-/*  f04f2f4:	24639fc0 */ 	addiu	$v1,$v1,-24640
-/*  f04f2f8:	8c6e0438 */ 	lw	$t6,0x438($v1)
-/*  f04f2fc:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f04f300:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f04f304:	25cf0002 */ 	addiu	$t7,$t6,0x2
-/*  f04f308:	ac6f0438 */ 	sw	$t7,0x438($v1)
-/*  f04f30c:	03e00008 */ 	jr	$ra
-/*  f04f310:	00001025 */ 	or	$v0,$zero,$zero
-);
+bool aiActivateAlarm(void)
+{
+	func0f0903b0();
+	g_Vars.aioffset += 2;
+
+	return false;
+}
 
 /**
  * @cmd 0029
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index 6ef0293bd..cb422a386 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -43,7 +43,7 @@
 /*0x0025*/ bool aiFadeOut(void);
 /*0x0026*/ bool aiRemoveChr(void);
 /*0x0027*/ bool ai0027(void);
-/*0x0028*/ bool ai0028(void);
+/*0x0028*/ bool aiActivateAlarm(void);
 /*0x0029*/ bool ai0029(void);
 /*0x002a*/ bool ai002a(void);
 /*0x002b*/ bool ai002b(void);
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index 22874ba92..3b0589dfe 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -13989,7 +13989,7 @@ bool (*command_pointers[])(void) = {
 	/*0x0025*/ aiFadeOut,
 	/*0x0026*/ aiRemoveChr,
 	/*0x0027*/ ai0027,
-	/*0x0028*/ ai0028,
+	/*0x0028*/ aiActivateAlarm,
 	/*0x0029*/ ai0029,
 	/*0x002a*/ ai002a,
 	/*0x002b*/ ai002b,