From c194deaa1aa2823e9afa9925f5d7a059f721b762 Mon Sep 17 00:00:00 2001
From: Jed Estep <jed@bolt.com>
Date: Wed, 21 Sep 2022 09:07:34 -0700
Subject: [PATCH] Update naming for a few JRB ship object variables

---
 include/object_fields.h           | 10 ++++----
 src/game/behaviors/jrb_ship.inc.c | 38 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/include/object_fields.h b/include/object_fields.h
index 8159f4aa..b04b2d79 100644
--- a/include/object_fields.h
+++ b/include/object_fields.h
@@ -849,8 +849,8 @@
 #define /*0x0F4*/ oSeesawPlatformPitchVel OBJECT_FIELD_F32(0x1B)
 
 /* Ship Part 3 */
-#define /*0x0F4*/ oShipPart3UnkF4 OBJECT_FIELD_S32(0x1B) // angle?
-#define /*0x0F8*/ oShipPart3UnkF8 OBJECT_FIELD_S32(0x1C) // angle?
+#define /*0x0F4*/ oShipPart3PitchAdjust OBJECT_FIELD_S32(0x1B)
+#define /*0x0F8*/ oShipPart3RollAdjust OBJECT_FIELD_S32(0x1C)
 
 /* Sink When Stepped On */
 #define /*0x104*/ oSinkWhenSteppedOnUnk104 OBJECT_FIELD_S32(0x1F)
@@ -864,9 +864,9 @@
 #define /*0x1AC*/ oSkeeterUnk1AC              OBJECT_FIELD_S16(0x49, 0)
 
 /* Jrb Sliding Box */
-#define /*0x0F4*/ oJrbSlidingBoxUnkF4 OBJECT_FIELD_OBJ(0x1B)
-#define /*0x0F8*/ oJrbSlidingBoxUnkF8 OBJECT_FIELD_S32(0x1C)
-#define /*0x0FC*/ oJrbSlidingBoxUnkFC OBJECT_FIELD_F32(0x1D)
+#define /*0x0F4*/ oJrbSlidingBoxShipCenterReference OBJECT_FIELD_OBJ(0x1B)
+#define /*0x0F8*/ oJrbSlidingBoxUnkF8               OBJECT_FIELD_S32(0x1C)
+#define /*0x0FC*/ oJrbSlidingBoxUnkFC               OBJECT_FIELD_F32(0x1D)
 
 /* WF Sliding Brick Platform */
 #define /*0x0F4*/ oWFSlidBrickPtfmMovVel OBJECT_FIELD_F32(0x1B)
diff --git a/src/game/behaviors/jrb_ship.inc.c b/src/game/behaviors/jrb_ship.inc.c
index 0918d8d0..8e3cccd9 100644
--- a/src/game/behaviors/jrb_ship.inc.c
+++ b/src/game/behaviors/jrb_ship.inc.c
@@ -28,10 +28,10 @@ void bhv_ship_part_3_loop(void) {
 
     cur_obj_set_pos_to_home_with_debug();
 
-    o->oShipPart3UnkF4 += 0x100;
+    o->oShipPart3PitchAdjust += 0x100;
 
-    o->oFaceAnglePitch = sins(o->oShipPart3UnkF4) * 0x400;
-    o->oFaceAngleRoll = sins(o->oShipPart3UnkF8) * 0x400;
+    o->oFaceAnglePitch = sins(o->oShipPart3PitchAdjust) * 0x400;
+    o->oFaceAngleRoll = sins(o->oShipPart3RollAdjust) * 0x400;
     o->oAngleVelPitch = o->oFaceAnglePitch - sp1E;
     o->oAngleVelRoll = o->oFaceAngleRoll - sp1C;
 
@@ -45,28 +45,28 @@ void bhv_jrb_sliding_box_loop(void) {
     Vec3f sp54;
     Vec3f sp48;
     Vec3s sp40;
-    struct Object *sp3C;
+    struct Object *shipCenter;
     struct Surface *sp38;
     UNUSED Vec3f sp2C;
     Vec3f sp20;
     s16 sp1E;
 
-    if (o->oJrbSlidingBoxUnkF4 == NULL) {
-        sp3C = cur_obj_nearest_object_with_behavior(bhvInSunkenShip3);
+    if (o->oJrbSlidingBoxShipCenterReference == NULL) {
+        shipCenter = cur_obj_nearest_object_with_behavior(bhvInSunkenShip3);
 
-        if (sp3C != NULL) { // NULL check only for assignment, not for dereference?
-            o->oJrbSlidingBoxUnkF4 = sp3C;
+        if (shipCenter != NULL) { // NULL check only for assignment, not for dereference?
+            o->oJrbSlidingBoxShipCenterReference = shipCenter;
         }
 
-        o->oParentRelativePosX = o->oPosX - sp3C->oPosX;
-        o->oParentRelativePosY = o->oPosY - sp3C->oPosY;
-        o->oParentRelativePosZ = o->oPosZ - sp3C->oPosZ;
+        o->oParentRelativePosX = o->oPosX - shipCenter->oPosX;
+        o->oParentRelativePosY = o->oPosY - shipCenter->oPosY;
+        o->oParentRelativePosZ = o->oPosZ - shipCenter->oPosZ;
     } else {
-        sp3C = o->oJrbSlidingBoxUnkF4;
+        shipCenter = o->oJrbSlidingBoxShipCenterReference;
 
-        sp40[0] = sp3C->oFaceAnglePitch;
-        sp40[1] = sp3C->oFaceAngleYaw;
-        sp40[2] = sp3C->oFaceAngleRoll;
+        sp40[0] = shipCenter->oFaceAnglePitch;
+        sp40[1] = shipCenter->oFaceAngleYaw;
+        sp40[2] = shipCenter->oFaceAngleRoll;
 
         sp54[0] = o->oParentRelativePosX;
         sp54[1] = o->oParentRelativePosY;
@@ -75,11 +75,11 @@ void bhv_jrb_sliding_box_loop(void) {
         mtxf_rotate_zxy_and_translate(sp60, sp54, sp40);
         linear_mtxf_mul_vec3f(sp60, sp48, sp54);
 
-        o->oPosX = sp3C->oPosX + sp48[0];
-        o->oPosY = sp3C->oPosY + sp48[1];
-        o->oPosZ = sp3C->oPosZ + sp48[2];
+        o->oPosX = shipCenter->oPosX + sp48[0];
+        o->oPosY = shipCenter->oPosY + sp48[1];
+        o->oPosZ = shipCenter->oPosZ + sp48[2];
 
-        sp1E = sp3C->oFaceAnglePitch;
+        sp1E = shipCenter->oFaceAnglePitch;
     }
 
     sp20[0] = o->oPosX;