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

Decompile graph.c

Browse source 
- decompile `graph.c` (2 non-matchings left)
- decompile `z_game_dlftbls.c`
- add noop macros in `gbi.h`
This commit is contained in:
Random 2020-04-04 18:12:59 +02:00
parent b96c016948
commit f818fb5299
685 changed files with 3310 additions and 3503 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View file

@ -204,7 +204,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; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 618);
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, 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);
@ -241,6 +241,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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682);
}
}

4
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View file

@ -204,7 +204,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; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 610);
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, 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);
@ -241,6 +241,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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676);
}
}

4
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View file

@ -204,7 +204,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; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 598);
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, 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);
@ -241,6 +241,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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 664);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 664);
}
}

4
src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
View file

@ -128,12 +128,12 @@ static void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 323);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333);
}

4
src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
View file

@ -104,7 +104,7 @@ void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) {
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285);
}

4
src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
View file

@ -100,7 +100,7 @@ static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) {
Gfx* gfxArr[4];
s32 pad;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288);
}

4
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
View file

@ -77,10 +77,10 @@ static void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272);
}

4
src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
View file

@ -86,12 +86,12 @@ static void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 210);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219);
}

4
src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
View file

@ -77,12 +77,12 @@ static void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171);
}

4
src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
View file

@ -172,13 +172,13 @@ static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]);
if (thisx->params == 3) {
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396);
}
}

4
src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
View file

@ -94,12 +94,12 @@ void BgSpot15Saku_Draw(BgSpot15Saku* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268);
}

4
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
View file

@ -282,7 +282,7 @@ static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) {
state = &globalCtx->state;
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, state->gfxCtx, "../z_bg_toki_swd.c", 727);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776);
}

4
src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
View file

@ -126,14 +126,14 @@ static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) {
tempgfxCtx = globalCtx->state.gfxCtx;
gfxCtx = tempgfxCtx;
func_800C6AC4(gfxArr, gfxCtx, "../z_bg_zg.c", 311);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, gfxCtx, "../z_bg_zg.c", 320);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_bg_zg.c", 320);
}
static void BgZg_Draw(BgZg* this, GlobalContext* globalCtx) {

8
src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
View file

@ -74,7 +74,7 @@ static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
func_800C6AC4(gfxArr, gfxCtx, "../z_demo_geff.c", 181);
Graph_OpenDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 181);
func_80093D18(gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183),
@ -82,7 +82,7 @@ static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) {
gSPDisplayList(gfxCtx->polyOpa.p++, dlist);
gSPPopMatrix(gfxCtx->polyOpa.p++, G_MTX_MODELVIEW);
func_800C6B54(gfxArr, gfxCtx, "../z_demo_geff.c", 188);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 188);
}
static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
@ -91,7 +91,7 @@ static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
func_800C6AC4(gfxArr, gfxCtx, "../z_demo_geff.c", 204);
Graph_OpenDisp(gfxArr, 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) {}
func_800C6B54(gfxArr, gfxCtx, "../z_demo_geff.c", 212);
Graph_CloseDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 212);
}
static void func_80978030(DemoGeff* this, GlobalContext* globalCtx) {

4
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -338,7 +338,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 732);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746);
}
void DemoGo_Draw(DemoGo* this, GlobalContext* globalCtx) {

4
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
View file

@ -168,10 +168,10 @@ static void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx) {
Gfx** dList = &D_05001390; // required for stack placement?
Gfx* gfxArr[3];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 440);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 449);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 449);
}

4
src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -285,7 +285,7 @@ static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) {
Gfx* gfxArr[4];
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 567);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 604);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 604);
}

4
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -468,7 +468,7 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) {
Gfx* gfxArr[4];
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 972);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 994);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 994);
}

4
src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
View file

@ -117,7 +117,7 @@ void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) {
dorf = (BossGanon*)this->actor.attachedA;
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(&gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 205);
Graph_OpenDisp(&gfxArr, 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");
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230);
}

4
src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
View file

@ -138,7 +138,7 @@ static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[5];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327);
Graph_OpenDisp(gfxArr, 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]);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337);
}

