8 files changed, 43 insertions, 29 deletions
diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h
new file mode 100644
index 000000000..5d38e9f35
--- /dev/null
+++ b/include/battle_pyramid.h
@@ -0,0 +1,24 @@
+#ifndef GUARD_BATTLE_PYRAMID_H
+#define GUARD_BATTLE_PYRAMID_H
+
+void CallBattlePyramidFunction(void);
+u16 LocalIdToPyramidTrainerId(u8 localId);
+bool8 GetBattlePyramidTrainerFlag(u8 eventId);
+void sub_81A9B04(void);
+void GenerateBattlePyramidWildMon(void);
+u8 GetPyramidRunMultiplier(void);
+u8 InBattlePyramid(void);
+bool8 InBattlePyramid_(void);
+void sub_81A9E90(void);
+void sub_81A9EC8(void);
+void CopyPyramidTrainerSpeechBefore(u16 trainerId);
+void CopyPyramidTrainerWinSpeech(u16 trainerId);
+void CopyPyramidTrainerLoseSpeech(u16 trainerId);
+u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId);
+void sub_81AA078(u16 *mapArg, u8 arg1);
+void sub_81AA1D8(void);
+void sub_81AA2F8(void);
+u8 sub_81AAA40(void);
+u16 GetBattlePyramidPickupItemId(void);
+
+#endif // GUARD_BATTLE_PYRAMID_H
diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h
index 2301b0aa0..48f8de3c0 100644
--- a/include/battle_pyramid_bag.h
+++ b/include/battle_pyramid_bag.h
@@ -34,6 +34,7 @@ struct PyramidBagCursorData
 extern struct PyramidBagResources *gPyramidBagResources;
 extern struct PyramidBagCursorData gPyramidBagCursorData;
 
+void sub_81C4EEC(void);
 void CB2_PyramidBagMenuFromStartMenu(void);
 void sub_81C4F84(void);
 void sub_81C5924(void);
diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h
index e1fec36ea..7539f7240 100644
--- a/include/decoration_inventory.h
+++ b/include/decoration_inventory.h
@@ -1,12 +1,15 @@
 #ifndef GUARD_DECORATION_INVENTORY_H
 #define GUARD_DECORATION_INVENTORY_H
-struct DecorationInventory {
+
+struct DecorationInventory
+{
     u8 *items;
     u8 size;
 };
 
 extern struct DecorationInventory gDecorationInventories[];
 
+void SetDecorationInventoriesPointers(void);
 void ClearDecorationInventories(void);
 s8 GetFirstEmptyDecorSlot(u8 idx);
 u8 CheckHasDecoration(u8);
diff --git a/include/global.h b/include/global.h
index 5a86d5daa..3da68185f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -135,6 +135,7 @@ enum LanguageId
 #define BAG_POKEBALLS_COUNT  16
 #define BAG_TMHM_COUNT       64
 #define BAG_BERRIES_COUNT    46
+#define EVENT_OBJECT_TEMPLATES_COUNT 64
 
 #define PYRAMID_BAG_ITEMS_COUNT 10
 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode.
@@ -442,12 +443,14 @@ struct BattleFrontier
     /*0xE10*/ u8 field_E10_1:3;
     /*0xE10*/ u8 field_E10_2:4;
     /*0xE10*/ u8 field_E10_3:1;
-    /*0xE12*/ u16 field_E12[4];
+    /*0xE12*/ u16 field_E12[3];
+    /*0xE18*/ u16 field_E18;
     /*0xE1A*/ u16 pyramidWinStreaks[2];
     /*0xE1E*/ u16 pyramidRecordStreaks[2];
-    /*0xE1E*/ u16 field_E1F[5];
+    /*0xE22*/ u16 field_E22[4];
+    /*0xE2A*/ u8 field_E2A;
     /*0xE2C*/ struct PyramidBag pyramidBag;
-    /*0xE58*/ u16 field_E58;
+    /*0xE68*/ u8 field_E68;
     /*0xE6A*/ u16 field_E6A;
     /*0xE6C*/ u16 field_E6C;
     /*0xE6E*/ u16 field_E6E;
@@ -905,7 +908,7 @@ struct SaveBlock1
     /*0x9C8*/ u16 trainerRematchStepCounter;
     /*0x9CA*/ u8 trainerRematches[100];
     /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT];
