mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 10:50:29 -05:00
Code Issues Projects Releases Wiki Activity

Open & Close _DISP __FILE__ & __LINE__ clean up

Browse Source
This commit is contained in:
Baoulettes 2022-06-27 16:29:52 +02:00
parent 4a3905b62b
commit 146fbb0d1b
378 changed files with 1682 additions and 1682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
soh/include/macros.h
View File

@ -140,34 +140,34 @@ extern GraphicsContext* __gfxCtx;
// __gfxCtx shouldn't be used directly.
// Use the DISP macros defined above when writing to display buffers.
#ifndef NDEBUG
#define OPEN_DISPS(gfxCtx, file, line) \
#define OPEN_DISPS(gfxCtx) \
{ \
void FrameInterpolation_RecordOpenChild(const void* a, int b); \
FrameInterpolation_RecordOpenChild(file, line); \
FrameInterpolation_RecordOpenChild(__FILE__, __LINE__); \
GraphicsContext* __gfxCtx; \
Gfx* dispRefs[4]; \
__gfxCtx = gfxCtx; \
(void)__gfxCtx; \
Graph_OpenDisps(dispRefs, gfxCtx, file, line)
Graph_OpenDisps(dispRefs, gfxCtx, __FILE__, __LINE__)
#else
#define OPEN_DISPS(gfxCtx, file, line) \
#define OPEN_DISPS(gfxCtx) \
{ \
void FrameInterpolation_RecordOpenChild(const void* a, int b); \
FrameInterpolation_RecordOpenChild(file, line); \
FrameInterpolation_RecordOpenChild(__FILE__, __LINE__); \
GraphicsContext* __gfxCtx; \
__gfxCtx = gfxCtx; \
(void)__gfxCtx;
#endif
#ifndef NDEBUG
#define CLOSE_DISPS(gfxCtx, file, line) \
#define CLOSE_DISPS(gfxCtx) \
{void FrameInterpolation_RecordCloseChild(void); \
FrameInterpolation_RecordCloseChild();} \
Graph_CloseDisps(dispRefs, gfxCtx, file, line); \
Graph_CloseDisps(dispRefs, gfxCtx, __FILE__, __LINE__); \
} \
(void)0
#else
#define CLOSE_DISPS(gfxCtx, file, line) \
#define CLOSE_DISPS(gfxCtx) \
{void FrameInterpolation_RecordCloseChild(void); \
FrameInterpolation_RecordCloseChild();} \
(void)0; \

4
soh/soh/Enhancements/debugger/colViewer.cpp
View File

@ -698,7 +698,7 @@ void DrawColViewer() {
return;
}
OPEN_DISPS(gGlobalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gGlobalCtx->state.gfxCtx);
opaDl.push_back(gsSPEndDisplayList());
gSPDisplayList(POLY_OPA_DISP++, opaDl.data());
@ -706,5 +706,5 @@ void DrawColViewer() {
xluDl.push_back(gsSPEndDisplayList());
gSPDisplayList(POLY_XLU_DISP++, xluDl.data());
CLOSE_DISPS(gGlobalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gGlobalCtx->state.gfxCtx);
}

4
soh/src/code/flg_set.c
View File

@ -40,7 +40,7 @@ void FlagSet_Update(GlobalContext* globalCtx) {
Gfx* gfx;
Gfx* polyOpa;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
{
GfxPrint printer;
@ -148,5 +148,5 @@ void FlagSet_Update(GlobalContext* globalCtx) {
globalCtx->pauseCtx.debugState = 0;
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}

12
soh/src/code/game.c
View File

@ -143,7 +143,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
Gfx* newDList;
Gfx* polyOpaP;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
newDList = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP);
gSPDisplayList(OVERLAY_DISP++, newDList);
@ -184,7 +184,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
if (1) {}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
func_80063D7C(gfxCtx);
@ -195,7 +195,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
}
void GameState_SetFrameBuffer(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0, 0);
gSPSegment(POLY_OPA_DISP++, 0xF, gfxCtx->curFrameBuffer);
@ -207,14 +207,14 @@ void GameState_SetFrameBuffer(GraphicsContext* gfxCtx) {
gSPSegment(OVERLAY_DISP++, 0xF, gfxCtx->curFrameBuffer);
gSPSegment(OVERLAY_DISP++, 0xE, gZBuffer);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800C49F4(GraphicsContext* gfxCtx) {
Gfx* newDlist;
Gfx* polyOpaP;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
newDlist = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP);
gSPDisplayList(OVERLAY_DISP++, newDlist);
@ -225,7 +225,7 @@ void func_800C49F4(GraphicsContext* gfxCtx) {
if (1) {}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void PadMgr_RequestPadData(PadMgr*, Input*, s32);

16
soh/src/code/graph.c
View File

@ -225,9 +225,9 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
task->output_buff_size = (u64*)((u8*)gGfxSPTaskOutputBuffer + sizeof(gGfxSPTaskOutputBuffer));
task->data_ptr = (u64*)gfxCtx->workBuffer;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer;
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
{ s32 pad2; } // Necessary to match stack usage
@ -272,29 +272,29 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
gameState->unk_A0 = 0;
Graph_InitTHGA(gfxCtx);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gDPNoOpString(WORK_DISP++, "WORK_DISP 開始", 0);
gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 開始", 0);
gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 開始", 0);
gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 開始", 0);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
GameState_ReqPadData(gameState);
GameState_Update(gameState);
Debug_Draw();
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gDPNoOpString(WORK_DISP++, "WORK_DISP 終了", 0);
gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 終了", 0);
gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 終了", 0);
gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 終了", 0);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPBranchList(WORK_DISP++, gfxCtx->polyOpaBuffer);
gSPBranchList(POLY_OPA_DISP++, gfxCtx->polyXluBuffer);
@ -305,7 +305,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
gDPFullSync(OVERLAY_DISP++);
gSPEndDisplayList(OVERLAY_DISP++);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
if (HREG(80) == 10 && HREG(93) == 2) {
HREG(80) = 7;

8
soh/src/code/speed_meter.c
View File

@ -55,7 +55,7 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) {
uly = this->y;
lry = this->y + 2;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
/*! @bug if gIrqMgrRetraceTime is 0, CLOSE_DISPS will never be reached */
if (gIrqMgrRetraceTime == 0) {
@ -98,7 +98,7 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) {
OVERLAY_DISP = gfx;
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void SpeedMeter_InitAllocEntry(SpeedMeterAllocEntry* this, u32 maxval, u32 val, u16 backColor, u16 foreColor, u32 ulx,
@ -123,7 +123,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC
LOG_NUM("this->maxval", this->maxval, __FILE__, __LINE__);
osSyncPrintf(VT_RST);
} else {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
View_Init(&view, gfxCtx);
view.flags = 0xA;
@ -146,7 +146,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC
gDPPipeSync(gfx++);
OVERLAY_DISP = gfx;
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
}

72
soh/src/code/z_actor.c
View File

@ -93,7 +93,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf
temp1 = actor->world.pos.y - actor->floorHeight;
if (temp1 >= -50.0f && temp1 < 500.0f) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C);
@ -124,7 +124,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, dlist);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
}
@ -148,7 +148,7 @@ void ActorShadow_DrawFoot(GlobalContext* globalCtx, Light* light, MtxF* arg2, s3
f32 sp58;
s32 pad2[2];
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0,
(u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF);
@ -164,7 +164,7 @@ void ActorShadow_DrawFoot(GlobalContext* globalCtx, Light* light, MtxF* arg2, s3
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gFootShadowDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx) {
@ -200,7 +200,7 @@ void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx
Vec3f* feetPosPtr = actor->shape.feetPos;
f32* floorHeightPtr = floorHeight;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C);
@ -267,7 +267,7 @@ void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@ -416,7 +416,7 @@ void func_8002C0C0(TargetContext* targetCtx, Actor* actor, GlobalContext* global
void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
Actor* actor = targetCtx->targetedActor;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (targetCtx->unk_48 != 0) {
TargetContextEntry* entry;
@ -531,7 +531,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
FrameInterpolation_RecordCloseChild();
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, GlobalContext* globalCtx) {
@ -1050,7 +1050,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
titleY = (titleCtx->y * 4) - (height * 2);
doubleWidth = width * 2;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
height = (width * height > 0x1000) ? 0x1000 / width : height;
titleSecondY = titleY + (height * 4);
@ -1098,7 +1098,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
titleSecondY + (height * 4), G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@ -1691,11 +1691,11 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext*
Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) {
Hilite* hilite;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
POLY_OPA_DISP = func_8002E830(object, eye, lightDir, gfxCtx, POLY_OPA_DISP, &hilite);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
return hilite;
}
@ -1703,11 +1703,11 @@ Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContex
Hilite* func_8002EB44(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) {
Hilite* hilite;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
POLY_XLU_DISP = func_8002E830(object, eye, lightDir, gfxCtx, POLY_XLU_DISP, &hilite);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
return hilite;
}
@ -1733,13 +1733,13 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) {
displayList = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx));
displayListHead = displayList;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10);
gSPEndDisplayList(displayListHead);
gSPSegment(POLY_OPA_DISP++, 0x07, displayList);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@ -1759,13 +1759,13 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) {
displayList = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx));
displayListHead = displayList;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10);
gSPEndDisplayList(displayListHead);
gSPSegment(POLY_XLU_DISP++, 0x07, displayList);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@ -2156,7 +2156,7 @@ void Actor_DrawFaroresWindPointer(GlobalContext* globalCtx) {
s32 lightRadius = -1;
s32 params;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
params = gSaveContext.respawn[RESPAWN_MODE_TOP].data;
@ -2293,7 +2293,7 @@ void Actor_DrawFaroresWindPointer(GlobalContext* globalCtx) {
((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z), 255, 255, 255, lightRadius);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80030488(GlobalContext* globalCtx) {
@ -2519,7 +2519,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
Fault_AddClient(&faultClient, Actor_FaultPrint, actor, "Actor_draw");
FrameInterpolation_RecordOpenChild(actor, 0);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
lights = LightContext_NewLights(&globalCtx->lightCtx, globalCtx->state.gfxCtx);
@ -2575,7 +2575,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
actor->shape.shadowDraw(actor, lights, globalCtx);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
FrameInterpolation_RecordCloseChild();
Fault_RemoveClient(&faultClient);
@ -2596,7 +2596,7 @@ void func_80030ED8(Actor* actor) {
}
void func_80030FA8(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gDPLoadTextureBlock(POLY_XLU_DISP++, gLensOfTruthMaskTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
@ -2611,7 +2611,7 @@ void func_80030FA8(GraphicsContext* gfxCtx) {
gSPWideTextureRectangle(POLY_XLU_DISP++, x, 0, x + abs(x), 960, G_TX_RENDERTILE, 0, 0, 0, 0);
gSPWideTextureRectangle(POLY_XLU_DISP++, 0, 0, w, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597);
gDPPipeSync(POLY_XLU_DISP++);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** invisibleActors) {
@ -2621,7 +2621,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv
gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ START", 0); // "Magic lens START"
@ -2682,7 +2682,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv
gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ END", 0); // "Magic lens END"
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) {
@ -2720,7 +2720,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
invisibleActorCounter = 0;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
actorListEntry = &actorCtx->actorLists[0];
@ -2810,7 +2810,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
CollisionCheck_DrawCollision(globalCtx, &globalCtx->colChkCtx);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) {
@ -3820,7 +3820,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx)
Vec3f sp50;
CollisionPoly* sp4C;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (0) {} // Necessary to match
@ -3847,7 +3847,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx)
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gCircleShadowDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
@ -3916,7 +3916,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) {
entry = &sDoorLocksInfo[type];
chainRotZ = entry->chainsRotZInit;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Translate(0.0f, entry->yShift, 500.0f, MTXMODE_APPLY);
Matrix_Get(&baseMtxF);
@ -3953,7 +3953,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, entry->lockDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1) {
@ -4195,7 +4195,7 @@ Gfx* func_80034B54(GraphicsContext* gfxCtx) {
void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw,
PostLimbDraw postLimbDraw, Actor* actor, s16 alpha) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -4207,12 +4207,12 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD
POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
overrideLimbDraw, postLimbDraw, actor, POLY_OPA_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw,
PostLimbDraw postLimbDraw, Actor* actor, s16 alpha) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
@ -4223,7 +4223,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
overrideLimbDraw, postLimbDraw, actor, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) {

8
soh/src/code/z_cheap_proc.c
View File

@ -1,23 +1,23 @@
#include "global.h"
void Gfx_DrawDListOpa(GlobalContext* globalCtx, Gfx* dlist) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, dlist);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Gfx_DrawDListXlu(GlobalContext* globalCtx, Gfx* dlist) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, dlist);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/code/z_collision_check.c
View File

@ -55,7 +55,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC,
f32 nz;
f32 originDist;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0xFF, r, g, b, 50);
@ -97,7 +97,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC,
gSPVertex(POLY_OPA_DISP++, vtxTbl, 3, 0);
gSP1Triangle(POLY_OPA_DISP++, 0, 1, 2, 0);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
s32 Collider_InitBase(GlobalContext* globalCtx, Collider* collider) {

4
soh/src/code/z_debug.c
View File

@ -222,7 +222,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) {
if (!CVar_GetS32("gDebugEnabled", 0))
return;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
GfxPrint_Init(&printer);
sp78 = POLY_OPA_DISP;
@ -246,7 +246,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) {
if (1) {}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
GfxPrint_Destroy(&printer);
}

