From adce48a7ae054b4c9323bc128c7a42d60f0350fc Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 28 Jun 2020 18:01:17 +1000
Subject: [PATCH] Decompile objIsHoverpropOrBike

---
 src/game/propobj.c         | 19 +++++--------------
 src/include/constants.h    |  6 +++---
 src/include/game/propobj.h |  2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/game/propobj.c b/src/game/propobj.c
index 0b4b78e6d..167b14ba1 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -13920,19 +13920,10 @@ glabel var7f1aa314
 /*  f0720b0:	27bd01d8 */ 	addiu	$sp,$sp,0x1d8
 );
 
-GLOBAL_ASM(
-glabel func0f0720b4
-/*  f0720b4:	90830003 */ 	lbu	$v1,0x3($a0)
-/*  f0720b8:	38620035 */ 	xori	$v0,$v1,0x35
-/*  f0720bc:	2c420001 */ 	sltiu	$v0,$v0,0x1
-/*  f0720c0:	14400003 */ 	bnez	$v0,.L0f0720d0
-/*  f0720c4:	00000000 */ 	nop
-/*  f0720c8:	38620033 */ 	xori	$v0,$v1,0x33
-/*  f0720cc:	2c420001 */ 	sltiu	$v0,$v0,0x1
-.L0f0720d0:
-/*  f0720d0:	03e00008 */ 	jr	$ra
-/*  f0720d4:	00000000 */ 	nop
-);
+s32 objIsHoverpropOrBike(struct defaultobj *obj)
+{
+	return obj->type == OBJTYPE_HOVERPROP || obj->type == OBJTYPE_HOVERBIKE;
+}
 
 f32 hoverpropGetTurnAngle(struct defaultobj *obj)
 {
@@ -13980,7 +13971,7 @@ glabel var7f1aa31c
 /*  f072168:	8c8f0014 */ 	lw	$t7,0x14($a0)
 /*  f07216c:	00808025 */ 	or	$s0,$a0,$zero
 /*  f072170:	e7ac0490 */ 	swc1	$f12,0x490($sp)
-/*  f072174:	0fc1c82d */ 	jal	func0f0720b4
+/*  f072174:	0fc1c82d */ 	jal	objIsHoverpropOrBike
 /*  f072178:	afaf00e8 */ 	sw	$t7,0xe8($sp)
 /*  f07217c:	1040002c */ 	beqz	$v0,.L0f072230
 /*  f072180:	c7ac0490 */ 	lwc1	$f12,0x490($sp)
diff --git a/src/include/constants.h b/src/include/constants.h
index 1019a79a6..526c952a5 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -2088,11 +2088,11 @@
 #define OBJTYPE_LINKPATHS        0x32
 #define OBJTYPE_HOVERBIKE        0x33
 #define OBJTYPE_END              0x34
-#define OBJTYPE_HOVERPROP        0x35
+#define OBJTYPE_HOVERPROP        0x35 // Hovercrates and hoverbeds
 #define OBJTYPE_FAN              0x36
-#define OBJTYPE_HOVERCAR         0x37
+#define OBJTYPE_HOVERCAR         0x37 // Datadyne cars, Chicago taxi and limo, and hoverbots
 #define OBJTYPE_PADEFFECT        0x38
-#define OBJTYPE_CHOPPER          0x39
+#define OBJTYPE_CHOPPER          0x39 // Extraction hovercopter and A51 interceptors
 #define OBJTYPE_MINE             0x3a
 #define OBJTYPE_ESCALATOR        0x3b
 
diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h
index 7b33c4ebf..d9a433c87 100644
--- a/src/include/game/propobj.h
+++ b/src/include/game/propobj.h
@@ -134,7 +134,7 @@ void liftGoToStop(struct liftobj *lift, s32 stopnum);
 u32 func0f071360(void);
 void func0f0713e4(struct defaultobj *obj, struct hov *hov, struct coord *coord, s16 *rooms, f32 *matrix);
 void func0f0714b8(struct defaultobj *obj, struct hov *hov);
-u32 func0f0720b4(void);
+s32 objIsHoverpropOrBike(struct defaultobj *obj);
 f32 hoverpropGetTurnAngle(struct defaultobj *obj);
 void hoverpropSetTurnAngle(struct defaultobj *obj, f32 angle);
 u32 func0f072144(void);