diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/cereader_tool.c | 6 | ||||
-rw-r--r-- | src/renewable_hidden_items.c | 6 | ||||
-rw-r--r-- | src/trainer_tower.c | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/cereader_tool.c b/src/cereader_tool.c index 5258b1910..7234cdac8 100644 --- a/src/cereader_tool.c +++ b/src/cereader_tool.c @@ -86,3 +86,9 @@ bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata) Free(buffer); return success; } + +bool32 ReadTrainerTowerAndValidate(void) +{ + // Stubbed out. Populated in Emerald + return FALSE; +} diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c index 127f353e8..c0406fe94 100644 --- a/src/renewable_hidden_items.c +++ b/src/renewable_hidden_items.c @@ -529,12 +529,6 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { }, }; -bool32 ReadTrainerHillAndValidate(void) -{ - // Stubbed out. Populated in Emerald - return FALSE; -} - void SetAllRenewableItemFlags(void) { u8 i, j; diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 21120ad20..193c2dd47 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -20,7 +20,6 @@ #include "menu.h" #include "new_menu_helpers.h" #include "sound.h" -#include "renewable_hidden_items.h" #include "constants/flags.h" #include "constants/vars.h" #include "constants/items.h" @@ -523,7 +522,7 @@ static void SetUpTrainerTowerDataStruct(void) // fakematching sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState)); sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - 42; - if (ReadTrainerHillAndValidate() == TRUE) + if (ReadTrainerTowerAndValidate() == TRUE) CEReaderTool_LoadTrainerTower(&sTrainerTowerState->unk_0004); else { @@ -781,7 +780,7 @@ static void StartTrainerTowerChallenge(void) if (gSaveBlock1Ptr->towerChallengeId >= NUM_TOWER_CHALLENGE_TYPES) gSaveBlock1Ptr->towerChallengeId = 0; ValidateOrResetCurTrainerTowerRecord(); - if (!ReadTrainerHillAndValidate()) + if (!ReadTrainerTowerAndValidate()) TRAINER_TOWER.validated = TRUE; else TRAINER_TOWER.validated = FALSE; |