Misc cleanup 13 (#1189)

* FaultAddrConv Functions

* Invisible Ruppe macros

* skybox

* Z64 header defines

* ActorId

* remove i from KaleidoManager_FaultAddrConv

* size_t and parens

include/functions.h

@@ -776,8 +776,8 @@ s32 Actor_IsSmallChest(struct EnBox* chest);
 void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16 limbPosCount, f32 effectScale, f32 frozenSteamScale, f32 effectAlpha, u8 type);
 void Actor_SpawnIceEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s32 limbPosCount, s32 effectsPerLimb, f32 scale, f32 scaleRange);
 
-void ActorOverlayTable_FaultPrint(void* arg0, void* arg1);
-void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1);
+void ActorOverlayTable_FaultClient(void* arg0, void* arg1);
+void* ActorOverlayTable_FaultAddrConv(void* address, void* param);
 void ActorOverlayTable_Init(void);
 void ActorOverlayTable_Cleanup(void);
 
@@ -2242,7 +2242,7 @@ void func_80161C0C(void);
 // void func_801631DC(void);
 // void func_80163334(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
 // void func_80163660(void);
-void* KaleidoManager_FaultAddrConvFunc(void* address, void* param);
+void* KaleidoManager_FaultAddrConv(void* address, void* param);
 void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl);
 void KaleidoManager_ClearOvl(KaleidoMgrOverlay* ovl);
 void KaleidoManager_Init(PlayState* play);
@@ -2443,7 +2443,7 @@ void Graph_FaultClient(void);
 void Graph_InitTHGA(TwoHeadGfxArena* arena, Gfx* buffer, s32 size);
 void Graph_SetNextGfxPool(GraphicsContext* gfxCtx);
 GameStateOverlay* Graph_GetNextGameState(GameState* gameState);
-void* Graph_FaultAddrConvFunc(void* address, void* param);
+void* Graph_FaultAddrConv(void* address, void* param);
 void Graph_Init(GraphicsContext* gfxCtx);
 void Graph_Destroy(GraphicsContext* gfxCtx);
 void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState);

include/variables.h

@@ -490,7 +490,7 @@ extern PlayState* actorCutscenesPlayState;
 extern s16 actorCutsceneReturnCamera;
 extern s16 D_801BD8C6;
 extern GameStateOverlay gGameStateOverlayTable[];
-extern s32 graphNumGameStates;
+extern s32 gGraphNumGameStates;
 // extern UNK_TYPE2 D_801BDA70;
 // extern UNK_TYPE2 D_801BDA74;
 // extern UNK_TYPE2 D_801BDA78;
@@ -2304,8 +2304,8 @@ extern f32 D_801ED8D0;
 // extern UNK_TYPE1 D_801ED8DC;
 extern Mtx D_801ED8E0;
 // extern UNK_TYPE1 D_801ED920;
-extern FaultClient D_801ED930;
-extern FaultAddrConvClient D_801ED940;
+extern FaultClient sActorOverlayTableFaultClient;
+extern FaultAddrConvClient sActorOverlayTableFaultAddrConvClient;
 extern char D_801ED950[80];
 extern char D_801ED9A0[80];
 extern Vec3f D_801ED9F0[3];
@@ -2476,7 +2476,7 @@ extern s16 D_801F4E7A;
 // extern UNK_TYPE1 D_801F6B58;
 extern void (*sKaleidoScopeUpdateFunc)(PlayState* play);
 extern void (*sKaleidoScopeDrawFunc)(PlayState* play);
-extern FaultAddrConvClient sKaleidoAreaFaultClient;
+extern FaultAddrConvClient sKaleidoMgrFaultAddrConvClient;
 extern s16 sTransitionFillTimer;
 extern Input D_801F6C18;
 extern TransitionTile sTransitionTile;

include/z64animation.h

@@ -1,5 +1,5 @@
-#ifndef Z64_ANIMATION_H
-#define Z64_ANIMATION_H
+#ifndef Z64ANIMATION_H
+#define Z64ANIMATION_H
 
 #include "PR/ultratypes.h"
 #include "PR/gbi.h"

include/z64audio.h

@@ -1,5 +1,5 @@
-#ifndef Z64_AUDIO_H
-#define Z64_AUDIO_H
+#ifndef Z64AUDIO_H
+#define Z64AUDIO_H
 
 #include "audiothread_cmd.h"
 

include/z64bgcheck.h

