Bit of cleanup.
This commit is contained in:
parent
751f02fcd1
commit
0723a9473a
|
@ -43,8 +43,6 @@ class CheckTrackerWindow : public LUS::GuiWindow {
|
||||||
//repeat...
|
//repeat...
|
||||||
#define INDEX_TO_16BIT_LITTLE_ENDIAN_BITMASK(idx) (0x8000 >> (7 - (idx % 8) + ((idx % 16) / 8) * 8))
|
#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 DefaultCheckData(RandomizerCheck rc);
|
||||||
void Teardown();
|
void Teardown();
|
||||||
void UpdateAllOrdering();
|
void UpdateAllOrdering();
|
||||||
|
|
|
@ -89,7 +89,7 @@ GameInteractorSail* GameInteractorSail::Instance;
|
||||||
|
|
||||||
#include "Enhancements/mods.h"
|
#include "Enhancements/mods.h"
|
||||||
#include "Enhancements/game-interactor/GameInteractor.h"
|
#include "Enhancements/game-interactor/GameInteractor.h"
|
||||||
#include "Enhancements//randomizer/draw.h"
|
#include "Enhancements/randomizer/draw.h"
|
||||||
#include <libultraship/libultraship.h>
|
#include <libultraship/libultraship.h>
|
||||||
|
|
||||||
// Resource Types/Factories
|
// Resource Types/Factories
|
||||||
|
@ -2422,10 +2422,6 @@ extern "C" ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(
|
||||||
return OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck);
|
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) {
|
extern "C" bool Randomizer_IsCheckShuffled(RandomizerCheck randomizerCheck) {
|
||||||
return CheckTracker::IsCheckShuffled(RandomizerCheckObjects::GetAllRCObjects().find(randomizerCheck)->second);
|
return CheckTracker::IsCheckShuffled(RandomizerCheckObjects::GetAllRCObjects().find(randomizerCheck)->second);
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,7 +66,6 @@ uint32_t IsGameMasterQuest();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus
|
||||||
GetItemEntry GetItemMystery;
|
|
||||||
void InitOTR(void);
|
void InitOTR(void);
|
||||||
void DeinitOTR(void);
|
void DeinitOTR(void);
|
||||||
void VanillaItemTable_Init();
|
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_GetItemFromActorWithoutObtainabilityCheck(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogId);
|
||||||
GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
|
GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
|
||||||
GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
|
GetItemEntry Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
|
||||||
bool Randomizer_IsVisibleInCheckTracker(RandomizerCheck check);
|
|
||||||
bool Randomizer_IsCheckShuffled(RandomizerCheck check);
|
bool Randomizer_IsCheckShuffled(RandomizerCheck check);
|
||||||
|
GetItemEntry GetItemMystery;
|
||||||
ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
|
ItemObtainability Randomizer_GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
|
||||||
int CustomMessage_RetrieveIfExists(PlayState* play);
|
int CustomMessage_RetrieveIfExists(PlayState* play);
|
||||||
void Overlay_DisplayText(float duration, const char* text);
|
void Overlay_DisplayText(float duration, const char* text);
|
||||||
|
|
Loading…
Reference in New Issue