Change PreRenderContext to just be PreRender (#862)

2 files changed, 33 insertions, 33 deletions

diff --git a/src/code/PreRender.c b/src/code/PreRender.c
index 38f3b28fe..ec502596f 100644
--- a/src/code/PreRender.c
+++ b/src/code/PreRender.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "alloca.h"
 
-void PreRender_SetValuesSave(PreRenderContext* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg) {
+void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg) {
     this->widthSave = width;
     this->heightSave = height;
     this->fbufSave = fbuf;
@@ -13,12 +13,12 @@ void PreRender_SetValuesSave(PreRenderContext* this, u32 width, u32 height, void
     this->lrySave = height - 1;
 }
 
-void PreRender_Init(PreRenderContext* this) {
-    bzero(this, sizeof(PreRenderContext));
+void PreRender_Init(PreRender* this) {
+    bzero(this, sizeof(PreRender));
     ListAlloc_Init(&this->alloc);
 }
 
-void PreRender_SetValues(PreRenderContext* this, u32 width, u32 height, void* fbuf, void* zbuf) {
+void PreRender_SetValues(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf) {
     this->width = width;
     this->height = height;
     this->fbuf = fbuf;
@@ -29,11 +29,11 @@ void PreRender_SetValues(PreRenderContext* this, u32 width, u32 height, void* fb
     this->lry = height - 1;
 }
 
-void PreRender_Destroy(PreRenderContext* this) {
+void PreRender_Destroy(PreRender* this) {
     ListAlloc_FreeAll(&this->alloc);
 }
 
-void func_800C0F28(PreRenderContext* this, Gfx** gfxp, void* buf, void* bufSave) {
+void func_800C0F28(PreRender* this, Gfx** gfxp, void* buf, void* bufSave) {
     Gfx* gfx;
     s32 x;
     s32 x2;
@@ -81,7 +81,7 @@ void func_800C0F28(PreRenderContext* this, Gfx** gfxp, void* buf, void* bufSave)
     *gfxp = gfx;
 }
 
-void func_800C1258(PreRenderContext* this, Gfx** gfxp) {
+void func_800C1258(PreRender* this, Gfx** gfxp) {
     Gfx* gfx;
     s32 y;
     s32 y2;
@@ -131,7 +131,7 @@ void func_800C1258(PreRenderContext* this, Gfx** gfxp) {
     *gfxp = gfx;
 }
 
-void func_800C170C(PreRenderContext* this, Gfx** gfxp, void* fbuf, void* fbufSave, u32 r, u32 g, u32 b, u32 a) {
+void func_800C170C(PreRender* this, Gfx** gfxp, void* fbuf, void* fbufSave, u32 r, u32 g, u32 b, u32 a) {
     Gfx* gfx;
     s32 x;
     s32 x2;
@@ -183,11 +183,11 @@ void func_800C170C(PreRenderContext* this, Gfx** gfxp, void* fbuf, void* fbufSav
     *gfxp = gfx;
 }
 
-void func_800C1AE8(PreRenderContext* this, Gfx** gfxp, void* fbuf, void* fbufSave) {
+void func_800C1AE8(PreRender* this, Gfx** gfxp, void* fbuf, void* fbufSave) {
     func_800C170C(this, gfxp, fbuf, fbufSave, 255, 255, 255, 255);
 }
 
-void func_800C1B24(PreRenderContext* this, Gfx** gfxp, void* fbuf, void* cvgSave) {
+void func_800C1B24(PreRender* this, Gfx** gfxp, void* fbuf, void* cvgSave) {
     Gfx* gfx;
     s32 x;
     s32 x2;
@@ -236,7 +236,7 @@ void func_800C1B24(PreRenderContext* this, Gfx** gfxp, void* fbuf, void* cvgSave
     *gfxp = gfx;
 }
 
-void func_800C1E9C(PreRenderContext* this, Gfx** gfxp) {
+void func_800C1E9C(PreRender* this, Gfx** gfxp) {
     LogUtils_CheckNullPointer("this->zbuf_save", this->zbufSave, "../PreRender.c", 481);
     LogUtils_CheckNullPointer("this->zbuf", this->zbuf, "../PreRender.c", 482);
 
@@ -245,7 +245,7 @@ void func_800C1E9C(PreRenderContext* this, Gfx** gfxp) {
     }
 }
 
-void func_800C1F20(PreRenderContext* this, Gfx** gfxp) {
+void func_800C1F20(PreRender* this, Gfx** gfxp) {
     LogUtils_CheckNullPointer("this->fbuf_save", this->fbufSave, "../PreRender.c", 495);
     LogUtils_CheckNullPointer("this->fbuf", this->fbuf, "../PreRender.c", 496);
 
@@ -254,7 +254,7 @@ void func_800C1F20(PreRenderContext* this, Gfx** gfxp) {
     }
 }
 
-void func_800C1FA4(PreRenderContext* this, Gfx** gfxp) {
+void func_800C1FA4(PreRender* this, Gfx** gfxp) {
     Gfx* gfx = *gfxp;
 
     gDPPipeSync(gfx++);
@@ -271,7 +271,7 @@ void func_800C1FA4(PreRenderContext* this, Gfx** gfxp) {
     *gfxp = gfx;
 }
 
-void func_800C20B4(PreRenderContext* this, Gfx** gfxp) {
+void func_800C20B4(PreRender* this, Gfx** gfxp) {
     func_800C1FA4(this, gfxp);
     LogUtils_CheckNullPointer("this->cvg_save", this->cvgSave, "../PreRender.c", 532);
     if (this->cvgSave != NULL) {
@@ -279,11 +279,11 @@ void func_800C20B4(PreRenderContext* this, Gfx** gfxp) {
     }
 }
 
-void func_800C2118(PreRenderContext* this, Gfx** gfxp) {
+void func_800C2118(PreRender* this, Gfx** gfxp) {
     func_800C0F28(this, gfxp, this->zbufSave, this->zbuf);
 }
 
-void func_800C213C(PreRenderContext* this, Gfx** gfxp) {
+void func_800C213C(PreRender* this, Gfx** gfxp) {
     Gfx* gfx;
     s32 y;
     s32 y2;
@@ -341,15 +341,15 @@ void func_800C213C(PreRenderContext* this, Gfx** gfxp) {
     }
 }
 
-void func_800C24BC(PreRenderContext* this, Gfx** gfxp) {
+void func_800C24BC(PreRender* this, Gfx** gfxp) {
     func_800C0F28(this, gfxp, this->fbufSave, this->fbuf);
 }
 
-void func_800C24E0(PreRenderContext* this, Gfx** gfxp) {
+void func_800C24E0(PreRender* this, Gfx** gfxp) {
     func_800C1258(this, gfxp);
 }
 
-void func_800C2500(PreRenderContext* this, s32 x, s32 y) {
+void func_800C2500(PreRender* this, s32 x, s32 y) {
     s32 i;
     s32 j;
     s32 buffA[3 * 5];
@@ -469,7 +469,7 @@ void func_800C2500(PreRenderContext* this, s32 x, s32 y) {
     this->fbufSave[x + y * this->width] = pxOut.rgba;
 }
 
-void func_800C2FE4(PreRenderContext* this) {
+void func_800C2FE4(PreRender* this) {
     s32 x;
     s32 y;
     s32 phi_v0;
@@ -539,7 +539,7 @@ void func_800C2FE4(PreRenderContext* this) {
     }
 }
 
-void PreRender_Calc(PreRenderContext* this) {
+void PreRender_Calc(PreRender* this) {
     s32 x;
     s32 y;
 
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 56fb61faa..6788a652b 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -149,7 +149,7 @@ void Gameplay_Destroy(GameState* thisx) {
     SREG(91) = 0;
     R_PAUSE_MENU_MODE = 0;
 
-    PreRender_Destroy(&globalCtx->preRenderCtx);
+    PreRender_Destroy(&globalCtx->pauseBgPreRender);
     Effect_DeleteAll(globalCtx);
     EffectSs_ClearAll(globalCtx);
     CollisionCheck_DestroyContext(globalCtx, &globalCtx->colChkCtx);
@@ -321,9 +321,9 @@ void Gameplay_Init(GameState* thisx) {
 
     SREG(91) = -1;
     R_PAUSE_MENU_MODE = 0;
-    PreRender_Init(&globalCtx->preRenderCtx);
-    PreRender_SetValuesSave(&globalCtx->preRenderCtx, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0);
-    PreRender_SetValues(&globalCtx->preRenderCtx, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
+    PreRender_Init(&globalCtx->pauseBgPreRender);
+    PreRender_SetValuesSave(&globalCtx->pauseBgPreRender, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0);
+    PreRender_SetValues(&globalCtx->pauseBgPreRender, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
     gTrnsnUnkState = 0;
     globalCtx->transitionMode = 0;
     FrameAdvance_Init(&globalCtx->frameAdvCtx);
@@ -1139,12 +1139,12 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
             POLY_OPA_DISP = sp88;
             goto Gameplay_Draw_DrawOverlayElements;
         } else {
-            PreRender_SetValues(&globalCtx->preRenderCtx, SCREEN_WIDTH, SCREEN_HEIGHT, gfxCtx->curFrameBuffer,
+            PreRender_SetValues(&globalCtx->pauseBgPreRender, SCREEN_WIDTH, SCREEN_HEIGHT, gfxCtx->curFrameBuffer,
                                 gZBuffer);
 
             if (R_PAUSE_MENU_MODE == 2) {
                 MsgEvent_SendNullTask();
-                PreRender_Calc(&globalCtx->preRenderCtx);
+                PreRender_Calc(&globalCtx->pauseBgPreRender);
                 R_PAUSE_MENU_MODE = 3;
             } else if (R_PAUSE_MENU_MODE >= 4) {
                 R_PAUSE_MENU_MODE = 0;
@@ -1153,7 +1153,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
             if (R_PAUSE_MENU_MODE == 3) {
                 Gfx* sp84 = POLY_OPA_DISP;
 
-                func_800C24BC(&globalCtx->preRenderCtx, &sp84);
+                func_800C24BC(&globalCtx->pauseBgPreRender, &sp84);
                 POLY_OPA_DISP = sp84;
                 goto Gameplay_Draw_DrawOverlayElements;
             } else {
@@ -1271,12 +1271,12 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
                     Gfx* sp70 = OVERLAY_DISP;
                     s32 pad[4];
 
-                    globalCtx->preRenderCtx.fbuf = gfxCtx->curFrameBuffer;
-                    globalCtx->preRenderCtx.fbufSave = (u16*)gZBuffer;
-                    func_800C1F20(&globalCtx->preRenderCtx, &sp70);
+                    globalCtx->pauseBgPreRender.fbuf = gfxCtx->curFrameBuffer;
+                    globalCtx->pauseBgPreRender.fbufSave = (u16*)gZBuffer;
+                    func_800C1F20(&globalCtx->pauseBgPreRender, &sp70);
                     if (R_PAUSE_MENU_MODE == 1) {
-                        globalCtx->preRenderCtx.cvgSave = (u8*)gfxCtx->curFrameBuffer;
-                        func_800C20B4(&globalCtx->preRenderCtx, &sp70);
+                        globalCtx->pauseBgPreRender.cvgSave = (u8*)gfxCtx->curFrameBuffer;
+                        func_800C20B4(&globalCtx->pauseBgPreRender, &sp70);
                         R_PAUSE_MENU_MODE = 2;
                     } else {
                         gTrnsnUnkState = 2;