Move ReadTrainerTowerAndValidate

6 files changed, 10 insertions, 11 deletions

diff --git a/data/specials.inc b/data/specials.inc
index 4313c0d16..1e156be66 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -439,7 +439,7 @@ gSpecials:: @ 815FD60
 	def_special Special_SetDeoxysTriangleObjectPal
 	def_special sub_8147594
 	def_special Special_BadEggInParty
-	def_special ReadTrainerHillAndValidate
+	def_special ReadTrainerTowerAndValidate
 	def_special HasAllMons
 	def_special Special_PlayerIsNotInTrainerTowerLobby
 	def_special Special_BrailleCursorToggle
diff --git a/include/cereader_tool.h b/include/cereader_tool.h
index db1dd04fa..c3eadfe81 100644
--- a/include/cereader_tool.h
+++ b/include/cereader_tool.h
@@ -47,5 +47,6 @@ bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata);
 bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata);
 bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata);
 u8 sub_815D654(void);
+bool32 ReadTrainerTowerAndValidate(void);
 
 #endif //GUARD_CEREADER_TOOL_H
diff --git a/include/renewable_hidden_items.h b/include/renewable_hidden_items.h
index b88c44b6b..3a0385c00 100644
--- a/include/renewable_hidden_items.h
+++ b/include/renewable_hidden_items.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_RENEWABLE_HIDDEN_ITEMS_H
 #define GUARD_RENEWABLE_HIDDEN_ITEMS_H
 
-bool32 ReadTrainerHillAndValidate(void);
 void IncrementRenewableHiddenItemStepCounter(void);
 void TryRegenerateRenewableHiddenItems(void);
 void SetAllRenewableItemFlags(void);
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;