8
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -472,7 +472,7 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291);
}
static void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) {
@ -790,7 +790,7 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4];
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663);
}
static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) {

4
src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c
View file

@ -65,11 +65,11 @@ static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) {
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290);
Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290);
displayListHead = displayList;
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, displayListHead);
func_80093D18(globalCtx->state.gfxCtx);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386);
}

8
src/overlays/actors/ovl_En_Tana/z_en_tana.c
View file

@ -72,12 +72,12 @@ static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) {
Gfx* gfxArr[4];
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 148);
Graph_OpenDisp(gfxArr, 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]);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 157);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 157);
}
static void func_80B1809C(EnTana* this, GlobalContext* globalCtx) {
@ -86,11 +86,11 @@ static void func_80B1809C(EnTana* this, GlobalContext* globalCtx) {
Gfx* gfxArr[4];
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 163);
Graph_OpenDisp(gfxArr, 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]);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 174);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 174);
}

16
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -108,12 +108,12 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
Gfx* pgdl[4];
/*
* This assignment always occurs before a call to func_800C6AC4 which
* This assignment always occurs before a call to Graph_OpenDisp which
* makes me suspect that they're inside a macro where the function call
* is present only for debug builds. Same for func_800C6B54 most likely.
* is present only for debug builds. Same for Graph_CloseDisp most likely.
*/
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114);
Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114);
gfxSetup = 0;
@ -154,7 +154,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
eff++;
}
func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154);
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154);
}
s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) {
@ -697,11 +697,11 @@ void func_80B1D200(GlobalContext* globalCtx) {
Gfx* pgdl[4];
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188);
Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188);
gSPDisplayList(gfxCtx->polyOpa.p++, D_0600ACE0);
func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190);
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190);
}
s32 func_80B1D278(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) {
@ -755,7 +755,7 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) {
Matrix_Pull();
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294);
Graph_OpenDisp(pgdl, 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);
func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312);
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312);
}

8
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -570,7 +570,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) {
}
// clang-format off
gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386);
gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfx, 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);
func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426);
Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426);
}
static s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
@ -615,7 +615,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
if (limbIndex == 2) {
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1478);
Graph_OpenDisp(&gfx, 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();
func_800C6B54(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495);
Graph_CloseDisp(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495);
}
}

4
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
View file

@ -187,7 +187,7 @@ void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx) {
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 369);
Graph_OpenDisp(gfxArr, 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);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 402);
Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 402);
}

2
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View file

@ -138,4 +138,6 @@
#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s")

2
src/overlays/gamestates/ovl_opening/z_opening.c
View file

@ -26,7 +26,7 @@ static void Opening_Update(OpeningContext* this) {
func_80803C5C(this);
}
static void Opening_Destroy(OpeningContext* this) {
void Opening_Destroy(OpeningContext* this) {
}
void Opening_Init(OpeningContext* this) {

8
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -77,7 +77,7 @@ void Title_Draw(TitleContext* this) {
GraphicsContext* gfxCtx = this->state.gfxCtx;
Gfx* gfxArr[4];
func_800C6AC4(&gfxArr, this->state.gfxCtx, "../z_title.c", 395);
Graph_OpenDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 395);
v3.x = 69;
v3.y = 69;
@ -124,7 +124,7 @@ void Title_Draw(TitleContext* this) {
sTitleRotY += 300;
func_800C6B54(&gfxArr, this->state.gfxCtx, "../z_title.c", 483);
Graph_CloseDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 483);
}
void Title_Update(TitleContext* this) {
@ -134,7 +134,7 @@ void Title_Update(TitleContext* this) {
u32 pad2;
Gfx* gfx[2];
func_800C6AC4(&gfxArr, this->state.gfxCtx, "../z_title.c", 494);
Graph_OpenDisp(&gfxArr, 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);
}
func_800C6B54(&gfxArr, this->state.gfxCtx, "../z_title.c", 541);
Graph_CloseDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 541);
}
void Title_Destroy(TitleContext* this) {