Misc cleanup 13 (#1189)

* FaultAddrConv Functions

* Invisible Ruppe macros

* skybox

* Z64 header defines

* ActorId

* remove i from KaleidoManager_FaultAddrConv

* size_t and parens

1 files changed, 14 insertions, 14 deletions

diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c
index 2569f81fa..489f596e5 100644
--- a/src/code/z_vr_box_draw.c
+++ b/src/code/z_vr_box_draw.c
@@ -5,19 +5,19 @@ Mtx* sSkyboxDrawMatrix;
 Mtx* Skybox_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z) {
     Matrix_Translate(x, y, z, MTXMODE_NEW);
     Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
-    Matrix_RotateXFApply(skyboxCtx->rotX);
-    Matrix_RotateYF(skyboxCtx->rotY, MTXMODE_APPLY);
-    Matrix_RotateZF(skyboxCtx->rotZ, MTXMODE_APPLY);
+    Matrix_RotateXFApply(skyboxCtx->rot.x);
+    Matrix_RotateYF(skyboxCtx->rot.y, MTXMODE_APPLY);
+    Matrix_RotateZF(skyboxCtx->rot.z, MTXMODE_APPLY);
     return Matrix_ToMtx(sSkyboxDrawMatrix);
 }
 
 void Skybox_SetColors(SkyboxContext* skyboxCtx, u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB) {
-    skyboxCtx->primR = primR;
-    skyboxCtx->primG = primG;
-    skyboxCtx->primB = primB;
-    skyboxCtx->envR = envR;
-    skyboxCtx->envG = envG;
-    skyboxCtx->envB = envB;
+    skyboxCtx->prim.r = primR;
+    skyboxCtx->prim.g = primG;
+    skyboxCtx->prim.b = primB;
+    skyboxCtx->env.r = envR;
+    skyboxCtx->env.g = envG;
+    skyboxCtx->env.b = envB;
 }
 
 void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z) {
@@ -32,9 +32,9 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId
 
     Matrix_Translate(x, y, z, MTXMODE_NEW);
     Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
-    Matrix_RotateXFApply(skyboxCtx->rotX);
-    Matrix_RotateYF(skyboxCtx->rotY, MTXMODE_APPLY);
-    Matrix_RotateZF(skyboxCtx->rotZ, MTXMODE_APPLY);
+    Matrix_RotateXFApply(skyboxCtx->rot.x);
+    Matrix_RotateYF(skyboxCtx->rot.y, MTXMODE_APPLY);
+    Matrix_RotateZF(skyboxCtx->rot.z, MTXMODE_APPLY);
     Matrix_ToMtx(sSkyboxDrawMatrix);
 
     gSPMatrix(POLY_OPA_DISP++, sSkyboxDrawMatrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -45,8 +45,8 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId
     gDPSetTextureConvert(POLY_OPA_DISP++, G_TC_FILT);
     gDPSetCombineLERP(POLY_OPA_DISP++, TEXEL1, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, TEXEL1, TEXEL0, PRIMITIVE, TEXEL0,
                       PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED);
-    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, skyboxCtx->primR, skyboxCtx->primG, skyboxCtx->primB, blend);
-    gDPSetEnvColor(POLY_OPA_DISP++, skyboxCtx->envR, skyboxCtx->envG, skyboxCtx->envB, 0);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, skyboxCtx->prim.r, skyboxCtx->prim.g, skyboxCtx->prim.b, blend);
+    gDPSetEnvColor(POLY_OPA_DISP++, skyboxCtx->env.r, skyboxCtx->env.g, skyboxCtx->env.b, 0);
 
     gSPDisplayList(POLY_OPA_DISP++, &skyboxCtx->dListBuf[0]);
     gSPDisplayList(POLY_OPA_DISP++, &skyboxCtx->dListBuf[2]);