Fix build after develop merge

soh/CMakeLists.txt

@@ -282,6 +282,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	endif()
 	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
 endif()
+
 ################################################################################
 # apclientpp + dependencies
 ################################################################################
@@ -293,7 +294,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/wswrap/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/valijson/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/apclientpp
-
+)
 
 # Find/download Dr Libs (For custom audio)
 ################################################################################
@@ -306,7 +307,6 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(dr_libs)
 
-
 ################################################################################
 # Compile definitions
 ################################################################################

soh/soh/Enhancements/randomizer/3drando/random.cpp

@@ -32,23 +32,6 @@ uint32_t next32() {
     return std::rotr(xorshifted, rot);
 }
 
-uint32_t next32() {
-    if (!init) {
-        // No seed given, get a random number from device to seed
-#if !defined(__SWITCH__) && !defined(__WIIU__)
-        uint64_t seed = static_cast<uint64_t>(std::random_device{}());
-#else
-        uint64_t seed = static_cast<uint64_t>(std::hash<std::string>{}(std::to_string(rand())));
-#endif
-        Random_Init(seed);
-    }
-
-    state = state * multiplier + increment;
-    uint32_t xorshifted = static_cast<uint32_t>(((state >> 18) ^ state) >> 27);
-    uint32_t rot = static_cast<int>(state >> 59);
-    return std::rotr(xorshifted, rot);
-}
-
 // Returns a random integer in range [min, max-1]
 uint32_t Random(uint32_t min, uint32_t max) {
     if (min == max) {

soh/soh/Enhancements/randomizer/context.cpp

@@ -598,7 +598,6 @@ void Context::ParseArchipelagoOptions(const std::map<std::string, int>& slot_dat
     mOptions[RSK_STARTING_NUTS].Set(RO_GENERIC_NO);
     mOptions[RSK_FULL_WALLETS].Set(RO_GENERIC_YES);
     mOptions[RSK_SHUFFLE_CHEST_MINIGAME].Set(RO_GENERIC_NO);
-    mOptions[RSK_CUCCO_COUNT].Set(1);
     mOptions[RSK_BIG_POE_COUNT].Set(1);
     mOptions[RSK_SKIP_EPONA_RACE].Set(RO_GENERIC_YES);
     mOptions[RSK_COMPLETE_MASK_QUEST].Set(RO_GENERIC_YES);

soh/soh/Enhancements/randomizer/hook_handlers.cpp

@@ -13,7 +13,6 @@
 #include "soh/SohGui/ImGuiUtils.h"
 #include "soh/Notification/Notification.h"
 #include "soh/SaveManager.h"
-#include "soh/Enhancements/randomizer/ShuffleFairies.h"
 #include "soh/Network/Archipelago/ArchipelagoConsoleWindow.h"
 
 extern "C" {