From b1fcc72979603d67212553d66e5e0b5d7bd5444e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 16 Feb 2020 01:27:02 +1000
Subject: [PATCH] Decompile aiSetRotarySpeed

---
 src/files/setup/setuplue.c           |  2 +-
 src/game/chr/chraicommands.c         | 53 ++++++++--------------------
 src/game/data/data_0083d0.c          |  2 +-
 src/include/commands.h               |  8 +++--
 src/include/game/chr/chraicommands.h |  2 +-
 src/include/types.h                  |  7 ++++
 6 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c
index 48e58674c..99e8f179a 100644
--- a/src/files/setup/setuplue.c
+++ b/src/files/setup/setuplue.c
@@ -906,7 +906,7 @@ u8 func0408_start_path07[] = {
 };
 
 u8 func0409_set_rotor_speed[] = {
-	set_rotor_speed(0x026c, 0x1c, 0x20)
+	set_rotor_speed(620, 7200)
 	beginloop(0x04)
 	endloop(0x04)
 
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 4e9c76ba0..c8f6bda9e 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -98,7 +98,6 @@ const u32 var7f1a9ccc[] = {0x7f05592c};
 const u32 var7f1a9cd0[] = {0x7f05592c};
 const u32 var7f1a9cd4[] = {0x7f05592c};
 const u32 var7f1a9cd8[] = {0x3d4ccccd};
-const u32 var7f1a9cdc[] = {0x40c907a9};
 
 /**
  * @cmd 0000
@@ -6169,43 +6168,21 @@ bool aiSetVehicleSpeed(void)
 /**
  * @cmd 00d7
  */
-GLOBAL_ASM(
-glabel ai00d7
-/*  f056ae8:	3c05800a */ 	lui	$a1,%hi(g_Vars)
-/*  f056aec:	24a59fc0 */ 	addiu	$a1,$a1,%lo(g_Vars)
-/*  f056af0:	8ca30438 */ 	lw	$v1,0x438($a1)
-/*  f056af4:	8cae0434 */ 	lw	$t6,0x434($a1)
-/*  f056af8:	3c017f1b */ 	lui	$at,%hi(var7f1a9cdc)
-/*  f056afc:	c42a9cdc */ 	lwc1	$f10,%lo(var7f1a9cdc)($at)
-/*  f056b00:	01c31021 */ 	addu	$v0,$t6,$v1
-/*  f056b04:	90490002 */ 	lbu	$t1,0x2($v0)
-/*  f056b08:	904b0003 */ 	lbu	$t3,0x3($v0)
-/*  f056b0c:	904f0004 */ 	lbu	$t7,0x4($v0)
-/*  f056b10:	00095200 */ 	sll	$t2,$t1,0x8
-/*  f056b14:	014b6025 */ 	or	$t4,$t2,$t3
-/*  f056b18:	448c3000 */ 	mtc1	$t4,$f6
-/*  f056b1c:	90590005 */ 	lbu	$t9,0x5($v0)
-/*  f056b20:	000fc200 */ 	sll	$t8,$t7,0x8
-/*  f056b24:	46803220 */ 	cvt.s.w	$f8,$f6
-/*  f056b28:	8ca4042c */ 	lw	$a0,0x42c($a1)
-/*  f056b2c:	3c014561 */ 	lui	$at,0x4561
-/*  f056b30:	03194025 */ 	or	$t0,$t8,$t9
-/*  f056b34:	44882000 */ 	mtc1	$t0,$f4
-/*  f056b38:	44819000 */ 	mtc1	$at,$f18
-/*  f056b3c:	460a4402 */ 	mul.s	$f16,$f8,$f10
-/*  f056b40:	00001025 */ 	or	$v0,$zero,$zero
-/*  f056b44:	46802020 */ 	cvt.s.w	$f0,$f4
-/*  f056b48:	10800005 */ 	beqz	$a0,.L0f056b60
-/*  f056b4c:	46128083 */ 	div.s	$f2,$f16,$f18
-/*  f056b50:	e482006c */ 	swc1	$f2,0x6c($a0)
-/*  f056b54:	8cad042c */ 	lw	$t5,0x42c($a1)
-/*  f056b58:	e5a00070 */ 	swc1	$f0,0x70($t5)
-/*  f056b5c:	8ca30438 */ 	lw	$v1,0x438($a1)
-.L0f056b60:
-/*  f056b60:	246e0006 */ 	addiu	$t6,$v1,0x6
-/*  f056b64:	03e00008 */ 	jr	$ra
-/*  f056b68:	acae0438 */ 	sw	$t6,0x438($a1)
-);
+bool aiSetRotarySpeed(void)
+{
+	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
+	f32 speedtime = cmd[5] | (cmd[4] << 8);
+	f32 speedaim = (cmd[3] | (cmd[2] << 8)) * (M_PI * 2) / 3600;
+
+	if (g_Vars.heli) {
+		g_Vars.heli->rotaryspeedaim = speedaim;
+		g_Vars.heli->rotaryspeedtime = speedtime;
+	}
+
+	g_Vars.aioffset += 6;
+
+	return false;
+}
 
 /**
  * @cmd 00d8
diff --git a/src/game/data/data_0083d0.c b/src/game/data/data_0083d0.c
index c2acefaae..5e648f9ef 100644
--- a/src/game/data/data_0083d0.c
+++ b/src/game/data/data_0083d0.c
@@ -6434,7 +6434,7 @@ bool (*g_CommandPointers[])(void) = {
 	/*0x00d4*/ ai00d4,
 	/*0x00d5*/ ai00d5,
 	/*0x00d6*/ aiSetVehicleSpeed,
-	/*0x00d7*/ ai00d7,
+	/*0x00d7*/ aiSetRotarySpeed,
 	/*0x00d8*/ aiNoOp00d8,
 	/*0x00d9*/ aiNoOp00d9,
 	/*0x00da*/ aiSetObjImage,
diff --git a/src/include/commands.h b/src/include/commands.h
index bb52cd611..55a430c56 100644
--- a/src/include/commands.h
+++ b/src/include/commands.h
@@ -1917,12 +1917,14 @@
 
 /**
  * Sets the speed of a component of the given vehicle, such as a rotor or wheel.
+ *
+ * Speed is the target speed. Time is the amount of time to reach that speed.
+ * The units for this aren't known.
  */
-#define set_rotor_speed(speed, u1, u2) \
+#define set_rotor_speed(speed, time) \
 	mkshort(0x00d7), \
 	mkshort(speed), \
-	u1, \
-	u2,
+	mkshort(time),
 
 #define noop00d8(u1) \
 	mkshort(0x00d8), \
diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h
index c5d2a524f..205bd305d 100644
--- a/src/include/game/chr/chraicommands.h
+++ b/src/include/game/chr/chraicommands.h
@@ -217,7 +217,7 @@
 /*0x00d4*/ bool ai00d4(void);
 /*0x00d5*/ bool ai00d5(void);
 /*0x00d6*/ bool aiSetVehicleSpeed(void);
-/*0x00d7*/ bool ai00d7(void);
+/*0x00d7*/ bool aiSetRotarySpeed(void);
 /*0x00d8*/ bool aiNoOp00d8(void);
 /*0x00d9*/ bool aiNoOp00d9(void);
 /*0x00da*/ bool aiSetObjImage(void);
diff --git a/src/include/types.h b/src/include/types.h
index eea5ae56c..792a2972f 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -836,6 +836,13 @@ struct heliobj {
 	/*0x5c*/ u8 *ailist;
 	/*0x60*/ u16 aioffset;
 	/*0x62*/ s16 aireturnlist;
+	/*0x64*/ u32 unk64;
+	/*0x68*/ f32 rotaryspeed;
+	/*0x6c*/ f32 rotaryspeedaim;
+	/*0x70*/ f32 rotaryspeedtime;
+	/*0x74*/ f32 speed;
+	/*0x78*/ f32 speedaim;
+	/*0x7c*/ f32 speedtime60;
 };
 
 struct liftobj { // objtype 30