mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 01:40:47 +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

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
View file

@ -113,7 +113,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
pauseCtx->stickRelX = input->rel.stick_x;
pauseCtx->stickRelY = input->rel.stick_y;
func_800944C4(play->state.gfxCtx);
Gfx_SetupDL_39Opa(play->state.gfxCtx);
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);

4
src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file

@ -536,7 +536,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
}
}
func_800949A8(play->state.gfxCtx);
Gfx_SetupDL_42Opa(play->state.gfxCtx);
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
@ -594,7 +594,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
gSPSegment(POLY_OPA_DISP++, 0x0B, play->interfaceCtx.mapSegment);
gSPSegment(POLY_OPA_DISP++, 0x0C, pauseCtx->iconItemAltSegment);
func_800949A8(play->state.gfxCtx);
Gfx_SetupDL_42Opa(play->state.gfxCtx);
KaleidoScope_DrawEquipmentImage(play, pauseCtx->playerSegment, PAUSE_EQUIP_PLAYER_WIDTH, PAUSE_EQUIP_PLAYER_HEIGHT);
if (gUpgradeMasks[0]) {}

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View file

@ -96,7 +96,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_kaleido_item.c", 234);
func_800949A8(play->state.gfxCtx);
Gfx_SetupDL_42Opa(play->state.gfxCtx);
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);

4
src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
View file

@ -549,7 +549,7 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetTextureFilter(POLY_OPA_DISP++, G_TF_BILERP);
func_800949A8(gfxCtx);
Gfx_SetupDL_42Opa(gfxCtx);
gDPSetCombineLERP(POLY_OPA_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, 0,
PRIMITIVE, 0);
@ -658,7 +658,7 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
pointPulseTimer = 20;
}
func_800949A8(gfxCtx);
Gfx_SetupDL_42Opa(gfxCtx);
gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);

12
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -677,7 +677,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
if (sInDungeonScene) {
KaleidoScope_DrawDungeonMap(play, gfxCtx);
func_800949A8(gfxCtx);
Gfx_SetupDL_42Opa(gfxCtx);
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@ -721,7 +721,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
if (sInDungeonScene) {
KaleidoScope_DrawDungeonMap(play, gfxCtx);
func_800949A8(gfxCtx);
Gfx_SetupDL_42Opa(gfxCtx);
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@ -779,7 +779,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
}
}
func_800949A8(gfxCtx);
Gfx_SetupDL_42Opa(gfxCtx);
if ((pauseCtx->state == 7) || ((pauseCtx->state >= 8) && (pauseCtx->state < 0x12))) {
KaleidoScope_UpdatePrompt(play);
@ -2215,7 +2215,7 @@ void KaleidoScope_DrawGameOver(PlayState* play) {
OPEN_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 3122);
func_800944C4(gfxCtx);
Gfx_SetupDL_39Opa(gfxCtx);
gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE);
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_XLU_SURF2);
@ -2276,11 +2276,11 @@ void KaleidoScope_Draw(PlayState* play) {
if (pauseCtx->debugState == 0) {
KaleidoScope_SetView(pauseCtx, pauseCtx->eye.x, pauseCtx->eye.y, pauseCtx->eye.z);
func_800949A8(play->state.gfxCtx);
Gfx_SetupDL_42Opa(play->state.gfxCtx);
KaleidoScope_InitVertices(play, play->state.gfxCtx);
KaleidoScope_DrawPages(play, play->state.gfxCtx);
func_800949A8(play->state.gfxCtx);
Gfx_SetupDL_42Opa(play->state.gfxCtx);
gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);