mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 06:40:15 +00:00
Code Issues 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

6
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
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);
}
}

6
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
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);
}
}

6
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
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);
}
}

6
src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
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);
}

6
src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
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);
}

6
src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
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);
}

6
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
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);
}

6
src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
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);
}

6
src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
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);
}

6
src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
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);
}
}

6
src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
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);
}

6
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
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);
}

6
src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
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) {

12
src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
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) {

6
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
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) {

6
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
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);
}

6
src/overlays/actors/ovl_En_Boom/z_en_boom.c
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);
}

6
src/overlays/actors/ovl_En_Dog/z_en_dog.c
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);
}

6
src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
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);
}

6
src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
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);
}

12
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
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) {

6
src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c
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);
}

12
src/overlays/actors/ovl_En_Tana/z_en_tana.c
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);
}

22
src/overlays/actors/ovl_En_Tk/z_en_tk.c
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);
}

12
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
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);
}
}

6
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
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);
}

12
src/overlays/gamestates/ovl_title/z_title.c
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) {