8 files changed, 38 insertions, 12 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h
index 78e3f8e43..4c3c23e48 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -4,9 +4,10 @@
 #include "global.h"
 
 u16 sub_8164FCC(u8, u8);
-void sub_80E7524(u32 *);
+void sub_80E7524(struct BattleTowerEReaderTrainer *);
 void ValidateEReaderTrainer(void);
 u8 GetBattleTowerTrainerFrontSpriteId(void);
 u8 GetEreaderTrainerFrontSpriteId(void);
+void CopyEReaderTrainerName5(u8 *dest);
 
 #endif //GUARD_BATTLE_TOWER_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 59dbf8ebb..9e34127f9 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -95,13 +95,13 @@
 #define VAR_ENIGMA_BERRY_AVAILABLE 0x4033
 
 #define VAR_0x4034                 0x4034
-#define VAR_0x4035                 0x4035
-#define VAR_STORAGE_UNKNOWN        0x4036
+#define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035
+#define VAR_RESORT_GOREGOUS_REQUESTED_MON 0x4036
 #define VAR_0x4037                 0x4037
 #define VAR_0x4038                 0x4038
 #define VAR_0x4039                 0x4039
 #define VAR_ELEVATOR_FLOOR         0x403A
-#define VAR_0x403B                 0x403B
+#define VAR_RESORT_GOREGOUS_REWARD                 0x403B
 #define VAR_0x403C                 0x403C
 #define VAR_0x403D                 0x403D
 #define VAR_DEOXYS_INTERACTION_NUM 0x403E
diff --git a/include/field_camera.h b/include/field_camera.h
index d67523c8f..d2165780a 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -27,5 +27,8 @@ extern u16 gUnknown_03005DE8;
 void DrawWholeMapView(void);
 void CurrentMapDrawMetatileAt(int x, int y);
 void sub_805A658(s16 *x, s16 *y);
+void SetCameraPanningCallback(void (*cb)(void));
+void SetCameraPanning(s16 x, s16 y);
+void InstallCameraPanAheadCallback(void);
 
 #endif //GUARD_FIELD_CAMERA_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index baed87ac6..40d7ed933 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -94,6 +94,7 @@ void npc_paltag_set_load(u8 mode);
 bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject);
 u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject);
 u8 sub_8063F84(u8 direction);
+void CameraObjectSetFollowedObjectId(u8 spriteId);
 
 // Exported data declarations
 
diff --git a/include/global.h b/include/global.h
index 57035ce30..5c4501be3 100644
--- a/include/global.h
+++ b/include/global.h
@@ -194,6 +194,11 @@ struct LinkBattleRecords
     u8 languages[LINK_B_RECORDS_COUNT];
 };
 
+#include "constants/game_stat.h"
+#include "global.fieldmap.h"
+#include "global.berry.h"
+#include "pokemon.h"
+
 struct UnknownSaveBlock2Struct
 {
     u8 field_0;
@@ -214,6 +219,20 @@ struct UnknownSaveBlock2Struct
     u8 field_EB;
 }; // sizeof = 0xEC
 
+struct BattleTowerEReaderTrainer
+{
+    /*0x4A0 0x3F0 0x00*/ u8 unk0;
+    /*0x4A1 0x3F1 0x01*/ u8 facilityClass;
+    /*0x4A2 0x3F2 0x02*/ u16 winStreak;
+    /*0x4A4 0x3F4 0x04*/ u8 name[8];
+    /*0x4AC 0x3FC 0x0C*/ u8 trainerId[4];
+    /*0x4B0 0x400 0x10*/ u16 greeting[6];
+    /*0x4BC 0x40C 0x1C*/ u16 farewellPlayerLost[6];
+    /*0x4C8 0x418 0x28*/ u16 farewellPlayerWon[6];
+    /*0x4D4 0x424 0x34*/ struct BattleTowerPokemon party[3];
+    /*0x558 0x4A8 0xB8*/ u32 checksum;
+};
+
 struct UnkSaveBlock2Substruct_55C
 {
     /* 0x000:0x55C */ u8 unk_00_0:1;
@@ -232,7 +251,7 @@ struct UnkSaveBlock2Substruct_55C
 struct UnkSaveBlock2Substruct_B0
 {
     /* 0x000:0x0B0 */ u8 field_0[0x3F0];
-    /* 0x3F0:0x4A0 */ u32 field_3F0[0x2F];
+    /* 0x3F0:0x4A0 */ struct BattleTowerEReaderTrainer field_3F0;
     /* 0x4AC:0x55C */ struct UnkSaveBlock2Substruct_55C field_4AC;
     /* 0x4C4:0x574 */ u8 field_4C4[0x324];
 }; // size: 0x7E8
@@ -261,7 +280,6 @@ struct SaveBlock2
     /*0x0A8*/ u32 field_A8;
     /*0x0AC*/ u8 field_AC;
     /*0x0AD*/ u8 field_AD;
-    /*0x0AE*/ u8 filler_AE[0x2];
     /*0x0B0*/ struct UnkSaveBlock2Substruct_B0 unk_B0;
     /*0x898*/ u16 mapView[0x100];
     /*0xA98*/ struct LinkBattleRecords linkBattleRecords;
@@ -304,11 +322,6 @@ struct SecretBaseRecord
     /*0x1AD0*/ struct SecretBaseParty party;
 };
 
-#include "constants/game_stat.h"
-#include "global.fieldmap.h"
-#include "global.berry.h"
-#include "pokemon.h"
-
 struct WarpData
 {
     s8 mapGroup;
diff --git a/include/pokemon.h b/include/pokemon.h
index c5ee4eda5..77c8191f3 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -346,7 +346,7 @@ struct BattleTowerPokemon
              u32 gap:1;
              u32 abilityNum:1;
     /*0x1C*/ u32 personality;
-    /*0x20*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+    /*0x20*/ u8 nickname[11];
     /*0x2B*/ u8 friendship;
 };
 
diff --git a/include/script_menu.h b/include/script_menu.h
index c1e32beae..d3d04c65d 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -15,5 +15,6 @@ void ScriptMenu_DisplayPCStartupPrompt(void);
 
 bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
 void sub_809D6D4(void);
+void sub_809D424(void);
 
 #endif //GUARD_SCRIPT_MENU_H
diff --git a/include/strings.h b/include/strings.h
index 8f3da98cf..763b9b569 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -475,4 +475,11 @@ extern const u8 gSaveStatName_Time[];
 // mail
 extern const u8 gText_From[];
 
+// field_specials
+extern const u8 gUnknown_8417FBB[];
+extern const u8 gUnknown_8417FC3[];
+extern const u8 gUnknown_8417FD0[];
+extern const u8 gUnknown_8417FCC[];
+extern const u8 gUnknown_8418075[];
+
 #endif //GUARD_STRINGS_H