diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h index c23d7a63b..baf5682c9 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h @@ -43,8 +43,6 @@ class CheckTrackerWindow : public LUS::GuiWindow { //repeat... #define INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(idx) (0x8000 >> (7 - (idx % 8) + ((idx % 16) / 8) * 8)) -bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj); - void DefaultCheckData(RandomizerCheck rc); void Teardown(); void UpdateAllOrdering(); diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 819c90c13..73af5b9aa 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -89,7 +89,7 @@ GameInteractorSail* GameInteractorSail::Instance; #include "Enhancements/mods.h" #include "Enhancements/game-interactor/GameInteractor.h" -#include "Enhancements//randomizer/draw.h" +#include "Enhancements/randomizer/draw.h" #include // Resource Types/Factories @@ -2422,10 +2422,6 @@ extern "C" ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck( return OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck); } -extern "C" bool Randomizer_IsVisibleInCheckTracker(RandomizerCheck check) { - return CheckTracker::IsVisibleInCheckTracker(RandomizerCheckObjects::GetAllRCObjects().find(check)->second); -} - extern "C" bool Randomizer_IsCheckShuffled(RandomizerCheck randomizerCheck) { return CheckTracker::IsCheckShuffled(RandomizerCheckObjects::GetAllRCObjects().find(randomizerCheck)->second); } diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h index aac473c9f..a95bc9bf6 100644 --- a/soh/soh/OTRGlobals.h +++ b/soh/soh/OTRGlobals.h @@ -66,7 +66,6 @@ uint32_t IsGameMasterQuest(); #endif #ifndef __cplusplus -GetItemEntry GetItemMystery; void InitOTR(void); void DeinitOTR(void); void VanillaItemTable_Init(); @@ -166,8 +165,8 @@ GetItemEntry Randomizer_GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorPar GetItemEntry Randomizer_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId); GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId); GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId); -bool Randomizer_IsVisibleInCheckTracker(RandomizerCheck check); bool Randomizer_IsCheckShuffled(RandomizerCheck check); +GetItemEntry GetItemMystery; ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck); int CustomMessage_RetrieveIfExists(PlayState* play); void Overlay_DisplayText(float duration, const char* text);