5 files changed, 25 insertions, 11 deletions
diff --git a/arm9/lib/include/FS_archive.h b/arm9/lib/include/FS_archive.h
index baf11add..a86478e8 100644
--- a/arm9/lib/include/FS_archive.h
+++ b/arm9/lib/include/FS_archive.h
@@ -168,7 +168,19 @@ static inline BOOL FSi_IsArchiveUnloading(volatile const FSArchive * p_arc)
     return (p_arc->flag & FS_ARCHIVE_FLAG_UNLOADING) != 0;
 }
 
+static inline BOOL FSi_IsArchiveAsync(volatile const FSArchive * p_arc)
+{
+    return (p_arc->flag & FS_ARCHIVE_FLAG_IS_ASYNC) != 0;
+}
+
+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);
 BOOL FSi_ExecuteSyncCommand(struct FSFile * file);
+BOOL FS_SuspendArchive(FSArchive * p_arc);
+BOOL FS_ResumeArchive(FSArchive * p_arc);
 
 #endif //NITRO_FS_ARCHIVE_H_
diff --git a/arm9/lib/include/FS_file.h b/arm9/lib/include/FS_file.h
index 92e2149e..fdf6c4e2 100644
--- a/arm9/lib/include/FS_file.h
+++ b/arm9/lib/include/FS_file.h
@@ -179,6 +179,7 @@ BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_top, u32 im
 int FS_ReadFile(FSFile * p_file, void * dst, s32 len);
 int FS_ReadFileAsync(FSFile * p_file, void * dst, s32 len);
 BOOL FS_OpenFileFast(FSFile * p_file, FSFileID file_id);
+BOOL FS_CloseFile(FSFile * p_file);
 
 static inline u32 const FS_GetFileImageTop(volatile const FSFile * p_file) {
     return p_file->prop.file.top;
diff --git a/arm9/lib/include/FS_overlay.h b/arm9/lib/include/FS_overlay.h
index 1ef6469c..6025d04a 100644
--- a/arm9/lib/include/FS_overlay.h
+++ b/arm9/lib/include/FS_overlay.h
@@ -45,12 +45,11 @@ static inline u32 const FS_GetOverlayTotalSize(FSOverlayInfo * p_ovi)
     return p_ovi->header.ram_size + p_ovi->header.bss_size;
 }
 
-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_LoadOverlayImage(FSOverlayInfo *p_ovi);
-void    FS_StartOverlay(FSOverlayInfo *p_ovi);
-BOOL    FS_LoadOverlayImageAsync(FSOverlayInfo *p_ovi, FSFile *p_file);
-void    FS_CloseFile(FSFile *p_file);
+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_LoadOverlayImage(FSOverlayInfo *p_ovi);
+void FS_StartOverlay(FSOverlayInfo *p_ovi);
+BOOL FS_LoadOverlayImageAsync(FSOverlayInfo *p_ovi, FSFile *p_file);
 
 #endif //NITRO_FS_OVERLAY_H_
diff --git a/arm9/lib/include/FSi_util.h b/arm9/lib/include/FSi_util.h
index babb6d75..1012df13 100644
--- a/arm9/lib/include/FSi_util.h
+++ b/arm9/lib/include/FSi_util.h
@@ -1,6 +1,10 @@
 #ifndef NITRO_FSI_UTIL_H_
 #define NITRO_FSI_UTIL_H_
 
+#define ALIGN_MASK(a) ((u32)((a) - 1))
+
+#define ALIGN_BYTE(n, a) (((u32)(n) + ALIGN_MASK(a)) & ~ALIGN_MASK(a))
+
 static inline BOOL FSi_IsSlash(u32 c)
 {
     return (c == '/') || (c == '\\');
diff --git a/arm9/lib/include/OS_system.h b/arm9/lib/include/OS_system.h
index 1b263b19..88137c3b 100644
--- a/arm9/lib/include/OS_system.h
+++ b/arm9/lib/include/OS_system.h
@@ -37,9 +37,7 @@ OSProcMode OS_GetProcMode();
 void OS_SpinWait();
 void OS_WaitVBlankIntr();
 void OS_Terminate(void);
-static inline void OS_TPanic(const char * message)
-{
-    OS_Terminate();
-}
+#define OS_TPanic(...) OS_Terminate()
+#define OS_TWarning(...) ((void)0)
 
 #endif //POKEDIAMOND_OS_SYSTEM_H