Merge pull request HarbourMasters#116 from MelonSpeedruns/testing-out…

…-item-replacement forest temple skips
MelonSpeedruns · Jun 12, 2022 · 51ccfee · 51ccfee
2 parents c4e34cf + 16d3429
commit 51ccfee
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -179,6 +179,12 @@ void EnPoSisters_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnPoSisters* this = (EnPoSisters*)thisx;
     s32 pad;
 
+    // Skip Poe Intro Cutscene
+    if (gSaveContext.n64ddFlag && thisx->params == 4124) {
+        Flags_SetSwitch(globalCtx, 0x1B);
+        Actor_Kill(thisx);
+    }
+
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f);
     SkelAnime_Init(globalCtx, &this->skelAnime, &gPoeSistersSkel, &gPoeSistersSwayAnim, this->jointTable,
@@ -851,6 +857,11 @@ void func_80ADB338(EnPoSisters* this, GlobalContext* globalCtx) {
         if (Actor_WorldDistXZToPoint(&player->actor, &this->actor.home.pos) < 600.0f) {
             if (this->unk_19C != 0) {
                 this->unk_19C--;
+
+                // Force Meg to respawn instantly after getting hit
+                if (gSaveContext.n64ddFlag) {
+                    this->unk_19C = 0;
+                }
             }
         } else {
             this->unk_19C = 100;