5 files changed, 26 insertions, 6 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h
index a3e1ff28c..fe9d4ae6e 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -98,5 +98,6 @@ void SetEReaderTrainerName(u8*);
 u8 GetEReaderTrainerPicIndex(void);
 u8 GetEReaderTrainerClassNameIndex(void);
 void ValidateEReaderTrainer(void);
+void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderTrainer);
 
 #endif // GUARD_BATTLE_TOWER_H
diff --git a/include/global.berry.h b/include/global.berry.h
index 21a0dd500..8f185c8f9 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -3,7 +3,7 @@
 
 struct Berry
 {
-    /*0x00*/ const u8 name[7];
+    /*0x00*/ u8 name[7];
     /*0x07*/ u8 firmness;
     /*0x08*/ u16 size;
     /*0x0A*/ u8 maxYield;
diff --git a/include/global.h b/include/global.h
index 6dd772795..4b23fded7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -734,9 +734,10 @@ struct Pokedex
 
 struct BattleTowerTrainer
 {
-    u8 trainerClass;
-    u8 name[8];
-    u8 teamFlags;
+    /*0x00*/ u8 trainerClass;
+    /*0x01*/ u8 name[8];
+    /*0x09*/ u8 teamFlags;
+    /*0x0C*/
     struct {
         u16 easyChat[6];
     } greeting;
@@ -756,6 +757,7 @@ struct BattleTowerRecord // record mixing
     /*0xA0*/u32 checksum;
 };
 
+#if 0
 struct BattleTowerEReaderTrainer
 {
     /*0x00*/u8 unk0;
@@ -775,6 +777,21 @@ struct BattleTowerEReaderTrainer
     /*0x34*/struct UnknownPokemonStruct party[3];
     /*0xB8*/u32 checksum;
 };
+#endif
+
+struct BattleTowerEReaderTrainer
+{
+    /*0x00*/ u8 unk0;
+    /*0x01*/ u8 trainerClass;
+    /*0x02*/ u16 winStreak;
+    /*0x04*/ u8 name[8];
+    /*0x0C*/ u8 trainerId[4];
+    /*0x10*/ u16 greeting[6];
+    /*0x1C*/ u16 farewellPlayerLost[6];
+    /*0x28*/ u16 farewellPlayerWon[6];
+    /*0x34*/ struct UnknownPokemonStruct party[3];
+    /*0xB8*/ u32 checksum;
+};
 
 struct BattleTowerData
 {
@@ -831,7 +848,7 @@ struct MapPosition
 {
     s16 x;
     s16 y;
-    u8 height;
+    s8 height;
 };
 
 struct UnkStruct_8054FF8
diff --git a/include/shop.h b/include/shop.h
index 80602e26c..347d46d3c 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -28,7 +28,7 @@ enum
 struct MartInfo
 {
     /* 0x0 */ void (* callback) (void);
-    /* 0x4 */ u16 *itemList;
+    /* 0x4 */ const u16 *itemList;
     /* 0x8 */ u8 itemCount; // how many unique items are there for sale?
     /* 0x9 */ u8 cursor; // this shows the on-screen true index of the cursor and not the current item selected.
     /* 0xA */ u8 numChoices; // how many options does the mart have? can be either 2 or 1 (BUY/SELL vs BUY)
diff --git a/include/start_menu.h b/include/start_menu.h
index d3f77dc99..5e513b9dc 100644
--- a/include/start_menu.h
+++ b/include/start_menu.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_STARTER_CHOOSE_H
 #define GUARD_STARTER_CHOOSE_H
 
+extern u8 (*gMenuCallback)(void);
+
 //Public functions
 void CreateStartMenuTask(void (*func)(u8));
 void sub_80712B4(u8 taskId);