Merge pull request #18 from lunarsoap5/master

Re apply the state enforcement in hyrule field for MDH

Author: Zephiles

GameCube/Makefile

@@ -15,7 +15,7 @@ export BUILDID:='"$(shell date +'%Y%m%d%H%M')"'
 # Version
 export _VERSION_MAJOR:=1
 export _VERSION_MINOR:=0
-export _VERSION_PATCH:=0
+export _VERSION_PATCH:=1
 export _VERSION:='"$(_VERSION_MAJOR).$(_VERSION_MINOR).$(_VERSION_PATCH)"'
 # Variant: i.e. Public, NoLogic, Race, etc.
 #export _VARIANT:= public

GameCube/source/events.cpp

@@ -1096,8 +1096,8 @@ namespace mod::events
     void loadCustomRoomSCOBs()
     {
         using namespace libtp;
-
-        if (tp::d_a_alink::checkStageName(data::stage::allStages[data::stage::StageIDs::Hyrule_Field]))
+        if (tp::d_a_alink::checkStageName(data::stage::allStages[data::stage::StageIDs::Hyrule_Field]) &&
+            libtp::tp::d_a_alink::dComIfGs_isEventBit(libtp::data::flags::MIDNAS_DESPERATE_HOUR_COMPLETED))
         {
             tools::spawnSCOB(3, HorseJumpScob);
         }

GameCube/source/game_patch/01_getLayerNo.cpp

@@ -645,28 +645,35 @@ namespace mod::game_patch
 
                     case stage::StageIDs::Hyrule_Field:
                     {
-                        condition =
-                            libtp::tp::d_a_alink::dComIfGs_isEventBit(MIDNAS_DESPERATE_HOUR_STARTED); // MDH State Activated
-
-                        if (condition)
+                        if (libtp::tp::d_com_inf_game::dComIfG_gameInfo.save.save_file.player.player_status_b
+                                .dark_clear_level_flag >= 0x7)
                         {
                             condition =
-                                libtp::tp::d_a_alink::dComIfGs_isEventBit(MIDNAS_DESPERATE_HOUR_COMPLETED); // MDH Completed
+                                libtp::tp::d_a_alink::dComIfGs_isEventBit(MIDNAS_DESPERATE_HOUR_STARTED); // MDH State Activated
 
                             if (condition)
                             {
-                                chosenLayer = stage::HyruleFieldStateIDs::Hyrule_Field_MDH_Completed;
+                                condition =
+                                    libtp::tp::d_a_alink::dComIfGs_isEventBit(MIDNAS_DESPERATE_HOUR_COMPLETED); // MDH Completed
+
+                                if (condition)
+                                {
+                                    chosenLayer = stage::HyruleFieldStateIDs::Hyrule_Field_MDH_Completed;
+                                }
+                                else
+                                {
+                                    chosenLayer = stage::HyruleFieldStateIDs::Hyrule_Field_MDH_Started;
+                                }
                             }
                             else
                             {
-                                chosenLayer = stage::HyruleFieldStateIDs::Hyrule_Field_MDH_Started;
+                                chosenLayer = stage::HyruleFieldStateIDs::Hyrule_Field_New_Game;
                             }
                         }
                         else
                         {
-                            chosenLayer = stage::HyruleFieldStateIDs::Hyrule_Field_MDH_Completed;
+                            chosenLayer = stage::HyruleFieldStateIDs::Hyrule_Field_New_Game;
                         }
-
                         break;
                     }