From 4d1ddff798abba6fa2f2035cccf81d6f48598bec Mon Sep 17 00:00:00 2001
From: balloondude2 <55861555+balloondude2@users.noreply.github.com>
Date: Sun, 8 Sep 2024 17:01:02 -0600
Subject: Fix some Fierce Diety interactions in Clock Town (#730)

* fix fd town archery softlock

* allow FD to leave town
---
 mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c | 5 +++++
 mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c
index f31e7bf70..fd135719d 100644
--- a/mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c
+++ b/mm/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c
@@ -405,6 +405,11 @@ void func_80AE7F34(EnStopheishi* this, PlayState* play) {
         case PLAYER_FORM_GORON:
             phi_a2 = 2;
             break;
+
+        // 2SH2 [FD Enhancement] - Guard treats FD as if Human has already talked
+        case PLAYER_FORM_FIERCE_DEITY:
+            phi_a2 = 1;
+            break;
     }
 
     if (((phi_a2 == 1) || (phi_a2 == 2) || (phi_a2 == 3)) &&
diff --git a/mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index 0a0e723f2..57dba44ff 100644
--- a/mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/mm/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -587,6 +587,9 @@ void EnSyatekiMan_Town_StartIntroTextbox(EnSyatekiMan* this, PlayState* play) {
             }
             break;
 
+        // 2SH2 [FD Enhancement]  Don't allow playing town archery with FD becuase Swamp prevents FD archery by default.
+        // Get Goron's "quite the build" text
+        case PLAYER_FORM_FIERCE_DEITY:
         case PLAYER_FORM_GORON:
             if (CURRENT_DAY != 3) {
                 if (!(this->talkFlags & TALK_FLAG_TOWN_HAS_SPOKEN_WITH_GORON)) {
-- 
cgit v1.2.3