don't spawn blocking mido after we've already shown him the sword/shi…

…eld (HarbourMasters#675) Co-authored-by: briaguya <briaguya@alice>
lilDavid · Jul 14, 2022 · cb68767 · cb68767
1 parent f7db886
commit cb68767
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c
@@ -485,7 +485,10 @@ u8 EnMd_ShouldSpawn(EnMd* this, GlobalContext* globalCtx) {
     if (globalCtx->sceneNum == SCENE_SPOT04) {
         if (gSaveContext.n64ddFlag) {
             // if we have beaten deku tree or have open forest turned on
-            if (gSaveContext.dungeonsDone[1] || GetRandoSettingValue(RSK_FOREST) == 1) {
+            // or have already shown mido we have an equipped sword/shield
+            if (gSaveContext.dungeonsDone[1] ||
+                GetRandoSettingValue(RSK_FOREST) == 1 ||
+                gSaveContext.eventChkInf[0] & 0x10) {
                 return 0;
             }
             return 1;