8
soh/src/code/z_debug_display.c
View File

@ -67,7 +67,7 @@ void DebugDisplay_DrawObjects(GlobalContext* globalCtx) {
}
void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80094678(globalCtx->state.gfxCtx);
@ -85,11 +85,11 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, GlobalCo
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, gDebugSpriteDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* dlist, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8009435C(globalCtx->state.gfxCtx);
@ -104,5 +104,5 @@ void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* dlist, GlobalConte
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, dlist);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/code/z_demo.c
View File

@ -1916,7 +1916,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) {
if (0) {} // Also necessary to match
if (BREG(0) != 0) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
prevDisplayList = POLY_OPA_DISP;
displayList = Graph_GfxPlusOne(POLY_OPA_DISP);
@ -1926,7 +1926,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) {
Graph_BranchDlist(prevDisplayList, displayList);
POLY_OPA_DISP = displayList;
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
csCtx->frames++;

104
soh/src/code/z_draw.c
View File

@ -382,33 +382,33 @@ void GetItem_Draw(GlobalContext* globalCtx, s16 drawId) {
void GetItem_DrawMaskOrBombchu(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093BA8(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawSoldOut(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 5);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -428,13 +428,13 @@ void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -457,13 +457,13 @@ void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -485,13 +485,13 @@ void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawMirrorShield(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -508,13 +508,13 @@ void GetItem_DrawMirrorShield(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawSkullToken(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -530,13 +530,13 @@ void GetItem_DrawSkullToken(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawEggOrMedallion(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093BA8(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -544,13 +544,13 @@ void GetItem_DrawEggOrMedallion(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawCompass(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -562,13 +562,13 @@ void GetItem_DrawCompass(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawPotion(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -588,13 +588,13 @@ void GetItem_DrawPotion(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[5]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawGoronSword(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -605,13 +605,13 @@ void GetItem_DrawGoronSword(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawDekuNuts(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -622,13 +622,13 @@ void GetItem_DrawDekuNuts(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawRecoveryHeart(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -639,13 +639,13 @@ void GetItem_DrawRecoveryHeart(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawFish(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -656,26 +656,26 @@ void GetItem_DrawFish(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawOpa0(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawOpa0Xlu1(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -687,13 +687,13 @@ void GetItem_DrawOpa0Xlu1(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawXlu01(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -701,13 +701,13 @@ void GetItem_DrawXlu01(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawOpa10Xlu2(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -720,13 +720,13 @@ void GetItem_DrawOpa10Xlu2(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawMagicArrow(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -739,13 +739,13 @@ void GetItem_DrawMagicArrow(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawMagicSpell(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -758,13 +758,13 @@ void GetItem_DrawMagicSpell(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawOpa1023(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -774,13 +774,13 @@ void GetItem_DrawOpa1023(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]);
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawOpa10Xlu32(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -794,13 +794,13 @@ void GetItem_DrawOpa10Xlu32(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawSmallRupee(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY);
@ -816,13 +816,13 @@ void GetItem_DrawSmallRupee(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawScale(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -836,13 +836,13 @@ void GetItem_DrawScale(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawBulletBag(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -857,13 +857,13 @@ void GetItem_DrawBulletBag(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -877,5 +877,5 @@ void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[6]);
gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[7]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

32
soh/src/code/z_eff_blure.c
View File

@ -382,11 +382,11 @@ void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3
}
void EffectBlure_SetupSmooth(EffectBlure* this, GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
// original name: "SQ_NoInterpolate_disp"
@ -403,7 +403,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement*
Vec3f sp60;
Vec3f sp54;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
Math_Vec3s_ToVec3f(&sp6C, &this->elements[0].p2);
@ -483,7 +483,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement*
gSP2Triangles(POLY_XLU_DISP++, 0, 1, 2, 0, 0, 2, 3, 0);
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElement* elem, s32 index,
@ -514,7 +514,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem
Color_RGBA8 sp144;
Vec3f sp138;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
Math_Vec3s_ToVec3f(&sp138, &this->elements[0].p2);
@ -656,7 +656,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem
gSP2Triangles(POLY_XLU_DISP++, 12, 13, 15, 0, 12, 15, 14, 0);
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) {
@ -668,7 +668,7 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) {
MtxF sp5C;
Mtx* mtx;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if (this->numElements < 2) {
return;
@ -710,19 +710,19 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) {
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gDPPipeSync(POLY_XLU_DISP++);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26);
@ -743,7 +743,7 @@ void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx*
gDPSetEnvColor(POLY_XLU_DISP++, this->altEnvColor.r, this->altEnvColor.g, this->altEnvColor.b, this->altEnvColor.a);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void (*sSetupHandlers[])(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) = {
@ -757,7 +757,7 @@ s32 D_80115788 = 0; // unused
void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) {
Mtx* mtx;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
sSetupHandlers[this->drawMode](gfxCtx, this, vtx);
gDPPipeSync(POLY_XLU_DISP++);
@ -829,7 +829,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this,
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
Vtx_t D_8011578C[] = {
@ -949,7 +949,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) {
s32 phi_t2;
FrameInterpolation_RecordOpenChild(this, 0);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -1061,6 +1061,6 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) {
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
FrameInterpolation_RecordCloseChild();
}

4
soh/src/code/z_eff_shield_particle.c
View File

@ -157,7 +157,7 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
Color_RGBA8 envColor;
FrameInterpolation_RecordOpenChild(this, 0);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if (this != NULL) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26);
@ -215,6 +215,6 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
FrameInterpolation_RecordCloseChild();
}

4
soh/src/code/z_eff_spark.c
View File

@ -155,7 +155,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
f32 ratio;
FrameInterpolation_RecordOpenChild(this, 0);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if (this != NULL) {
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -276,6 +276,6 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
}
end:
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
FrameInterpolation_RecordCloseChild();
}

24
soh/src/code/z_eff_ss_dead.c
View File

@ -5,7 +5,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a
Gfx* displayListHead;
f32 absCos;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
displayListHead = POLY_OPA_DISP;
cos = Math_CosS((0x8000 / arg3) * arg2);
@ -25,7 +25,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a
if (1) {} // Necessary to match
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) {
@ -33,7 +33,7 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a
f32 cos;
if (arg3 != 0) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
cos = Math_CosS((0x4000 / arg3) * arg2);
displayListHead = POLY_OPA_DISP;
@ -46,19 +46,19 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a
if (1) {} // Necessary to match
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
void func_80026608(GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gDPPipeSync(POLY_OPA_DISP++);
POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) {
@ -66,7 +66,7 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a
Gfx* displayListHead;
f32 absCos;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
displayListHead = POLY_XLU_DISP;
cos = Math_CosS((0x8000 / arg3) * arg2);
@ -86,14 +86,14 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a
if (1) {} // Necessary to match
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) {
f32 cos;
Gfx* displayListHead;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
displayListHead = POLY_XLU_DISP;
cos = Math_CosS((0x4000 / arg3) * arg2);
@ -106,16 +106,16 @@ void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a
if (1) {} // Necessary to match
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80026A6C(GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gDPPipeSync(POLY_XLU_DISP++);
POLY_XLU_DISP = Gameplay_SetFog(globalCtx, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/code/z_effect_soft_sprite_old_init.c
View File

@ -51,7 +51,7 @@ void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* textur
Mtx* mtx;
void* object = globalCtx->objectCtx.status[this->rgObjBankIdx].segment;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
scale = this->rgScale * 0.0025f;
SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
@ -73,7 +73,7 @@ void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* textur
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
// EffectSsDust Spawn Functions

4
soh/src/code/z_en_a_keep.c
View File

@ -348,7 +348,7 @@ void EnAObj_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 type = thisx->params;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -364,5 +364,5 @@ void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, sDLists[type]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

16
soh/src/code/z_en_item00.c
View File

@ -1244,7 +1244,7 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
s32 pad;
s32 texIndex;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(&this->actor, globalCtx, 0);
@ -1262,7 +1262,7 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gRupeeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -1271,7 +1271,7 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) {
s32 texIndex = this->actor.params - 3;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP);
@ -1289,7 +1289,7 @@ void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gItemDropDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -1298,7 +1298,7 @@ void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) {
void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(&this->actor, globalCtx, 0);
@ -1312,7 +1312,7 @@ void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, gHeartContainerInteriorDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -1321,7 +1321,7 @@ void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx) {
void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
func_8002ED80(&this->actor, globalCtx, 0);
@ -1329,7 +1329,7 @@ void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, gHeartPieceInteriorDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**

4
soh/src/code/z_fcurve_data_skelanime.c
View File

@ -104,7 +104,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve*
OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, void* data) {
SkelCurveLimb* limb = SEGMENTED_TO_VIRTUAL(skelCurve->limbList[limbIndex]);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Push();
@ -175,7 +175,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve*
SkelCurve_DrawLimb(globalCtx, limb->nextLimbIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, data);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void SkelCurve_Draw(Actor* actor, GlobalContext* globalCtx, SkelAnimeCurve* skelCurve,

40
soh/src/code/z_kankyo.c
View File

@ -949,7 +949,7 @@ void Environment_Update(GlobalContext* globalCtx, EnvironmentContext* envCtx, Li
Gfx* displayList;
Gfx* prevDisplayList;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
prevDisplayList = POLY_OPA_DISP;
displayList = Graph_GfxPlusOne(POLY_OPA_DISP);
@ -959,7 +959,7 @@ void Environment_Update(GlobalContext* globalCtx, EnvironmentContext* envCtx, Li
Graph_BranchDlist(prevDisplayList, displayList);
POLY_OPA_DISP = displayList;
if (1) {}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
if ((envCtx->unk_BF != 0xFF) && (envCtx->unk_DC != 2) && (envCtx->unk_BD != envCtx->unk_BF) &&
@ -1302,7 +1302,7 @@ void Environment_DrawSunAndMoon(GlobalContext* globalCtx) {
f32 scale;
f32 temp;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (globalCtx->csCtx.state != 0) {
Math_SmoothStepToF(&globalCtx->envCtx.sunPos.x,
@ -1397,7 +1397,7 @@ void Environment_DrawSunAndMoon(GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Environment_DrawSunLensFlare(GlobalContext* globalCtx, EnvironmentContext* envCtx, View* view,
@ -1461,7 +1461,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1,
};
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
dist = Math3D_Vec3f_DistXYZ(&pos, &view->eye) / 12.0f;
@ -1615,7 +1615,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
f32 func_800746DC(void) {
@ -1642,7 +1642,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext*
Player* player = GET_PLAYER(globalCtx);
if (!(globalCtx->cameraPtrs[0]->unk_14C & 0x100) && (globalCtx->envCtx.unk_EE[2] == 0)) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
vec.x = view->lookAt.x - view->eye.x;
vec.y = view->lookAt.y - view->eye.y;
@ -1724,7 +1724,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext*
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
}
@ -1758,7 +1758,7 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) {
(globalCtx->skyboxId == SKYBOX_UNSET_1D)) {
f32 alpha;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_800938B4(globalCtx->state.gfxCtx);
@ -1776,11 +1776,11 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) {
globalCtx->lightCtx.fogColor[2], 255.0f * alpha);
gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
if (globalCtx->envCtx.customSkyboxFilter) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_800938B4(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, globalCtx->envCtx.skyboxFilterColor[0],
@ -1788,18 +1788,18 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) {
globalCtx->envCtx.skyboxFilterColor[3]);
gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
void Environment_DrawLightningFlash(GlobalContext* globalCtx, u8 red, u8 green, u8 blue, u8 alpha) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_800938B4(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, red, green, blue, alpha);
gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Environment_UpdateLightningStrike(GlobalContext* globalCtx) {
@ -1914,7 +1914,7 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) {
Vec3f unused1 = { 0.0f, 0.0f, 0.0f };
Vec3f unused2 = { 0.0f, 0.0f, 0.0f };
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
for (i = 0; i < ARRAY_COUNT(sLightningBolts); i++) {
switch (sLightningBolts[i].state) {
@ -1973,7 +1973,7 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Environment_PlaySceneSequence(GlobalContext* globalCtx) {
@ -2239,7 +2239,7 @@ void func_800766C4(GlobalContext* globalCtx) {
void Environment_FillScreen(GraphicsContext* gfxCtx, u8 red, u8 green, u8 blue, u8 alpha, u8 drawFlags) {
if (alpha != 0) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if (drawFlags & FILL_SCREEN_OPA) {
POLY_OPA_DISP = func_800937C0(POLY_OPA_DISP);
@ -2262,7 +2262,7 @@ void Environment_FillScreen(GraphicsContext* gfxCtx, u8 red, u8 green, u8 blue,
gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
}
@ -2413,7 +2413,7 @@ void Environment_DrawSandstorm(GlobalContext* globalCtx, u8 sandstormState) {
sp94 = (s32)(D_8015FDB0 * (9.0f / 6.0f));
sp92 = (s32)(D_8015FDB0 * (6.0f / 6.0f));
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_XLU_DISP = func_80093F34(POLY_XLU_DISP);
gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE);
@ -2429,7 +2429,7 @@ void Environment_DrawSandstorm(GlobalContext* globalCtx, u8 sandstormState) {
gSPWideTextureRectangle(POLY_XLU_DISP++, OTRGetRectDimensionFromLeftEdge(0) << 2, 0,
OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH) << 2, 0x03C0, G_TX_RENDERTILE, 0, 0, 0x008C,
-0x008C);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
D_8015FDB0 += (s32)sp98;
}

4
soh/src/code/z_lifemeter.c
View File

@ -412,7 +412,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
u8* curBgImgLoaded = NULL;
s32 ddHeartCountMinusOne = gSaveContext.inventory.defenseHearts - 1;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if (!(gSaveContext.health % 0x10)) {
fullHeartCount--;
@ -584,7 +584,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void HealthMeter_HandleCriticalAlarm(GlobalContext* globalCtx) {

8
soh/src/code/z_lights.c
View File

@ -67,7 +67,7 @@ void Lights_Draw(Lights* lights, GraphicsContext* gfxCtx) {
#if 1
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPNumLights(POLY_OPA_DISP++, lights->numLights);
gSPNumLights(POLY_XLU_DISP++, lights->numLights);
@ -88,7 +88,7 @@ void Lights_Draw(Lights* lights, GraphicsContext* gfxCtx) {
gSPLight(POLY_OPA_DISP++, &lights->l.a, i);
gSPLight(POLY_XLU_DISP++, &lights->l.a, i);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
#endif
}
@ -417,7 +417,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
node = globalCtx->lightCtx.listHead;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_XLU_DISP = func_800947AC(POLY_XLU_DISP++);
gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE);
@ -449,5 +449,5 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
node = node->next;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

8
soh/src/code/z_map_exp.c
View File

@ -599,7 +599,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 tempX, tempZ;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (globalCtx->interfaceCtx.minimapAlpha >= 0xAA) {
func_80094A14(globalCtx->state.gfxCtx);
@ -639,7 +639,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) {
gSPDisplayList(OVERLAY_DISP++, gCompassArrowDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Minimap_Draw(GlobalContext* globalCtx) {
@ -647,7 +647,7 @@ void Minimap_Draw(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
s32 mapIndex = gSaveContext.mapIndex;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (globalCtx->pauseCtx.state < 4) {
switch (globalCtx->sceneNum) {
@ -819,7 +819,7 @@ void Minimap_Draw(GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
s16 Map_GetFloorTextIndexOffset(s32 mapIndex, s32 floor) {

4
soh/src/code/z_map_mark.c
View File

@ -96,7 +96,7 @@ void MapMark_DrawForDungeon(GlobalContext* globalCtx) {
mapMarkIconData = &sLoadedMarkDataTable[dungeon][interfaceCtx->mapRoomNum][0];
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
while (true) {
if (mapMarkIconData->markType == MAP_MARK_NONE) {
@ -145,7 +145,7 @@ void MapMark_DrawForDungeon(GlobalContext* globalCtx) {
mapMarkIconData++;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void MapMark_Draw(GlobalContext* globalCtx) {

8
soh/src/code/z_message_PAL.c
View File

@ -2919,7 +2919,7 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) {
static s16 sFillTimer = 0;
s32 pad;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if (sVarLastValue != *var) {
sVarLastValue = *var;
@ -2940,7 +2940,7 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) {
gDPFillRectangle(POLY_OPA_DISP++, 40, 120, 60, 140); // 20x20 white box
gDPPipeSync(POLY_OPA_DISP++);
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void Message_DrawDebugText(GlobalContext* globalCtx, Gfx** p) {
@ -2966,7 +2966,7 @@ void Message_Draw(GlobalContext* globalCtx) {
Gfx* polyOpaP;
s16 watchVar;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
watchVar = gSaveContext.scarecrowCustomSongSet;
Message_DrawDebugVariableChanged(&watchVar, globalCtx->state.gfxCtx);
@ -2985,7 +2985,7 @@ void Message_Draw(GlobalContext* globalCtx) {
gSPEndDisplayList(plusOne++);
Graph_BranchDlist(polyOpaP, plusOne);
POLY_OPA_DISP = plusOne;
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Message_Update(GlobalContext* globalCtx) {

8
soh/src/code/z_moji.c
View File

@ -73,7 +73,7 @@ void Moji_SetPosition(s32 gridX, s32 gridY) {
void Moji_DrawChar(GraphicsContext* gfxCtx, char c) {
s32 pad[2];
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if ((u32)gMojiFontTLUTs & 0xF) {
osSyncPrintf("moji_tlut --> %X\n", gMojiFontTLUTs);
@ -87,7 +87,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) {
(sScreenPosY + DISP_CHAR_HEIGHT) << 2, G_TX_RENDERTILE, GET_TEX_CHAR_S(c), GET_TEX_CHAR_T(c),
(1 << 10) * TEX_CHAR_WIDTH / DISP_CHAR_WIDTH, (1 << 10) * TEX_CHAR_HEIGHT / DISP_CHAR_HEIGHT);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
/**
@ -99,7 +99,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) {
void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) {
s32 i;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if ((u32)gMojiFontTex & 0xF) {
osSyncPrintf("font_ff --> %X\n", gMojiFontTex);
@ -140,5 +140,5 @@ void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) {
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}

28
soh/src/code/z_parameter.c
View File

@ -2835,7 +2835,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
s16 magicBarY;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (gSaveContext.magicLevel != 0) {
if (gSaveContext.healthCapacity > 0xA0) {
@ -2921,7 +2921,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80088AA0(s16 arg0) {
@ -2961,7 +2961,7 @@ void func_80088B34(s16 arg0) {
}
void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gDPLoadTextureBlock_4b(OVERLAY_DISP++, texture, G_IM_FMT_IA, DO_ACTION_TEX_WIDTH, DO_ACTION_TEX_HEIGHT, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
@ -2969,7 +2969,7 @@ void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) {
gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void Interface_DrawItemButtons(GlobalContext* globalCtx) {
@ -2988,7 +2988,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
s16 C_Up_BTN_Pos[] = { C_UP_BUTTON_X+Right_HUD_Margin, C_UP_BUTTON_Y+(Top_HUD_Margin*-1) };
s16 C_Down_BTN_Pos[] = { C_DOWN_BUTTON_X+Right_HUD_Margin, C_DOWN_BUTTON_Y+(Top_HUD_Margin*-1) };
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
// B Button Color & Texture
// Also loads the Item Button Texture reused by other buttons afterwards
@ -3184,7 +3184,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
int16_t gItemIconX[] = { B_BUTTON_X, C_LEFT_BUTTON_X, C_DOWN_BUTTON_X, C_RIGHT_BUTTON_X,
@ -3195,7 +3195,7 @@ int16_t gItemIconWidth[] = { 30, 24, 24, 24, 16, 16, 16, 16 };
int16_t gItemIconDD[] = { 550, 680, 680, 680, 1024, 1024, 1024, 1024 };
void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 button) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gDPLoadTextureBlock(OVERLAY_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -3207,7 +3207,7 @@ void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16
(gItemIconY[button] + (Top_HUD_Margin * -1) + gItemIconWidth[button]) << 2, G_TX_RENDERTILE, 0, 0,
gItemIconDD[button] << 1, gItemIconDD[button] << 1);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
const char* _gAmmoDigit0Tex[] =
@ -3225,7 +3225,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) {
s16 i;
s16 ammo;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
i = gSaveContext.equips.buttonItems[button];
@ -3278,13 +3278,13 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) {
gItemAmmoY[button] + (Top_HUD_Margin * -1), 8, 8, 1 << 10, 1 << 10);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Interface_DrawActionButton(GlobalContext* globalCtx, f32 x, f32 y) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Translate(-137.0f + x, 97.0f - y, XREG(18) / 10.0f, MTXMODE_NEW);
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
@ -3300,7 +3300,7 @@ void Interface_DrawActionButton(GlobalContext* globalCtx, f32 x, f32 y) {
gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Interface_InitVertices(GlobalContext* globalCtx) {
@ -3464,7 +3464,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
s16 svar6;
bool fullUi = !CVar_GetS32("gMinimalUI", 0) || !R_MINIMAP_DISABLED || globalCtx->pauseCtx.state != 0;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
// Invalidate Do Action textures as they may have changed
gSPInvalidateTexCache(OVERLAY_DISP++, interfaceCtx->doActionSegment);
@ -4350,7 +4350,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
gDPFillRectangle(OVERLAY_DISP++, 0, 0, gScreenWidth - 1, gScreenHeight - 1);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Interface_Update(GlobalContext* globalCtx) {

4
soh/src/code/z_play.c
View File

@ -1065,7 +1065,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
Lights* sp228;
Vec3f sp21C;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSegments[4] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment);
gSegments[5] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment);
@ -1341,7 +1341,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
POLY_OPA_DISP = gfxP;
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void Gameplay_Main(GameState* thisx) {

28
soh/src/code/z_player_lib.c
View File

@ -719,7 +719,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
s32 eyeIndex = (jointTable[22].x & 0xF) - 1;
s32 mouthIndex = (jointTable[22].x >> 4) - 1;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (eyeIndex < 0) {
eyeIndex = sEyeMouthIndexes[face][0];
@ -814,7 +814,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
Vec3f D_8012602C = { 0.0f, 0.0f, 0.0f };
@ -1166,7 +1166,7 @@ void func_800906D4(GlobalContext* globalCtx, Player* this, Vec3f* newTipPos) {
void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPos, s32 drawIdPlusOne) {
f32 height = (this->exchangeItemId != EXCH_ITEM_NONE) ? 6.0f : 14.0f;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSegments[6] = VIRTUAL_TO_PHYSICAL(this->giObjectSegment);
@ -1180,7 +1180,7 @@ void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPo
GetItem_Draw(globalCtx, drawIdPlusOne - 1);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void Player_DrawGetItem(GlobalContext* globalCtx, Player* this) {
@ -1226,7 +1226,7 @@ void Player_DrawHookshotReticle(GlobalContext* globalCtx, Player* this, f32 arg2
if (1) {}
if (BgCheck_AnyLineTest3(&globalCtx->colCtx, &sp8C, &sp80, &sp74, &sp9C, 1, 1, 1, 1, &bgId)) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
WORLD_OVERLAY_DISP = Gfx_CallSetupDL(WORLD_OVERLAY_DISP, 0x07);
@ -1242,7 +1242,7 @@ void Player_DrawHookshotReticle(GlobalContext* globalCtx, Player* this, f32 arg2
gSPSegment(WORLD_OVERLAY_DISP++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment);
gSPDisplayList(WORLD_OVERLAY_DISP++, gLinkAdultHookshotReticleDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@ -1308,7 +1308,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
if (this->itemActionParam == PLAYER_AP_STICK) {
Vec3f sp124[3];
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (this->actor.scale.y >= 0.0f) {
D_80126080.x = this->unk_85C * 5000.0f;
@ -1328,7 +1328,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gLinkChildLinkDekuStickDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
} else if ((this->actor.scale.y >= 0.0f) && (this->swordState != 0)) {
Vec3f spE4[3];
@ -1343,14 +1343,14 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
} else if ((*dList != NULL) && (this->leftHandType == 7)) {
Color_RGB8* bottleColor = &sBottleColors[Player_ActionToBottle(this, this->itemActionParam)];
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetEnvColor(POLY_XLU_DISP++, bottleColor->r, bottleColor->g, bottleColor->b, 0);
gSPDisplayList(POLY_XLU_DISP++, sBottleDLists[(gSaveContext.linkAge)]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
if (this->actor.scale.y >= 0.0f) {
@ -1386,7 +1386,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
} else if ((this->rightHandType == 11) || (this->rightHandType == 12)) {
BowStringData* stringData = &sBowStringData[gSaveContext.linkAge];
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Push();
Matrix_Translate(stringData->pos.x, stringData->pos.y, stringData->pos.z, MTXMODE_APPLY);
@ -1423,7 +1423,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
} else if ((this->actor.scale.y >= 0.0f) && (this->rightHandType == 10)) {
Matrix_Get(&this->shieldMf);
func_80090604(globalCtx, this, &this->shieldQuad, D_80126154);
@ -1590,7 +1590,7 @@ void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, SkelAnime
Mtx* perspMtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx));
Mtx* lookAtMtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx));
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
@ -1660,7 +1660,7 @@ void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, SkelAnime
POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP++);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
uintptr_t SelectedAnim = 0; // Current Animaiton on the menu

4
soh/src/code/z_prenmi.c
View File

@ -30,7 +30,7 @@ void PreNMI_Draw(PreNMIContext* this) {
osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
func_80095248(gfxCtx, 0, 0, 0);
@ -38,7 +38,7 @@ void PreNMI_Draw(PreNMIContext* this) {
gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(255, 255, 255, 1) << 16) | GPACK_RGBA5551(255, 255, 255, 1));
gDPFillRectangle(POLY_OPA_DISP++, 0, this->timer + 100, SCREEN_WIDTH - 1, this->timer + 100);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void PreNMI_Main(GameState* thisx) {

184
soh/src/code/z_rcp.c
View File

@ -928,83 +928,83 @@ Gfx* func_80093808(Gfx* gfx) {
}
void func_80093848(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x3A]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800938B4(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x39]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093920(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x32]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_8009398C(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x33]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800939F8(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x34]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093A64(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x35]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093AD0(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x36]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093B3C(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x37]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093BA8(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1A]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093C14(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x19]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093C80(GlobalContext* globalCtx) {
@ -1013,52 +1013,52 @@ void func_80093C80(GlobalContext* globalCtx) {
func_80093D18(gfxCtx);
if (globalCtx->roomCtx.curRoom.unk_03 == 3) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gDPSetColorDither(POLY_OPA_DISP++, G_CD_DISABLE);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
}
void func_80093D18(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x19]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093D84(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x19]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093DF0(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1F]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093E5C(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x20]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093EC8(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x21]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
Gfx* func_80093F34(Gfx* gfx) {
@ -1072,35 +1072,35 @@ Gfx* func_80093F58(Gfx* gfx) {
}
void func_80093F7C(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
POLY_OPA_DISP = func_80093F58(POLY_OPA_DISP);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80093FD8(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x23]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094044(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x2C]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800940B0(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x24]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
Gfx* func_8009411C(Gfx* gfx) {
@ -1109,67 +1109,67 @@ Gfx* func_8009411C(Gfx* gfx) {
}
void func_80094140(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1C]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800941AC(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2B]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094218(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2D]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094284(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(OVERLAY_DISP++, sSetupDL[0x2E]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800942F0(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x26]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_8009435C(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x04]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800943C8(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x25]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094434(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x02]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
Gfx* func_800944A0(Gfx* gfx) {
@ -1178,27 +1178,27 @@ Gfx* func_800944A0(Gfx* gfx) {
}
void func_800944C4(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
POLY_OPA_DISP = func_800944A0(POLY_OPA_DISP);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800944C4_KAL(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
POLY_KAL_DISP = func_800944A0(POLY_KAL_DISP);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094520(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
OVERLAY_DISP = func_800944A0(OVERLAY_DISP);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_8009457C(Gfx** gfxp) {
@ -1208,27 +1208,27 @@ void func_8009457C(Gfx** gfxp) {
}
void func_800945A0(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x28]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_8009460C(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x29]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094678(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x2F]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
Gfx* func_800946E4(Gfx* gfx) {
@ -1288,76 +1288,76 @@ Gfx* func_80094968(Gfx* gfx) {
}
void func_800949A8(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2A]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800949A8_KAL(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_KAL_DISP++, sSetupDL[0x2A]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094A14(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(OVERLAY_DISP++, sSetupDL[0x2A]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094A80(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x30]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094AEC(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x31]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094B58(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x1B]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094BC4(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x3C]);
gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094C50(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x3D]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094CBC(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x38]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80094D28(Gfx** gfxp) {
@ -1369,11 +1369,11 @@ void func_80094D28(Gfx** gfxp) {
}
void func_80094D4C(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x3B]);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height) {
@ -1454,7 +1454,7 @@ Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a) {
}
void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL);
gSPDisplayList(POLY_XLU_DISP++, sFillSetupDL);
@ -1545,16 +1545,16 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_80095974(GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL);
gDPSetScissor(POLY_OPA_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth, gScreenHeight);
gDPSetDepthImage(POLY_OPA_DISP++, gZBuffer);
gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}

16
soh/src/code/z_room.c
View File

@ -37,7 +37,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) {
PolygonType0* polygon0;
PolygonDlist* polygonDlist;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (flags & 1) {
func_800342EC(&D_801270A0, globalCtx);
@ -67,7 +67,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) {
polygonDlist++;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
#define SHAPE_SORT_MAX 64
@ -99,7 +99,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) {
PolygonDlist2* temp;
f32 temp_f2;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (flags & 1) {
func_800342EC(&D_801270A0, globalCtx);
//gSPSegment(POLY_OPA_DISP++, 0x03, room->segment);
@ -215,7 +215,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) {
iREG(88) = sp9C - 1;
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
//#define JPEG_MARKER 0xFFD8FFE0
@ -344,7 +344,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) {
u32 sp94;
u32 sp90;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
camera = GET_ACTIVE_CAM(globalCtx);
sp9C = (camera->setting == CAM_SET_PREREND_FIXED);
@ -390,7 +390,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) {
gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) {
@ -439,7 +439,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) {
u32 sp90;
u32 sp8C;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
camera = GET_ACTIVE_CAM(globalCtx);
sp98 = (camera->setting == CAM_SET_PREREND_FIXED);
@ -485,7 +485,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) {
gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Room Draw Polygon Type 1

4
soh/src/code/z_sample.c
View File

@ -11,7 +11,7 @@ void Sample_Draw(SampleContext* this) {
GraphicsContext* gfxCtx = this->state.gfxCtx;
View* view = &this->view;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
gSPSegment(POLY_OPA_DISP++, 0x01, this->staticSegment);
@ -36,7 +36,7 @@ void Sample_Draw(SampleContext* this) {
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 0, 0);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void Sample_Main(GameState* thisx) {

208
soh/src/code/z_scene_table.c
View File

@ -976,12 +976,12 @@ void func_800994A0(GlobalContext* globalCtx) {
// Scene Draw Config 0
void func_80099550(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, sDefaultDisplayList);
gSPDisplayList(POLY_XLU_DISP++, sDefaultDisplayList);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* D_8012A2F8[] = {
@ -993,7 +993,7 @@ void* D_8012A2F8[] = {
void func_800995DC(GlobalContext* globalCtx) {
u32 gameplayFrames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x09,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
@ -1006,14 +1006,14 @@ void func_800995DC(GlobalContext* globalCtx) {
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.nightFlag]));
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 28
void func_80099760(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1023,7 +1023,7 @@ void func_80099760(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* gDCEntranceTextures[] = {
@ -1041,7 +1041,7 @@ void func_80099878(GlobalContext* globalCtx) {
s32 pad;
Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx[3]));
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDCEntranceTextures[gSaveContext.nightFlag]));
@ -1071,7 +1071,7 @@ void func_80099878(GlobalContext* globalCtx) {
gDPSetEnvColor(displayListHead++, 255, 255, 255, globalCtx->roomCtx.unk_74[BGDODOAGO_EYE_RIGHT]);
gSPEndDisplayList(displayListHead);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 30
@ -1079,7 +1079,7 @@ void func_80099BD8(GlobalContext* globalCtx) {
f32 temp;
Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Gfx));
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
temp = globalCtx->roomCtx.unk_74[0] / 255.0f;
@ -1123,7 +1123,7 @@ void func_80099BD8(GlobalContext* globalCtx) {
gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->roomCtx.unk_74[1]);
gSPEndDisplayList(displayListHead);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
if (gSaveContext.sceneSetupIndex == 5) {
gCustomLensFlareOn = true;
@ -1140,7 +1140,7 @@ void func_80099BD8(GlobalContext* globalCtx) {
void func_8009A45C(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16));
@ -1163,14 +1163,14 @@ void func_8009A45C(GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 32
void func_8009A798(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64));
@ -1191,14 +1191,14 @@ void func_8009A798(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 33
void func_8009A9DC(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1214,14 +1214,14 @@ void func_8009A9DC(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 48
void func_8009AB98(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16));
@ -1232,14 +1232,14 @@ void func_8009AB98(GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 39
void func_8009ACA8(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1253,14 +1253,14 @@ void func_8009ACA8(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 24
void func_8009AE30(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
@ -1280,7 +1280,7 @@ void func_8009AE30(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sThievesHideoutEntranceTextures[] = {
@ -1292,7 +1292,7 @@ void* sThievesHideoutEntranceTextures[] = {
void func_8009AFE0(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32));
@ -1301,7 +1301,7 @@ void func_8009AFE0(GlobalContext* globalCtx) {
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures[gSaveContext.nightFlag]));
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* D_8012A330[] = {
@ -1315,7 +1315,7 @@ void func_8009B0FC(GlobalContext* globalCtx) {
s32 spB0;
s32 spAC;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (1) {} // Necessary to match
@ -1378,14 +1378,14 @@ void func_8009B0FC(GlobalContext* globalCtx) {
{ s32 pad[2]; }
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 29
void func_8009B86C(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -1397,14 +1397,14 @@ void func_8009B86C(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 145);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 34
void func_8009B9BC(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16));
@ -1412,14 +1412,14 @@ void func_8009B9BC(GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 35
void func_8009BAA4(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1437,7 +1437,7 @@ void func_8009BAA4(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 36
@ -1449,7 +1449,7 @@ void func_8009BC44(GlobalContext* globalCtx) {
sp83 = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
@ -1476,7 +1476,7 @@ void func_8009BC44(GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, sp83, sp83, sp83, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Screen Shake for Ganon's Tower Collapse
@ -1507,7 +1507,7 @@ void func_8009C0AC(GlobalContext* globalCtx) {
sp7B = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -1530,7 +1530,7 @@ void func_8009C0AC(GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, sp7B, sp7B, sp7B, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
if (Flags_GetSwitch(globalCtx, 0x37)) {
if ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) ||
@ -1551,7 +1551,7 @@ void func_8009C3EC(GlobalContext* globalCtx) {
if (0) {} // Necessary to match
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sIceCavernEntranceTextures[gSaveContext.nightFlag]));
@ -1570,14 +1570,14 @@ void func_8009C3EC(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 42
void func_8009C608(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16));
@ -1597,14 +1597,14 @@ void func_8009C608(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 43
void func_8009C8B8(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -1621,14 +1621,14 @@ void func_8009C8B8(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 47
void func_8009CAC0(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1641,7 +1641,7 @@ void func_8009CAC0(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sGTGEntranceTextures[] = {
@ -1655,7 +1655,7 @@ void func_8009CC00(GlobalContext* globalCtx) {
if (0) {} // Necessary to match
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGTGEntranceTextures[gSaveContext.nightFlag]));
@ -1674,7 +1674,7 @@ void func_8009CC00(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2,
@ -1700,7 +1700,7 @@ Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y
void func_8009CF84(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1715,14 +1715,14 @@ void func_8009CF84(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 41
void func_8009D0E8(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1740,7 +1740,7 @@ void func_8009D0E8(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sLonLonHouseEntranceTextures[] = {
@ -1750,7 +1750,7 @@ void* sLonLonHouseEntranceTextures[] = {
// Scene Draw Config 44
void func_8009D31C(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
{ s32 pad[2]; }
@ -1762,7 +1762,7 @@ void func_8009D31C(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sGuardHouseView2Textures[] = {
@ -1778,7 +1778,7 @@ void* sGuardHouseView1Textures[] = {
void func_8009D438(GlobalContext* globalCtx) {
s32 var;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (LINK_IS_ADULT) {
var = 1;
@ -1795,14 +1795,14 @@ void func_8009D438(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 46
void func_8009D5B4(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32));
@ -1816,7 +1816,7 @@ void func_8009D5B4(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sForestTempleEntranceTextures[] = {
@ -1830,7 +1830,7 @@ void func_8009D758(GlobalContext* globalCtx) {
if (0) {} // Necessary to match
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sForestTempleEntranceTextures[gSaveContext.nightFlag]));
@ -1849,7 +1849,7 @@ void func_8009D758(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sSpiritTempleEntranceTextures[] = {
@ -1859,13 +1859,13 @@ void* sSpiritTempleEntranceTextures[] = {
// Scene Draw Config 25
void func_8009D974(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
{ s32 pad[2]; }
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSpiritTempleEntranceTextures[gSaveContext.nightFlag]));
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 1
@ -1875,7 +1875,7 @@ void func_8009DA30(GlobalContext* globalCtx) {
displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx));
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1911,7 +1911,7 @@ void func_8009DA30(GlobalContext* globalCtx) {
gSPEndDisplayList(displayListHead);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sKakarikoWindowTextures[] = {
@ -1921,7 +1921,7 @@ void* sKakarikoWindowTextures[] = {
// Scene Draw Config 2
void func_8009DD5C(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
{ s32 pad[2]; }
@ -1933,14 +1933,14 @@ void func_8009DD5C(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 3
void func_8009DE78(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -1959,7 +1959,7 @@ void func_8009DE78(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 4
@ -1976,7 +1976,7 @@ void func_8009E0B8(GlobalContext* globalCtx) {
if (1) {}
if (1) {}
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x09,
@ -2015,14 +2015,14 @@ void func_8009E0B8(GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->roomCtx.unk_74[0] * 0.02f), 32, 16, 1,
0, (s16)(-globalCtx->roomCtx.unk_74[0] * 0.02f), 32, 16));
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 5
void func_8009E54C(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if ((gSaveContext.sceneSetupIndex > 3) || (LINK_IS_ADULT && !(gSaveContext.eventChkInf[6] & 0x200))) {
globalCtx->roomCtx.unk_74[0] = 87;
@ -2039,7 +2039,7 @@ void func_8009E54C(GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sZorasDomainEntranceTextures[] = {
@ -2052,7 +2052,7 @@ void func_8009E730(GlobalContext* globalCtx) {
u32 gameplayFrames;
u32 var;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
var = 127 - (gameplayFrames * 1) % 128;
@ -2068,14 +2068,14 @@ void func_8009E730(GlobalContext* globalCtx) {
{ s32 pad[2]; }
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 7
void func_8009E8C0(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -2093,14 +2093,14 @@ void func_8009E8C0(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 8
void func_8009EAD8(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -2128,7 +2128,7 @@ void func_8009EAD8(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 9
@ -2137,7 +2137,7 @@ void func_8009EE44(GlobalContext* globalCtx) {
if (0) {} // Necessary to match
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -2161,14 +2161,14 @@ void func_8009EE44(GlobalContext* globalCtx) {
globalCtx->roomCtx.unk_74[1]++;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 10
void func_8009F074(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -2180,7 +2180,7 @@ void func_8009F074(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* D_8012A380[] = {
@ -2190,20 +2190,20 @@ void* D_8012A380[] = {
// Scene Draw Config 11
void func_8009F1B4(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
{ s32 pad[2]; }
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag]));
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 12
void func_8009F270(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -2219,14 +2219,14 @@ void func_8009F270(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 13
void func_8009F40C(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -2242,14 +2242,14 @@ void func_8009F40C(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 14
void func_8009F5D4(GlobalContext* globalCtx) {
Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx));
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, displayListHead);
@ -2277,7 +2277,7 @@ void func_8009F5D4(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 15
@ -2286,7 +2286,7 @@ void func_8009F7D4(GlobalContext* globalCtx) {
s8 sp6E = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8;
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
sp6F = (sp6F >> 1) + 192;
@ -2302,7 +2302,7 @@ void func_8009F7D4(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sGoronCityEntranceTextures[] = {
@ -2314,7 +2314,7 @@ void* sGoronCityEntranceTextures[] = {
void func_8009F9D0(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -2331,7 +2331,7 @@ void func_8009F9D0(GlobalContext* globalCtx) {
{ s32 pad[2]; }
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void* sLonLonRanchWindowTextures[] = {
@ -2341,7 +2341,7 @@ void* sLonLonRanchWindowTextures[] = {
// Scene Draw Config 17
void func_8009FB74(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
{ s32 pad[2]; }
@ -2353,14 +2353,14 @@ void func_8009FB74(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 18
void func_8009FC90(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -2377,7 +2377,7 @@ void func_8009FC90(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 64);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
f32 D_8012A398 = 0.0f;
@ -2388,7 +2388,7 @@ void func_8009FE58(GlobalContext* globalCtx) {
u32 gameplayFrames;
f32 temp;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
if (globalCtx->sceneNum == SCENE_BDAN) {
@ -2459,14 +2459,14 @@ void func_8009FE58(GlobalContext* globalCtx) {
gSPSegment(POLY_OPA_DISP++, 0x0D, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__));
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 26
void func_800A0334(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -2485,7 +2485,7 @@ void func_800A0334(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
// Scene Draw Config 52
@ -2502,7 +2502,7 @@ void func_800A057C(GlobalContext* globalCtx) {
void func_800A059C(GlobalContext* globalCtx) {
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -2515,7 +2515,7 @@ void func_800A059C(GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void (*sSceneDrawHandlers[])(GlobalContext*) = {
@ -2548,14 +2548,14 @@ void Scene_Draw(GlobalContext* globalCtx) {
HREG(94) = 0;
}
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (HREG(81) == 1) {
gSPDisplayList(POLY_OPA_DISP++, sDefaultDisplayList);
gSPDisplayList(POLY_XLU_DISP++, sDefaultDisplayList);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
if (HREG(82) == 1) {
sSceneDrawHandlers[globalCtx->sceneConfig](globalCtx);

32
soh/src/code/z_skelanime.c
View File

@ -25,7 +25,7 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele
Vec3f pos;
Vec3s rot;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Push();
limb = (LodLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]);
@ -62,7 +62,7 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele
SkelAnime_DrawLimbLod(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -84,7 +84,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa
return;
}
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Push();
@ -114,7 +114,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -148,10 +148,10 @@ void SkelAnime_DrawFlexLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** s
if (newDList != NULL) {
Matrix_ToMtx(*mtx, __FILE__, __LINE__);
{
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, *mtx, G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, newDList);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
(*mtx)++;
} else if (limbDList != NULL) {
@ -197,7 +197,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
return;
}
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0xD, mtx);
Matrix_Push();
@ -235,7 +235,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -248,7 +248,7 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele
Vec3f pos;
Vec3s rot;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Push();
limb = (StandardLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]);
@ -282,7 +282,7 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -303,7 +303,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa
return;
}
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Push();
rootLimb = (StandardLimb*)SEGMENTED_TO_VIRTUAL(skeleton[0]);
@ -333,7 +333,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -348,7 +348,7 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s
Vec3f pos;
Vec3s rot;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Push();
@ -390,7 +390,7 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s
SkelAnime_DrawFlexLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
limbMatricies);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**
@ -415,7 +415,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
return;
}
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0xD, mtx);
@ -454,7 +454,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
}
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
/**

16
soh/src/code/z_skin.c
View File

@ -59,7 +59,7 @@ void Skin_ApplyLimbModifications(GraphicsContext* gfxCtx, Skin* skin, s32 limbIn
Vec3f spD0;
SkinTransformation* transformationEntry;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
skeleton = (SkinLimb**)SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment);
data = SEGMENTED_TO_VIRTUAL(((SkinLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]))->segment);
@ -130,7 +130,7 @@ void Skin_ApplyLimbModifications(GraphicsContext* gfxCtx, Skin* skin, s32 limbIn
vtxEntry->index = (vtxEntry->index == 0) ? 1 : 0;
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
/**
@ -141,7 +141,7 @@ void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s
SkinLimb** skeleton;
SkinAnimatedLimbData* data;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment);
data = SEGMENTED_TO_VIRTUAL(((SkinLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]))->segment);
@ -152,7 +152,7 @@ void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s
gSPDisplayList(POLY_OPA_DISP++, data->dlist);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
/**
@ -163,7 +163,7 @@ void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlis
SkinLimb** skeleton;
s32 pad;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment);
@ -182,7 +182,7 @@ void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlis
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostDraw postDraw,
@ -193,7 +193,7 @@ void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostD
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s32 pad;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
if (!(drawFlags & SKIN_DRAW_FLAG_CUSTOM_TRANSFORMS)) {
Skin_ApplyAnimTransformations(skin, gSkinLimbMatrices, actor, setTranslation);
@ -235,7 +235,7 @@ void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostD
}
close_disps:
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
// allows specifying PostLimbDraw and setTranslation

24
soh/src/code/z_view.c
View File

@ -181,7 +181,7 @@ void func_800AA550(View* view) {
ASSERT(lrx <= SCREEN_WIDTH, "lrx <= SCREEN_WD", __FILE__, __LINE__);
ASSERT(lry <= SCREEN_HEIGHT, "lry <= SCREEN_HT", __FILE__, __LINE__);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
gDPPipeSync(POLY_OPA_DISP++);
gDPSetScissor(POLY_OPA_DISP++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry);
@ -190,7 +190,7 @@ void func_800AA550(View* view) {
gDPPipeSync(POLY_KAL_DISP++);
gDPSetScissor(POLY_KAL_DISP++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void func_800AA76C(View* view, f32 x, f32 y, f32 z) {
@ -293,7 +293,7 @@ s32 func_800AAA9C(View* view) {
Mtx* viewing;
GraphicsContext* gfxCtx = view->gfxCtx;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
vp = Graph_Alloc(gfxCtx, sizeof(Vp));
LogUtils_CheckNullPointer("vp", vp, __FILE__, __LINE__);
@ -460,7 +460,7 @@ s32 func_800AAA9C(View* view) {
gSPMatrix(POLY_KAL_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
FrameInterpolation_RecordCloseChild();
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
return 1;
}
@ -470,7 +470,7 @@ s32 func_800AB0A8(View* view) {
Mtx* projection;
GraphicsContext* gfxCtx = view->gfxCtx;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
vp = Graph_Alloc(gfxCtx, sizeof(Vp));
LogUtils_CheckNullPointer("vp", vp, __FILE__, __LINE__);
@ -497,7 +497,7 @@ s32 func_800AB0A8(View* view) {
gSPMatrix(POLY_XLU_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
gSPMatrix(POLY_KAL_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
return 1;
}
@ -509,7 +509,7 @@ s32 func_800AB2C4(View* view) {
gfxCtx = view->gfxCtx;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
vp = Graph_Alloc(gfxCtx, sizeof(Vp));
LogUtils_CheckNullPointer("vp", vp, __FILE__, __LINE__);
@ -532,7 +532,7 @@ s32 func_800AB2C4(View* view) {
gSPMatrix(OVERLAY_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
return 1;
}
@ -547,7 +547,7 @@ s32 func_800AB560(View* view) {
Mtx* viewing;
GraphicsContext* gfxCtx = view->gfxCtx;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
vp = Graph_Alloc(gfxCtx, sizeof(Vp));
LogUtils_CheckNullPointer("vp", vp, __FILE__, __LINE__);
@ -592,19 +592,19 @@ s32 func_800AB560(View* view) {
gSPMatrix(OVERLAY_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
return 1;
}
s32 func_800AB944(View* view) {
OPEN_DISPS(view->gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(view->gfxCtx);
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
view->up.x, view->up.y, view->up.z);
CLOSE_DISPS(view->gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(view->gfxCtx);
return 1;
}

4
soh/src/code/z_vr_box_draw.c
View File

@ -14,7 +14,7 @@ Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z) {
}
void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z) {
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
FrameInterpolation_RecordOpenChild(NULL, FrameInterpolation_GetCameraEpoch());
func_800945A0(gfxCtx);
@ -89,7 +89,7 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb
//gsSPShaderTest2(POLY_OPA_DISP++);
FrameInterpolation_RecordCloseChild();
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}
void SkyboxDraw_Update(SkyboxContext* skyboxCtx) {

4
soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View File

@ -306,7 +306,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 sp58;
if ((player->actor.draw != NULL) && (player->rightHandType == 15)) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if ((ArmsHook_Shoot != this->actionFunc) || (this->timer <= 0)) {
Matrix_MultVec3f(&D_80865B70, &this->unk_1E8);
@ -335,6 +335,6 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gLinkAdultHookshotChainDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}

4
soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View File

@ -204,7 +204,7 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) {
if (1) {}
tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
@ -242,6 +242,6 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) {
255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}

4
soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View File

@ -203,7 +203,7 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (1) {}
tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
@ -241,6 +241,6 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}

4
soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View File

@ -201,7 +201,7 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (1) {}
tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
@ -239,6 +239,6 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}

4
soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
View File

@ -202,7 +202,7 @@ void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
BgBowlWall* this = (BgBowlWall*)thisx;
u32 frames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x8,
@ -217,5 +217,5 @@ void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_OPA_DISP++, gBowlingRound2WallDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View File

@ -294,7 +294,7 @@ void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgBreakwall* this = (BgBreakwall*)thisx;
if (this->bombableWallDList != NULL) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -315,6 +315,6 @@ void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}

4
soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
View File

@ -309,7 +309,7 @@ void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (Flags_GetEventChkInf(0xB0)) {
func_80093D18(globalCtx->state.gfxCtx);
@ -318,7 +318,7 @@ void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gDodongoLowerJawDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgDodoago_Reset(void) {

8
soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View File

@ -894,7 +894,7 @@ static void* sMouthTextures[] = {
void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgDyYoseizo* this = (BgDyYoseizo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (this->actionFunc != BgDyYoseizo_Vanish) {
func_80093D18(globalCtx->state.gfxCtx);
@ -909,7 +909,7 @@ void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, BgDyYoseizo_OverrideLimbDraw, NULL, this);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
BgDyYoseizo_ParticleDraw(this, globalCtx);
}
@ -1010,7 +1010,7 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) {
BgDyYoseizoParticle* particle = this->particles;
s16 i;
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
for (i = 0; i < 200; i++, particle++) {
@ -1037,5 +1037,5 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View File

@ -257,7 +257,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossGanon* ganondorf;
f32 spBC = -30.0f;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
actor = globalCtx->actorCtx.actorLists[ACTORCAT_BOSS].head;
while (actor != NULL) {
@ -368,5 +368,5 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
actor = actor->next;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
View File

@ -124,7 +124,7 @@ void BgGateShutter_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -132,5 +132,5 @@ void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gKakarikoGuardGateDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
View File

@ -100,7 +100,7 @@ void BgGjyoBridge_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = (BgGjyoBridge*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
@ -117,5 +117,5 @@ void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gRainbowBridgeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

8
soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
View File

@ -197,19 +197,19 @@ void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, GlobalContext* globalCtx) {
this->timer2 = vanishTimer * 8;
}
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
//! @bug Due to a bug in the display list, the transparency data is not used.
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 198, 202, 208, this->timer2);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
Gfx_DrawDListXlu(globalCtx, gClearBlockDL);
}
}
void BgGndDarkmeiro_DrawStaticBlock(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 198, 202, 208, 255);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
Gfx_DrawDListXlu(globalCtx, gClearBlockDL);
}

4
soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
View File

@ -140,12 +140,12 @@ void BgGndFiremeiro_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGndFiremeiro_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_800943C8(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gFireTrialPlatformDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
View File

@ -201,12 +201,12 @@ void BgGndSoulmeiro_Draw(Actor* thisx, GlobalContext* globalCtx) {
switch (params) {
case 0:
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, dLists[params]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
break;
case 1:
Gfx_DrawDListXlu(globalCtx, dLists[params]);

4
soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
View File

@ -148,7 +148,7 @@ void BgHaka_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHaka_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
@ -161,5 +161,5 @@ void BgHaka_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gGravestoneEarthDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

8
soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
View File

@ -319,7 +319,7 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) {
f32 scale;
if (this->vFlameScale > 0) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (1) {}
@ -337,7 +337,7 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
@ -356,7 +356,7 @@ void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else {
func_80093D18(globalCtx->state.gfxCtx);
if (thisx->params == BGHAKAGATE_FLOOR) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Get(&currentMtxF);
Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY);
Matrix_RotateX(this->vOpenAngle * (M_PI / 0x8000), MTXMODE_APPLY);
@ -371,7 +371,7 @@ void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_010C10);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
} else {
Gfx_DrawDListOpa(globalCtx, displayLists[thisx->params]);
}

4
soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
View File

@ -198,7 +198,7 @@ void BgHakaShip_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaShip* this = (BgHakaShip*)thisx;
f32 angleTemp;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
if (this->dyna.actor.params == 0) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -220,7 +220,7 @@ void BgHakaShip_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_00E910);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
if (this->actionFunc == BgHakaShip_CutsceneStationary || this->actionFunc == BgHakaShip_Move) {
s32 pad;
Vec3f sp2C;

4
soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
View File

@ -222,7 +222,7 @@ void BgHakaTubo_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
Matrix_Translate(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + 235.0f, this->dyna.actor.world.pos.z,
@ -239,7 +239,7 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgHakaTubo_Draw(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
View File

@ -112,7 +112,7 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 temp;
s32 pad2;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
if (this->isLowered) {
@ -144,5 +144,5 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBotwWaterFallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
View File

@ -489,7 +489,7 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
Player* player = GET_PLAYER(globalCtx);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (BgHeavyBlock_LiftedUp == this->actionFunc) {
Matrix_SetTranslateRotateYXZ(player->leftHandPos.x, player->leftHandPos.y, player->leftHandPos.z,
@ -508,7 +508,7 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gHeavyBlockEntirePillarDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgHeavyBlock_DrawPiece(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
View File

@ -242,7 +242,7 @@ void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx2) {
void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanCurtain* this = (BgHidanCurtain*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 220, 0, this->alpha);
@ -258,5 +258,5 @@ void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View File

@ -202,7 +202,7 @@ static void* sFireballTexs[] = {
void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = (BgHidanFirewall*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14);
@ -213,5 +213,5 @@ void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFireTempleFireballUpperHalfDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
View File

@ -251,7 +251,7 @@ void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
f32 height;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
@ -274,5 +274,5 @@ void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gFireTempleBigFireWallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
View File

@ -397,7 +397,7 @@ void BgHidanHamstep_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -410,5 +410,5 @@ void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gFireTempleStoneStep2DL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
View File

@ -151,7 +151,7 @@ void BgHidanKousi_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanKousi_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -159,5 +159,5 @@ void BgHidanKousi_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sMetalFencesDLs[thisx->params & 0xFF]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
View File

@ -324,7 +324,7 @@ void BgHidanKowarerukabe_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgHidanKowarerukabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -334,5 +334,5 @@ void BgHidanKowarerukabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateSpheres(0, &this->collider);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
View File

@ -353,7 +353,7 @@ static void* sVerticalFlamesTexs[] = {
void func_8088BC40(GlobalContext* globalCtx, BgHidanRock* this) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x01, 255, 255, 0, 150);
@ -375,7 +375,7 @@ void func_8088BC40(GlobalContext* globalCtx, BgHidanRock* this) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFireTempleBigVerticalFlameDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgHidanRock_Draw(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
View File

@ -229,7 +229,7 @@ void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
MtxF mf;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -259,5 +259,5 @@ void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
View File

@ -395,7 +395,7 @@ void BgHidanSekizou_Draw(Actor* thisx, GlobalContext* globalCtx2) {
s32 i;
s32 sp6C[4];
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -430,5 +430,5 @@ void BgHidanSekizou_Draw(Actor* thisx, GlobalContext* globalCtx2) {
}
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
View File

@ -279,7 +279,7 @@ Gfx* func_8088EB54(GlobalContext* globalCtx, BgHidanSima* this, Gfx* gfx) {
void BgHidanSima_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSima* this = (BgHidanSima*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -294,5 +294,5 @@ void BgHidanSima_Draw(Actor* thisx, GlobalContext* globalCtx) {
POLY_XLU_DISP = func_8088EB54(globalCtx, this, POLY_XLU_DISP);
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
View File

@ -388,7 +388,7 @@ void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgIceShelter* this = (BgIceShelter*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
@ -435,5 +435,5 @@ void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) {
break;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
View File

@ -104,7 +104,7 @@ void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -113,5 +113,5 @@ void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gIngoGateDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
View File

@ -213,7 +213,7 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
Actor* lift;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
lift = Actor_Find(&globalCtx->actorCtx, ACTOR_BG_JYA_LIFT, ACTORCAT_BG);
if (lift != NULL) {
@ -235,7 +235,7 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gBigMirror2DL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgJyaBigmirror_Draw(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
View File

@ -64,7 +64,7 @@ void BgJyaBlock_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBlock_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -74,5 +74,5 @@ void BgJyaBlock_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_OPA_DISP++, 232, 210, 176, 255);
gSPDisplayList(POLY_OPA_DISP++, gPushBlockDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

8
soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
View File

@ -197,18 +197,18 @@ void BgJyaBombchuiwa_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBombchuiwa_DrawRock(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBombchuiwa2DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgJyaBombchuiwa_DrawLight(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombchuiwa* this = (BgJyaBombchuiwa*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -217,7 +217,7 @@ void BgJyaBombchuiwa_DrawLight(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, CLAMP_MAX((u32)(this->lightRayIntensity * 255.0f), 255));
gSPDisplayList(POLY_XLU_DISP++, gBombchuiwaLight2DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgJyaBombchuiwa_Draw(Actor* thisx, GlobalContext* globalCtx) {

12
soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
View File

@ -531,21 +531,21 @@ void BgJyaCobra_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
void func_80896CB4(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCobra2DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_80896D78(BgJyaCobra* this, GlobalContext* globalCtx) {
s32 pad;
Vec3s sp44;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
sp44.x = D_80897308[this->dyna.actor.params & 3] + this->dyna.actor.shape.rot.x;
@ -559,7 +559,7 @@ void func_80896D78(BgJyaCobra* this, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s32)(this->unk_18C * 140.0f));
gSPDisplayList(POLY_XLU_DISP++, gCobra3DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
@ -568,7 +568,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
Vec3f sp64;
Vec3s* phi_a3;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80094044(globalCtx->state.gfxCtx);
@ -602,7 +602,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sShadowDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgJyaCobra_Draw(Actor* thisx, GlobalContext* globalCtx) {

8
soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
View File

@ -297,7 +297,7 @@ static void* sLeftSideCrumbles[] = {
};
void BgJyaMegami_DrawFace(BgJyaMegami* this, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRightSideCrumbles[this->crumbleIndex]));
@ -306,7 +306,7 @@ void BgJyaMegami_DrawFace(BgJyaMegami* this, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMegami1DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
static Gfx* sDLists[] = {
@ -320,7 +320,7 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, GlobalContext* globalCtx) {
BgJyaMegamiPiece* piece;
u32 i;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -339,7 +339,7 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, sDLists[i]);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgJyaMegami_Draw(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
View File

@ -123,7 +123,7 @@ void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriEye* this = (BgMenkuriEye*)thisx;
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
if (Flags_GetSwitch(globalCtx, this->actor.params)) {
gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 255);
@ -139,7 +139,7 @@ void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gGTGEyeStatueEyeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgMenkuriEye_Reset(void) {

4
soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
View File

@ -505,7 +505,7 @@ void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
u32 frames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (1) {}
frames = globalCtx->gameplayFrames;
@ -527,5 +527,5 @@ void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
if (this->dList != NULL) {
gSPDisplayList(POLY_OPA_DISP++, this->dList);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
View File

@ -365,7 +365,7 @@ void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx2) {
if (1) {}
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
frames = globalCtx->gameplayFrames;
func_80093D18(globalCtx->state.gfxCtx);
@ -393,5 +393,5 @@ void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_OPA_DISP++, this->dlist);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
View File

@ -158,7 +158,7 @@ void BgMizuShutter_Draw(BgMizuShutter* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuShutter* this = (BgMizuShutter*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -166,5 +166,5 @@ void BgMizuShutter_Draw(BgMizuShutter* thisx, GlobalContext* globalCtx) {
if (this->displayList != NULL) {
gSPDisplayList(POLY_OPA_DISP++, this->displayList);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
View File

@ -329,7 +329,7 @@ void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMizuWater* this = (BgMizuWater*)thisx;
s32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
gameplayFrames = globalCtx->gameplayFrames;
func_80093D84(globalCtx->state.gfxCtx);
@ -346,5 +346,5 @@ void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gObjectMizuObjectsWaterDL_004B20);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
View File

@ -107,7 +107,7 @@ void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = (BgMjin*)thisx;
Gfx* dlist;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (thisx->params != 0) {
s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjectIDs[thisx->params - 1]);
@ -127,5 +127,5 @@ void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, dlist);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
View File

@ -244,7 +244,7 @@ void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriBigst* this = (BgMoriBigst*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
@ -253,5 +253,5 @@ void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMoriBigstDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
View File

@ -252,7 +252,7 @@ void BgMoriElevator_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriElevator* this = (BgMoriElevator*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
@ -260,5 +260,5 @@ void BgMoriElevator_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMoriElevatorDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
View File

@ -282,7 +282,7 @@ void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashigo* this = (BgMoriHashigo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
if (1) {}
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
@ -298,5 +298,5 @@ void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gMoriHashigoLadderDL);
break;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
View File

@ -162,7 +162,7 @@ void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashira4* this = (BgMoriHashira4*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
@ -171,5 +171,5 @@ void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sDisplayLists[this->dyna.actor.params]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
View File

@ -232,7 +232,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
s8 objIndex;
MtxF mtx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIdx].segment);
@ -279,7 +279,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gTreasureChestBossKeyChestSideAndTopDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgMoriHineri_Reset() {

4
soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
View File

@ -163,7 +163,7 @@ void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMoriIdomizu* this = (BgMoriIdomizu*)thisx;
u32 gameplayFrames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
@ -180,5 +180,5 @@ void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gMoriIdomizuWaterDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
View File

@ -161,7 +161,7 @@ void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
@ -171,5 +171,5 @@ void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gMoriKaitenkabeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
View File

@ -222,7 +222,7 @@ void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
@ -232,5 +232,5 @@ void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gMoriRakkatenjoDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
View File

@ -605,7 +605,7 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 sp48;
s32 pad2;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
if ((this->type == 3) || (this->type == 2)) {
if (this->actionFunc == BgPoEvent_PaintingEmpty) {
@ -620,7 +620,7 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, displayLists[this->type]);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
if ((this->type == 0) || (this->type == 1)) {
sp48 = (833.0f - this->dyna.actor.world.pos.y) * 0.0025f;

4
soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
View File

@ -150,7 +150,7 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
u8 green;
u8 blue;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
@ -187,5 +187,5 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
View File

@ -78,12 +78,12 @@ void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gBlockSmallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

8
soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
View File

@ -260,7 +260,7 @@ void BgSpot00Hanebasi_DrawTorches(Actor* thisx, GlobalContext* globalCtx2) {
f32 angle;
s32 i;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
@ -288,14 +288,14 @@ void BgSpot00Hanebasi_DrawTorches(Actor* thisx, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) {
Vec3f basePos = { 158.0f, 10.0f, 400.0f };
Vec3f newPos;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -327,5 +327,5 @@ void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gHyruleFieldCastleDrawbridgeChainsDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
View File

@ -76,7 +76,7 @@ void BgSpot01Fusya_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -84,5 +84,5 @@ void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gKakarikoWindmillSailsDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
View File

@ -321,7 +321,7 @@ void BgSpot01Idohashira_Init(Actor* thisx, GlobalContext* globalCtx) {
void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) {
GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(localGfxCtx, __FILE__, __LINE__);
OPEN_DISPS(localGfxCtx);
func_80093D18(localGfxCtx);
@ -330,7 +330,7 @@ void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) {
func_808AAF34(this, globalCtx);
gSPDisplayList(POLY_OPA_DISP++, gKakarikoWellArchDL);
CLOSE_DISPS(localGfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(localGfxCtx);
}
void BgSpot01Idohashira_Draw(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
View File

@ -70,7 +70,7 @@ void BgSpot01Idomizu_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
u32 frames;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
@ -84,5 +84,5 @@ void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gKakarikoWellWaterDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

4
soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
View File

@ -70,7 +70,7 @@ void BgSpot01Idosoko_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_80093D18(globalCtx->state.gfxCtx);
@ -78,5 +78,5 @@ void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gKakarikoBOTWStoneDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

8
soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
View File

@ -226,7 +226,7 @@ void func_808ACCB8(Actor* thisx, GlobalContext* globalCtx) {
u8 greenEnv;
u8 blueEnv;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[0] != NULL &&
globalCtx->csCtx.npcActions[0]->action == 2) {
@ -265,7 +265,7 @@ void func_808ACCB8(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void func_808AD3D4(BgSpot02Objects* this, GlobalContext* globalCtx) {
@ -288,7 +288,7 @@ void func_808AD450(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
f32 lerp;
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx);
if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[2] != NULL) {
u16 temp_v1 = globalCtx->csCtx.npcActions[2]->urot.z * 0.00549325f;
@ -329,5 +329,5 @@ void func_808AD450(Actor* thisx, GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

Some files were not shown because too many files have changed in this diff Show More