@@ -1,5 +1,5 @@
-#ifndef Z64_BGCHECK_H
-#define Z64_BGCHECK_H
+#ifndef Z64BGCHECK_H
+#define Z64BGCHECK_H
 
 struct PlayState;
 struct Actor;

include/z64collision_check.h

@@ -1,5 +1,5 @@
-#ifndef _Z_COLLISION_CHECK_H_
-#define _Z_COLLISION_CHECK_H_
+#ifndef Z64COLLISION_CHECK_H
+#define Z64COLLISION_CHECK_H
 
 #include "PR/ultratypes.h"
 #include "z64math.h"

include/z64curve.h

@@ -1,5 +1,5 @@
-#ifndef Z64_CURVE_H
-#define Z64_CURVE_H
+#ifndef Z64CURVE_H
+#define Z64CURVE_H
 
 #include "PR/ultratypes.h"
 #include "z64math.h"

include/z64dma.h

@@ -1,5 +1,5 @@
-#ifndef _Z64_DMA_H_
-#define _Z64_DMA_H_
+#ifndef Z64DMA_H
+#define Z64DMA_H
 
 #include "ultra64.h"
 

include/z64effect.h

@@ -1,5 +1,5 @@
-#ifndef _Z64EFFECT_H_
-#define _Z64EFFECT_H_
+#ifndef Z64EFFECT_H
+#define Z64EFFECT_H
 
 #include "PR/ultratypes.h"
 #include "color.h"

include/z64jpeg.h

@@ -1,5 +1,5 @@
-#ifndef Z64_JPEG_H
-#define Z64_JPEG_H
+#ifndef Z64JPEG_H
+#define Z64JPEG_H
 
 #include "PR/ultratypes.h"
 #include "ultra64/message.h"

include/z64skin.h

@@ -1,5 +1,5 @@
-#ifndef Z64_SKIN_H
-#define Z64_SKIN_H
+#ifndef Z64SKIN_H
+#define Z64SKIN_H
 
 #include "z64animation.h"
 

include/z64skybox.h

@@ -1,8 +1,9 @@
-#ifndef Z64_SKYBOX_H
-#define Z64_SKYBOX_H
+#ifndef Z64SKYBOX_H
+#define Z64SKYBOX_H
 
 #include "PR/ultratypes.h"
 #include "PR/gbi.h"
+#include "color.h"
 
 #include "z64dma.h"
 #include "z64math.h"
@@ -33,17 +34,11 @@ typedef struct SkyboxContext {
     /* 0x1E8 */ OSMesgQueue loadQueue;
     /* 0x200 */ OSMesg loadMsg;
     /* 0x204 */ s16 skyboxShouldDraw;
-    /* 0x208 */ f32 rotX;
-    /* 0x20C */ f32 rotY;
-    /* 0x210 */ f32 rotZ;
+    /* 0x208 */ Vec3f rot;
     /* 0x214 */ Vec3f eye;
     /* 0x220 */ s16 angle;
-    /* 0x222 */ u8 primR;
-    /* 0x223 */ u8 primG;
-    /* 0x224 */ u8 primB;
-    /* 0x225 */ u8 envR;
-    /* 0x226 */ u8 envG;
-    /* 0x227 */ u8 envB;
+    /* 0x222 */ Color_RGB8 prim;
+    /* 0x225 */ Color_RGB8 env;
 } SkyboxContext; // size = 0x228
 
 typedef struct struct_801C5F44 {

include/z64snap.h

@@ -1,5 +1,5 @@
-#ifndef Z64_SNAP_H
-#define Z64_SNAP_H
+#ifndef Z64SNAP_H
+#define Z64SNAP_H
 
 #include "PR/ultratypes.h"
 #include "z64actor.h"

include/z_en_hy_code.h

@@ -1,5 +1,5 @@
-#ifndef Z_EN_HY_CODE_H
-#define Z_EN_HY_CODE_H
+#ifndef Z64ENHY_CODE_H
+#define Z64ENHY_CODE_H
 
 #include "global.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"

include/z_prenmi.h

@@ -1,5 +1,5 @@
-#ifndef Z64_PRENMI_H
-#define Z64_PRENMI_H
+#ifndef Z64PRENMI_H
+#define Z64PRENMI_H
 
 #include "global.h"
 

include/z_title_setup.h

@@ -1,5 +1,5 @@
-#ifndef Z64_TITLE_SETUP_H
-#define Z64_TITLE_SETUP_H
+#ifndef Z64TITLE_SETUP_H
+#define Z64TITLE_SETUP_H
 
 #include "global.h"