Merge branch 'master' into unkk_020851B8

# Conflicts:
#	arm9/asm/unk_020851B8.s

1 files changed, 15 insertions, 15 deletions

diff --git a/include/game_init.h b/include/game_init.h
index 7a6e34fb..bf6569c4 100644
--- a/include/game_init.h
+++ b/include/game_init.h
@@ -9,26 +9,26 @@ void FUN_02015EF4(void);
 void Main_SetVBlankIntrCB(void (*a0)(void *), void * a1);
 void FUN_02015F1C(void);
 BOOL FUN_02015F34(void (*a0)(void *), void * a1);
-void FUN_02015F6C(void);
-void Main_HBlankIntr(BOOL a0);
+void Main_CallHBlankCallback(void);
+void Main_ToggleHBlankInterrupt(BOOL enableFlag);
 void FUN_02015FC8(void);
 void InitSystemForTheGame(void);
 void InitGraphicMemory(void);
-void * FUN_020161A4(u32 heap_id, const char * path);
-void FUN_020161F8(const char * path, void ** ptr);
-u32 FUN_02016230(const s8 * str);
-int FUN_020162A0(u32 a0);
-int FUN_020162C8(void * a0, u32 a1);
-void FUN_020162FC(void);
-void * FUN_02016324(const s8 * str, u32 heap_id);
-void FUN_020163BC(void);
+void * AllocAndReadFile(u32 heap_id, const char * path);
+void OpenAndReadWholeFile(const char * path, void ** ptr);
+u32 GetFilenameHash(const s8 * str);
+int GetFileCacheId(u32 hash);
+int AddFileToCache(void * contents, u32 hash);
+void ClearFileCache(void);
+void * OpenFileCached(const s8 * str, u32 heap_id);
+void InitKeypadAndTouchpad(void);
 void FUN_02016438(u8 a0);
 void FUN_02016444(u8 a0);
 void FUN_02016454(u8 a0);
-void FUN_02016464(void);
-void FUN_02016568(void);
-void FUN_0201669C(int x, int y);
-void FUN_020166A8(u8 a0);
-void FUN_020166B8(u8 a0);
+void ReadKeypadAndTocuhpad(void);
+void ApplyButtonModeToInput(void);
+void SetKeyRepeatTimers(int continueDelay, int startDelay);
+void SetSoftResetDisableMask(u8 a0);
+void ClearSoftResetDisableMask(u8 a0);
 
 #endif //POKEDIAMOND_GAME_INIT_H