From 5107d50e4f9767d54338f0eb5deacd4d062f6f80 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 28 Nov 2019 19:50:33 +1000
Subject: [PATCH] Identify aiIfTimerLessThan, aiIfTimerLessThan and
 heliGetTimer

---
 src/game/chr/chraicommands.c         | 10 +++++-----
 src/game/game_066310.c               |  2 +-
 src/include/game/chr/chraicommands.h |  4 ++--
 src/include/game/game_066310.h       |  2 +-
 src/setup/setup_000000.c             |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 306c102b5..85659d364 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -5470,7 +5470,7 @@ bool aiIfTimerGreaterThanRandom(void)
  * @cmd 00bc
  */
 GLOBAL_ASM(
-glabel ai00bc
+glabel aiIfTimerLessThan
 /*  f05511c:	3c03800a */ 	lui	$v1,%hi(g_Vars)
 /*  f055120:	24639fc0 */ 	addiu	$v1,$v1,%lo(g_Vars)
 /*  f055124:	8c6e0434 */ 	lw	$t6,0x434($v1)
@@ -5513,7 +5513,7 @@ glabel ai00bc
 /*  f0551b0:	50800014 */ 	beqzl	$a0,.L0f055204
 /*  f0551b4:	8c6d0438 */ 	lw	$t5,0x438($v1)
 /*  f0551b8:	afa2001c */ 	sw	$v0,0x1c($sp)
-/*  f0551bc:	0fc1ec48 */ 	jal	func0f07b120
+/*  f0551bc:	0fc1ec48 */ 	jal	heliGetTimer
 /*  f0551c0:	e7a20018 */ 	swc1	$f2,0x18($sp)
 /*  f0551c4:	c7a20018 */ 	lwc1	$f2,0x18($sp)
 /*  f0551c8:	3c03800a */ 	lui	$v1,%hi(g_Vars)
@@ -5547,7 +5547,7 @@ glabel ai00bc
  * @cmd 00bd
  */
 GLOBAL_ASM(
-glabel ai00bd
+glabel aiIfTimerGreaterThan
 /*  f055220:	27bdffd8 */ 	addiu	$sp,$sp,-40
 /*  f055224:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f055228:	3c10800a */ 	lui	$s0,%hi(g_Vars)
@@ -5584,7 +5584,7 @@ glabel ai00bd
 /*  f05529c:	8e040430 */ 	lw	$a0,0x430($s0)
 /*  f0552a0:	50800005 */ 	beqzl	$a0,.L0f0552b8
 /*  f0552a4:	8e040424 */ 	lw	$a0,0x424($s0)
-/*  f0552a8:	0fc1ec48 */ 	jal	func0f07b120
+/*  f0552a8:	0fc1ec48 */ 	jal	heliGetTimer
 /*  f0552ac:	afa20024 */ 	sw	$v0,0x24($sp)
 /*  f0552b0:	8fa20024 */ 	lw	$v0,0x24($sp)
 /*  f0552b4:	8e040424 */ 	lw	$a0,0x424($s0)
@@ -5603,7 +5603,7 @@ glabel ai00bd
 .L0f0552e4:
 /*  f0552e4:	50800010 */ 	beqzl	$a0,.L0f055328
 /*  f0552e8:	8e0d0438 */ 	lw	$t5,0x438($s0)
-/*  f0552ec:	0fc1ec48 */ 	jal	func0f07b120
+/*  f0552ec:	0fc1ec48 */ 	jal	heliGetTimer
 /*  f0552f0:	afa20024 */ 	sw	$v0,0x24($sp)
 /*  f0552f4:	c7a40020 */ 	lwc1	$f4,0x20($sp)
 /*  f0552f8:	8fa20024 */ 	lw	$v0,0x24($sp)
diff --git a/src/game/game_066310.c b/src/game/game_066310.c
index 322418b2d..3342f566a 100644
--- a/src/game/game_066310.c
+++ b/src/game/game_066310.c
@@ -24838,7 +24838,7 @@ glabel func0f07b0f4
 );
 
 GLOBAL_ASM(
-glabel func0f07b120
+glabel heliGetTimer
 /*  f07b120:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f07b124:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f07b128:	0fc1eb7d */ 	jal	func0f07adf4
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index 38b34e62b..5071f048f 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -190,8 +190,8 @@
 /*0x00b9*/ bool aiResumeTimer(void);
 /*0x00ba*/ bool aiIfTimerStopped(void);
 /*0x00bb*/ bool aiIfTimerGreaterThanRandom(void);
-/*0x00bc*/ bool ai00bc(void);
-/*0x00bd*/ bool ai00bd(void);
+/*0x00bc*/ bool aiIfTimerLessThan(void);
+/*0x00bd*/ bool aiIfTimerGreaterThan(void);
 /*0x00be*/ bool aiShowCountdownTimer(void);
 /*0x00bf*/ bool aiHideCountdownTimer(void);
 /*0x00c0*/ bool aiSetCountdownTimerValue(void);
diff --git a/src/include/game/game_066310.h b/src/include/game/game_066310.h
index cda2989b5..a8cb520a5 100644
--- a/src/include/game/game_066310.h
+++ b/src/include/game/game_066310.h
@@ -169,7 +169,7 @@ u32 func0f07b038(struct heliobj *heli);
 void func0f07b078(struct heliobj *heli);
 u32 func0f07b0bc(struct heliobj *heli, u32 arg1);
 u32 func0f07b0f4(struct heliobj *heli);
-u32 func0f07b120(void);
+float heliGetTimer(struct heliobj *heli);
 u32 func0f07b158(void);
 u32 func0f07b164(void);
 u32 func0f07b290(struct heliobj *heli, u32 arg1);
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index 39eb374b5..63b25c05e 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -14320,8 +14320,8 @@ bool (*g_CommandPointers[])(void) = {
 	/*0x00b9*/ aiResumeTimer,
 	/*0x00ba*/ aiIfTimerStopped,
 	/*0x00bb*/ aiIfTimerGreaterThanRandom,
-	/*0x00bc*/ ai00bc,
-	/*0x00bd*/ ai00bd,
+	/*0x00bc*/ aiIfTimerLessThan,
+	/*0x00bd*/ aiIfTimerGreaterThan,
 	/*0x00be*/ aiShowCountdownTimer,
 	/*0x00bf*/ aiHideCountdownTimer,
 	/*0x00c0*/ aiSetCountdownTimerValue,