-    /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[64];
+    /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT];
     /*0x1270*/ u8 flags[FLAGS_COUNT];
     /*0x139C*/ u16 vars[VARS_COUNT];
     /*0x159C*/ u32 gameStats[NUM_GAME_STATS];
diff --git a/include/load_save.h b/include/load_save.h
index b8b27ade5..c64a1179b 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -30,6 +30,5 @@ void LoadPlayerBag(void);
 void SavePlayerBag(void);
 void ApplyNewEncryptionKeyToHword(u16 *hWord, u32 newKey);
 void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey);
-void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
 
 #endif // GUARD_LOAD_SAVE_H
diff --git a/include/overworld.h b/include/overworld.h
index 6b38a8782..3e9d42a22 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -73,7 +73,7 @@ void SetFixedHoleWarpAsDestination(s16 x, s16 y);
 void warp1_set_to_sav1w(void);
 void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void sub_8084F6C(u8 a1);
-void sub_8084FAC(void);
+void sub_8084FAC(int unused);
 const struct MapConnection *GetMapConnection(u8 dir);
 static bool8 SetDiveWarp(u8 dir, u16 x, u16 y);
 bool8 SetDiveWarpEmerge(u16 x, u16 y);
diff --git a/include/save.h b/include/save.h
index a5f014904..b151f1064 100644
--- a/include/save.h
+++ b/include/save.h
@@ -54,7 +54,12 @@ enum
     SAVE_HALL_OF_FAME_ERASE_BEFORE // unused
 };
 
-#define SECTION_ID_RECORDED_BATTLE  31
+#define SECTOR_SAVE_SLOT_LENGTH 14
+#define SECTOR_ID_HOF_1 28
+#define SECTOR_ID_HOF_2 29
+#define SECTOR_ID_TRAINER_HILL 30
+#define SECTOR_ID_RECORDED_BATTLE  31
+#define SECTORS_COUNT 32
 
 extern u16 gLastWrittenSector;
 extern u32 gLastSaveCounter;
@@ -72,26 +77,6 @@ extern struct SaveSection gSaveDataBuffer;
 
 void ClearSaveData(void);
 void Save_ResetSaveCounters(void);
-bool32 SetDamagedSectorBits(u8 op, u8 bit);
-u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location);
-u8 HandleWriteSector(u16 a1, const struct SaveSectionLocation *location);
-u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size);
-u8 TryWriteSector(u8 sector, u8 *data);
-u32 RestoreSaveBackupVarsAndIncrement(const struct SaveSectionLocation *location);
-u32 RestoreSaveBackupVars(const struct SaveSectionLocation *location);
-u8 sub_81529D4(u16 a1, const struct SaveSectionLocation *location);
-u8 sub_8152A34(u16 a1, const struct SaveSectionLocation *location);
-u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location);
-u8 sav12_xor_get(u16 a1, const struct SaveSectionLocation *location);
-u8 sub_8152CAC(u16 a1, const struct SaveSectionLocation *location);
-u8 sub_8152D44(u16 a1, const struct SaveSectionLocation *location);
-u8 sub_8152DD0(u16 a1, const struct SaveSectionLocation *location);
-u8 sub_8152E10(u16 a1, const struct SaveSectionLocation *location);
-u8 GetSaveValidStatus(const struct SaveSectionLocation *location);
-u8 sub_81530DC(u8 a1, u8 *data, u16 size);
-u8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section);
-u16 CalculateChecksum(void *data, u16 size);
-void UpdateSaveAddresses(void);
 u8 HandleSavingData(u8 saveType);
 u8 TrySavingData(u8 saveType);
 bool8 sub_8153380(void);
diff --git a/include/save_location.h b/include/save_location.h
index 95b3a7d7d..71dbd3fd8 100644
--- a/include/save_location.h
+++ b/include/save_location.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_SAVE_LOCATION_H
 #define GUARD_SAVE_LOCATION_H
 
-bool32 sub_81AFCEC(void);
 void TrySetMapSaveWarpStatus(void);
 void sub_81AFDA0(void);
 void sub_81AFDD0(void);