mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-10 23:12:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename Matrix_Pull to Matrix_Pop (#703)

Browse Source
This commit is contained in:
Roman971
2021-02-24 20:28:04 +01:00
committed by GitHub
parent 3eec91504c
commit d30ef91417
89 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/sys_matrix.c
+1 -1
View File
@@ -29,7 +29,7 @@ void Matrix_Push(void) {
sCurrentMatrix++;
}
void Matrix_Pull(void) {
void Matrix_Pop(void) {
sCurrentMatrix--;
if (sCurrentMatrix < sMatrixStack) {
__assert("Matrix_now >= Matrix_stack", "../sys_matrix.c", 176);
src/code/z_actor.c
+2 -2
View File
@@ -387,7 +387,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2116),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(OVERLAY_DISP++, gZTargetLockOnTriangleDL);
Matrix_Pull();
Matrix_Pop();
}
}
@@ -1921,7 +1921,7 @@ void func_8002FBAC(GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, &gEffFlash1DL);
Matrix_Pull();
Matrix_Pop();
phi_f6 = ~((globalCtx->gameplayFrames * 1200) & 0xFFFF);
Matrix_RotateZ((phi_f6 * M_PI) / 32768.0f, MTXMODE_APPLY);
src/code/z_draw.c
+3 -3
View File
@@ -425,7 +425,7 @@ void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 615),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 621);
}
@@ -454,7 +454,7 @@ void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) {
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 663);
}
@@ -482,7 +482,7 @@ void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 704);
}
src/code/z_fcurve_data_skelanime.c
+1 -1
View File
@@ -165,7 +165,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve*
SkelCurve_DrawLimb(globalCtx, limb->firstChildIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, data);
}
Matrix_Pull();
Matrix_Pop();
if (limb->nextLimbIdx != LIMB_DONE) {
SkelCurve_DrawLimb(globalCtx, limb->nextLimbIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, data);
src/code/z_player_lib.c
+2 -2
View File
@@ -738,7 +738,7 @@ void func_8008F87C(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime,
Matrix_Translate(D_80126050[(void)0, gSaveContext.linkAge], 0.0f, 0.0f, MTXMODE_APPLY);
Matrix_MultVec3f(&D_8012602C, &sp98);
Matrix_MultVec3f(&D_80126070, &footprintPos);
Matrix_Pull();
Matrix_Pop();
footprintPos.y += 15.0f;
@@ -1281,7 +1281,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s*
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, stringData->dList);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2809);
} else if ((this->actor.scale.y >= 0.0f) && (this->rightHandType == 10)) {
src/code/z_skelanime.c
+12 -12
View File
@@ -56,7 +56,7 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele
SkelAnime_DrawLimbLod(globalCtx, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawLimbLod(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod);
@@ -113,7 +113,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa
lod);
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 894);
}
@@ -168,7 +168,7 @@ void SkelAnime_DrawFlexLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** s
lod, mtx);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawFlexLimbLod(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
@@ -234,7 +234,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
lod, &mtx);
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1053);
}
@@ -278,7 +278,7 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele
SkelAnime_DrawLimbOpa(globalCtx, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg);
@@ -333,7 +333,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa
SkelAnime_DrawLimbOpa(globalCtx, rootLimb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg);
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1190);
}
@@ -386,7 +386,7 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s
limbMatricies);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
SkelAnime_DrawFlexLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
@@ -456,7 +456,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi
&mtx);
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1347);
}
@@ -543,7 +543,7 @@ Gfx* SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, void** skeleton
SkelAnime_DrawLimb(globalCtx, limb->child, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, gfx);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
gfx = SkelAnime_DrawLimb(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg,
@@ -601,7 +601,7 @@ Gfx* SkelAnime_Draw(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable
gfx);
}
Matrix_Pull();
Matrix_Pop();
return gfx;
}
@@ -649,7 +649,7 @@ Gfx* SkelAnime_DrawFlexLimb(GlobalContext* globalCtx, s32 limbIndex, void** skel
mtx, gfx);
}
Matrix_Pull();
Matrix_Pop();
if (limb->sibling != LIMB_DONE) {
gfx = SkelAnime_DrawFlexLimb(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw,
@@ -714,7 +714,7 @@ Gfx* SkelAnime_DrawFlex(GlobalContext* globalCtx, void** skeleton, Vec3s* jointT
arg, &mtx, gfx);
}
Matrix_Pull();
Matrix_Pop();
return gfx;
}
src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+1 -1
View File
@@ -980,7 +980,7 @@ void BgDyYoseizo_ParticleUpdate(BgDyYoseizo* this, GlobalContext* globalCtx) {
sp94.x = sp94.y = sp94.z = 3.0f;
Matrix_MultVec3f(&sp94, &sp88);
Matrix_Pull();
Matrix_Pop();
particle->pos.x += sp88.x;
particle->pos.y += sp88.y;
particle->pos.z += sp88.z;
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
+2 -2
View File
@@ -347,7 +347,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 785),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sPlatformSideDList);
Matrix_Pull();
Matrix_Pop();
}
}
}
@@ -383,7 +383,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 847),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sFlashDList);
Matrix_Pull();
Matrix_Pop();
}
}
}
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+6 -6
View File
@@ -1764,7 +1764,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2661),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06000980);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_RotateY((2.0f * M_PI) / 3.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
@@ -1772,7 +1772,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2672),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06000980);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_RotateY((4.0f * M_PI) / 3.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
@@ -1780,7 +1780,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2683),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06000980);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2688);
}
@@ -1845,7 +1845,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, D_06000330);
func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(&this->actor, globalCtx, 0);
Matrix_Pull();
Matrix_Pop();
this->godLgt.rotation++;
if (this->godLgt.rotation > 120) {
@@ -1895,7 +1895,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
if (disp) {};
gSPDisplayList(POLY_XLU_DISP++, disp);
Matrix_Pull();
Matrix_Pop();
Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY);
Matrix_RotateZ(-(f32)this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2874),
@@ -1998,7 +1998,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 180, 255, 255, this->triforceSpot.lightColumnOpacity);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 150, 255);
gSPDisplayList(POLY_XLU_DISP++, D_06000840);
Matrix_Pull();
Matrix_Pop();
}
if (this->triforceSpot.triforceSpotOpacity != 0) {
src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
+1 -1
View File
@@ -201,7 +201,7 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateRPY((s16)(kREG(16) + 0x4000), this->rotationPitch, kREG(18), MTXMODE_APPLY);
Matrix_Translate(kREG(22), kREG(23), kREG(24), MTXMODE_APPLY);
Matrix_ToMtx(mtx, "../z_demo_ext.c", 476);
Matrix_Pull();
Matrix_Pop();
func_80093D84(gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, kREG(33) + 128, kREG(25) + 140, kREG(26) + 80, kREG(27) + 140, this->primAlpha);
src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
+6 -6
View File
@@ -679,7 +679,7 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) {
unk188 = this->unk_188;
unk178 = this->unk_178;
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
@@ -1302,7 +1302,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx) {
func_80980F8C(this, globalCtx2);
}
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp60, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
@@ -1421,7 +1421,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) {
func_80981458(this, globalCtx);
}
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp60, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1513,7 +1513,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) {
Matrix_Translate(sp4C.x, sp4C.y, sp4C.z, MTXMODE_APPLY);
Matrix_ToMtx(sp64, "../z_demo_gt_part4_3.c", 291);
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp64, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1605,7 +1605,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) {
Matrix_Translate(sp44.x, sp44.y, sp44.z, MTXMODE_APPLY);
Matrix_ToMtx(sp5C, "../z_demo_gt_part5.c", 152);
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1696,7 +1696,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) {
Matrix_Translate(sp44.x, sp44.y, sp44.z, MTXMODE_APPLY);
Matrix_ToMtx(sp5C, "../z_demo_gt_part6.c", 153);
Matrix_Pull();
Matrix_Pop();
func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
+1 -1
View File
@@ -298,7 +298,7 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, GlobalContext* globalCtx2) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5,
frames * -10, 0x20, 0x20));
gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierOrbDL);
Matrix_Pull();
Matrix_Pop();
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 656),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(POLY_XLU_DISP++);
src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
+2 -2
View File
@@ -87,7 +87,7 @@ void func_809B26EC(EnAnubiceFire* this, GlobalContext* globalCtx) {
Matrix_RotateX(BINANG_TO_RAD(this->actor.world.rot.x), MTXMODE_APPLY);
velocity.z = 15.0f;
Matrix_MultVec3f(&velocity, &this->actor.velocity);
Matrix_Pull();
Matrix_Pop();
this->actionFunc = func_809B27D8;
this->actor.world.rot.x = this->actor.world.rot.y = this->actor.world.rot.z = 0;
@@ -252,7 +252,7 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
break;
}
}
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_anubice_fire.c", 556);
}
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+1 -1
View File
@@ -487,7 +487,7 @@ void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1374),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffSparklesDL);
Matrix_Pull();
Matrix_Pop();
Matrix_RotateY(this->actor.world.rot.y * (M_PI / 32768), MTXMODE_APPLY);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1381);
src/overlays/actors/ovl_En_Ba/z_en_ba.c
+1 -1
View File
@@ -504,7 +504,7 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
Matrix_ToMtx(mtx, "../z_en_ba.c", 970);
}
Matrix_Pull();
Matrix_Pop();
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ba.c", 973),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06000890);
src/overlays/actors/ovl_En_Bw/z_en_bw.c
+1 -1
View File
@@ -828,7 +828,7 @@ s32 EnBw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bw.c", 1388),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList((*gfx)++, *dList);
Matrix_Pull();
Matrix_Pop();
return 1;
}
}
src/overlays/actors/ovl_En_Dh/z_en_dh.c
+1 -1
View File
@@ -548,7 +548,7 @@ void EnDh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
Matrix_Push();
Matrix_Translate(headOffset.x, headOffset.y, headOffset.z, MTXMODE_APPLY);
Collider_UpdateSpheres(1, &this->collider2);
Matrix_Pull();
Matrix_Pop();
}
}
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
+1 -1
View File
@@ -437,7 +437,7 @@ void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push();
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState]));
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL, this);
Matrix_Pull();
Matrix_Pop();
Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW);
Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1040),
src/overlays/actors/ovl_En_Fd/z_en_fd.c
+1 -1
View File
@@ -769,7 +769,7 @@ void EnFd_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push();
EnFd_DrawDots(this, globalCtx);
EnFd_DrawFlames(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
if (this->actionFunc != EnFd_Reappear && !(this->fadeAlpha < 0.9f)) {
if (1) {}
func_80093D84(globalCtx->state.gfxCtx);
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
+1 -1
View File
@@ -1110,7 +1110,7 @@ void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_floormas.c", 2299), G_MTX_LOAD);
gSPDisplayList((*gfx)++, D_06008688);
Matrix_Pull();
Matrix_Pop();
}
}
src/overlays/actors/ovl_En_Fr/z_en_fr.c
+1 -1
View File
@@ -1053,7 +1053,7 @@ void EnFr_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fr.c", 1738),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fr.c", 1741);
}
}
src/overlays/actors/ovl_En_Fw/z_en_fw.c
+1 -1
View File
@@ -399,7 +399,7 @@ void EnFw_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnFw_UpdateDust(this);
Matrix_Push();
EnFw_DrawDust(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnFw_OverrideLimbDraw, EnFw_PostLimbDraw, this);
src/overlays/actors/ovl_En_Gb/z_en_gb.c
+1 -1
View File
@@ -545,7 +545,7 @@ void EnGb_DrawCagedSouls(EnGb* this, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_0600C0B0);
Matrix_Pull();
Matrix_Pop();
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_gb.c", 962);
src/overlays/actors/ovl_En_Gm/z_en_gm.c
+2 -2
View File
@@ -304,13 +304,13 @@ void func_80A3E090(EnGm* this) {
this->collider.dim.pos.x = vec2.x;
this->collider.dim.pos.y = vec2.y;
this->collider.dim.pos.z = vec2.z;
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(0.0f, 0.0f, 4300.0f, MTXMODE_APPLY);
Matrix_RotateRPY(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY);
vec1.x = vec1.y = vec1.z = 0.0f;
Matrix_MultVec3f(&vec1, &this->talkPos);
Matrix_Pull();
Matrix_Pop();
Matrix_Translate(0.0f, 0.0f, 3800.0f, MTXMODE_APPLY);
Matrix_RotateRPY(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY);
vec1.x = vec1.y = vec1.z = 0.0f;
src/overlays/actors/ovl_En_Go/z_en_go.c
+3 -3
View File
@@ -1066,7 +1066,7 @@ void EnGo_DrawCurledUp(EnGo* this, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, D_0600BD80);
Matrix_MultVec3f(&D_80A41BB4, &this->actor.focus.pos);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2341);
}
@@ -1084,7 +1084,7 @@ void EnGo_DrawRolling(EnGo* this, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_0600C140);
Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2383);
}
@@ -1139,7 +1139,7 @@ void EnGo_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGo_UpdateDust(this);
Matrix_Push();
EnGo_DrawDust(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
if (this->actionFunc == EnGo_CurledUp) {
EnGo_DrawCurledUp(this, globalCtx);
src/overlays/actors/ovl_En_Go2/z_en_go2.c
+1 -1
View File
@@ -2050,7 +2050,7 @@ void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGo2_UpdateDust(this);
Matrix_Push();
EnGo2_DrawDust(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
if ((this->actionFunc == EnGo2_CurledUp) && (this->skelAnime.playSpeed == 0.0f) &&
(this->skelAnime.curFrame == 0.0f)) {
src/overlays/actors/ovl_En_Gs/z_en_gs.c
+1 -1
View File
@@ -601,7 +601,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, D_060009D0);
gSPDisplayList(POLY_OPA_DISP++, D_06000A60);
Matrix_Pull();
Matrix_Pop();
if (this->unk_19E & 2) {
func_80093D84(globalCtx->state.gfxCtx);
func_800D1FD4(&globalCtx->mf_11DA0);
src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
+1 -1
View File
@@ -437,7 +437,7 @@ void EnHeishi1_Update(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(((this->actor.shape.rot.y + this->headAngle) / 32768.0f) * M_PI, 0);
searchBallMult.z = 30.0f;
Matrix_MultVec3f(&searchBallMult, &searchBallVel);
Matrix_Pull();
Matrix_Pop();
EffectSsSolderSrchBall_Spawn(globalCtx, &searchBallPos, &searchBallVel, &searchBallAccel, 2,
&this->linkDetected);
src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
+2 -2
View File
@@ -1028,7 +1028,7 @@ s32 EnPeehat_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1959),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1963);
return true;
}
@@ -1062,7 +1062,7 @@ void EnPeehat_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1990),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1994);
}
}
src/overlays/actors/ovl_En_Rr/z_en_rr.c
+2 -2
View File
@@ -862,7 +862,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) {
(1.0f + this->bodySegs[RR_BASE].scaleMod.z) * this->bodySegs[RR_BASE].scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_rr.c", 1501),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
Matrix_Pull();
Matrix_Pop();
zeroVec.x = 0.0f;
zeroVec.y = 0.0f;
zeroVec.z = 0.0f;
@@ -875,7 +875,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) {
(1.0f + this->bodySegs[i].scaleMod.y) * this->bodySegs[i].scale.y,
(1.0f + this->bodySegs[i].scaleMod.z) * this->bodySegs[i].scale.z, MTXMODE_APPLY);
Matrix_ToMtx(segMtx, "../z_en_rr.c", 1527);
Matrix_Pull();
Matrix_Pop();
segMtx++;
Matrix_MultVec3f(&zeroVec, &this->effectPos[i]);
}
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+3 -3
View File
@@ -205,7 +205,7 @@ void EnSsh_AddBlureVertex(EnSsh* this) {
Matrix_Push();
Matrix_MultVec3f(&p1base, &p1);
Matrix_MultVec3f(&p2base, &p2);
Matrix_Pull();
Matrix_Pop();
EffectBlure_AddVertex(Effect_GetByIndex(this->blureIdx), &p1, &p2);
}
@@ -446,7 +446,7 @@ void EnSsh_Sway(EnSsh* this) {
Matrix_Translate(this->ceilingPos.x, this->ceilingPos.y, this->ceilingPos.z, MTXMODE_NEW);
Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_MultVec3f(&swayVecBase, &swayVec);
Matrix_Pull();
Matrix_Pop();
this->actor.shape.rot.z = -(swayAngle * 2);
this->actor.world.pos.x = swayVec.x;
this->actor.world.pos.z = swayVec.z;
@@ -599,7 +599,7 @@ s32 EnSsh_SetCylinderOC(EnSsh* this, GlobalContext* globalCtx) {
Matrix_Translate(cylPos.x, cylPos.y, cylPos.z, MTXMODE_NEW);
Matrix_RotateY((this->initialYaw / (f32)0x8000) * M_PI, MTXMODE_APPLY);
Matrix_MultVec3f(&cyloffsets[i], &cylPos);
Matrix_Pull();
Matrix_Pop();
this->colCylinder[i + 3].dim.pos.x = cylPos.x;
this->colCylinder[i + 3].dim.pos.y = cylPos.y;
this->colCylinder[i + 3].dim.pos.z = cylPos.z;
src/overlays/actors/ovl_En_St/z_en_st.c
+3 -3
View File
@@ -250,7 +250,7 @@ void EnSt_AddBlurVertex(EnSt* this) {
Matrix_Push();
Matrix_MultVec3f(&v1, &v1Pos);
Matrix_MultVec3f(&v2, &v2Pos);
Matrix_Pull();
Matrix_Pop();
EffectBlure_AddVertex(Effect_GetByIndex(this->blureIdx), &v1Pos, &v2Pos);
}
@@ -362,7 +362,7 @@ s32 EnSt_SetCylinderOC(EnSt* this, GlobalContext* globalCtx) {
Matrix_Translate(cylPos.x, cylPos.y, cylPos.z, MTXMODE_NEW);
Matrix_RotateY((this->initalYaw / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_MultVec3f(&cyloffsets[i], &cylPos);
Matrix_Pull();
Matrix_Pop();
this->colCylinder[i + 3].dim.pos.x = cylPos.x;
this->colCylinder[i + 3].dim.pos.y = cylPos.y;
this->colCylinder[i + 3].dim.pos.z = cylPos.z;
@@ -781,7 +781,7 @@ void EnSt_Sway(EnSt* this) {
Matrix_Translate(this->ceilingPos.x, this->ceilingPos.y, this->ceilingPos.z, MTXMODE_NEW);
Matrix_RotateY(this->actor.world.rot.y * (M_PI / 32768.0f), MTXMODE_APPLY);
Matrix_MultVec3f(&amtToTranslate, &translatedPos);
Matrix_Pull();
Matrix_Pop();
this->actor.shape.rot.z = -(rotAngle * 2);
this->actor.world.pos.x = translatedPos.x;
this->actor.world.pos.z = translatedPos.z;
src/overlays/actors/ovl_En_Tk/z_en_tk.c
+1 -1
View File
@@ -734,7 +734,7 @@ void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push();
EnTkEff_Draw(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tk.c", 1294);
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+1 -1
View File
@@ -646,7 +646,7 @@ void EnWallMas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1489), G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, D_06008688);
Matrix_Pull();
Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495);
}
src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+5 -5
View File
@@ -512,7 +512,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_1DC[6] + kREG(37), unk_1DC[7] + kREG(38), unk_1DC[8] + kREG(39), MTXMODE_APPLY);
Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[2], "../z_en_zl2.c", 1120);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY);
Matrix_Get(&sp34);
@@ -535,7 +535,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_1DC[12] + kREG(43), unk_1DC[13] + kREG(44), unk_1DC[14] + kREG(45), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[4], "../z_en_zl2.c", 1164);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY);
Matrix_Get(&sp34);
@@ -558,8 +558,8 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_1DC[18] + kREG(49), unk_1DC[19] + kREG(50), unk_1DC[20] + kREG(51), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[6], "../z_en_zl2.c", 1208);
Matrix_Pull();
Matrix_Pull();
Matrix_Pop();
Matrix_Pop();
this->unk_24C = 1;
}
return false;
@@ -586,7 +586,7 @@ void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList((*gfx)++, &D_0600BAE8);
}
Matrix_Pull();
Matrix_Pop();
}
}
}
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
+8 -8
View File
@@ -681,7 +681,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_28C[6] + kREG(37), unk_28C[7] + kREG(38), unk_28C[8] + kREG(39), MTXMODE_APPLY);
Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp78[2], "../z_en_zl3.c", 1554);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY);
Matrix_Get(&sp38);
@@ -704,7 +704,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_28C[12] + kREG(43), unk_28C[13] + kREG(44), unk_28C[14] + kREG(45), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp78[4], "../z_en_zl3.c", 1598);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY);
Matrix_Get(&sp38);
@@ -727,8 +727,8 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_RotateRPY(unk_28C[18] + kREG(49), unk_28C[19] + kREG(50), unk_28C[20] + kREG(51), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp78[6], "../z_en_zl3.c", 1642);
Matrix_Pull();
Matrix_Pull();
Matrix_Pop();
Matrix_Pop();
this->unk_2FC = 1;
} else if (limbIndex == 7) {
rot->x += unk_3F8_unk_0E->y;
@@ -2503,20 +2503,20 @@ s32 func_80B5944C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Matrix_ToMtx(&mtx[1], "../z_en_zl3_inEscape.c", 2474);
Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[2], "../z_en_zl3_inEscape.c", 2477);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(40.0f, 264.0f, 386.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[3], "../z_en_zl3_inEscape.c", 2483);
Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[4], "../z_en_zl3_inEscape.c", 2486);
Matrix_Pull();
Matrix_Pop();
Matrix_Push();
Matrix_Translate(40.0f, 264.0f, -386.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[5], "../z_en_zl3_inEscape.c", 2492);
Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&mtx[6], "../z_en_zl3_inEscape.c", 2495);
Matrix_Pull();
Matrix_Pull();
Matrix_Pop();
Matrix_Pop();
}
return false;
}
src/overlays/actors/ovl_En_Zo/z_en_zo.c
+1 -1
View File
@@ -792,7 +792,7 @@ void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnZo_DrawRipples(this, globalCtx);
EnZo_DrawBubbles(this, globalCtx);
EnZo_DrawSplashes(this, globalCtx);
Matrix_Pull();
Matrix_Pop();
if ((s32)this->alpha != 0) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo.c", 1008);
src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
+1 -1
View File
@@ -271,7 +271,7 @@ void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
Matrix_RotateZ(sp6C * (M_PI / 32), MTXMODE_APPLY);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
Matrix_Pull();
Matrix_Pop();
Matrix_RotateZ(-sp6C * (M_PI / 32), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 639),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
src/overlays/actors/ovl_player_actor/z_player.c
+1 -1
View File
@@ -10381,7 +10381,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateX(-sp78, MTXMODE_APPLY);
func_8084A0E8(globalCtx, this, lod, gCullFrontDList, overrideLimbDraw);
this->actor.scale.y = -this->actor.scale.y;
Matrix_Pull();
Matrix_Pop();
}
gSPClearGeometryMode(POLY_OPA_DISP++, G_CULL_BOTH);