diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 548036d47..f5d8f3ce6 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -1519,7 +1519,7 @@ bool aiIfPathStarted(void)
  */
 bool aiIfAlarmActive(void)
 {
-	if (func0f090438()) {
+	if (alarmIsActive()) {
 		u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
 	} else {
diff --git a/src/game/game_000000.c b/src/game/game_000000.c
index ead3dad02..eac53dfcd 100644
--- a/src/game/game_000000.c
+++ b/src/game/game_000000.c
@@ -83729,7 +83729,7 @@ GLOBAL_ASM(
 glabel func0f04a2b4
 /*  f04a2b4:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f04a2b8:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f04a2bc:	0fc2410e */ 	jal	func0f090438
+/*  f04a2bc:	0fc2410e */ 	jal	alarmIsActive
 /*  f04a2c0:	afa40018 */ 	sw	$a0,0x18($sp)
 /*  f04a2c4:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*  f04a2c8:	27bd0018 */ 	addiu	$sp,$sp,0x18
diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c
index 94ebf992e..2af8f2696 100644
--- a/src/game/game_0601b0.c
+++ b/src/game/game_0601b0.c
@@ -44031,7 +44031,7 @@ glabel func0f086f40
 /*  f0871d4:	2407ffff */ 	addiu	$a3,$zero,-1
 /*  f0871d8:	0c004241 */ 	jal	0x10904
 /*  f0871dc:	e7a60014 */ 	swc1	$f6,0x14($sp)
-/*  f0871e0:	0fc2410e */ 	jal	func0f090438
+/*  f0871e0:	0fc2410e */ 	jal	alarmIsActive
 /*  f0871e4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0871e8:	10400005 */ 	beqz	$v0,.L0f087200
 /*  f0871ec:	00000000 */ 	sll	$zero,$zero,0x0
@@ -54572,14 +54572,10 @@ void alarmDeactivate(void)
 	func0f0903d4();
 }
 
-GLOBAL_ASM(
-glabel func0f090438
-/*  f090438:	3c028007 */ 	lui	$v0,0x8007
-/*  f09043c:	8c4298d4 */ 	lw	$v0,-0x672c($v0)
-/*  f090440:	0002702a */ 	slt	$t6,$zero,$v0
-/*  f090444:	03e00008 */ 	jr	$ra
-/*  f090448:	01c01025 */ 	or	$v0,$t6,$zero
-);
+bool alarmIsActive(void)
+{
+	return g_AlarmActive > 0;
+}
 
 GLOBAL_ASM(
 glabel func0f09044c
@@ -55272,7 +55268,7 @@ GLOBAL_ASM(
 glabel func0f090db4
 /*  f090db4:	27bdffc8 */ 	addiu	$sp,$sp,-56
 /*  f090db8:	afbf002c */ 	sw	$ra,0x2c($sp)
-/*  f090dbc:	0fc2410e */ 	jal	func0f090438
+/*  f090dbc:	0fc2410e */ 	jal	alarmIsActive
 /*  f090dc0:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f090dc4:	10400079 */ 	beqz	$v0,.L0f090fac
 /*  f090dc8:	3c0e800a */ 	lui	$t6,0x800a
diff --git a/src/include/types.h b/src/include/types.h
index 9a73ff079..ab855ebcd 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "constants.h"
 
-#define bool u8
+#define bool u32
 
 struct coord {
 	float x;