mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 12:04:29 +00:00
Code Issues Projects Releases Wiki Activity

Name top and bottom dlists

Browse source
This commit is contained in:
Sirius902 2020-11-14 23:37:10 -08:00
parent 22eb68c5ef
commit 34ba98c6fe
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,9 +308,9 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (platform->dyna.actor.projectedPos.z > spBC) { if (platform->dyna.actor.projectedPos.z > spBC) {
if (camera->eye.y > platform->dyna.actor.posRot.pos.y) { if (camera->eye.y > platform->dyna.actor.posRot.pos.y) {
phi_s2 = D_808773B0; phi_s2 = sPlatformTopDList;
} else { } else {
phi_s2 = D_80877408; phi_s2 = sPlatformBottomDList;
} }
Matrix_Translate(platform->dyna.actor.posRot.pos.x, platform->dyna.actor.posRot.pos.y, Matrix_Translate(platform->dyna.actor.posRot.pos.x, platform->dyna.actor.posRot.pos.y,
platform->dyna.actor.posRot.pos.z, MTXMODE_NEW); platform->dyna.actor.posRot.pos.z, MTXMODE_NEW);
@ -319,9 +319,9 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateX(((f32)platform->dyna.actor.shape.rot.x / 0x8000) * M_PI, MTXMODE_APPLY); Matrix_RotateX(((f32)platform->dyna.actor.shape.rot.x / 0x8000) * M_PI, MTXMODE_APPLY);
Matrix_RotateZ(((f32)platform->dyna.actor.shape.rot.z / 0x8000) * M_PI, MTXMODE_APPLY); Matrix_RotateZ(((f32)platform->dyna.actor.shape.rot.z / 0x8000) * M_PI, MTXMODE_APPLY);
if (camera->eye.y > platform->dyna.actor.posRot.pos.y) { if (camera->eye.y > platform->dyna.actor.posRot.pos.y) {
phi_s1 = D_80877408; phi_s1 = sPlatformBottomDList;
} else { } else {
phi_s1 = D_808773B0; phi_s1 = sPlatformTopDList;
} }
} }
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),

4
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c
View file

@ -87,7 +87,7 @@ static Gfx D_80877328[] = {
gsSPEndDisplayList(), gsSPEndDisplayList(),
}; };
static Gfx D_808773B0[] = { static Gfx sPlatformTopDList[] = {
gsSPVertex(sVertices1, ARRAY_COUNT(sVertices1), 0), gsSPVertex(sVertices1, ARRAY_COUNT(sVertices1), 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSPEndDisplayList(), gsSPEndDisplayList(),
@ -100,7 +100,7 @@ static Vtx sVertices2[] = {
VTX(-60, -60, 60, 2048, 1024, 0x32, 0x32, 0x32, 0xFF), VTX(-60, -60, 60, 2048, 1024, 0x32, 0x32, 0x32, 0xFF),
}; };
static Gfx D_80877408[] = { static Gfx sPlatformBottomDList[] = {
gsSPVertex(sVertices2, ARRAY_COUNT(sVertices2), 0), gsSPVertex(sVertices2, ARRAY_COUNT(sVertices2), 0),
gsSP2Triangles(0, 2, 1, 0, 0, 3, 2, 0), gsSP2Triangles(0, 2, 1, 0, 0, 3, 2, 0),
gsSPEndDisplayList(), gsSPEndDisplayList(),