Fix some Fierce Diety interactions in Clock Town (HarbourMasters#730)

* fix fd town archery softlock * allow FD to leave town
Malkierian · Sep 8, 2024 · 4d1ddff · 4d1ddff
1 parent bbfa903
commit 4d1ddff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
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
@@ -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
@@ -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)) {