From 570fbda38aea55e1ce9b62bb4ddb9d62b04f8aa1 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Fri, 14 Aug 2026 06:58:20 -0700 Subject: [PATCH] Scene_CommandWindSettings --- include/z64scene.h | 8 ++++---- src/code/z_scene.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/z64scene.h b/include/z64scene.h index 89dc8ad4e7..bd5e48d493 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -58,10 +58,10 @@ typedef struct { /* 0x0 */ u8 code; /* 0x1 */ u8 data1; /* 0x2 */ UNK_TYPE1 pad2[2]; - /* 0x4 */ s8 west; - /* 0x5 */ s8 vertical; - /* 0x6 */ s8 south; - /* 0x7 */ u8 clothIntensity; + /* 0x4 */ s8 x; + /* 0x5 */ s8 y; + /* 0x6 */ s8 z; + /* 0x7 */ u8 speed; } SCmdWindSettings; // size = 0x8 typedef struct { diff --git a/src/code/z_scene.c b/src/code/z_scene.c index c9a34d4e5a..a64c43d64e 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -433,14 +433,14 @@ void Scene_CommandTimeSettings(PlayState* play, SceneCmd* cmd) { // SceneTableEntry Header Command 0x05: Wind Settings void Scene_CommandWindSettings(PlayState* play, SceneCmd* cmd) { - s8 temp1 = cmd->windSettings.west; - s8 temp2 = cmd->windSettings.vertical; - s8 temp3 = cmd->windSettings.south; + s8 x = cmd->windSettings.x; + s8 y = cmd->windSettings.y; + s8 z = cmd->windSettings.z; - play->envCtx.windDirection.x = temp1; - play->envCtx.windDirection.y = temp2; - play->envCtx.windDirection.z = temp3; - play->envCtx.windSpeed = cmd->windSettings.clothIntensity; + play->envCtx.windDirection.x = x; + play->envCtx.windDirection.y = y; + play->envCtx.windDirection.z = z; + play->envCtx.windSpeed = cmd->windSettings.speed; } // SceneTableEntry Header Command 0x13: Exit List