Merge pull request #23 from inspectredc/phantom-ganon-crown-fix

Caladius · web-flow · commit 4fcf1b073271 · 2023-11-30T18:56:41.000-05:00
fix crown
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
@@ -1452,7 +1452,7 @@ void BossGanondrof_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec
     if (((this->flyMode != GND_FLY_PAINTING) || (this->actionFunc == BossGanondrof_Intro)) && (limbIndex <= 25)) {
         Matrix_MultVec3f(&zeroVec, &this->bodyPartsPos[limbIndex - 1]);
     }
-    if (CVarGetInteger("gLetItSnow", 0)) {
+    if (CVarGetInteger("gLetItSnow", 0) && this->deathState == NOT_DEAD) {
         if (limbIndex == 15) {
             OPEN_DISPS(play->state.gfxCtx);
             Matrix_Push();

Original file line number	Diff line number	Diff line change
`@@ -1452,7 +1452,7 @@ void BossGanondrof_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec`
`1452`	`1452`	`if (((this->flyMode != GND_FLY_PAINTING) \|\| (this->actionFunc == BossGanondrof_Intro)) && (limbIndex <= 25)) {`
`1453`	`1453`	`Matrix_MultVec3f(&zeroVec, &this->bodyPartsPos[limbIndex - 1]);`
`1454`	`1454`	`}`
`1455`		`- if (CVarGetInteger("gLetItSnow", 0)) {`
	`1455`	`+ if (CVarGetInteger("gLetItSnow", 0) && this->deathState == NOT_DEAD) {`
`1456`	`1456`	`if (limbIndex == 15) {`
`1457`	`1457`	`OPEN_DISPS(play->state.gfxCtx);`
`1458`	`1458`	`Matrix_Push();`