Animation Cleanup: En_V* and En_W* (#1713)

* begin anim v and w

* structs

* bgId

* cleanup

* space

* more cleanup

* spacing

* Unsigned

16 files changed, 106 insertions, 104 deletions

diff --git a/include/PR/os_internal.h b/include/PR/os_internal.h
index f2c5bfa17..10ae5515e 100644
--- a/include/PR/os_internal.h
+++ b/include/PR/os_internal.h
@@ -7,8 +7,8 @@
 #include "os_internal_rsp.h"
 
 typedef struct __osHwInt {
-    /* 0x00 */ s32 (*handler)(void);
-    /* 0x04 */ void* stackEnd;
-} __osHwInt; // size = 0x08
+    /* 0x0 */ s32 (*handler)(void);
+    /* 0x4 */ void* stackEnd;
+} __osHwInt; // size = 0x8
 
 #endif
diff --git a/include/PR/os_pfs.h b/include/PR/os_pfs.h
index 4ce1acd52..f0ee2fa5c 100644
--- a/include/PR/os_pfs.h
+++ b/include/PR/os_pfs.h
@@ -95,14 +95,14 @@ typedef struct {
 
 typedef union {
     struct {
-        /* 0x00 */ u8 bank;
-        /* 0x01 */ u8 page;
+        /* 0x0 */ u8 bank;
+        /* 0x1 */ u8 page;
     } inode_t;
-    /* 0x00 */ u16 ipage;
-} __OSInodeUnit; // size = 0x02
+    /* 0x0 */ u16 ipage;
+} __OSInodeUnit; // size = 0x2
 
 typedef struct {
-    /* 0x00 */ __OSInodeUnit inodePage[128];
+    /* 0x0 */ __OSInodeUnit inodePage[128];
 } __OSInode; // size = 0x100
 
 typedef struct {
diff --git a/include/PR/os_thread.h b/include/PR/os_thread.h
index bced9f598..4823377d0 100644
--- a/include/PR/os_thread.h
+++ b/include/PR/os_thread.h
@@ -11,10 +11,10 @@ typedef s32 OSId;
 
 typedef union {
     struct {
-        /* 0x00 */ f32 f_odd;
-        /* 0x04 */ f32 f_even;
+        /* 0x0 */ f32 f_odd;
+        /* 0x4 */ f32 f_even;
     } f;
-} __OSfp; // size = 0x08
+} __OSfp; // size = 0x8
 
 typedef struct {
     /* 0x000 */ u64 at, v0, v1, a0, a1, a2, a3;
@@ -29,9 +29,9 @@ typedef struct {
 } __OSThreadContext; // size = 0x190
 
 typedef struct {
-    /* 0x00 */ u32 flag;
-    /* 0x04 */ u32 count;
-    /* 0x08 */ u64 time;
+    /* 0x0 */ u32 flag;
+    /* 0x4 */ u32 count;
+    /* 0x8 */ u64 time;
 } __OSThreadprofile; // size = 0x10
 
 typedef struct OSThread {
diff --git a/include/PR/viint.h b/include/PR/viint.h
index bc9ce2335..25c7d1224 100644
--- a/include/PR/viint.h
+++ b/include/PR/viint.h
@@ -49,7 +49,7 @@ typedef struct {
     /* 0x0 */ f32 factor;
     /* 0x4 */ u16 offset;
     /* 0x8 */ u32 scale;
-} __OSViScale; // size = 0x0C
+} __OSViScale; // size = 0xC
 
 typedef struct {
     /* 0x00 */ u16 state;
diff --git a/include/gfx.h b/include/gfx.h
index 0a7a64577..eb9c6805b 100644
--- a/include/gfx.h
+++ b/include/gfx.h
@@ -86,8 +86,8 @@ Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f);
 Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f);
 Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f);
 
-Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height);
-void func_8012CB04(Gfx** gfxp, u32 x, u32 y);
+Gfx* Gfx_BranchTexScroll(Gfx** gfxP, u32 x, u32 y, s32 width, s32 height);
+void func_8012CB04(Gfx** gfxP, u32 x, u32 y);
 Gfx* func_8012CB28(GraphicsContext* gfxCtx, u32 x, u32 y);
 Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height);
 Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, u32 y2, s32 width2, s32 height2);
