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

16
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -2613,7 +2613,7 @@ void func_80904D88(BossGanon2* this, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5575);
if (this->unk_30C > 0.0f) {
func_80093D84(play->state.gfxCtx);
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
if (this->unk_380 > 0.0f) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 0);
@ -2643,7 +2643,7 @@ void func_80904FC8(BossGanon2* this, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5632);
if (this->unk_384 > 0.0f) {
func_80093D84(play->state.gfxCtx);
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 200);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 0);
gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B308);
@ -2674,7 +2674,7 @@ void func_8090523C(BossGanon2* this, PlayState* play) {
s8 i;
player = GET_PLAYER(play);
func_80093D84(play->state.gfxCtx);
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->unk_38C);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 0);
gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B308);
@ -2755,8 +2755,8 @@ void BossGanon2_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5840);
func_80093D18(play->state.gfxCtx);
func_80093D84(play->state.gfxCtx);
Gfx_SetupDL_25Opa(play->state.gfxCtx);
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
switch (this->unk_337) {
case 0:
@ -2898,7 +2898,7 @@ void BossGanon2_DrawEffects(PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 6086);
func_80093D18(play->state.gfxCtx);
Gfx_SetupDL_25Opa(play->state.gfxCtx);
for (i = 0; i < 1; i++) {
if (effect->type == 1) {
@ -2906,7 +2906,7 @@ void BossGanon2_DrawEffects(PlayState* play) {
f32 temp_f0;
f32 angle;
func_80093D84(play->state.gfxCtx);
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
spA0.x = play->envCtx.dirLight1.params.dir.x;
spA0.y = play->envCtx.dirLight1.params.dir.y;
spA0.z = play->envCtx.dirLight1.params.dir.z;
@ -3059,7 +3059,7 @@ void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, PlaySta
OPEN_DISPS(gfxCtx, "../z_boss_ganon2.c", 6430);
func_80093D18(play->state.gfxCtx);
Gfx_SetupDL_25Opa(play->state.gfxCtx);
if ((play->envCtx.lightSetting == 1) || (play->envCtx.lightSetting == 2)) {
alpha = (s16)(play->envCtx.lightBlend * 180.0f) + 30;