Merge pull request #17 from lunarsoap5/master

Patched Goats Minigame and adjust readFile call for gci's generated with DVD params

Author: Zephiles

GameCube/include/events.h

@@ -153,6 +153,7 @@ namespace mod::events
     uint16_t getPauseRupeeMax(libtp::tp::d_save::dSv_player_status_a_c* plyrStatus);
     uint32_t autoMashThroughText(libtp::tp::m_do_controller_pad::CPadInfo* padInfo);
     void* handleTransformAnywhere(libtp::tp::f_op_actor_iter::fopAcIt_JudgeFunc unk1, void* unk2);
+    bool checkValidTransformAnywhere();
 
     void performStaticASMReplacement(uint32_t memoryOffset, uint32_t value);
 

GameCube/source/events.cpp

@@ -914,7 +914,7 @@ namespace mod::events
 
     int32_t proc_query042(void* unk1, void* unk2, int32_t unk3)
     {
-        if (transformAnywhereEnabled)
+        if (checkValidTransformAnywhere())
         {
             // Return false to allow transforming infront of NPCs using Midna's transform option
             return 0;
@@ -1111,6 +1111,7 @@ namespace mod::events
     void handleQuickTransform()
     {
         rando::Seed* seed;
+        using namespace libtp::tp::d_com_inf_game;
         if (seed = getCurrentSeed(randomizer), !seed)
         {
             return;
@@ -1122,7 +1123,7 @@ namespace mod::events
         }
 
         // Ensure that Link is loaded on the map.
-        libtp::tp::d_a_alink::daAlink* linkMapPtr = libtp::tp::d_com_inf_game::dComIfG_gameInfo.play.mPlayer;
+        libtp::tp::d_a_alink::daAlink* linkMapPtr = dComIfG_gameInfo.play.mPlayer;
         if (!linkMapPtr)
         {
             return;
@@ -1178,7 +1179,7 @@ namespace mod::events
             return;
         }
 
-        if (!transformAnywhereEnabled)
+        if (!checkValidTransformAnywhere())
         {
             if (daMidna_c__checkMetamorphoseEnableBase)
             {
@@ -1490,7 +1491,7 @@ namespace mod::events
 
     void* handleTransformAnywhere(libtp::tp::f_op_actor_iter::fopAcIt_JudgeFunc unk1, void* unk2)
     {
-        if (transformAnywhereEnabled)
+        if (checkValidTransformAnywhere())
         {
             // Return nullptr to make the calling function return true
             return nullptr;
@@ -1500,6 +1501,39 @@ namespace mod::events
         return libtp::tp::f_op_actor_iter::fopAcIt_Judge(unk1, unk2);
     }
 
+    bool checkValidTransformAnywhere()
+    {
+        using namespace libtp::data::stage;
+        using namespace libtp::tp::d_com_inf_game;
+
+        if (!transformAnywhereEnabled)
+        {
+            return false;
+        }
+
+        // Check if the player is currently playing the Goats minigame
+        if (libtp::tp::d_a_alink::checkStageName(allStages[StageIDs::Ordon_Ranch]))
+        {
+            switch (dComIfG_gameInfo.play.mStartStage.mLayer)
+            {
+                // Layer 4 or 5 is used when the minigame is taking place
+                case 4:
+                case 5:
+                {
+                    // Return false, as the game will crash if the player is in wolf form after the minigame ends
+                    return false;
+                }
+                default:
+                {
+                    break;
+                }
+            }
+        }
+
+        // Return true, as the bool is set and there are no conflicting scenarios to prevent transformation
+        return true;
+    }
+
     KEEP_FUNC void performStaticASMReplacement(uint32_t memoryOffset, uint32_t value)
     {
         *reinterpret_cast<uint32_t*>(memoryOffset) = value;

GameCube/subrel/boot/source/rando/seedlist.cpp

@@ -123,7 +123,7 @@ namespace mod::rando
             snprintf(filePath, sizeof(filePath), "/mod/seed/%s", currentFileName);
 
             // Try to open the file and get the header data
-            if (DVD_STATE_END != libtp::tools::ReadFile(filePath, sizeof(header), 0, &header))
+            if (DVD_STATE_END != libtp::tools::readFile(filePath, sizeof(header), 0, &header))
             {
 #else
             // Try to get the status of an arbitrary file slot

GameCube/subrel/seed/source/rando/seed.cpp

@@ -56,7 +56,7 @@ namespace mod::rando
         char filePath[96];
         snprintf(filePath, sizeof(filePath), "/mod/seed/%s", fileName);
 
-        m_CARDResult = libtp::tools::ReadFile(filePath, totalSize, 0, data);
+        m_CARDResult = libtp::tools::readFile(filePath, totalSize, 0, data);
         constexpr int32_t resultComparison = DVD_STATE_END;
 #else
         // The memory card should already be mounted