diff --git a/include/gfx_setupdl.h b/include/gfx_setupdl.h
index feafc6b21..54d5c813e 100644
--- a/include/gfx_setupdl.h
+++ b/include/gfx_setupdl.h
@@ -85,7 +85,7 @@ typedef enum SetupDL {
 
 Gfx* Gfx_SetupDLImpl(Gfx* gfx, u32 i);
 Gfx* Gfx_SetupDL(Gfx* gfx, u32 i);
-void Gfx_SetupDLAtPtr(Gfx** gfxp, u32 i);
+void Gfx_SetupDLAtPtr(Gfx** gfxP, u32 i);
 Gfx* Gfx_SetupDL57(Gfx* gfx);
 Gfx* Gfx_SetupDL57_b(Gfx* gfx);
 Gfx* Gfx_SetupDL52_NoCD(Gfx* gfx);
@@ -128,7 +128,7 @@ void Gfx_SetupDL2_Opa(GraphicsContext* gfxCtx);
 Gfx* Gfx_SetupDL39(Gfx* gfx);
 void Gfx_SetupDL39_Opa(GraphicsContext* gfxCtx);
 void Gfx_SetupDL39_Overlay(GraphicsContext* gfxCtx);
-void Gfx_SetupDL39_Ptr(Gfx** gfxp);
+void Gfx_SetupDL39_Ptr(Gfx** gfxP);
 void Gfx_SetupDL40_Opa(GraphicsContext* gfxCtx);
 void Gfx_SetupDL41_Opa(GraphicsContext* gfxCtx);
 void Gfx_SetupDL47_Xlu(GraphicsContext* gfxCtx);
@@ -147,7 +147,7 @@ void Gfx_SetupDL27_Xlu(GraphicsContext* gfxCtx);
 void Gfx_SetupDL60_XluNoCD(GraphicsContext* gfxCtx);
 void Gfx_SetupDL61_Xlu(GraphicsContext* gfxCtx);
 void Gfx_SetupDL56_Opa(GraphicsContext* gfxCtx);
-void Gfx_SetupDL56_Ptr(Gfx** gfxp);
+void Gfx_SetupDL56_Ptr(Gfx** gfxP);
 void Gfx_SetupDL59_Opa(GraphicsContext* gfxCtx);
 
 extern Gfx gSetupDLs[SETUPDL_MAX][6];
diff --git a/include/sfx.h b/include/sfx.h
index 719422dfe..d37e333ac 100644
--- a/include/sfx.h
+++ b/include/sfx.h
@@ -98,7 +98,7 @@ typedef struct {
 typedef struct {
     /* 0x0 */ u32 priority; // lower is more prioritized
     /* 0x4 */ u8 entryIndex;
-} ActiveSfx; // size = 0x08
+} ActiveSfx; // size = 0x8
 
 // SfxParams bit-packing
 
diff --git a/include/z64camera.h b/include/z64camera.h
index 8c2a001d2..969dca94f 100644
--- a/include/z64camera.h
+++ b/include/z64camera.h
@@ -1022,10 +1022,10 @@ typedef struct {
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
 
 typedef struct {
-    /* 0x00 */ f32 unk_00;
-    /* 0x04 */ f32 unk_04;
-    /* 0x08 */ f32 fov;
-    /* 0x0C */ s16 interfaceFlags;
+    /* 0x0 */ f32 unk_00;
+    /* 0x4 */ f32 unk_04;
+    /* 0x8 */ f32 fov;
+    /* 0xC */ s16 interfaceFlags;
 } Fixed1ReadOnlyData; // size = 0x10
 
 typedef struct {
@@ -1162,8 +1162,8 @@ typedef struct {
 } Unique2ReadOnlyData; // size = 0x14
 
 typedef struct {
-    /* 0x00 */ f32 unk_00;
-    /* 0x04 */ s16 unk_04;
+    /* 0x0 */ f32 unk_00;
+    /* 0x4 */ s16 unk_04;
 } Unique2ReadWriteData; // size = 0x8
 
 typedef struct {
@@ -1205,8 +1205,8 @@ typedef struct {
 } Unique0ReadWriteData; // size = 0x40
 
 typedef struct {
-    /* 0x00 */ Unique0ReadOnlyData roData;
-    /* 0x0C */ Unique0ReadWriteData rwData;
+    /* 0x0 */ Unique0ReadOnlyData roData;
+    /* 0xC */ Unique0ReadWriteData rwData;
 } Unique0; // size = 0x4C
 
 #define UNIQUE0_FLAG_0 (1 << 0)
@@ -1220,11 +1220,11 @@ typedef struct {
  */
 
 typedef struct {
-    /* 0x00 */ s16 interfaceFlags;
+    /* 0x0 */ s16 interfaceFlags;
 } Unique6ReadOnlyData; // size = 0x4
 
 typedef struct {
-    /* 0x00 */ Unique6ReadOnlyData roData;
+    /* 0x0 */ Unique6ReadOnlyData roData;
 } Unique6; // size = 0x4
 
 #define UNIQUE6_FLAG_0 (1 << 0)
@@ -1246,7 +1246,7 @@ typedef struct {
  */
 
 typedef struct {
-    /* 0x00 */ s16 interfaceFlags;
+    /* 0x0 */ s16 interfaceFlags;
 } Demo1ReadOnlyData; // size = 0x4
 
 typedef struct {
@@ -1257,8 +1257,8 @@ typedef struct {
 } Demo1ReadWriteData; // size = 0x20
 
 typedef struct {
-    /* 0x00 */ Demo1ReadOnlyData roData;
-    /* 0x04 */ Demo1ReadWriteData rwData;
+    /* 0x0 */ Demo1ReadOnlyData roData;
+    /* 0x4 */ Demo1ReadWriteData rwData;
 } Demo1; // size = 0x24
 
 
@@ -1273,9 +1273,9 @@ typedef struct {
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
 
 typedef struct {
-    /* 0x00 */ f32 fov;
-    /* 0x04 */ f32 unk_04; // unused
-    /* 0x08 */ s16 interfaceFlags;
+    /* 0x0 */ f32 fov;
+    /* 0x4 */ f32 unk_04; // unused
+    /* 0x8 */ s16 interfaceFlags;
 } Demo2ReadOnlyData; // size = 0xC
 
 typedef struct {
@@ -1286,8 +1286,8 @@ typedef struct {
 } Demo2ReadWriteData; // size = 0x14
 
 typedef struct {
-    /* 0x08 */ Demo2ReadOnlyData roData;
-    /* 0x0C */ Demo2ReadWriteData rwData;
+    /* 0x8 */ Demo2ReadOnlyData roData;
+    /* 0xC */ Demo2ReadWriteData rwData;
 } Demo2; // size = 0x20
 
 
@@ -1297,18 +1297,18 @@ typedef struct {
  */
 
 typedef struct {
-    /* 0x00 */ s16 interfaceFlags;
+    /* 0x0 */ s16 interfaceFlags;
 } Demo3ReadOnlyData; // size = 0x4
 
 typedef struct {
-    /* 0x00 */ f32 unk_00;
-    /* 0x04 */ s16 unk_04;
-    /* 0x06 */ s16 timer;
+    /* 0x0 */ f32 unk_00;
+    /* 0x4 */ s16 unk_04;
+    /* 0x6 */ s16 timer;
 } Demo3ReadWriteData; // size = 0x8
 
 typedef struct {
-    /* 0x00 */ Demo3ReadOnlyData roData;
-    /* 0x04 */ Demo3ReadWriteData rwData;
+    /* 0x0 */ Demo3ReadOnlyData roData;
+    /* 0x4 */ Demo3ReadWriteData rwData;
 } Demo3; // size = 0xC
 
 
@@ -1318,7 +1318,7 @@ typedef struct {
  */
 
 typedef struct {
-    /* 0x00 */ s16 interfaceFlags;
+    /* 0x0 */ s16 interfaceFlags;
 } Demo4ReadOnlyData; // size = 0x4
 
 typedef struct {
@@ -1332,8 +1332,8 @@ typedef struct {
 } Demo4ReadWriteData; // size = 0x24
 
 typedef struct {
-    /* 0x00 */ Demo4ReadOnlyData roData;
-    /* 0x04 */ Demo4ReadWriteData rwData;
+    /* 0x0 */ Demo4ReadOnlyData roData;
+    /* 0x4 */ Demo4ReadWriteData rwData;
 } Demo4; // size = 0x28
 
 
@@ -1343,7 +1343,7 @@ typedef struct {
  */
 
 typedef struct {
-    /* 0x00 */ s16 interfaceFlags;
+    /* 0x0 */ s16 interfaceFlags;
 } Demo5ReadOnlyData; // size = 0x4
 
 typedef struct {
@@ -1358,8 +1358,8 @@ typedef struct {
 } Demo5ReadWriteData; // size = 0x28
 
 typedef struct {
-    /* 0x00 */ Demo5ReadOnlyData roData;
-    /* 0x04 */ Demo5ReadWriteData rwData;
+    /* 0x0 */ Demo5ReadOnlyData roData;
+    /* 0x4 */ Demo5ReadWriteData rwData;
 } Demo5; // size = 0x2C
 
 
@@ -1369,7 +1369,7 @@ typedef struct {
  */
 
 typedef struct {
-    /* 0x00 */ s16 interfaceFlags;
+    /* 0x0 */ s16 interfaceFlags;
 } Demo0ReadOnlyData; // size = 0x4
 
 typedef struct {
@@ -1383,8 +1383,8 @@ typedef struct {
 } Demo0ReadWriteData; // size = 0x1C
 
 typedef struct {
-    /* 0x00 */ Demo0ReadOnlyData roData;
-    /* 0x04 */ Demo0ReadWriteData rwData;
+    /* 0x0 */ Demo0ReadOnlyData roData;
+    /* 0x4 */ Demo0ReadWriteData rwData;
 } Demo0; // size = 0x20
 
 
@@ -1415,7 +1415,7 @@ typedef struct {
 } Special5ReadOnlyData; // size = 0x1C
 
 typedef struct {
-    /* 0x00 */ s16 animTimer;
+    /* 0x0 */ s16 animTimer;
 } Special5ReadWriteData; // size = 0x4
 
 typedef struct {
@@ -1432,9 +1432,9 @@ typedef struct {
 // For functions that deal with doors, an extra struct is added to the paramData
 
 typedef struct {
-    /* 0x00 */ Actor* doorActor;
-    /* 0x04 */ s16 bgCamIndex;
-    /* 0x06 */ union {
+    /* 0x0 */ Actor* doorActor;
+    /* 0x4 */ s16 bgCamIndex;
+    /* 0x6 */ union {
         Vec3s eye; // position of the camera while exiting a spiral staircase
         struct {
             s16 timer1; // timer while camera is fixed in front of the door
@@ -1470,9 +1470,9 @@ typedef struct {
 } Special8ReadOnlyData; // size = 0x14
 
 typedef struct {
-    /* 0x00 */ Vec3f eye;
-    /* 0x0C */ s16 spiralDoorCsFrame; // 1/5th of the length of the cutscene
-    /* 0x0E */ s16 fov;
+    /* 0x0 */ Vec3f eye;
+    /* 0xC */ s16 spiralDoorCsFrame; // 1/5th of the length of the cutscene
+    /* 0xE */ s16 fov;
 } Special8ReadWriteData; // size = 0x10
 
 typedef struct {
@@ -1495,18 +1495,18 @@ typedef struct {
     { interfaceFlags, CAM_DATA_INTERFACE_FLAGS }
 
 typedef struct {
-    /* 0x00 */ f32 yOffset;
-    /* 0x04 */ f32 fov;
-    /* 0x08 */ s16 interfaceFlags;
+    /* 0x0 */ f32 yOffset;
+    /* 0x4 */ f32 fov;
+    /* 0x8 */ s16 interfaceFlags;
 } Special9ReadOnlyData; // size = 0xC
 
 typedef struct {
-    /* 0x00 */ s16 unk_00;
+    /* 0x0 */ s16 unk_00;
 } Special9ReadWriteData; // size = 0x4
 
 typedef struct {
-    /* 0x00 */ Special9ReadOnlyData roData;
-    /* 0x0C */ Special9ReadWriteData rwData;
+    /* 0x0 */ Special9ReadOnlyData roData;
+    /* 0xC */ Special9ReadWriteData rwData;
 } Special9; // size = 0x10
 
 #define SPECIAL9_FLAG_0 (1 << 0)
diff --git a/include/z64cutscene.h b/include/z64cutscene.h
index a308048cd..a7e19ebf5 100644
--- a/include/z64cutscene.h
+++ b/include/z64cutscene.h
@@ -624,16 +624,16 @@ typedef struct {
 /* Actor Cutscenes, which encompasses all cutscenes */
 
 typedef struct {
-    /* 0x00 */ s16 priority; // Lower means higher priority. -1 means it ignores priority
-    /* 0x02 */ s16 length;
-    /* 0x04 */ s16 csCamId; // Index of CsCameraEntry to use. Negative indices use sGlobalCamDataSettings. Indices 0 and above use CsCameraEntry from a sceneLayer
-    /* 0x06 */ s16 scriptIndex;
-    /* 0x08 */ s16 additionalCsId;
-    /* 0x0A */ u8 endSfx;
-    /* 0x0B */ u8 customValue; // 0 - 99: actor-specific custom value. 100+: spawn. 255: none
-    /* 0x0C */ s16 hudVisibility; 
-    /* 0x0E */ u8 endCam;
-    /* 0x0F */ u8 letterboxSize;
+    /* 0x0 */ s16 priority; // Lower means higher priority. -1 means it ignores priority
+    /* 0x2 */ s16 length;
+    /* 0x4 */ s16 csCamId; // Index of CsCameraEntry to use. Negative indices use sGlobalCamDataSettings. Indices 0 and above use CsCameraEntry from a sceneLayer
+    /* 0x6 */ s16 scriptIndex;
+    /* 0x8 */ s16 additionalCsId;
+    /* 0xA */ u8 endSfx;
+    /* 0xB */ u8 customValue; // 0 - 99: actor-specific custom value. 100+: spawn. 255: none
+    /* 0xC */ s16 hudVisibility; 
+    /* 0xE */ u8 endCam;
+    /* 0xF */ u8 letterboxSize;
 } CutsceneEntry; // size = 0x10
 
 typedef enum {
diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h
index 749f742f8..1bc350af7 100644
--- a/include/z64cutscene_commands.h
+++ b/include/z64cutscene_commands.h
@@ -294,7 +294,7 @@
  * FORMAT
  *   Capital U is Unused
  *   ttttssss eeeerrgg bbUUUUUU
- *   size = 0x0C
+ *   size = 0xC
  */
 #define CS_TRANSITION_GENERAL(type, startFrame, endFrame, red, green, blue) \
     { CMD_HH(type, startFrame) }, { CMD_HBB(endFrame, red, green) }, { CMD_BBBB(blue, 0, 0, 0) }
@@ -461,7 +461,7 @@
  * FORMAT
  *   Capital U is Unused
  *   ppppssss eeeeUUUU UUUUUUUU
- *   size = 0x0C
+ *   size = 0xC
  */
 #define CS_FADE_OUT_SEQ(seqPlayer, startFrame, endFrame) \
     { CMD_HH(seqPlayer, startFrame) }, { CMD_HH(endFrame, 0) }, { CMD_W(0) }
diff --git a/include/z64environment.h b/include/z64environment.h
index 74f89aade..514801f6b 100644
--- a/include/z64environment.h
+++ b/include/z64environment.h
@@ -65,7 +65,9 @@ typedef enum {
     /* 0 */ WEATHER_MODE_CLEAR,
     /* 1 */ WEATHER_MODE_RAIN,
     /* 2 */ WEATHER_MODE_2,
-    /* 3 */ WEATHER_MODE_SNOW
+    /* 3 */ WEATHER_MODE_SNOW,
+    /* 4 */ WEATHER_MODE_4,
+    /* 5 */ WEATHER_MODE_5
 } WeatherMode;
 
 typedef enum {
diff --git a/include/z64math.h b/include/z64math.h
index 5d31396b1..a8f0da7df 100644
--- a/include/z64math.h
+++ b/include/z64math.h
@@ -72,8 +72,8 @@ The plane paramaters are of form `ax + by + cz + d = 0`
 where `(a,b,c)` is the plane's normal vector and d is the originDist
  */
 typedef struct {
-    /* 0x00 */ Vec3f normal;
-    /* 0x0C */ f32   originDist;
+    /* 0x0 */ Vec3f normal;
+    /* 0xC */ f32   originDist;
 } Plane; // size = 0x10
 
 typedef struct {
diff --git a/include/z64player.h b/include/z64player.h
index 25d04eb5a..dc5bb1b6f 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -1246,10 +1246,10 @@ typedef struct Player {
     /* 0xADE */ u8 unk_ADE;
     /* 0xADF */ s8 unk_ADF[4]; // Circular buffer used for testing for triggering a quickspin
     /* 0xAE3 */ s8 unk_AE3[4]; // Circular buffer used for ?
-    /* 0xAE7 */ union { 
+    /* 0xAE7 */ union {
         s8 actionVar1;
     } av1; // "Action Variable 1": context dependent variable that has different meanings depending on what action is currently running
-    /* 0xAE8 */ union { 
+    /* 0xAE8 */ union {
         s16 actionVar2;
     } av2; // "Action Variable 2": context dependent variable that has different meanings depending on what action is currently running
     /* 0xAEC */ f32 unk_AEC;
diff --git a/include/z64prerender.h b/include/z64prerender.h
index 813f6827a..07c4738ab 100644
--- a/include/z64prerender.h
+++ b/include/z64prerender.h
@@ -47,19 +47,19 @@ void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf,
 void PreRender_Init(PreRender* this);
 void PreRender_SetValues(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf);
 void PreRender_Destroy(PreRender* this);
-void PreRender_CopyImage(PreRender* this, Gfx** gfxp, void* img, void* imgDst, u32 useThresholdAlphaCompare);
-void PreRender_RestoreBuffer(PreRender* this, Gfx** gfxp, void* buf, void* bufSave);
-void func_8016FF90(PreRender* this, Gfx** gfxp, void* buf, void* bufSave, s32 envR, s32 envG, s32 envB, s32 envA);
-void func_80170200(PreRender* this, Gfx** gfxp, void* buf, void* bufSave);
-void PreRender_CoverageRgba16ToI8(PreRender* this, Gfx** gfxp, void* img, void* cvgDst);
-void PreRender_SaveZBuffer(PreRender* this, Gfx** gfxp);
-void PreRender_SaveFramebuffer(PreRender* this, Gfx** gfxp);
-void PreRender_FetchFbufCoverage(PreRender* this, Gfx** gfxp);
-void PreRender_DrawCoverage(PreRender* this, Gfx** gfxp);
-void PreRender_RestoreZBuffer(PreRender* this, Gfx** gfxp);
-void func_80170798(PreRender* this, Gfx** gfxp);
-void func_80170AE0(PreRender* this, Gfx** gfxp, s32 alpha);
-void PreRender_RestoreFramebuffer(PreRender* this, Gfx** gfxp);
+void PreRender_CopyImage(PreRender* this, Gfx** gfxP, void* img, void* imgDst, u32 useThresholdAlphaCompare);
+void PreRender_RestoreBuffer(PreRender* this, Gfx** gfxP, void* buf, void* bufSave);
+void func_8016FF90(PreRender* this, Gfx** gfxP, void* buf, void* bufSave, s32 envR, s32 envG, s32 envB, s32 envA);
+void func_80170200(PreRender* this, Gfx** gfxP, void* buf, void* bufSave);
+void PreRender_CoverageRgba16ToI8(PreRender* this, Gfx** gfxP, void* img, void* cvgDst);
+void PreRender_SaveZBuffer(PreRender* this, Gfx** gfxP);
+void PreRender_SaveFramebuffer(PreRender* this, Gfx** gfxP);
+void PreRender_FetchFbufCoverage(PreRender* this, Gfx** gfxP);
+void PreRender_DrawCoverage(PreRender* this, Gfx** gfxP);
+void PreRender_RestoreZBuffer(PreRender* this, Gfx** gfxP);
+void func_80170798(PreRender* this, Gfx** gfxP);
+void func_80170AE0(PreRender* this, Gfx** gfxP, s32 alpha);
+void PreRender_RestoreFramebuffer(PreRender* this, Gfx** gfxP);
 void PreRender_AntiAliasFilterPixel(PreRender* this, s32 x, s32 y);
 void PreRender_AntiAliasFilter(PreRender* this);
 u32 PreRender_Get5bMedian9(u8* px1, u8* px2, u8* px3);
@@ -68,6 +68,6 @@ void PreRender_ApplyFilters(PreRender* this);
 void PreRender_ApplyFiltersSlowlyInit(PreRender* this);
 void PreRender_ApplyFiltersSlowlyDestroy(PreRender* this);
 void func_801720C4(PreRender* this);
-void Prerender_DrawBackground2D(Gfx** gfxp, void* timg, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 tt, u16 tlutCount, f32 x, f32 y, f32 xScale, f32 yScale, u32 flags);
+void Prerender_DrawBackground2D(Gfx** gfxP, void* timg, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 tt, u16 tlutCount, f32 x, f32 y, f32 xScale, f32 yScale, u32 flags);
 
 #endif
diff --git a/include/z64transition.h b/include/z64transition.h
index 923e076cb..c4d8c7846 100644
--- a/include/z64transition.h
+++ b/include/z64transition.h
@@ -244,7 +244,7 @@ void TransitionFade_SetType(void* thisx, s32 type);
 
 // z_fbdemo_circle.c
 
-void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, void const* texture, s32 fmt, s32 arg3, s32 masks, s32 maskt, f32 arg6);
+void TransitionCircle_LoadAndSetTexture(Gfx** gfxP, void const* texture, s32 fmt, s32 arg3, s32 masks, s32 maskt, f32 arg6);
 
 // z_overlay.c
 
diff --git a/include/z64view.h b/include/z64view.h
index b5474147f..780a8c758 100644
--- a/include/z64view.h
+++ b/include/z64view.h
@@ -10,10 +10,10 @@
 struct GraphicsContext;
 
 typedef struct Viewport {
-    /* 0x00 */ s32 topY;    // uly (upper left y)
-    /* 0x04 */ s32 bottomY; // lry (lower right y)
-    /* 0x08 */ s32 leftX;   // ulx (upper left x)
-    /* 0x0C */ s32 rightX;  // lrx (lower right x)
+    /* 0x0 */ s32 topY;    // uly (upper left y)
+    /* 0x4 */ s32 bottomY; // lry (lower right y)
+    /* 0x8 */ s32 leftX;   // ulx (upper left x)
+    /* 0xC */ s32 rightX;  // lrx (lower right x)
 } Viewport; // size = 0x10
 
 typedef struct View {
@@ -99,6 +99,6 @@ s32 View_Apply(View* view, s32 mask);
 s32 View_ApplyOrthoToOverlay(View* view);
 s32 View_ApplyPerspectiveToOverlay(View* view);
 s32 View_UpdateViewingMatrix(View* view);
-s32 View_ApplyTo(View* view, Gfx** gfxp);
+s32 View_ApplyTo(View* view, Gfx** gfxP);
 
 #endif