Merge branch 'master' into lilycove_lady

include/gpu_regs.h

@@ -0,0 +1,15 @@
+//
+// Created by scott on 9/15/2017.
+//
+
+#ifndef GUARD_GPU_REGS_H
+#define GUARD_GPU_REGS_H
+
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+void ClearGpuRegBits(u8 regOffset, u16 mask);
+
+#endif //GUARD_GPU_REGS_H

include/load_save.h

@@ -18,5 +18,6 @@ void SaveSerializedGame(void);
 void LoadSerializedGame(void);
 void LoadPlayerBag(void);
 void SavePlayerBag(void);
+void SetSaveBlocksPointers(u16);
 
 #endif // GUARD_LOAD_SAVE_H

include/malloc.h

@@ -5,8 +5,10 @@
 #define calloc AllocZeroed
 #define free Free
 
+extern u8 gHeap[];
 void *Alloc(u32 size);
 void *AllocZeroed(u32 size);
 void Free(void *pointer);
+void InitHeap(void *pointer, u32 size);
 
 #endif // GUARD_MALLOC_H

include/new_game.h

@@ -9,5 +9,7 @@ void ClearPokedexFlags(void);
 void WarpToTruck(void);
 void NewGameInitData(void);
 void ResetMiniGamesResults(void);
+void sub_808447C(void);
+void Sav2_ClearSetDefault(void);
 
 #endif // GUARD_NEW_GAME_H

include/rom4.h

@@ -27,5 +27,6 @@ extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
 void strange_npc_table_clear(void);
 const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8);
 void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
+void sub_8086230(void);
 
 #endif //GUARD_ROM4_H

include/save.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_SAVE_H
 #define GUARD_SAVE_H
 
+extern u16 gSaveFileStatus;
+
 struct SaveSectionLocation
 {
     void *data;
@@ -88,5 +90,7 @@ u16 CalculateChecksum(void *, u16);
 //u8 unref_sub_8125FF0(u8 *data, u16 size);
 //u8 unref_sub_8126068(u8 sector, u8 *data, u32 size);
 //u8 unref_sub_8126080(u8 sector, u8 *data);
+u16 sub_815355C(void);
+u8 sub_81534D0(u8);
 
 #endif // GUARD_SAVE_H