return of the warnings

4 files changed, 42 insertions, 19 deletions

diff --git a/arm9/lib/include/DGT_dgt.h b/arm9/lib/include/DGT_dgt.h
index 1c48531c..bc9cb47e 100644
--- a/arm9/lib/include/DGT_dgt.h
+++ b/arm9/lib/include/DGT_dgt.h
@@ -1,6 +1,6 @@
 #ifndef NITRO_DGT_DGT_H_
 #define NITRO_DGT_DGT_H_
 
-void DGT_Hash2CalcHmac(void* digest, void* bin_ptr, int bin_len, void* key_ptr, int keylen);
+void DGT_Hash2CalcHmac(void* digest, void* bin_ptr, u32 bin_len, void* key_ptr, u32 keylen);
 
 #endif //NITRO_DGT_DGT_H_
diff --git a/arm9/lib/include/FS_archive.h b/arm9/lib/include/FS_archive.h
index d30081d7..3987341c 100644
--- a/arm9/lib/include/FS_archive.h
+++ b/arm9/lib/include/FS_archive.h
@@ -146,8 +146,6 @@ typedef struct FSArchive
     u32 proc_flag;
 } FSArchive;
 
-FSArchive * const FS_FindArchive(const char * path, int offset);
-
 static inline BOOL FS_IsArchiveLoaded(volatile const FSArchive * p_arc)
 {
     return (p_arc->flag & FS_ARCHIVE_FLAG_LOADED) ? TRUE : FALSE;
@@ -198,15 +196,25 @@ static inline BOOL FS_IsArchiveTableLoaded(volatile const FSArchive * p_arc)
     return (p_arc->flag & FS_ARCHIVE_FLAG_TABLE_LOAD) ? TRUE : FALSE;
 }
 
-BOOL FSi_SendCommand(struct FSFile * file, FSCommandType command);
+u32 FSi_GetPackedName(const char * name, int name_len);
+FSResult FSi_ReadMemCallback(struct FSArchive * p_arc, void * dest, u32 pos, u32 size);
+FSResult FSi_WriteMemCallback(struct FSArchive * p_arc, const void * src, u32 pos, u32 size);
+FSResult FSi_ReadMemoryCore(struct FSArchive * p_arc, void * dest, u32 pos, u32 size);
+struct FSFile * FSi_NextCommand(struct FSArchive * p_arc);
+void FSi_ExecuteAsyncCommand(struct FSFile * p_file);
 BOOL FSi_ExecuteSyncCommand(struct FSFile * file);
-BOOL FS_SuspendArchive(FSArchive * p_arc);
-BOOL FS_ResumeArchive(FSArchive * p_arc);
-void FS_NotifyArchiveAsyncEnd(FSArchive *p_arc, FSResult ret);
-BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int name_len);
-void FS_InitArchive(FSArchive * p_arc);
+BOOL FSi_SendCommand(struct FSFile * file, FSCommandType command);
+void FS_InitArchive(struct FSArchive * p_arc);
+struct FSArchive * const FS_FindArchive(const char * path, int offset);
+BOOL FS_RegisterArchiveName(struct FSArchive * p_arc, const char * name, int name_len);
+void FS_ReleaseArchiveName(struct FSArchive * p_arc);
+BOOL FS_LoadArchive(struct FSArchive * p_arc, u32 base, u32 fat, u32 fat_size, u32 fnt, u32 fnt_size, FS_ARCHIVE_READ_FUNC read_func, FS_ARCHIVE_WRITE_FUNC write_func);
+BOOL FS_UnloadArchive(struct FSArchive * p_arc);
+u32 FS_LoadArchiveTables(struct FSArchive *p_arc, void *p_mem, u32 max_size);
+void * FS_UnloadArchiveTables(struct FSArchive * p_arc);
+BOOL FS_SuspendArchive(struct FSArchive * p_arc);
+BOOL FS_ResumeArchive(struct FSArchive * p_arc);
 void FS_SetArchiveProc(struct FSArchive * p_arc, FS_ARCHIVE_PROC_FUNC proc, u32 flags);
-BOOL FS_LoadArchive(FSArchive * p_arc, u32 base, u32 fat, u32 fat_size, u32 fnt, u32 fnt_size, FS_ARCHIVE_READ_FUNC read_func, FS_ARCHIVE_WRITE_FUNC write_func);
-u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size);
+void FS_NotifyArchiveAsyncEnd(struct FSArchive *p_arc, FSResult ret);
 
 #endif //NITRO_FS_ARCHIVE_H_
diff --git a/arm9/lib/include/FS_overlay.h b/arm9/lib/include/FS_overlay.h
index 14c7ce66..203f555f 100644
--- a/arm9/lib/include/FS_overlay.h
+++ b/arm9/lib/include/FS_overlay.h
@@ -52,17 +52,19 @@ static inline u32 const FS_GetOverlayTotalSize(FSOverlayInfo *p_ovi)
     return p_ovi->header.ram_size + p_ovi->header.bss_size;
 }
 
+u32 FSi_GetOverlayBinarySize(FSOverlayInfo * p_ovi);
+void FS_ClearOverlayImage(FSOverlayInfo * p_ovi);
+FSFileID FS_GetOverlayFileID(FSOverlayInfo * p_ovi);
+BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id, FSArchive * arc, u32 offset_arm9, u32 len_arm9, u32 offset_arm7, u32 len_arm7);
 BOOL FS_LoadOverlayInfo(FSOverlayInfo *p_ovi, MIProcessor target, FSOverlayID id);
-
-BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id);
-
-BOOL FS_UnloadOverlay(MIProcessor target, FSOverlayID id);
-
+BOOL FS_LoadOverlayImageAsync(FSOverlayInfo *p_ovi, FSFile *p_file);
 BOOL FS_LoadOverlayImage(FSOverlayInfo *p_ovi);
-
+BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, u32 len);
 void FS_StartOverlay(FSOverlayInfo *p_ovi);
-
-BOOL FS_LoadOverlayImageAsync(FSOverlayInfo *p_ovi, FSFile *p_file);
+void FS_EndOverlay(FSOverlayInfo *p_ovi);
+BOOL FS_UnloadOverlayImage(FSOverlayInfo * p_ovi);
+BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id);
+BOOL FS_UnloadOverlay(MIProcessor target, FSOverlayID id);
 
 #if defined(__cplusplus)
 };
diff --git a/arm9/lib/include/custom_allocator.h b/arm9/lib/include/custom_allocator.h
new file mode 100644
index 00000000..828566f7
--- /dev/null
+++ b/arm9/lib/include/custom_allocator.h
@@ -0,0 +1,13 @@
+#ifndef POKEDIAMOND_CUSTOM_ALLOCATOR_H
+#define POKEDIAMOND_CUSTOM_ALLOCATOR_H
+
+#include "types.h"
+
+typedef void * (* AllocFunc)(u32 size);
+typedef void (* FreeFunc)(void * ptr);
+
+void* CallCustomAllocator(u32 size);
+void CallCustomDestructor(void * ptr);
+void SetCustomAllocatorAndDestructor(AllocFunc allocator, FreeFunc destructor);
+
+#endif //POKEDIAMOND_CUSTOM_ALLOCATOR_H