Trainer Hill --> Trainer Tower

7 files changed, 23 insertions, 23 deletions

diff --git a/asm/overworld.s b/asm/overworld.s
index 92ffbd038..e70702710 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -1718,7 +1718,7 @@ sub_8055864: @ 8055864
 	bl sav1_reset_battle_music_maybe
 	bl mapheader_run_script_with_tag_x3
 	bl TryRegenerateRenewableHiddenItems
-	bl not_trainer_hill_battle_pyramid
+	bl not_trainer_tower_battle_pyramid
 	ldr r4, _0805591C @ =gMapHeader
 	ldr r0, [r4]
 	bl copy_map_tileset2_to_vram_2
@@ -1798,7 +1798,7 @@ _08055974:
 	bl UpdateLocationHistoryForRoamer
 	bl RoamerMoveToOtherLocationSet
 	bl sub_8110920
-	bl not_trainer_hill_battle_pyramid
+	bl not_trainer_tower_battle_pyramid
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -1823,7 +1823,7 @@ sub_80559A8: @ 80559A8
 	bl sub_8110920
 	bl sub_8111708
 	bl set_current_map_header_from_sav1
-	bl not_trainer_hill_battle_pyramid
+	bl not_trainer_tower_battle_pyramid
 	pop {r0}
 	bx r0
 	.align 2, 0
diff --git a/include/cereader_tool.h b/include/cereader_tool.h
index c3eadfe81..dd1866fb3 100644
--- a/include/cereader_tool.h
+++ b/include/cereader_tool.h
@@ -26,7 +26,7 @@ struct TrainerTowerFloor
     /* 0x3DC */ u32 checksum;
 };
 
-struct EReaderTrainerHillSetSubstruct
+struct EReaderTrainerTowerSetSubstruct
 {
     u8 numFloors;
     u8 id;
@@ -34,7 +34,7 @@ struct EReaderTrainerHillSetSubstruct
     u32 checksum;
 };
 
-struct EReaderTrainerHillSet
+struct EReaderTrainerTowerSet
 {
     u8 numFloors;
     u8 id;
@@ -43,9 +43,9 @@ struct EReaderTrainerHillSet
     struct TrainerTowerFloor floors[MAX_TRAINER_TOWER_FLOORS];
 };
 
-bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata);
-bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata);
-bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata);
+bool32 ValidateTrainerTowerData(struct EReaderTrainerTowerSet * ttdata);
+bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata);
+bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerTowerSet * ttdata);
 u8 sub_815D654(void);
 bool32 ReadTrainerTowerAndValidate(void);
 
diff --git a/include/constants/battle.h b/include/constants/battle.h
index b28955210..c9a563a4e 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -71,7 +71,7 @@
 #define BATTLE_TYPE_x800000          0x800000
 #define BATTLE_TYPE_RECORDED         0x1000000
 #define BATTLE_TYPE_x2000000         0x2000000
-#define BATTLE_TYPE_TRAINER_HILL     0x4000000
+#define BATTLE_TYPE_x4000000         0x4000000
 #define BATTLE_TYPE_SECRET_BASE      0x8000000
 #define BATTLE_TYPE_GROUDON          0x10000000
 #define BATTLE_TYPE_KYOGRE           0x20000000
diff --git a/src/cereader_tool.c b/src/cereader_tool.c
index 7234cdac8..c6e0c9a99 100644
--- a/src/cereader_tool.c
+++ b/src/cereader_tool.c
@@ -20,7 +20,7 @@ static bool32 ValidateTrainerTowerTrainer(struct TrainerTowerFloor * floor)
     return TRUE;
 }
 
-bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata)
+bool32 ValidateTrainerTowerData(struct EReaderTrainerTowerSet * ttdata)
 {
     u32 numFloors = ttdata->numFloors;
     s32 i;
@@ -36,10 +36,10 @@ bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata)
     return TRUE;
 }
 
-#define SEC30_SIZE  (offsetof(struct EReaderTrainerHillSet, floors[4]))
-#define SEC31_SIZE  (sizeof(struct EReaderTrainerHillSet) - SEC30_SIZE)
+#define SEC30_SIZE  (offsetof(struct EReaderTrainerTowerSet, floors[4]))
+#define SEC31_SIZE  (sizeof(struct EReaderTrainerTowerSet) - SEC30_SIZE)
 
