Addresses Forest Temple Poes and NPC Dialogue issues. (#3334)

2023-10-30 12:00:24 -04:00
parent 2810996475
commit ff7fa77427
2 changed files with 16 additions and 5 deletions
--- a/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+++ b/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
@@ -328,7 +328,11 @@ void EnWallmas_WaitToDrop(EnWallmas* this, PlayState* play) {
    }

    if (this->timer == 0) {
-        EnWallmas_SetupDrop(this, play);
+        if (this->actor.params == WMT_SHADOWTAG && (player->stateFlags1 & PLAYER_STATE1_IN_CUTSCENE)) {
+            this->timer = 0x82; // Prevents Shadow Tag Hand from dropping when talking to an NPC or Signpost.
+        } else {
+            EnWallmas_SetupDrop(this, play);
+        }
    }
 }