diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h
index 27357e99c..0e802bba8 100644
--- a/include/constants/trainer_hill.h
+++ b/include/constants/trainer_hill.h
@@ -37,8 +37,9 @@
 #define TRAINER_HILL_TEXT_PLAYER_WON   4
 #define TRAINER_HILL_TEXT_AFTER        5
 
-#define NUM_TRAINER_HILL_TRAINERS     (NUM_TRAINER_HILL_FLOORS * 2)
-#define NUM_TRAINER_HILL_TRAINERS_JP  (NUM_TRAINER_HILL_FLOORS_JP * 2)
+#define TRAINER_HILL_TRAINERS_PER_FLOOR 2
+#define NUM_TRAINER_HILL_TRAINERS     (NUM_TRAINER_HILL_FLOORS * TRAINER_HILL_TRAINERS_PER_FLOOR)
+#define NUM_TRAINER_HILL_TRAINERS_JP  (NUM_TRAINER_HILL_FLOORS_JP * TRAINER_HILL_TRAINERS_PER_FLOOR)
 
 // Values returned by TrainerHillGetChallengeStatus
 #define TRAINER_HILL_PLAYER_STATUS_LOST 0
diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
index 7cced65cb..937cfaca1 100755
--- a/include/ereader_helpers.h
+++ b/include/ereader_helpers.h
@@ -5,24 +5,23 @@
 
 struct EReaderTrainerHillTrainer
 {
-    u8 unk0;
-    struct TrainerHillTrainer unk4;
-    struct TrHillDisplay unk14C;
+    u8 trainerNum;
+    struct TrainerHillTrainer trainer;
+    struct TrHillDisplay display;
     u32 checksum;
 }; // size=0x274
 
 struct EReaderTrainerHillSet
 {
-    u8 count;
+    u8 numTrainers;
     u8 id;
-    u16 dummy;
     u32 checksum;
-    struct EReaderTrainerHillTrainer unk_8[6];
+    struct EReaderTrainerHillTrainer trainers[6];
     u8 unk_ec0[40];
 }; // size = 0xf00
 
-bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer);
-bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0);
+bool8 ValidateTrainerHillData(struct EReaderTrainerHillSet *);
+bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *);
 bool32 ReadTrainerHillAndValidate(void);
 int EReaderHandleTransfer(u8, size_t, const void *, void *);
 void EReaderHelper_Timer3Callback(void);
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index 4db62c847..eef2a15d8 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -14,6 +14,7 @@
 #include "constants/trainers.h"
 #include "constants/moves.h"
 #include "constants/items.h"
+#include "constants/trainer_hill.h"
 
 enum {
     EREADER_XFR_STATE_INIT = 0,
@@ -419,127 +420,131 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
     },
 };
 
-static u8 sub_81D38D4(void)
+static u8 GetTrainerHillUnkVal(void)
 {
     return (gSaveBlock1Ptr->trainerHill.unused + 1) % 256;
 }
 
-static bool32 Struct_EReaderTrainerHillTrainer_ValidateChecksum(struct EReaderTrainerHillTrainer *arg0)
+static bool32 ValidateTrainerChecksum(struct EReaderTrainerHillTrainer * hillTrainer)
 {
-    int checksum = CalcByteArraySum((u8 *)arg0, 0x270);
-    if (checksum != arg0->checksum)
+    int checksum = CalcByteArraySum((u8 *)hillTrainer, offsetof(typeof(*hillTrainer), checksum));
+    if (checksum != hillTrainer->checksum)
         return FALSE;
 
     return TRUE;
 }
 
-bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer)
+bool8 ValidateTrainerHillData(struct EReaderTrainerHillSet * hillSet)
 {
     u32 i;
     u32 checksum;
-    int var0 = buffer->count;
-    if (var0 < 1 || var0 > 8)
+    int numTrainers = hillSet->numTrainers;
+
+    // Validate number of trainers
+    if (numTrainers < 1 || numTrainers > NUM_TRAINER_HILL_TRAINERS)
         return FALSE;
 
-    for (i = 0; i < var0; i++)
+    // Validate trainers
+    for (i = 0; i < numTrainers; i++)
     {
-        if (!Struct_EReaderTrainerHillTrainer_ValidateChecksum(&buffer->unk_8[i]))
+        if (!ValidateTrainerChecksum(&hillSet->trainers[i]))
             return FALSE;
     }
 
-    checksum = CalcByteArraySum((u8 *)buffer->unk_8, var0 * sizeof(struct EReaderTrainerHillTrainer));
-    if (checksum != buffer->checksum)
+    // Validate checksum
+    checksum = CalcByteArraySum((u8 *)hillSet->trainers, numTrainers * sizeof(struct EReaderTrainerHillTrainer));
+    if (checksum != hillSet->checksum)
         return FALSE;
 
     return TRUE;
 }
 
-static bool32 TrainerHill_VerifyChecksum(struct EReaderTrainerHillSet *buffer)
+static bool32 ValidateTrainerHillChecksum(struct EReaderTrainerHillSet *hillSet)
 {
     u32 checksum;
-    int var0 = buffer->count;
-    if (var0 < 1 || var0 > 8)
+    int numTrainers = hillSet->numTrainers;
+    if (numTrainers < 1 || numTrainers > NUM_TRAINER_HILL_TRAINERS)
         return FALSE;
 
-    checksum = CalcByteArraySum((u8 *)buffer->unk_8, sizeof(struct EReaderTrainerHillSet) - offsetof(struct EReaderTrainerHillSet, unk_8));
-    if (checksum != buffer->checksum)
+    checksum = CalcByteArraySum((u8 *)hillSet->trainers, sizeof(struct EReaderTrainerHillSet) - offsetof(struct EReaderTrainerHillSet, trainers));
+    if (checksum != hillSet->checksum)
         return FALSE;
 
     return TRUE;
 }
 
-static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *ttdata, struct TrHillTag *buffer2)
+static bool32 TryWriteTrainerHill_Internal(struct EReaderTrainerHillSet * hillSet, struct TrHillTag * hillTag)
 {
     int i;
 
-    AGB_ASSERT_EX(ttdata->dummy == 0, "cereader_tool.c", 450);
-    AGB_ASSERT_EX(ttdata->id == 0, "cereader_tool.c", 452);
+    AGB_ASSERT_EX(hillSet->dummy == 0, "cereader_tool.c", 450);
+    AGB_ASSERT_EX(hillSet->id == 0, "cereader_tool.c", 452);
 
-    memset(buffer2, 0, 0x1000);
-    buffer2->numTrainers = ttdata->count;
-    buffer2->unused1 = sub_81D38D4();
-    buffer2->numFloors = (ttdata->count + 1) / 2;
+    memset(hillTag, 0, SECTOR_SIZE);
+    hillTag->numTrainers = hillSet->numTrainers;
+    hillTag->unused1 = GetTrainerHillUnkVal();
+    hillTag->numFloors = (hillSet->numTrainers + 1) / TRAINER_HILL_TRAINERS_PER_FLOOR;
 
-    for (i = 0; i < ttdata->count; i++)
+    for (i = 0; i < hillSet->numTrainers; i++)
     {
         if (!(i & 1))
         {
-            buffer2->floors[i / 2].trainerNum1 = ttdata->unk_8[i].unk0;
-            buffer2->floors[i / 2].display = ttdata->unk_8[i].unk14C;
-            buffer2->floors[i / 2].trainers[0] = ttdata->unk_8[i].unk4;
+            hillTag->floors[i / TRAINER_HILL_TRAINERS_PER_FLOOR].trainerNum1 = hillSet->trainers[i].trainerNum;
+            hillTag->floors[i / TRAINER_HILL_TRAINERS_PER_FLOOR].display = hillSet->trainers[i].display;
+            hillTag->floors[i / TRAINER_HILL_TRAINERS_PER_FLOOR].trainers[0] = hillSet->trainers[i].trainer;
         }
         else
         {
-            buffer2->floors[i / 2].trainerNum2 = ttdata->unk_8[i].unk0;
-            buffer2->floors[i / 2].trainers[1] = ttdata->unk_8[i].unk4;
+            hillTag->floors[i / TRAINER_HILL_TRAINERS_PER_FLOOR].trainerNum2 = hillSet->trainers[i].trainerNum;
+            hillTag->floors[i / TRAINER_HILL_TRAINERS_PER_FLOOR].trainers[1] = hillSet->trainers[i].trainer;
         }
     }
 
     if (i & 1)
     {
-        buffer2->floors[i / 2].trainers[1] = sTrainerHillTrainerTemplates_JP[i / 2];
+        hillTag->floors[i / TRAINER_HILL_TRAINERS_PER_FLOOR].trainers[1] = sTrainerHillTrainerTemplates_JP[i / TRAINER_HILL_TRAINERS_PER_FLOOR];
     }
 
-    buffer2->checksum = CalcByteArraySum((u8 *)buffer2->floors, 4 * sizeof(struct TrHillFloor));
-    if (TryWriteSpecialSaveSection(SECTOR_ID_TRAINER_HILL, (u8 *)buffer2) != SAVE_STATUS_OK)
+    hillTag->checksum = CalcByteArraySum((u8 *)hillTag->floors, NUM_TRAINER_HILL_FLOORS * sizeof(struct TrHillFloor));
+    if (TryWriteSpecialSaveSection(SECTOR_ID_TRAINER_HILL, (u8 *)hillTag) != SAVE_STATUS_OK)
         return FALSE;
 
     return TRUE;
 }
 
-bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0)
+bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet * hillSet)
 {
-    void *var0 = AllocZeroed(0x1000);
-    bool32 result = TryWriteTrainerHill_r(arg0, var0);
-    Free(var0);
+    void *buffer = AllocZeroed(SECTOR_SIZE);
+    bool32 result = TryWriteTrainerHill_Internal(hillSet, buffer);
+    Free(buffer);
     return result;
 }
 
-static bool32 TryReadTrainerHill_r(struct EReaderTrainerHillSet *dst, u8 *buffer)
+static bool32 TryReadTrainerHill_Internal(struct EReaderTrainerHillSet * dest, u8 * buffer)
 {
     if (TryReadSpecialSaveSection(SECTOR_ID_TRAINER_HILL, buffer) != SAVE_STATUS_OK)
         return FALSE;
 
-    memcpy(dst, buffer, sizeof(struct EReaderTrainerHillSet));
-    if (!TrainerHill_VerifyChecksum(dst))
+    memcpy(dest, buffer, sizeof(struct EReaderTrainerHillSet));
+    if (!ValidateTrainerHillChecksum(dest))
         return FALSE;
 
     return TRUE;
 }
 
-static bool32 TryReadTrainerHill(struct EReaderTrainerHillSet *arg0)
+static bool32 TryReadTrainerHill(struct EReaderTrainerHillSet * hillSet)
 {
-    u8 *var0 = AllocZeroed(0x1000);
-    bool32 result = TryReadTrainerHill_r(arg0, var0);
-    Free(var0);
+    u8 *buffer = AllocZeroed(SECTOR_SIZE);
+    bool32 result = TryReadTrainerHill_Internal(hillSet, buffer);
+    Free(buffer);
     return result;
 }
 
 bool32 ReadTrainerHillAndValidate(void)
 {
-    struct EReaderTrainerHillSet *var0 = AllocZeroed(0x1000);
-    bool32 result = TryReadTrainerHill(var0);
-    Free(var0);
+    struct EReaderTrainerHillSet *hillSet = AllocZeroed(SECTOR_SIZE);
+    bool32 result = TryReadTrainerHill(hillSet);
+    Free(hillSet);
     return result;
 }
 
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index d79b23b93..438c4bec9 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -401,7 +401,7 @@ static void sub_81D5084(u8 taskId)
         }
         break;
     case 15:
-        data->unkE = EReader_IsReceivedDataValid((struct EReaderTrainerHillSet *)gDecompressionBuffer);
+        data->unkE = ValidateTrainerHillData((struct EReaderTrainerHillSet *)gDecompressionBuffer);
         SetCloseLinkCallbackAndType(data->unkE);
         data->unk8 = 16;
         break;