-static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerHillSet * ttdata, u8 * buffer)
+static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, u8 * buffer)
 {
     AGB_ASSERT_EX(ttdata->dummy == 0, ABSPATH("cereader_tool.c"), 198);
     AGB_ASSERT_EX(ttdata->id == 0, ABSPATH("cereader_tool.c"), 199)
@@ -56,7 +56,7 @@ static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerHillSet * ttd
     return TRUE;
 }
 
-bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata)
+bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata)
 {
     u8 * buffer = AllocZeroed(0x1000);
     bool32 result = CEReaderTool_SaveTrainerTower_r(ttdata, buffer);
@@ -64,7 +64,7 @@ bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata)
     return result;
 }
 
-static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerHillSet * ttdata, void * buffer)
+static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, void * buffer)
 {
     if (TryCopySpecialSaveSection(SECTOR_TTOWER(0), buffer) != 1)
         return FALSE;
@@ -79,7 +79,7 @@ static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerHillSet * ttd
     return TRUE;
 }
 
-bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata)
+bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerTowerSet * ttdata)
 {
     void * buffer = AllocZeroed(0x1000);
     bool32 success = CEReaderTool_LoadTrainerTower_r(ttdata, buffer);
diff --git a/src/fieldmap.c b/src/fieldmap.c
index adb26f230..d64215295 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -63,7 +63,7 @@ const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * conn
     return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum);
 }
 
-void not_trainer_hill_battle_pyramid(void)
+void not_trainer_tower_battle_pyramid(void)
 {
     sub_8058A00(&gMapHeader);
     mapheader_run_script_with_tag_x1();
diff --git a/src/mevent.c b/src/mevent.c
index afad326b5..9d26cdc12 100644
--- a/src/mevent.c
+++ b/src/mevent.c
@@ -423,7 +423,7 @@ void sub_8143910(u8 taskId)
             }
             break;
         case 15:
-            data->t0E = ValidateTrainerTowerData((struct EReaderTrainerHillSet *)gDecompressionBuffer);
+            data->t0E = ValidateTrainerTowerData((struct EReaderTrainerTowerSet *)gDecompressionBuffer);
             sub_800AA80(data->t0E);
             data->state = 16;
             break;
@@ -437,7 +437,7 @@ void sub_8143910(u8 taskId)
             }
             break;
         case 17:
-            if (CEReaderTool_SaveTrainerTower((struct EReaderTrainerHillSet *)gDecompressionBuffer))
+            if (CEReaderTool_SaveTrainerTower((struct EReaderTrainerTowerSet *)gDecompressionBuffer))
             {
                 AddTextPrinterToWindow1(gUnknown_841DE99);
                 ResetDelayTimer(&data->t00);
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 193c2dd47..0f9907e2d 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -38,7 +38,7 @@
 struct UnkStruct_203F458
 {
     /* 0x0000 */ u8 floorIdx;
-    /* 0x0004 */ struct EReaderTrainerHillSet unk_0004;
+    /* 0x0004 */ struct EReaderTrainerTowerSet unk_0004;
 };
 
 struct TrainerTowerOpponent
@@ -435,7 +435,7 @@ static const u8 sKnockoutChallengeMonIdxs[][3] = {
     {0x01, 0x04, 0x05}
 };
 
-extern const struct EReaderTrainerHillSetSubstruct gUnknown_84827AC;
+extern const struct EReaderTrainerTowerSetSubstruct gUnknown_84827AC;
 extern const struct TrainerTowerFloor *const gUnknown_84827B4[][MAX_TRAINER_TOWER_FLOORS];
 
 void CallTrainerTowerFunc(void)
@@ -527,8 +527,8 @@ static void SetUpTrainerTowerDataStruct(void) // fakematching
     else
     {
         struct UnkStruct_203F458 * r0_ = sTrainerTowerState;
-        const struct EReaderTrainerHillSetSubstruct * r1 = &gUnknown_84827AC;
-        memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerHillSetSubstruct));
+        const struct EReaderTrainerTowerSetSubstruct * r1 = &gUnknown_84827AC;
+        memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerTowerSetSubstruct));
         r7 = gUnknown_84827B4[challengeType];
         for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++)
         {