From db95a06ae06d8bb32a3608216876c6253b9a953d Mon Sep 17 00:00:00 2001
From: Bassoonian <iasperbassoonian@gmail.com>
Date: Fri, 2 Feb 2024 15:24:46 +0100
Subject: [PATCH] Fix FREE_TRAINER_HILL

---
 include/config/save.h |  2 +-
 src/ereader_helpers.c |  2 ++
 src/trainer_hill.c    | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/include/config/save.h b/include/config/save.h
index 74fb5686dc..a6d4abd5fc 100644
--- a/include/config/save.h
+++ b/include/config/save.h
@@ -3,7 +3,7 @@
 
 // free saveblock 1 defines
 #define FREE_EXTRA_SEEN_FLAGS               FALSE   // Free up unused Pokédex seen flags (52 bytes).
-#define FREE_TRAINER_HILL                   FALSE   //frees up trainer hill data. 28 bytes.                          WARNING THIS HAS BEEN SHOWN TO BREAK MULTI BATTLES
+#define FREE_TRAINER_HILL                   FALSE   // Frees up Trainer Hill data (28 bytes). WARNING THIS HAS BEEN SHOWN TO BREAK MULTI BATTLES
 #define FREE_MYSTERY_EVENT_BUFFERS          FALSE   //frees up mystery event and ramScript. roughly 1880 bytes       Needed by FREE_BATTLE_TOWER_E_READER
 #define FREE_MATCH_CALL                     FALSE   // Frees up match call and rematch data. (104 bytes).
 #define FREE_UNION_ROOM_CHAT                FALSE   // Frees up union room chat (212 bytes).
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index cf12867667..d28940538f 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -377,6 +377,8 @@ static u8 GetTrainerHillUnkVal(void)
 {
 #if FREE_TRAINER_HILL == FALSE
     return (gSaveBlock1Ptr->trainerHill.unused + 1) % 256;
+#else
+    return 0;
 #endif //FREE_TRAINER_HILL
 }
 
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 3a523e6a2d..aa7c8ee930 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -71,10 +71,14 @@ static void TrainerHillSetMode(void);
 static void SetUpDataStruct(void);
 static void FreeDataStruct(void);
 static void TrainerHillDummy(void);
+#if FREE_TRAINER_HILL == FALSE
 static void SetTimerValue(u32 *dst, u32 val);
 static u32 GetTimerValue(u32 *src);
+#endif //FREE_TRAINER_HILL
 static void SetTrainerHillMonLevel(struct Pokemon *mon, u8 level);
+#if FREE_TRAINER_HILL == FALSE
 static u16 GetPrizeItemId(void);
+#endif //FREE_TRAINER_HILL
 
 // const data
 #include "data/battle_frontier/trainer_hill.h"
@@ -279,7 +283,9 @@ void CallTrainerHillFunction(void)
 
 void ResetTrainerHillResults(void)
 {
+#if FREE_TRAINER_HILL == FALSE
     s32 i;
+#endif //FREE_TRAINER_HILL
 
     gSaveBlock2Ptr->frontier.savedGame = 0;
     gSaveBlock2Ptr->frontier.unk_EF9 = 0;
@@ -526,9 +532,9 @@ static void TrainerHillGetChallengeStatus(void)
 
 static void BufferChallengeTime(void)
 {
+#if FREE_TRAINER_HILL == FALSE
     s32 total, minutes, secondsWhole, secondsFraction;
 
-#if FREE_TRAINER_HILL == FALSE
     total = gSaveBlock1Ptr->trainerHill.timer;
     if (total >= HILL_MAX_TIME)
         total = HILL_MAX_TIME;
@@ -584,6 +590,8 @@ bool8 InTrainerHillChallenge(void)
         return TRUE;
     else
         return FALSE;
+#else
+    return FALSE;
 #endif //FREE_TRAINER_HILL
 }
 
@@ -607,10 +615,10 @@ static void TrainerHillDummy(void)
 
 void PrintOnTrainerHillRecordsWindow(void)
 {
+#if FREE_TRAINER_HILL == FALSE
     s32 i, x, y;
     u32 total, minutes, secondsWhole, secondsFraction;
 
-#if FREE_TRAINER_HILL == FALSE
     SetUpDataStruct();
     FillWindowPixelBuffer(0, PIXEL_FILL(0));
     x = GetStringCenterAlignXOffset(FONT_NORMAL, gText_TimeBoard, 0xD0);
@@ -644,6 +652,7 @@ void PrintOnTrainerHillRecordsWindow(void)
 
 // Leftover from Fire Red / Leaf Green as in these games,
 // the timer had to be xored by the encryption key in Sav2.
+#if FREE_TRAINER_HILL == FALSE
 static u32 GetTimerValue(u32 *src)
 {
     return *src;
@@ -653,6 +662,7 @@ static void SetTimerValue(u32 *dst, u32 val)
 {
     *dst = val;
 }
+#endif //FREE_TRAINER_HILL
 
 void LoadTrainerHillObjectEventTemplates(void)
 {
@@ -1027,6 +1037,7 @@ static void TrainerHillSetMode(void)
 }
 
 // Determines which prize list to use from the set of prize lists.
+#if FREE_TRAINER_HILL == FALSE
 static u8 GetPrizeListId(bool8 allowTMs)
 {
     u8 prizeListId, i, modBy;
@@ -1081,7 +1092,6 @@ static u16 GetPrizeItemId(void)
     else
         i = GetPrizeListId(FALSE);
 
-#if FREE_TRAINER_HILL == FALSE
     // 1 is added to Expert mode's prize list selection because otherwise it has the same prizes as Variety
     if (gSaveBlock1Ptr->trainerHill.mode == HILL_MODE_EXPERT)
         i = (i + 1) % NUM_TRAINER_HILL_PRIZE_LISTS;
@@ -1116,7 +1126,7 @@ static u16 GetPrizeItemId(void)
         id = 4; // ITEM_FLUFFY_TAIL
     else
         id = 5; // ITEM_GREAT_BALL
-#endif //FREE_TRAINER_HILL
 
     return prizeList[id];
 }
+#endif //FREE_TRAINER_HILL