summaryrefslogtreecommitdiff
path: root/src/d/d_kyeff.cpp
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2023-10-15 21:21:07 -0700
committerJasper St. Pierre <jstpierre@mecheye.net>2023-10-15 21:21:18 -0700
commit09c4a4dfc723c427b3ced91a8d31ca97276d7beb (patch)
treeec56ad9b09f6b52b8f203174bcd6de5ea4d91f10 /src/d/d_kyeff.cpp
parentc9485926d68d47bfc790fe1e7dddeba33b0e5bbe (diff)
d_place_name 90%
Diffstat (limited to 'src/d/d_kyeff.cpp')
-rw-r--r--src/d/d_kyeff.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp
index 64e4102d..fe1c742b 100644
--- a/src/d/d_kyeff.cpp
+++ b/src/d/d_kyeff.cpp
@@ -49,6 +49,8 @@ s16 s16_data_ratio_set(s16 param_0, s16 param_1, f32 param_2) {
/* 8019808C-8019847C .text menu_vrbox_set__Fv */
void menu_vrbox_set() {
/* Nonmatching - regalloc. */
+ f32 blendPalAB, curTime;
+
camera_class * pCamera = dComIfGp_getCamera(0);
pCamera->mLookat.mEye.x = 9377.0f;
@@ -59,7 +61,7 @@ void menu_vrbox_set() {
pCamera->mLookat.mCenter.z = 1000.0f;
g_env_light.mWind.mWindPower = 0.7f;
- f32 curTime = g_env_light.mCurTime;
+ curTime = g_env_light.mCurTime;
g_env_light.mCurTime += 0.03f;
if ((u32)g_env_light.mCurTime >= 360.0f)
@@ -70,8 +72,7 @@ void menu_vrbox_set() {
g_env_light.mpSchejule = dKyd_schejule_menu_getp();
- u8 palIdx0, palIdx1;
- f32 blendPalAB;
+ u8 palIdx1, palIdx0;
for (s32 i = 0; i < 11; i++) {
if (curTime >= g_env_light.mpSchejule[i].mTimeEnd && curTime <= g_env_light.mpSchejule[i].mTimeBegin) {
palIdx0 = g_env_light.mpSchejule[i].mPalIdx0;
@@ -83,8 +84,8 @@ void menu_vrbox_set() {
stage_vrbox_info_class* vrbox = dKyd_dmvrbox_getp();
g_env_light.mpVrboxInfo = vrbox;
- stage_vrbox_info_class* vrbox0 = &vrbox[palIdx0];
- stage_vrbox_info_class* vrbox1 = &vrbox[palIdx1];
+ stage_vrbox_info_class* vrbox0 = &vrbox[palIdx0];
+ stage_vrbox_info_class* vrbox1 = &vrbox[palIdx1];
g_env_light.mVrSkyColor.r = s16_data_ratio_set(vrbox0->mSkyColor.r, vrbox1->mSkyColor.r, blendPalAB);
g_env_light.mVrSkyColor.g = s16_data_ratio_set(vrbox0->mSkyColor.g, vrbox1->mSkyColor.g, blendPalAB);
g_env_light.mVrSkyColor.b = s16_data_ratio_set(vrbox0->mSkyColor.b, vrbox1->mSkyColor.b, blendPalAB);