From 242f918f0e7f433b5929d23e8da5a436e13642a7 Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Mon, 2 Jun 2025 18:42:54 -0400 Subject: [PATCH] Rename head turn speed variable --- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 16 ++++++++-------- src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 52b6af18b2..517b53f045 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1311,7 +1311,7 @@ void EnRu1_UpdateHeadRotation(EnRu1* this) { s32 headRotOffset; s16* headRotTimer = &this->headRotTimer; s16* headRotY = &this->interactInfo.headRot.y; - s16* headRotAngle = &this->headRotAngle; + s16* headTurnSpeed = &this->headTurnSpeed; s32 pad[2]; if (DECR(*headRotTimer) == 0) { @@ -1324,18 +1324,18 @@ void EnRu1_UpdateHeadRotation(EnRu1* this) { } else { this->headRotDirection = 0; } - *headRotAngle = 0; + *headTurnSpeed = 0; } if (this->headRotDirection == 0) { - Math_SmoothStepToS(headRotAngle, 0 - *headRotY, 1, 0x190, 0x190); - Math_SmoothStepToS(headRotY, 0, 3, ABS(*headRotAngle), 0x64); + Math_SmoothStepToS(headTurnSpeed, 0 - *headRotY, 1, 0x190, 0x190); + Math_SmoothStepToS(headRotY, 0, 3, ABS(*headTurnSpeed), 0x64); } else if (this->headRotDirection == 1) { - Math_SmoothStepToS(headRotAngle, -0x2AAA - *headRotY, 1, 0x190, 0x190); - Math_SmoothStepToS(headRotY, -0x2AAA, 3, ABS(*headRotAngle), 0x64); + Math_SmoothStepToS(headTurnSpeed, -0x2AAA - *headRotY, 1, 0x190, 0x190); + Math_SmoothStepToS(headRotY, -0x2AAA, 3, ABS(*headTurnSpeed), 0x64); } else { - Math_SmoothStepToS(headRotAngle, 0x2AAA - *headRotY, 1, 0x190, 0x190); - Math_SmoothStepToS(headRotY, 0x2AAA, 3, ABS(*headRotAngle), 0x64); + Math_SmoothStepToS(headTurnSpeed, 0x2AAA - *headRotY, 1, 0x190, 0x190); + Math_SmoothStepToS(headRotY, 0x2AAA, 3, ABS(*headTurnSpeed), 0x64); } } diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 3e3f968c3c..7684a93fe0 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -38,7 +38,7 @@ typedef struct EnRu1 { /* 0x0294 */ char unk_294[0x4]; /* 0x0298 */ s32 unk_298; /* 0x029C */ char unk_29C[0x2]; - /* 0x029E */ s16 headRotAngle; + /* 0x029E */ s16 headTurnSpeed; /* 0x02A0 */ char unk_2A0[0x4]; /* 0x02A4 */ f32 unk_2A4; /* 0x02A8 */ s32 alpha;