mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 06:54:33 +00:00
Code Issues Projects Releases Wiki Activity

More BgGanonOtyuka_Draw

Browse source
This commit is contained in:
Sirius902 2020-11-14 19:39:30 -08:00
parent 53b52f63e7
commit 55d2969095
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View file

@ -157,9 +157,9 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
break; break;
} else {
actor = actor->next;
} }
actor = actor->next;
} }
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -170,18 +170,20 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
if ((actor->id == ACTOR_BG_GANON_OTYUKA) && (actor->projectedPos.z > spBC)) { if ((actor->id == ACTOR_BG_GANON_OTYUKA) && (actor->projectedPos.z > spBC)) {
otyuka = (BgGanonOtyuka*)actor; otyuka = (BgGanonOtyuka*)actor;
phi_s2 = D_80877408;
if (camera->eye.y > actor->posRot.pos.y) { if (camera->eye.y > actor->posRot.pos.y) {
phi_s2 = D_808773B0; phi_s2 = D_808773B0;
} else {
phi_s2 = D_80877408;
} }
Matrix_Translate(actor->posRot.pos.x, actor->posRot.pos.y, actor->posRot.pos.z, MTXMODE_NEW); Matrix_Translate(actor->posRot.pos.x, actor->posRot.pos.y, actor->posRot.pos.z, MTXMODE_NEW);
phi_s1 = NULL; phi_s1 = NULL;
if (otyuka->unk_16A != 0) { if (otyuka->unk_16A != 0) {
Matrix_RotateX((actor->shape.rot.x / 32768.0f) * M_PI, MTXMODE_APPLY); Matrix_RotateX((actor->shape.rot.x / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateZ((actor->shape.rot.z / 32768.0f) * M_PI, MTXMODE_APPLY); Matrix_RotateZ((actor->shape.rot.z / 32768.0f) * M_PI, MTXMODE_APPLY);
phi_s1 = D_808773B0;
if (camera->eye.y > actor->posRot.pos.y) { if (camera->eye.y > actor->posRot.pos.y) {
phi_s1 = D_80877408; phi_s1 = D_80877408;
} else {
phi_s1 = D_808773B0;
} }
} }
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 766), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 766),
@ -203,9 +205,9 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Pull(); Matrix_Pull();
} }
} }
} else {
actor = actor->next;
} }
actor = actor->next;
} }
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -213,7 +215,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (actor != NULL) { if (actor != NULL) {
otyuka = (BgGanonOtyuka*)actor; otyuka = (BgGanonOtyuka*)actor;
while (actor->next != NULL) { do {
if ((actor->id == ACTOR_BG_GANON_OTYUKA) && (actor->projectedPos.z > -30.0f) && (otyuka->unk_16E != 0)) { if ((actor->id == ACTOR_BG_GANON_OTYUKA) && (actor->projectedPos.z > -30.0f) && (otyuka->unk_16E != 0)) {
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, otyuka->unk_16D * 4, 0, 32, 64, 1, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, otyuka->unk_16D * 4, 0, 32, 64, 1,
@ -232,15 +234,15 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, gSPMatrix(POLY_XLU_DISP++,
Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 847), Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 847),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_80877CF8); gSPDisplayList(POLY_XLU_DISP++, D_80877CF8);
Matrix_Pull(); Matrix_Pull();
} }
} }
break; break;
} else { }
actor = actor->next; actor = actor->next;
} } while (actor->next != NULL);
}
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 857); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 857);