mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-16 14:50:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in PR #50 (3)

Browse Source 
- Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps
- Rename gfxArr to dispRefs
This commit is contained in:
Random
2020-04-05 19:29:30 +02:00
parent 62c6549eec
commit 43acba22a9
667 changed files with 1928 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/graph.c
+23 -23
View File
@@ -157,7 +157,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
u32 temp;
OSTime time;
OSTask_t* task;
Gfx* gfxArr[3];
Gfx* dispRefs[3];
OSScTask* scTask;
CfbInfo* cfb;
@@ -219,9 +219,9 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
task->output_buff_size = gGfxSPTaskYieldBuffer; // ??
task->data_ptr = gfxCtx->workBuffer;
Graph_OpenDisp(gfxArr, gfxCtx, "../graph.c", 828);
Graph_OpenDisps(dispRefs, gfxCtx, "../graph.c", 828);
task->data_size = (u32)gfxCtx->work.p - (u32)gfxCtx->workBuffer;
Graph_CloseDisp(gfxArr, gfxCtx, "../graph.c", 830);
Graph_CloseDisps(dispRefs, gfxCtx, "../graph.c", 830);
task->yield_data_ptr = gGfxSPTaskYieldBuffer;
task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer);
@@ -264,40 +264,40 @@ u32 sGraphCfbInfoIdx = 0;
#ifdef NON_MATCHING
void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
u32 problem; // 0xC4 -> 0xD4
Gfx* gfxArr[5]; // 0xB0 -> 0xC0
Gfx* gfxArr2[9]; // 0x8C -> 0x9C
Gfx* gfxArr3[9]; // 0x68 -> 0x78
Gfx* dispRefs[5]; // 0xB0 -> 0xC0
Gfx* dispRefs2[9]; // 0x8C -> 0x9C
Gfx* dispRefs3[9]; // 0x68 -> 0x78
u64 time;
GfxPool* pool; // 0x4C -> 0x6C
gameState->unk_A0 = 0;
Graph_InitTHGA(gfxCtx);
Graph_OpenDisp(gfxArr, gfxCtx, "../graph.c", 966);
Graph_OpenDisps(dispRefs, gfxCtx, "../graph.c", 966);
gDPNoOpString(gfxCtx->work.p++, "WORK_DISP 開始", 0);
gDPNoOpString(gfxCtx->polyOpa.p++, "POLY_OPA_DISP 開始", 0);
gDPNoOpString(gfxCtx->polyXlu.p++, "POLY_XLU_DISP 開始", 0);
gDPNoOpString(gfxCtx->overlay.p++, "OVERLAY_DISP 開始", 0);
Graph_CloseDisp(gfxArr, gfxCtx, "../graph.c", 975);
Graph_CloseDisps(dispRefs, gfxCtx, "../graph.c", 975);
func_800C4A98(gameState); // Game_ReqPadData
func_800C4AC8(gameState); // Game_SetGameFrame
Graph_OpenDisp(gfxArr2, gfxCtx, "../graph.c", 987);
Graph_OpenDisps(dispRefs2, gfxCtx, "../graph.c", 987);
gDPNoOpString(gfxCtx->work.p++, "WORK_DISP 終了", 0);
gDPNoOpString(gfxCtx->polyOpa.p++, "POLY_OPA_DISP 終了", 0);
gDPNoOpString(gfxCtx->polyXlu.p++, "POLY_XLU_DISP 終了", 0);
gDPNoOpString(gfxCtx->overlay.p++, "OVERLAY_DISP 終了", 0);
Graph_CloseDisp(gfxArr2, gfxCtx, "../graph.c", 996);
Graph_CloseDisps(dispRefs2, gfxCtx, "../graph.c", 996);
Graph_OpenDisp(gfxArr3, gfxCtx, "../graph.c", 999);
Graph_OpenDisps(dispRefs3, gfxCtx, "../graph.c", 999);
gSPBranchList(gfxCtx->work.p++, gfxCtx->polyOpaBuffer);
gSPBranchList(gfxCtx->polyOpa.p++, gfxCtx->polyXluBuffer);
gSPBranchList(gfxCtx->polyXlu.p++, gfxCtx->overlayBuffer);
gDPPipeSync(gfxCtx->overlay.p++);
gDPFullSync(gfxCtx->overlay.p++);
gSPEndDisplayList(gfxCtx->overlay.p++);
Graph_CloseDisp(gfxArr3, gfxCtx, "../graph.c", 1028);
Graph_CloseDisps(dispRefs3, gfxCtx, "../graph.c", 1028);
if (HREG(80) == 10 && HREG(93) == 2) {
HREG(80) = 7;
@@ -467,11 +467,11 @@ void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size) {
return THGA_AllocEnd(&gfxCtx->polyOpa, ALIGN16(size));
}
void Graph_OpenDisp(Gfx** gfxArr, GraphicsContext* gfxCtx, const char* file, s32 line) {
void Graph_OpenDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file, s32 line) {
if (HREG(80) == 7 && HREG(82) != 4) {
gfxArr[0] = gfxCtx->polyOpa.p;
gfxArr[1] = gfxCtx->polyXlu.p;
gfxArr[2] = gfxCtx->overlay.p;
dispRefs[0] = gfxCtx->polyOpa.p;
dispRefs[1] = gfxCtx->polyXlu.p;
dispRefs[2] = gfxCtx->overlay.p;
gDPNoOpOpenDisp(gfxCtx->polyOpa.p++, file, line);
gDPNoOpOpenDisp(gfxCtx->polyXlu.p++, file, line);
@@ -479,22 +479,22 @@ void Graph_OpenDisp(Gfx** gfxArr, GraphicsContext* gfxCtx, const char* file, s32
}
}
void Graph_CloseDisp(Gfx** gfxArr, GraphicsContext* gfxCtx, const char* file, s32 line) {
void Graph_CloseDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file, s32 line) {
if (HREG(80) == 7 && HREG(82) != 4) {
if (gfxArr[0] + 1 == gfxCtx->polyOpa.p) {
gfxCtx->polyOpa.p = gfxArr[0];
if (dispRefs[0] + 1 == gfxCtx->polyOpa.p) {
gfxCtx->polyOpa.p = dispRefs[0];
} else {
gDPNoOpCloseDisp(gfxCtx->polyOpa.p++, file, line);
}
if (gfxArr[1] + 1 == gfxCtx->polyXlu.p) {
gfxCtx->polyXlu.p = gfxArr[1];
if (dispRefs[1] + 1 == gfxCtx->polyXlu.p) {
gfxCtx->polyXlu.p = dispRefs[1];
} else {
gDPNoOpCloseDisp(gfxCtx->polyXlu.p++, file, line);
}
if (gfxArr[2] + 1 == gfxCtx->overlay.p) {
gfxCtx->overlay.p = gfxArr[2];
if (dispRefs[2] + 1 == gfxCtx->overlay.p) {
gfxCtx->overlay.p = dispRefs[2];
} else {
gDPNoOpCloseDisp(gfxCtx->overlay.p++, file, line);
}
src/code/z_actor.c
+54 -54
View File
@@ -14,14 +14,14 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global
f32 temp2;
MtxF sp60;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
if (actor->floorPoly != NULL) {
temp1 = actor->posRot.pos.y - actor->unk_80;
if (temp1 >= -50.0f && temp1 < 500.0f) {
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1553);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1553);
gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C);
@@ -52,7 +52,7 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, dlist);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1594);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1594);
}
}
}
@@ -74,9 +74,9 @@ void ActorShadow_DrawFunc_Squiggly(Actor* actor, LightMapper* lightMapper, Globa
void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
f32 sp58;
Gfx* gfxArr[7];
Gfx* dispRefs[7];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1661);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1661);
gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0, 0, 0,
(u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF);
@@ -92,7 +92,7 @@ void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3,
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_04048180);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1693);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1693);
}
#ifdef NON_MATCHING
@@ -103,7 +103,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa
f32 spE0[2];
s32 i;
f32* spAC;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
f32 temp_10;
u8 temp_14;
f32 temp_f0;
@@ -139,7 +139,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa
temp_s6 -= 2;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1741);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1741);
gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C);
actor->shape.unk_15 = 0;
@@ -209,7 +209,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa
actor->shape.unk_15 = ((spE0[0] + temp_f0) < (spE0[1] - temp_f0)) ? 2 : 1;
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1831);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1831);
}
}
#else
@@ -316,7 +316,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
Actor* actor;
Player* player;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
TargetContextEntry* entry;
s16 spCE;
f32 temp1;
@@ -331,7 +331,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
actor = targetCtx->targetedActor;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2029);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 2029);
if (targetCtx->unk_48 != 0) {
player = PLAYER;
@@ -431,7 +431,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
gSPDisplayList(gfxCtx->polyXlu.p++, &D_0400CB70);
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2158);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 2158);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_8002C124.s")
@@ -736,7 +736,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
s32 spB4;
s32 spB0;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
if (titleCtx->unk_C != 0) {
spCC = titleCtx->unk_8;
@@ -746,7 +746,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
sp38 = spCC * 2;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2824);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 2824);
spB0 = spCC * spC8 * gSaveContext.language;
spC8 = (spCC * spC8 > 0x1000) ? 0x1000 / spCC : spC8;
@@ -777,7 +777,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
G_TX_RENDERTILE, 0, 0, 1024, 1024);
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2880);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 2880);
}
}
@@ -1331,22 +1331,22 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext*
Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) {
Hilite* hilite;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_actor.c", 4306);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_actor.c", 4306);
gfxCtx->polyOpa.p = func_8002E830(object, eye, lightDir, gfxCtx, gfxCtx->polyOpa.p, &hilite);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_actor.c", 4313);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_actor.c", 4313);
return hilite;
}
Hilite* func_8002EB44(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) {
Hilite* hilite;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_actor.c", 4332);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_actor.c", 4332);
gfxCtx->polyXlu.p = func_8002E830(object, eye, lightDir, gfxCtx, gfxCtx->polyXlu.p, &hilite);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_actor.c", 4339);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_actor.c", 4339);
return hilite;
}
@@ -1357,7 +1357,7 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) {
Gfx* displayListHead;
Gfx* displayList;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
lightDir.x = globalCtx->unk_10A4E;
lightDir.y = globalCtx->unk_10A4F;
@@ -1375,13 +1375,13 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) {
displayListHead = displayList;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4384);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 4384);
gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10);
gSPEndDisplayList(displayListHead);
gSPSegment(gfxCtx->polyOpa.p++, 0x07, displayList);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4394);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 4394);
}
}
@@ -1391,7 +1391,7 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) {
Gfx* displayListHead;
Gfx* displayList;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
lightDir.x = globalCtx->unk_10A4E;
lightDir.y = globalCtx->unk_10A4F;
@@ -1404,13 +1404,13 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) {
displayListHead = displayList;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4429);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 4429);
gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10);
gSPEndDisplayList(displayListHead);
gSPSegment(gfxCtx->polyXlu.p++, 0x07, displayList);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4439);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 4439);
}
}
@@ -1807,7 +1807,7 @@ Color_RGB8 D_80116064 = { 0x64, 0xC8, 0x00 };
// this also doesn't generate a few useless struct copies
void func_8002FBAC(GlobalContext* globalCtx) {
GraphicsContext* gfxCtx;
Gfx* gfxArr[6];
Gfx* dispRefs[6];
Vec3f lightPos;
f32 spD8;
f32 spD4;
@@ -1830,7 +1830,7 @@ void func_8002FBAC(GlobalContext* globalCtx) {
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5308);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 5308);
if (gSaveContext.respawn[RESPAWN_MODE_TOP].data != 0) {
if (LINK_IS_ADULT) {
@@ -1962,7 +1962,7 @@ void func_8002FBAC(GlobalContext* globalCtx) {
Lights_InitType0PositionalLight(&D_8015BC00, lightPos.x, lightPos.y, lightPos.z, 0xFF, 0xFF, 0xFF,
500.0f * spD4);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5474);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 5474);
}
}
#else
@@ -2192,13 +2192,13 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
LightMapper* lightMapper;
GraphicsContext* gfxCtx;
Camera* camera;
Gfx* gfxArr[3];
Gfx* dispRefs[3];
Fault_AddClient(&faultClient, Actor_FaultPrint, actor, "Actor_draw");
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6035);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6035);
lightMapper = Lights_CreateMapper(&globalCtx->lightCtx, globalCtx->state.gfxCtx);
@@ -2253,7 +2253,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
actor->shape.shadowDrawFunc(actor, lightMapper, globalCtx);
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6119);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6119);
Fault_RemoveClient(&faultClient);
}
@@ -2273,9 +2273,9 @@ void func_80030ED8(Actor* actor) {
}
void func_80030FA8(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_actor.c", 6161);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_actor.c", 6161);
gDPLoadTextureBlock(gfxCtx->polyXlu.p++, &D_0401E370, 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);
@@ -2284,18 +2284,18 @@ void func_80030FA8(GraphicsContext* gfxCtx) {
gSPTextureRectangle(gfxCtx->polyXlu.p++, 0, 0, 1280, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597);
gDPPipeSync(gfxCtx->polyXlu.p++);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_actor.c", 6183);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_actor.c", 6183);
}
void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invisibleActors) {
Actor** invisibleActor;
GraphicsContext* gfxCtx;
s32 i;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, gfxCtx, "../z_actor.c", 6197);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_actor.c", 6197);
// Translates to: "MAGIC LENS START"
gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ START", 0);
@@ -2360,7 +2360,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi
// Translates to: "MAGIC LENS END"
gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ END", 0);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_actor.c", 6284);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_actor.c", 6284);
}
s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) {
@@ -2388,7 +2388,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
ActorListEntry* actorListEntry;
GraphicsContext* gfxCtx;
s32 i;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Actor* actor;
ActorOverlay* overlayEntry;
char* actorName;
@@ -2396,7 +2396,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
gfxCtx = globalCtx->state.gfxCtx;
invisibleActorCounter = 0;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6336);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6336);
actorListEntry = &actorCtx->actorList[0];
@@ -2485,7 +2485,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
func_8005D62C(globalCtx, &globalCtx->sub_11E60);
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6563);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6563);
}
void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) {
@@ -3483,9 +3483,9 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx)
Vec3f sp50;
CollisionPoly* sp4C;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8120);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8120);
if (0) {} // Necessary to match
@@ -3512,7 +3512,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx)
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_04049210);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8155);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8155);
}
void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
@@ -3572,13 +3572,13 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) {
f32 temp2;
f32 temp3;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
entry = &D_801160DC[arg2];
var = entry->unk_10;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8265);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8265);
Matrix_Translate(0.0f, entry->unk_08, 500.0f, MTXMODE_APPLY);
Matrix_Get(&spB0);
@@ -3615,7 +3615,7 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, entry->unk_18);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8319);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8319);
}
void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1) {
@@ -3887,9 +3887,9 @@ Gfx* func_80034B54(GraphicsContext* gfxCtx) {
void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_LimbUpdateMatrix2 unkFunc1,
SkelAnime_LimbAppendDlist2 unkFunc2, Actor* actor, s16 alpha) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8831);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8831);
func_80093D18(globalCtx->state.gfxCtx);
@@ -3901,15 +3901,15 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim
gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl,
skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyOpa.p);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8860);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8860);
}
void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_LimbUpdateMatrix2 unkFunc1,
SkelAnime_LimbAppendDlist2 unkFunc2, Actor* actor, s16 alpha) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8876);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8876);
func_80093D84(globalCtx->state.gfxCtx);
@@ -3920,7 +3920,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl,
skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyXlu.p);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8904);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8904);
}
s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) {
src/code/z_cheap_proc.c
+6 -6
View File
@@ -3,28 +3,28 @@
void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 216),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, dlist);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219);
}
void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 230),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, dlist);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233);
}
src/code/z_debug.c
+3 -3
View File
@@ -221,9 +221,9 @@ void func_80063D7C(GraphicsContext* gfxCtx) {
void* unk2[6];
GfxPrint gfxPrint;
void* unk[2];
Gfx* dlFrame[4]; // stores state of GfxCtx next ptrs
Gfx* dispRefs[4]; // stores state of GfxCtx next ptrs
Graph_OpenDisp(&dlFrame, gfxCtx, "../z_debug.c", 628);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_debug.c", 628);
GfxPrint_Ctor(&gfxPrint);
sp78 = gfxCtx->polyOpa.p;
tempRet = Graph_GfxPlusOne(gfxCtx->polyOpa.p);
@@ -244,6 +244,6 @@ void func_80063D7C(GraphicsContext* gfxCtx) {
Graph_BranchDlist(sp78, sp7C);
gfxCtx->polyOpa.p = sp7C;
if (0) {}
Graph_CloseDisp(&dlFrame, gfxCtx, "../z_debug.c", 664);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_debug.c", 664);
GfxPrint_Dtor(&gfxPrint);
}
src/code/z_debug_display.c
+6 -6
View File
@@ -72,9 +72,9 @@ void DebugDisplay_DrawObjects(GlobalContext* globalCtx) {
static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 169);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 169);
func_80094678(globalCtx->state.gfxCtx);
@@ -92,14 +92,14 @@ static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, Glo
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, &D_04004298);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 192);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 192);
}
static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 211);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 211);
func_8009435C(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a);
@@ -113,5 +113,5 @@ static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, Global
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, dlist);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 231);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 231);
}
src/code/z_demo.c
+3 -3
View File
@@ -1867,7 +1867,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) {
Gfx* displayList;
Gfx* prevDisplayList;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
if (0) {} // Necessary to match
@@ -1876,7 +1876,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) {
if (BREG(0) != 0) {
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo.c", 4101);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo.c", 4101);
prevDisplayList = gfxCtx->polyOpa.p;
displayList = Graph_GfxPlusOne(gfxCtx->polyOpa.p);
@@ -1886,7 +1886,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) {
Graph_BranchDlist(prevDisplayList, displayList);
gfxCtx->polyOpa.p = displayList;
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo.c", 4108);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo.c", 4108);
}
csCtx->frames++;
src/code/z_draw.c
+78 -78
View File
@@ -169,37 +169,37 @@ void func_800694A0(GlobalContext* globalCtx, s16 drawId) {
static void func_800694E4(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 556);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 556);
func_80093BA8(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 560),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 565);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 565);
}
static void func_800695C0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 572);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 572);
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 5);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 581);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 581);
}
static void func_8006969C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 588);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 588);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 592),
@@ -219,14 +219,14 @@ static void func_8006969C(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
Matrix_Pull();
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 621);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 621);
}
static void func_80069880(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 628);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 628);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 632),
@@ -249,14 +249,14 @@ static void func_80069880(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]);
Matrix_Pull();
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 663);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 663);
}
static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 670);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 670);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 674),
@@ -278,14 +278,14 @@ static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]);
Matrix_Pull();
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 704);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 704);
}
static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 712);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 712);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
@@ -302,14 +302,14 @@ static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 735);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 735);
}
static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 742);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 742);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 746),
@@ -325,14 +325,14 @@ static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 765);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 765);
}
static void func_8006A060(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 772);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 772);
func_80093BA8(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 776),
@@ -340,14 +340,14 @@ static void func_8006A060(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 783);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 783);
}
static void func_8006A158(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 811);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 811);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 815),
@@ -359,14 +359,14 @@ static void func_8006A158(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 827);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 827);
}
static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 834);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 834);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
@@ -386,14 +386,14 @@ static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[4]);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[5]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 861);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 861);
}
static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 868);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 868);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
@@ -404,14 +404,14 @@ static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 883);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 883);
}
static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 890);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 890);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
@@ -422,14 +422,14 @@ static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 906);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 906);
}
static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 913);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 913);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
@@ -440,14 +440,14 @@ static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 929);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 929);
}
static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 936);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 936);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
@@ -458,28 +458,28 @@ static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 952);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 952);
}
static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 959);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 959);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 963),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 968);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 968);
}
static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 975);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 975);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 979),
@@ -491,27 +491,27 @@ static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 991);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 991);
}
static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 998);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 998);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1002),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1008);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1008);
}
static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1015);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1015);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1019),
@@ -524,14 +524,14 @@ static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1032);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1032);
}
static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1039);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1039);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1043),
@@ -544,14 +544,14 @@ static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1056);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1056);
}
static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1063);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1063);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
@@ -564,14 +564,14 @@ static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1081);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1081);
}
static void func_8006B124(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1088);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1088);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1092),
@@ -581,14 +581,14 @@ static void func_8006B124(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[2]);
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[3]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1100);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1100);
}
static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1108);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1108);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1112),
@@ -602,14 +602,14 @@ static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1126);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1126);
}
static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1133);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1133);
Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY);
@@ -625,14 +625,14 @@ static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1154);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1154);
}
static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1162);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1162);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
@@ -646,14 +646,14 @@ static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1181);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1181);
}
static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1188);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1188);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1192),
@@ -668,15 +668,15 @@ static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]);
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[4]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1207);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1207);
}
static void func_8006B870(GlobalContext* globalCtx, s16 drawId) {
u32 pad;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1214);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1214);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1218),
@@ -690,5 +690,5 @@ static void func_8006B870(GlobalContext* globalCtx, s16 drawId) {
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[6]);
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[7]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1230);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1230);
}
src/code/z_eff_blure.c
+3 -3
View File
@@ -10,13 +10,13 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020A50.s")
void func_80020F60(u32 unused, GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, D_80135180, 809);
Graph_OpenDisps(dispRefs, gfxCtx, D_80135180, 809);
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26);
Graph_CloseDisp(gfxArr, gfxCtx, D_80135194, 813);
Graph_CloseDisps(dispRefs, gfxCtx, D_80135194, 813);
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020FC0.s")
src/code/z_en_a_keep.c
+3 -3
View File
@@ -331,9 +331,9 @@ void En_A_Obj_Update(ActorEnAObj* this, GlobalContext* globalCtx) {
void En_A_Obj_Draw(ActorEnAObj* this, GlobalContext* globalCtx) {
s32 type = this->actor.params;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 701);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 701);
func_80093D18(globalCtx->state.gfxCtx);
@@ -349,5 +349,5 @@ void En_A_Obj_Draw(ActorEnAObj* this, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, D_80115484[type]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 715);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 715);
}
src/code/z_en_item00.c
+12 -12
View File
@@ -767,9 +767,9 @@ void En_Item00_Draw(ActorEnItem00* this, GlobalContext* globalCtx) {
void func_8001EF30(ActorEnItem00* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s32 iconNb;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1546);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1546);
func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(&this->actor, globalCtx, 0);
@@ -789,7 +789,7 @@ void func_8001EF30(ActorEnItem00* this, GlobalContext* globalCtx) {
gSPDisplayList(gfxCtx->polyOpa.p++, &D_04042440);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1568);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1568);
}
/**
@@ -798,11 +798,11 @@ void func_8001EF30(ActorEnItem00* this, GlobalContext* globalCtx) {
void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx) {
s32 iconNb;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
iconNb = this->actor.params - 3;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1594);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1594);
gfxCtx->polyOpa.p = func_800BC8A0(globalCtx, gfxCtx->polyOpa.p);
@@ -820,7 +820,7 @@ void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_0403F070);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1611);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1611);
}
/**
@@ -828,9 +828,9 @@ void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx) {
*/
void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1623);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1623);
func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(&this->actor, globalCtx, 0);
@@ -844,7 +844,7 @@ void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, &D_0403BCD8);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1647);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1647);
}
/**
@@ -852,9 +852,9 @@ void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx) {
*/
void func_8001F334(ActorEnItem00* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1658);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1658);
func_80093D84(globalCtx->state.gfxCtx);
func_8002ED80(&this->actor, globalCtx, 0);
@@ -862,7 +862,7 @@ void func_8001F334(ActorEnItem00* this, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, &D_0403B030);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1673);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1673);
}
/**
src/code/z_lifemeter.c
+3 -3
View File
@@ -206,9 +206,9 @@ void Interface_DrawHealth(GlobalContext* globalCtx) {
s32 curCombineModeSet = 0;
u8* curBgImgLoaded = NULL;
s32 ddHeartCountMinusOne = gSaveContext.defense_hearts - 1;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_lifemeter.c", 353);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_lifemeter.c", 353);
if (!(gSaveContext.health % 0x10)) {
fullHeartCount--;
@@ -379,7 +379,7 @@ void Interface_DrawHealth(GlobalContext* globalCtx) {
}
}
Graph_CloseDisp(gfxArr, gfxCtx, "../z_lifemeter.c", 606);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_lifemeter.c", 606);
}
u32 Health_IsCritical(void);
src/code/z_map_mark.c
+3 -3
View File
@@ -86,7 +86,7 @@ void MapMark_Draw(GlobalContext* globalCtx) {
s32 rectLeft;
s32 rectTop;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
dungeonId = gSaveContext.dungeon_index;
interfaceCtx = &globalCtx->interfaceCtx;
@@ -101,7 +101,7 @@ void MapMark_Draw(GlobalContext* globalCtx) {
mapMarkData = &sLoadedMarkDataTable[dungeonId][interfaceCtx->roomNum][0];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_map_mark.c", 303);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_map_mark.c", 303);
while (1) {
if (mapMarkData->markType == -1) {
@@ -134,7 +134,7 @@ void MapMark_Draw(GlobalContext* globalCtx) {
mapMarkData++;
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_map_mark.c", 339);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_map_mark.c", 339);
}
void MapMark_DrawConditionally(GlobalContext* globalCtx) {
src/code/z_moji.c
+6 -6
View File
@@ -37,9 +37,9 @@ void func_8007B934(s32 arg0, s32 arg1) {
}
void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) {
Gfx* gfxArr[7];
Gfx* dispRefs[7];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_moji.c", 86);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_moji.c", 86);
if ((u32)gLetterTLUT & 0xF) {
osSyncPrintf("moji_tlut --> %X\n", gLetterTLUT);
@@ -54,14 +54,14 @@ void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) {
(D_80120124 + 8) << 2, G_TX_RENDERTILE, (u16)(arg1 & 4) * 64, (u16)(arg1 >> 3) * 256, 1024,
1024);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_moji.c", 123);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_moji.c", 123);
}
void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) {
s32 i;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_moji.c", 137);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_moji.c", 137);
if ((u32)gFontFF & 0xF) {
osSyncPrintf("font_ff --> %X\n", gFontFF);
@@ -108,5 +108,5 @@ void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) {
}
}
Graph_CloseDisp(gfxArr, gfxCtx, "../z_moji.c", 181);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_moji.c", 181);
}
src/code/z_parameter.c
+21 -21
View File
@@ -2582,10 +2582,10 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
s16 magicBarY;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2650);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2650);
if (gSaveContext.magic_level != 0) {
if (gSaveContext.health_capacity > 0xA0) {
@@ -2660,7 +2660,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) {
}
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2731);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2731);
}
void func_80088AA0(s16 arg0) {
@@ -2700,9 +2700,9 @@ void func_80088B34(s16 arg0) {
}
void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_parameter.c", 2820);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_parameter.c", 2820);
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture);
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
@@ -2716,7 +2716,7 @@ void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) {
gSP1Quadrangle(gfxCtx->overlay.p++, 0, 2, 3, 1, 0);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_parameter.c", 2829);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_parameter.c", 2829);
}
u8* sCUpLabelTextures[] = { D_02002FC0, D_02002FC0, D_02002FC0 };
@@ -2733,11 +2733,11 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
s16 cUpAlpha;
s32 pad;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2900);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2900);
// B Button Color & Texture
// Also loads the Item Button Texture reused by other buttons afterwards
@@ -2881,7 +2881,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
}
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3071);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3071);
}
#else
void Interface_DrawItemButtons(GlobalContext* globalCtx);
@@ -2890,10 +2890,10 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx);
void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 button) {
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3079);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3079);
gDPLoadTextureBlock(gfxCtx->overlay.p++, 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);
@@ -2903,7 +2903,7 @@ void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16
(R_ITEM_ICON_Y(button) + R_ITEM_ICON_WIDTH(button)) << 2, G_TX_RENDERTILE, 0, 0,
R_ITEM_ICON_DD(button) * 2, R_ITEM_ICON_DD(button) * 2);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3094);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3094);
}
void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) {
@@ -2911,10 +2911,10 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) {
s16 ammo;
GraphicsContext* gfxCtx;
s16 i;
Gfx* gfxArr[3];
Gfx* dispRefs[3];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3105);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3105);
item = gSaveContext.equips.button_items[button];
@@ -2964,16 +2964,16 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) {
R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024);
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3158);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3158);
}
void Interface_DrawActionButton(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3172);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3172);
Matrix_Translate(0.0f, 0.0f, XREG(18) / 10.0f, MTXMODE_NEW);
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
@@ -2991,7 +2991,7 @@ void Interface_DrawActionButton(GlobalContext* globalCtx) {
gSP1Quadrangle(gfxCtx->overlay.p++, 0, 2, 3, 1, 0);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3187);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3187);
}
void Interface_InitVertices(GlobalContext* globalCtx) {
@@ -3149,11 +3149,11 @@ void Interface_Draw(GlobalContext* globalCtx) {
s16 phi_s0;
s16 sp274;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
s32 pad;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3405);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3405);
gSPSegment(gfxCtx->overlay.p++, 0x02, interfaceCtx->parameterSegment);
gSPSegment(gfxCtx->overlay.p++, 0x07, interfaceCtx->do_actionSegment);
@@ -3968,7 +3968,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
gDPFillRectangle(gfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, gScreenHeight - 1);
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 4269);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 4269);
}
#else
s16 D_8015FFE0;
src/code/z_prenmi.c
+3 -3
View File
@@ -26,11 +26,11 @@ void PreNMI_Update(PreNMIContext* prenmiCtx) {
void PreNMI_Draw(PreNMIContext* prenmiCtx) {
GraphicsContext* gfxCtx = prenmiCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST);
Graph_OpenDisp(gfxArr, gfxCtx, "../z_prenmi.c", 96);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_prenmi.c", 96);
gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL);
func_80095248(gfxCtx, 0, 0, 0);
@@ -39,7 +39,7 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) {
(GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1));
gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, SCREEN_WIDTH - 1, prenmiCtx->timer + 100);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_prenmi.c", 112);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_prenmi.c", 112);
}
void PreNMI_Main(PreNMIContext* prenmiCtx) {
src/code/z_rcp.c
+132 -132
View File
@@ -889,169 +889,169 @@ Gfx* func_80093808(Gfx* gfx) {
}
void func_80093848(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1293);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1293);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3A]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1297);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1297);
}
void func_800938B4(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1309);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1309);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x39]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1313);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1313);
}
void func_80093920(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1325);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1325);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x32]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1329);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1329);
}
void func_8009398C(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1341);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1341);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x33]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1345);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1345);
}
void func_800939F8(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1357);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1357);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x34]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1361);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1361);
}
void func_80093A64(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1373);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1373);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x35]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1377);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1377);
}
void func_80093AD0(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1389);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1389);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x36]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1393);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1393);
}
void func_80093B3C(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1405);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1405);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x37]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1409);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1409);
}
void func_80093BA8(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1421);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1421);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1A]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1425);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1425);
}
void func_80093C14(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1439);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1439);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1443);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1443);
}
void func_80093C80(GlobalContext* globalCtx) {
GraphicsContext* gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
gfxCtx = globalCtx->state.gfxCtx;
func_80093D18(gfxCtx);
if (globalCtx->roomCtx.curRoom.unk_03 == 3) {
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1460);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1460);
gDPSetColorDither(gfxCtx->polyOpa.p++, G_CD_DISABLE);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1462);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1462);
}
}
void func_80093D18(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1475);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1475);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x19]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1479);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1479);
}
void func_80093D84(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1491);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1491);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1495);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1495);
}
void func_80093DF0(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1507);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1507);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1F]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1511);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1511);
}
void func_80093E5C(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1523);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1523);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x20]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1527);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1527);
}
void func_80093EC8(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1539);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1539);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x21]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1543);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1543);
}
Gfx* func_80093F34(Gfx* gfx) {
@@ -1065,43 +1065,43 @@ Gfx* func_80093F58(Gfx* gfx) {
}
void func_80093F7C(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1569);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1569);
gfxCtx->polyOpa.p = func_80093F58(gfxCtx->polyOpa.p);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1573);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1573);
}
void func_80093FD8(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1585);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1585);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x23]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1589);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1589);
}
void func_80094044(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1601);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1601);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2C]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1605);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1605);
}
void func_800940B0(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1617);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1617);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x24]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1621);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1621);
}
Gfx* func_8009411C(Gfx* gfx) {
@@ -1110,83 +1110,83 @@ Gfx* func_8009411C(Gfx* gfx) {
}
void func_80094140(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1640);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1640);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1C]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1644);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1644);
}
void func_800941AC(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1651);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1651);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2B]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1655);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1655);
}
void func_80094218(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1670);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1670);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2D]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1674);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1674);
}
void func_80094284(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1681);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1681);
gSPDisplayList(gfxCtx->overlay.p++, &sSetupDL[6 * 0x2E]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1685);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1685);
}
void func_800942F0(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1700);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1700);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x26]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1704);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1704);
}
void func_8009435C(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1722);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1722);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x04]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1726);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1726);
}
void func_800943C8(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1758);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1758);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x25]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1762);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1762);
}
void func_80094434(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1775);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1775);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x02]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1779);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1779);
}
Gfx* func_800944A0(Gfx* gfx) {
@@ -1195,23 +1195,23 @@ Gfx* func_800944A0(Gfx* gfx) {
}
void func_800944C4(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1799);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1799);
gfxCtx->polyOpa.p = func_800944A0(gfxCtx->polyOpa.p);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1801);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1801);
}
void func_80094520(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1809);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1809);
gfxCtx->overlay.p = func_800944A0(gfxCtx->overlay.p);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1811);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1811);
}
void func_8009457C(Gfx** gfxp) {
@@ -1221,33 +1221,33 @@ void func_8009457C(Gfx** gfxp) {
}
void func_800945A0(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1837);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1837);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x28]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1841);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1841);
}
void func_8009460C(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1853);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1853);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x29]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1857);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1857);
}
void func_80094678(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1869);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1869);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2F]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1873);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1873);
}
Gfx* func_800946E4(Gfx* gfx) {
@@ -1307,84 +1307,84 @@ Gfx* func_80094968(Gfx* gfx) {
}
void func_800949A8(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1953);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1953);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2A]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1957);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1957);
}
void func_80094A14(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1964);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1964);
gSPDisplayList(gfxCtx->overlay.p++, &sSetupDL[6 * 0x2A]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1968);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1968);
}
void func_80094A80(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1992);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1992);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x30]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1996);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1996);
}
void func_80094AEC(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2008);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2008);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x31]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2012);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2012);
}
void func_80094B58(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2024);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2024);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x1B]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2028);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2028);
}
void func_80094BC4(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2040);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2040);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3C]);
gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2043);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2043);
}
void func_80094C50(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2056);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2056);
gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3D]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2058);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2058);
}
void func_80094CBC(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2086);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2086);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x38]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2090);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2090);
}
void func_80094D28(Gfx** gfxp) {
@@ -1394,13 +1394,13 @@ void func_80094D28(Gfx** gfxp) {
}
void func_80094D4C(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2112);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2112);
gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3B]);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2116);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2116);
}
#ifdef NON_MATCHING
@@ -1484,10 +1484,10 @@ Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a) {
}
void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
s32 ret;
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2386);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2386);
gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL);
gSPDisplayList(gfxCtx->polyXlu.p++, sFillSetupDL);
@@ -1577,13 +1577,13 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
}
}
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2497);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2497);
}
void func_80095974(GraphicsContext* gfxCtx) {
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2503);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2503);
gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL);
gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f,
@@ -1591,5 +1591,5 @@ void func_80095974(GraphicsContext* gfxCtx) {
gDPSetDepthImage(gfxCtx->polyOpa.p++, gZBuffer);
gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2513);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2513);
}
src/code/z_room.c
+12 -12
View File
@@ -38,10 +38,10 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) {
PolygonType0* polygon0;
PolygonDlist* polygonDlist;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 193);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 193);
if (flags & 1) {
func_800342EC(&D_801270A0, globalCtx);
@@ -71,7 +71,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) {
polygonDlist++;
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 239);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 239);
}
#define SHAPE_SORT_MAX 64
@@ -105,12 +105,12 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) {
f32 temp_f0;
f32 temp_f2;
GraphicsContext* gfxCtx;
Gfx* sp5C[4];
Gfx* dispRefs[4];
spB0 = NULL;
spB4 = NULL;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(sp5C, globalCtx->state.gfxCtx, "../z_room.c", 287);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 287);
if (flags & 1) {
func_800342EC(&D_801270A0, globalCtx);
@@ -222,7 +222,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) {
iREG(88) = sp9C - 1;
Graph_CloseDisp(sp5C, globalCtx->state.gfxCtx, "../z_room.c", 430);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 430);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_room/func_80095D04.s")
@@ -350,10 +350,10 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) {
u32 sp94;
u32 sp90;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 628);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 628);
camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0];
polygon1 = &room->mesh->polygon1;
@@ -399,7 +399,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) {
gSPDisplayList(gfxCtx->polyXlu.p++, polygonDlist->xlu);
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 691);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 691);
}
typedef struct {
@@ -456,10 +456,10 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) {
u32 sp90;
u32 sp8C;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 752);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 752);
camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0];
sp98 = (camera->unk_142 ^ 25) == 0;
@@ -505,7 +505,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) {
gSPDisplayList(gfxCtx->polyXlu.p++, polygonDlist->xlu);
}
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 819);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 819);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_room/func_80096B6C.s")
src/code/z_sample.c
+3 -3
View File
@@ -15,10 +15,10 @@ void Sample_Draw(SampleContext* this) {
u32 pad;
GraphicsContext* gfxCtx = this->state.gfxCtx;
View* view = &this->view;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Mtx* mtx;
Graph_OpenDisp(gfxArr, gfxCtx, "../z_sample.c", 62);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_sample.c", 62);
gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL);
gSPSegment(gfxCtx->polyOpa.p++, 0x01, this->staticSegment);
@@ -41,7 +41,7 @@ void Sample_Draw(SampleContext* this) {
PRIMITIVE);
gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0xFF, 0xFF, 0x00, 0x00);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_sample.c", 111);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_sample.c", 111);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/Sample_Draw.s")
src/code/z_scene_table.c
+156 -156
View File
File diff suppressed because it is too large Load Diff
src/code/z_skelanime.c
+24 -24
View File
@@ -36,10 +36,10 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk
Vec3f pos;
Vec3s rot;
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 773);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 773);
Matrix_Push();
limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]);
limbIndex++;
@@ -80,7 +80,7 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk
appendDlistFunc, actor, dListIndex);
}
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 821);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 821);
}
/*
@@ -95,7 +95,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto
Vec3f pos;
Vec3s rot;
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
if (skeleton == NULL) {
osSyncPrintf(VT_FGCOL(RED));
@@ -104,7 +104,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto
return;
}
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 849);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 849);
Matrix_Push();
limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]);
@@ -133,7 +133,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto
}
Matrix_Pull();
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 894);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 894);
}
/*
@@ -148,7 +148,7 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton*
Vec3f pos;
Vec3s rot;
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
Matrix_Push();
@@ -169,10 +169,10 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton*
if (dList[1] != NULL) {
Matrix_ToMtx(*mtx, "../z_skelanime.c", 945);
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 946);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 946);
gSPMatrix(gfxCtx->polyOpa.p++, *mtx, G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]);
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 949);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 949);
(*mtx)++;
} else if (dList[0] != NULL) {
Matrix_ToMtx(*mtx, "../z_skelanime.c", 954);
@@ -210,7 +210,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* ac
Vec3s rot;
Mtx* mtx;
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(Mtx));
@@ -221,7 +221,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* ac
return;
}
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1000);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1000);
gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx);
Matrix_Push();
@@ -258,7 +258,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* ac
Matrix_Pull();
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053);
}
/*
@@ -272,11 +272,11 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skele
Vec3f pos;
Vec3s rot;
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1076);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1076);
Matrix_Push();
limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]);
@@ -316,7 +316,7 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skele
appendDlistFunc, actor);
}
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121);
}
void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable,
@@ -327,7 +327,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDr
Vec3f pos;
Vec3s rot;
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
if (skeleton == NULL) {
osSyncPrintf(VT_FGCOL(RED));
@@ -338,7 +338,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDr
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1148);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1148);
Matrix_Push();
rootLimb = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]);
@@ -369,7 +369,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDr
Matrix_Pull();
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1190);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1190);
}
void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable,
@@ -380,10 +380,10 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske
Vec3f pos;
Vec3s rot;
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214);
Matrix_Push();
limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]);
@@ -426,7 +426,7 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske
appendDlistFunc, actor, limbMatricies);
}
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265);
}
void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount,
@@ -439,7 +439,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor
Vec3s rot;
Mtx* mtx;
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(Mtx));
@@ -452,7 +452,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1294);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1294);
gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx);
@@ -494,7 +494,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor
}
Matrix_Pull();
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1347);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1347);
}
/*
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+3 -3
View File
@@ -193,7 +193,7 @@ void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx;
Actor* tranform;
EnArrow* arrow;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
stateFrames = globalCtx->state.frames;
arrow = this->actor.attachedA;
@@ -203,7 +203,7 @@ void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) {
if (1) {}
tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor;
// clang-format off
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 618);
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 618);
// clang-format on
Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY);
@@ -240,6 +240,6 @@ void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (stateFrames * 2) % 256, 0, 64, 32, 1,
255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64));
gSPDisplayList(gfxCtx->polyXlu.p++, vertexDL);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682);
}
}
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+3 -3
View File
@@ -193,7 +193,7 @@ void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) {
u32 stateFrames;
GraphicsContext* gfxCtx;
EnArrow* arrow;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
stateFrames = globalCtx->state.frames;
arrow = this->actor.attachedA;
@@ -203,7 +203,7 @@ void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) {
if (1) {}
tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor;
// clang-format off
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 610);
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 610);
// clang-format on
Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY);
@@ -240,6 +240,6 @@ void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 128, 32, 1,
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16));
gSPDisplayList(gfxCtx->polyXlu.p++, vertexDL);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676);
}
}
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+3 -3
View File
@@ -193,7 +193,7 @@ void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx;
Actor* tranform;
EnArrow* arrow;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
stateFrames = globalCtx->state.frames;
arrow = this->actor.attachedA;
@@ -203,7 +203,7 @@ void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) {
if (1) {}
tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor;
// clang-format off
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 598);
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_light.c", 598);
// clang-format on
Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY);
@@ -240,6 +240,6 @@ void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 4, 32, 1,
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16));
gSPDisplayList(gfxCtx->polyXlu.p++, vertexDL);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 664);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_light.c", 664);
}
}
src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
+3 -3
View File
@@ -126,14 +126,14 @@ static void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx)
static void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 323);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 323);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 328),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001CD0);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333);
}
src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
+3 -3
View File
@@ -100,11 +100,11 @@ void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx) {
void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) {
s32 pad;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyXlu.p++, 8,
@@ -120,5 +120,5 @@ void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) {
gSPDisplayList(gfxCtx->polyXlu.p++, &D_06000600);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285);
}
src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
+3 -3
View File
@@ -97,10 +97,10 @@ static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) {
s32 objBankIndex;
u32 dlist;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
s32 pad;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250);
if (this->dyna.actor.params != 0) {
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, objectTbl[this->dyna.actor.params - 1]);
if (objBankIndex >= 0) {
@@ -115,5 +115,5 @@ static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) {
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285),
G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, dlist);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288);
}
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
+3 -3
View File
@@ -75,12 +75,12 @@ static void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx) {
static void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 269),
G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_06000000);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272);
}
src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
+3 -3
View File
@@ -84,14 +84,14 @@ static void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx)
static void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 210);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 210);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 214),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_06000100);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219);
}
src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
+3 -3
View File
@@ -75,14 +75,14 @@ extern u32 D_06003B20;
static void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 166),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_06003B20);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171);
}
src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
+3 -3
View File
@@ -167,18 +167,18 @@ static void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx) {
static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx) {
Actor* thisx = &this->dyna.actor;
GraphicsContext* gfxCtx;
Gfx* gfxArr[3];
Gfx* dispRefs[3];
Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]);
if (thisx->params == 3) {
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyXlu.p++, &D_06008010);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396);
}
}
src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
+3 -3
View File
@@ -92,14 +92,14 @@ void BgSpot15Saku_Update(BgSpot15Saku* this, GlobalContext* globalCtx) {
void BgSpot15Saku_Draw(BgSpot15Saku* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 263),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyXlu.p++, &D_060003C0);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268);
}
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+3 -3
View File
@@ -278,11 +278,11 @@ static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) {
s32 pad[4];
GameState* state;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
state = &globalCtx->state;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, state->gfxCtx, "../z_bg_toki_swd.c", 727);
Graph_OpenDisps(dispRefs, state->gfxCtx, "../z_bg_toki_swd.c", 727);
func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(&this->actor, globalCtx, 0);
@@ -293,5 +293,5 @@ static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001BD0);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776);
}
src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
+3 -3
View File
@@ -122,18 +122,18 @@ static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx;
GraphicsContext* tempgfxCtx; // oddly needs this to match
Gfx* gfxArr[4];
Gfx* dispRefs[4];
tempgfxCtx = globalCtx->state.gfxCtx;
gfxCtx = tempgfxCtx;
Graph_OpenDisp(gfxArr, gfxCtx, "../z_bg_zg.c", 311);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_bg_zg.c", 311);
func_80093D18(gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_bg_zg.c", 315),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001080);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_bg_zg.c", 320);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_bg_zg.c", 320);
}
static void BgZg_Draw(BgZg* this, GlobalContext* globalCtx) {
src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
+6 -6
View File
@@ -72,9 +72,9 @@ static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) {
static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 181);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 181);
func_80093D18(gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183),
@@ -82,16 +82,16 @@ static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) {
gSPDisplayList(gfxCtx->polyOpa.p++, dlist);
gSPPopMatrix(gfxCtx->polyOpa.p++, G_MTX_MODELVIEW);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 188);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 188);
}
static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
s32 pad[2];
s32 objBankIndex = this->objBankIndex;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 204);
Graph_OpenDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 204);
gSPSegment(gfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment);
gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objBankIndex].segment);
@@ -99,7 +99,7 @@ static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
// Necessary to match
if (!globalCtx) {}
Graph_CloseDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 212);
Graph_CloseDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 212);
}
static void func_80978030(DemoGeff* this, GlobalContext* globalCtx) {
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
+3 -3
View File
@@ -336,9 +336,9 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) {
void* srcSegment8 = D_8097D440[temp];
void* srcSegment9 = &D_0600E680;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 732);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_go.c", 732);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8));
@@ -347,7 +347,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) {
SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL,
&this->actor);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_go.c", 746);
}
void DemoGo_Draw(DemoGo* this, GlobalContext* globalCtx) {
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+3 -3
View File
@@ -166,12 +166,12 @@ static void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx) {
static void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx** dList = &D_05001390; // required for stack placement?
Gfx* gfxArr[3];
Gfx* dispRefs[3];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 440);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_door_ana.c", 440);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_ana.c", 446),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyXlu.p++, dList);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 449);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_door_ana.c", 449);
}
src/overlays/actors/ovl_En_Boom/z_en_boom.c
+3 -3
View File
@@ -282,10 +282,10 @@ static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) {
Vec3f mtxDest1;
Vec3f mtxDest2;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 567);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_boom.c", 567);
Matrix_RotateY(this->actor.posRot.rot.y * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateZ(0.7669904f, MTXMODE_APPLY);
Matrix_RotateX(this->actor.posRot.rot.x * 0.0000958738f, MTXMODE_APPLY);
@@ -303,5 +303,5 @@ static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_0400C808);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 604);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_boom.c", 604);
}
src/overlays/actors/ovl_En_Dog/z_en_dog.c
+3 -3
View File
@@ -465,10 +465,10 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) {
s32 pad;
Color_RGBA8 colors[] = { { 0xFF, 0xFF, 0xC8, 0x00 }, { 0x96, 0x64, 0x32, 0x00 } };
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 972);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_dog.c", 972);
func_80093D18(globalCtx->state.gfxCtx);
gDPPipeSync(gfxCtx->polyOpa.p++);
@@ -477,5 +477,5 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) {
SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount,
EnDog_Callback1, EnDog_Callback2, &this->actor);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 994);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_dog.c", 994);
}
src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
+3 -3
View File
@@ -113,11 +113,11 @@ void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) {
BossGanon* dorf;
u32 pad;
GraphicsContext* gfxCtx;
Gfx* gfxArr[3];
Gfx* dispRefs[3];
dorf = (BossGanon*)this->actor.attachedA;
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(&gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 205);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 205);
osSyncPrintf("ORGAN DRAW 1\n");
func_80093D18(globalCtx->state.gfxCtx);
if ((this->actor.params == 1) && (dorf->organFadeTimer != 0xff)) {
@@ -134,5 +134,5 @@ void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) {
gSPDisplayList(gfxCtx->polyOpa.p++, &D_80A2CCA8);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_80A2EAB0);
osSyncPrintf("ORGAN DRAW 2\n");
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230);
}
src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
+3 -3
View File
@@ -136,9 +136,9 @@ static void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx) {
static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
Gfx* dispRefs[5];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327);
func_80093D18(globalCtx->state.gfxCtx);
Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY);
@@ -147,5 +147,5 @@ static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[this->actor.params]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337);
}
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+6 -6
View File
@@ -470,9 +470,9 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) {
UNK_PTR addr = D_80AF410C[temp];
SkelAnime* skelAnime = &this->skelAnime;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr));
@@ -483,7 +483,7 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) {
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl,
skelAnime->dListCount, NULL, NULL, NULL, gfxCtx->polyXlu.p);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291);
}
static void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) {
@@ -788,9 +788,9 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
UNK_PTR addr = D_80AF410C[temp];
SkelAnime* skelAnime = &this->skelAnime;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr));
@@ -800,7 +800,7 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL,
&this->actor);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663);
}
static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) {
src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c
+3 -3
View File
@@ -59,17 +59,17 @@ static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) {
s32 pad1[0x2];
Gfx* displayListHead;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
displayList = Graph_Alloc(globalCtx->state.gfxCtx, 0x3C0);
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290);
displayListHead = displayList;
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, displayListHead);
func_80093D18(globalCtx->state.gfxCtx);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386);
}
src/overlays/actors/ovl_En_Tana/z_en_tana.c
+6 -6
View File
@@ -69,28 +69,28 @@ static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) {
Actor* thisx = &this->actor;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 148);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 148);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[thisx->params]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 157);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 157);
}
static void func_80B1809C(EnTana* this, GlobalContext* globalCtx) {
Actor* thisx = &this->actor;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 163);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 163);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(dListTbl2[thisx->params]));
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[thisx->params]);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 174);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 174);
}
src/overlays/actors/ovl_En_Tk/z_en_tk.c
+11 -11
View File
@@ -105,15 +105,15 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
s16 i;
s16 alpha;
s16 imageIdx;
Gfx* pgdl[4];
Gfx* dispRefs[4];
/*
* This assignment always occurs before a call to Graph_OpenDisp which
* This assignment always occurs before a call to Graph_OpenDisps which
* makes me suspect that they're inside a macro where the function call
* is present only for debug builds. Same for Graph_CloseDisp most likely.
* is present only for debug builds. Same for Graph_CloseDisps most likely.
*/
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114);
gfxSetup = 0;
@@ -154,7 +154,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
eff++;
}
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154);
}
s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) {
@@ -694,14 +694,14 @@ void EnTk_Update(EnTk* this, GlobalContext* globalCtx) {
void func_80B1D200(GlobalContext* globalCtx) {
GraphicsContext* gfxCtx;
Gfx* pgdl[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188);
gSPDisplayList(gfxCtx->polyOpa.p++, D_0600ACE0);
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190);
}
s32 func_80B1D278(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) {
@@ -748,14 +748,14 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) {
EnTk* thisAgain = this;
GraphicsContext* gfxCtx;
Gfx* pgdl[4];
Gfx* dispRefs[4];
Matrix_Push();
EnTkEff_Draw(thisAgain, globalCtx);
Matrix_Pull();
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294);
func_80093D18(globalCtx->state.gfxCtx);
@@ -764,5 +764,5 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) {
SkelAnime_DrawSV(globalCtx, thisAgain->skelAnim.skeleton, thisAgain->skelAnim.actorDrawTbl,
thisAgain->skelAnim.dListCount, func_80B1D278, func_80B1D2E4, &thisAgain->actor);
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312);
}
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+6 -6
View File
@@ -562,7 +562,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) {
MtxF mf;
GraphicsContext* gfxCtx;
f32 xzScale;
Gfx* gfx[3];
Gfx* dispRefs[3];
if ((this->actor.floorPoly == NULL) ||
((this->timer >= 0x51) && (this->actionFunc != (ActorFunc)&EnWallmas_Stun))) {
@@ -570,7 +570,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) {
}
// clang-format off
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386);
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386);
// clang-format on
func_80094044(globalCtx->state.gfxCtx);
@@ -591,7 +591,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) {
Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1421), G_MTX_LOAD);
gSPDisplayList(gfxCtx->polyXlu.p++, &D_04049210);
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426);
}
static s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
@@ -610,12 +610,12 @@ static s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL
static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) {
GraphicsContext* gfxCtx;
Gfx* gfx[4];
Gfx* dispRefs[4];
if (limbIndex == 2) {
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1478);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1478);
Matrix_Push();
Matrix_Translate(1600.0f, -700.0f, -1700.0f, MTXMODE_APPLY);
Matrix_RotateY(DEGREE_60_RAD, MTXMODE_APPLY);
@@ -626,7 +626,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
gSPDisplayList(gfxCtx->polyOpa.p++, D_06008688);
Matrix_Pull();
Graph_CloseDisp(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495);
}
}
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+3 -3
View File
@@ -183,11 +183,11 @@ void ObjComb_Update(ObjComb* this, GlobalContext* globalCtx) {
void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx) {
s32 pad;
GraphicsContext* gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 369);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_obj_comb.c", 369);
func_80093D18(globalCtx->state.gfxCtx);
Matrix_Translate(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (118.0f * this->actor.scale.y),
@@ -204,5 +204,5 @@ void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx) {
gSPDisplayList(gfxCtx->polyOpa.p++, &D_050095B0);
func_800628A4(0, &this->collider);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 402);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_obj_comb.c", 402);
}
src/overlays/gamestates/ovl_title/z_title.c
+6 -6
View File
@@ -75,9 +75,9 @@ void Title_Draw(TitleContext* this) {
Vec3f v2;
char pad2[0x8];
GraphicsContext* gfxCtx = this->state.gfxCtx;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
Graph_OpenDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 395);
Graph_OpenDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 395);
v3.x = 69;
v3.y = 69;
@@ -124,17 +124,17 @@ void Title_Draw(TitleContext* this) {
sTitleRotY += 300;
Graph_CloseDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 483);
Graph_CloseDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 483);
}
void Title_Update(TitleContext* this) {
GraphicsContext* gfxCtx = this->state.gfxCtx;
u32 pad;
Gfx* gfxArr[4];
Gfx* dispRefs[4];
u32 pad2;
Gfx* gfx[2];
Graph_OpenDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 494);
Graph_OpenDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 494);
gSPSegment(gfxCtx->polyOpa.p++, 0, NULL);
gSPSegment(gfxCtx->polyOpa.p++, 1, this->staticSegment);
@@ -154,7 +154,7 @@ void Title_Update(TitleContext* this) {
SET_NEXT_GAMESTATE(&this->state, Opening_Init, OpeningContext);
}
Graph_CloseDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 541);
Graph_CloseDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 541);
}
void Title_Destroy(TitleContext* this) {