General Cleanup (#155)

* minor fixes

* Consolidate into globalCtx

* fix error

* Fix Warnings

Co-authored-by: engineer124 <engineer124enginer124@gmail.com>

1 files changed, 33 insertions, 33 deletions

diff --git a/src/code/z_room.c b/src/code/z_room.c
index 6ad89a741..3dba3ba39 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -1,31 +1,31 @@
 #include <ultra64.h>
 #include <global.h>
 
-void Room_nop8012D510(GlobalContext* ctxt, Room* room, UNK_PTR param_3, UNK_TYPE1 param_4) {
+void Room_nop8012D510(GlobalContext* globalCtx, Room* room, UNK_PTR param_3, UNK_TYPE1 param_4) {
 }
 
-void Room_DrawType3Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
+void Room_DrawType3Mesh(GlobalContext* globalCtx, Room* room, u32 flags) {
 }
 
-void Room_DrawType0Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
+void Room_DrawType0Mesh(GlobalContext* globalCtx, Room* room, u32 flags) {
     RoomMeshType0* mesh;
     s32 i;
     RoomMeshType0Params* meshParams;
     GraphicsContext* gfxCtx;
     UNK_TYPE4 pad;
 
-    gfxCtx = ctxt->state.gfxCtx;
+    gfxCtx = globalCtx->state.gfxCtx;
     if (flags & 1) {
-        func_800BCBF4(&D_801C1D10, ctxt);
+        func_800BCBF4(&D_801C1D10, globalCtx);
         gSPSegment(gfxCtx->polyOpa.p++, 0x03, room->segment);
-        func_8012C268(ctxt);
+        func_8012C268(globalCtx);
         gSPMatrix(gfxCtx->polyOpa.p++, &D_801D1DE0, G_MTX_MODELVIEW | G_MTX_LOAD);
     }
 
     if (flags & 2) {
-        func_800BCC68(&D_801C1D10, ctxt);
+        func_800BCC68(&D_801C1D10, globalCtx);
         gSPSegment(gfxCtx->polyXlu.p++, 0x03, room->segment);
-        func_8012C2DC(ctxt->state.gfxCtx);
+        func_8012C2DC(globalCtx->state.gfxCtx);
         gSPMatrix(gfxCtx->polyXlu.p++, &D_801D1DE0, G_MTX_MODELVIEW | G_MTX_LOAD);
     }
 
@@ -52,18 +52,18 @@ void Room_DrawType0Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
 
 #pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012E32C.asm")
 
-void Room_DrawType1Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
+void Room_DrawType1Mesh(GlobalContext* globalCtx, Room* room, u32 flags) {
     RoomMeshType1* mesh = &room->mesh->type1;
     if (mesh->format == 1) {
-        func_8012DEE8(ctxt, room, flags);
+        func_8012DEE8(globalCtx, room, flags);
     } else if (mesh->format == 2) {
-        func_8012E32C(ctxt, room, flags);
+        func_8012E32C(globalCtx, room, flags);
     } else {
         assert_fail(D_801DDFAC, 0x3c5);
     }
 }
 
-void Room_Init(GlobalContext* ctxt, RoomContext* roomCtxt) {
+void Room_Init(GlobalContext* globalCtx, RoomContext* roomCtxt) {
     s32 i;
     roomCtxt->currRoom.num = -1;
     roomCtxt->currRoom.segment = NULL;
@@ -77,7 +77,7 @@ void Room_Init(GlobalContext* ctxt, RoomContext* roomCtxt) {
 #pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_AllocateAndLoad.asm")
 
 #ifdef NON_MATCHING
-s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 index) {
+s32 Room_StartRoomTransition(GlobalContext* globalCtx, RoomContext* roomCtxt, s32 index) {
     u32 size;
 
     // XXX: this should use a branch-likely
@@ -87,13 +87,13 @@ s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 ind
         roomCtxt->currRoom.segment = NULL;
         roomCtxt->unk31 = 1;
 
-        size = ctxt->roomAddrs[index].vromEnd - ctxt->roomAddrs[index].vromStart;
+        size = globalCtx->roomAddrs[index].vromEnd - globalCtx->roomAddrs[index].vromStart;
         roomCtxt->activeRoomVram =
             (void*)((s32)roomCtxt->roomMemPages[roomCtxt->activeMemPage] - (size + 8) * roomCtxt->activeMemPage + 8) &
             0xfffffff0;
 
         osCreateMesgQueue(&roomCtxt->loadQueue, roomCtxt->loadMsg, 1);
-        DmaMgr_SendRequestImpl(&roomCtxt->dmaRequest, roomCtxt->activeRoomVram, ctxt->roomAddrs[index].vromStart, size,
+        DmaMgr_SendRequestImpl(&roomCtxt->dmaRequest, roomCtxt->activeRoomVram, globalCtx->roomAddrs[index].vromStart, size,
                                0, &roomCtxt->loadQueue, NULL);
         roomCtxt->activeMemPage ^= 1;
 
@@ -106,7 +106,7 @@ s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 ind
 #pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_StartRoomTransition.asm")
 #endif
 
-s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) {
+s32 Room_HandleLoadCallbacks(GlobalContext* globalCtx, RoomContext* roomCtxt) {
     if (roomCtxt->unk31 == 1) {
         if (!osRecvMesg(&roomCtxt->loadQueue, NULL, OS_MESG_NOBLOCK)) {
             roomCtxt->unk31 = 0;
@@ -114,18 +114,18 @@ s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) {
             // TODO: Segment number enum
             gSegments[3] = PHYSICAL_TO_VIRTUAL(roomCtxt->activeRoomVram);
 
-            Scene_ProcessHeader(ctxt, (SceneCmd*)roomCtxt->currRoom.segment);
-            func_80123140(ctxt, (ActorPlayer*)ctxt->actorCtx.actorList[2].first);
-            Actor_SpawnTransitionActors(ctxt, &ctxt->actorCtx);
+            Scene_ProcessHeader(globalCtx, (SceneCmd*)roomCtxt->currRoom.segment);
+            func_80123140(globalCtx, PLAYER);
+            Actor_SpawnTransitionActors(globalCtx, &globalCtx->actorCtx);
 
-            if (((ctxt->sceneNum != SCENE_IKANA) || (roomCtxt->currRoom.num != 1)) &&
-                (ctxt->sceneNum != SCENE_IKNINSIDE)) {
-                ctxt->kankyoContext.unkC3 = 0xff;
-                ctxt->kankyoContext.unkE0 = 0;
+            if (((globalCtx->sceneNum != SCENE_IKANA) || (roomCtxt->currRoom.num != 1)) &&
+                (globalCtx->sceneNum != SCENE_IKNINSIDE)) {
+                globalCtx->kankyoContext.unkC3 = 0xff;
+                globalCtx->kankyoContext.unkE0 = 0;
             }
             func_800FEAB0();
-            if (!func_800FE4B8(ctxt)) {
-                func_800FD858(ctxt);
+            if (!func_800FE4B8(globalCtx)) {
+                func_800FD858(globalCtx);
             }
         } else {
             return 0;
@@ -135,23 +135,23 @@ s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) {
     return 1;
 }
 
-void Room_Draw(GlobalContext* ctxt, Room* room, u32 flags) {
+void Room_Draw(GlobalContext* globalCtx, Room* room, u32 flags) {
     if (room->segment != NULL) {
         // TODO: Segment number enum
         gSegments[3] = PHYSICAL_TO_VIRTUAL(room->segment);
-        roomDrawFuncs[room->mesh->type0.type](ctxt, room, flags);
+        roomDrawFuncs[room->mesh->type0.type](globalCtx, room, flags);
     }
     return;
 }
 
-void func_8012EBF8(GlobalContext* ctxt, RoomContext* roomCtxt) {
+void func_8012EBF8(GlobalContext* globalCtx, RoomContext* roomCtxt) {
     roomCtxt->prevRoom.num = -1;
     roomCtxt->prevRoom.segment = NULL;
-    func_800BA798(ctxt, &ctxt->actorCtx);
-    Actor_SpawnTransitionActors(ctxt, &ctxt->actorCtx);
+    func_800BA798(globalCtx, &globalCtx->actorCtx);
+    Actor_SpawnTransitionActors(globalCtx, &globalCtx->actorCtx);
     if (-1 < roomCtxt->currRoom.num) {
-        func_8010A33C(ctxt, roomCtxt->currRoom.num);
-        func_8010A2DC(ctxt);
+        func_8010A33C(globalCtx, roomCtxt->currRoom.num);
+        func_8010A2DC(globalCtx);
     }
-    func_801A3CD8(ctxt->roomContext.currRoom.echo);
+    func_801A3CD8(globalCtx->roomContext.currRoom.echo);
 }