mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-18 21:10:19 +00:00
Code Issues Projects Releases Wiki Activity

Add enum for setup dls and name z_rcp.c functions (#1196)

Browse source 
* Introduce `SetupDL` enum

* wip

* wip

* Remove comments on each setupdl index

* Name setup dl functions by setupdl index

* `Gfx_SetupDl` -> `Gfx_SetupDL`

* Run formatter

* globalctx -> play

* fix regressions

* `Gfx_SetupDL` -> `Gfx_SetupDL_` (add separating underscore)

* `CallSetupDL` -> `SetupDL`
This commit is contained in:
Dragorn421 2022-06-03 15:25:48 -07:00 • committed by GitHub
parent 4775fd4a7e
commit 1a41694d58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
376 changed files with 1047 additions and 971 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
View file

@ -668,7 +668,7 @@ void DemoGt_Draw1(DemoGt* this, PlayState* play) {
Matrix_Pop();
func_80093D18(gfxCtx);
Gfx_SetupDL_25Opa(gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08,
Gfx_TwoTexScrollEnvColor(gfxCtx, 0, 0, unk198[0], 0x20, 0x40, 1, 0, unk198[1], 0x20, 0x40, unk178[0],
@ -678,7 +678,7 @@ void DemoGt_Draw1(DemoGt* this, PlayState* play) {
unk188[1], unk188[2], 0x80));
gSPMatrix(POLY_OPA_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsExteriorStructureDL);
func_80093D84(gfxCtx);
Gfx_SetupDL_25Xlu(gfxCtx);
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
gSPSegment(
POLY_XLU_DISP++, 0x09,
@ -853,7 +853,7 @@ void DemoGt_Draw2(DemoGt* this, PlayState* play) {
OPEN_DISPS(gfxCtx, "../z_demo_gt_part2.c", 470);
func_80093D18(gfxCtx);
Gfx_SetupDL_25Opa(gfxCtx);
unk198 = this->unk_198;
unk178 = this->unk_178;
gSPSegment(POLY_OPA_DISP++, 0x08,
@ -1168,7 +1168,7 @@ void DemoGt_Draw3(DemoGt* this, PlayState* play) {
OPEN_DISPS(gfxCtx, "../z_demo_gt_part3.c", 1026);
func_80093D18(gfxCtx);
Gfx_SetupDL_25Opa(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part3.c", 1028),
G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureOuterDL);
@ -1291,7 +1291,7 @@ void DemoGt_Draw4(DemoGt* this, PlayState* play2) {
Matrix_Pop();
func_80093D18(gfxCtx);
Gfx_SetupDL_25Opa(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp60, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL);
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
@ -1410,7 +1410,7 @@ void DemoGt_Draw5(DemoGt* this, PlayState* play) {
Matrix_Pop();
func_80093D18(gfxCtx);
Gfx_SetupDL_25Opa(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp60, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL);
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
@ -1502,7 +1502,7 @@ void DemoGt_Draw6(DemoGt* this, PlayState* play) {
Matrix_Pop();
func_80093D18(gfxCtx);
Gfx_SetupDL_25Opa(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp64, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL);
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
@ -1594,7 +1594,7 @@ void DemoGt_Draw7(DemoGt* this, PlayState* play) {
Matrix_Pop();
func_80093D18(gfxCtx);
Gfx_SetupDL_25Opa(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsWalkwayDL);
@ -1685,7 +1685,7 @@ void DemoGt_Draw8(DemoGt* this, PlayState* play) {
Matrix_Pop();
func_80093D18(gfxCtx);
Gfx_SetupDL_25Opa(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsAlternativeWalkwayDL);