Fix style inconsistencies

6 files changed, 97 insertions, 97 deletions

diff --git a/arm9/lib/src/FS_archive.c b/arm9/lib/src/FS_archive.c
index 44a4e451..5928c90b 100644
--- a/arm9/lib/src/FS_archive.c
+++ b/arm9/lib/src/FS_archive.c
@@ -4,11 +4,12 @@
 #include "FSi_util.h"
 #include "MI_memory.h"
 #include "MI_byteAccess.h"
+#include "OS_printf.h"
 
 FSArchive * arc_list = NULL;
 FSDirPos current_dir_pos;
 
-u32 FSi_GetPackedName(const char * name, int name_len)
+ARM_FUNC u32 FSi_GetPackedName(const char * name, int name_len)
 {
     u32 ret = 0;
     if (name_len <= FS_ARCHIVE_NAME_LEN_MAX)
@@ -30,19 +31,19 @@ u32 FSi_GetPackedName(const char * name, int name_len)
     return ret;
 }
 
-FSResult FSi_ReadMemCallback(struct FSArchive * p_arc, void * dest, u32 pos, u32 size)
+ARM_FUNC FSResult FSi_ReadMemCallback(struct FSArchive * p_arc, void * dest, u32 pos, u32 size)
 {
     MI_CpuCopy8((const void *)FS_GetArchiveOffset(p_arc, pos), dest, size);
     return FS_RESULT_SUCCESS;
 }
 
-FSResult FSi_WriteMemCallback(struct FSArchive * p_arc, const void * src, u32 pos, u32 size)
+ARM_FUNC FSResult FSi_WriteMemCallback(struct FSArchive * p_arc, const void * src, u32 pos, u32 size)
 {
     MI_CpuCopy8(src, (void *)FS_GetArchiveOffset(p_arc, pos), size);
     return FS_RESULT_SUCCESS;
 }
 
-FSResult FSi_ReadMemoryCore(FSArchive * p_arc, void * dest, u32 pos, u32 size)
+ARM_FUNC FSResult FSi_ReadMemoryCore(FSArchive * p_arc, void * dest, u32 pos, u32 size)
 {
     MI_CpuCopy8((const void *)pos, dest, size);
     return FS_RESULT_SUCCESS;
@@ -115,7 +116,7 @@ FSFile * FSi_NextCommand(FSArchive * p_arc)
     return NULL;
 }
 
-void FSi_ExecuteAsyncCommand(FSFile * p_file)
+ARM_FUNC void FSi_ExecuteAsyncCommand(FSFile * p_file)
 {
     FSArchive *const p_arc = p_file->arc;
     while (p_file)
@@ -136,7 +137,7 @@ void FSi_ExecuteAsyncCommand(FSFile * p_file)
     }
 }
 
-BOOL FSi_ExecuteSyncCommand(FSFile * p_file)
+ARM_FUNC BOOL FSi_ExecuteSyncCommand(FSFile * p_file)
 {
     FSFile * p_target;
     FSResult ret = FSi_TranslateCommand(p_file, p_file->command);
@@ -147,7 +148,7 @@ BOOL FSi_ExecuteSyncCommand(FSFile * p_file)
     return FS_IsSucceeded(p_file);
 }
 
-BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command)
+ARM_FUNC BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command)
 {
     FSArchive * p_arc = p_file->arc;
     const int bit = 1 << command;
@@ -198,7 +199,7 @@ BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command)
     return FSi_ExecuteSyncCommand(p_file);
 }
 
-void FS_InitArchive(FSArchive * p_arc)
+ARM_FUNC void FS_InitArchive(FSArchive * p_arc)
 {
     MI_CpuClear8(p_arc, sizeof(FSArchive));
     p_arc->sync_q.head = p_arc->sync_q.tail = NULL;
@@ -216,7 +217,7 @@ FSArchive * const FS_FindArchive(const char * name, int name_len)
     return p_arc;
 }
 
-BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int name_len)
+ARM_FUNC BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int name_len)
 {
     BOOL ret = FALSE;
     OSIntrMode bak_psr = OS_DisableInterrupts();
@@ -246,7 +247,7 @@ BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int name_len)
     return ret;
 }
 
-void FS_ReleaseArchiveName(FSArchive * p_arc)
+ARM_FUNC void FS_ReleaseArchiveName(FSArchive * p_arc)
 {
     if (p_arc->name.pack)
     {
@@ -269,7 +270,7 @@ void FS_ReleaseArchiveName(FSArchive * p_arc)
     }
 }
 
-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)
+ARM_FUNC 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)
 {
     p_arc->base = base;
     p_arc->fat_size = fat_size;
@@ -284,7 +285,7 @@ BOOL FS_LoadArchive(FSArchive * p_arc, u32 base, u32 fat, u32 fat_size, u32 fnt,
     return TRUE;
 }
 
-BOOL FS_UnloadArchive(FSArchive * p_arc)
+ARM_FUNC BOOL FS_UnloadArchive(FSArchive * p_arc)
 {
     OSIntrMode bak_psr = OS_DisableInterrupts();
     if (FS_IsArchiveLoaded(p_arc))
@@ -318,7 +319,7 @@ BOOL FS_UnloadArchive(FSArchive * p_arc)
     return TRUE;
 }
 
-u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size)
+ARM_FUNC u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size)
 {
     u32 total_size = ALIGN_BYTE(p_arc->fat_size + p_arc->fnt_size + 32, 32);
     if (total_size <= max_size)
@@ -373,7 +374,7 @@ void * FS_UnloadArchiveTables(FSArchive * p_arc)
     return ret;
 }
 
-BOOL FS_SuspendArchive(FSArchive * p_arc)
+ARM_FUNC BOOL FS_SuspendArchive(FSArchive * p_arc)
 {
     OSIntrMode bak_psr = OS_DisableInterrupts();
     const BOOL bak_stat = !FS_IsArchiveSuspended(p_arc);
@@ -395,7 +396,7 @@ BOOL FS_SuspendArchive(FSArchive * p_arc)
     return bak_stat;
 }
 
-BOOL FS_ResumeArchive(FSArchive * p_arc)
+ARM_FUNC BOOL FS_ResumeArchive(FSArchive * p_arc)
 {
     FSFile * p_target = NULL;
     OSIntrMode bak_psr = OS_DisableInterrupts();
@@ -411,7 +412,7 @@ BOOL FS_ResumeArchive(FSArchive * p_arc)
     return bak_stat;
 }
 
-void FS_SetArchiveProc(struct FSArchive * p_arc, FS_ARCHIVE_PROC_FUNC proc, u32 flags)
+ARM_FUNC void FS_SetArchiveProc(struct FSArchive * p_arc, FS_ARCHIVE_PROC_FUNC proc, u32 flags)
 {
     if (!flags)
         proc = NULL;
@@ -421,7 +422,7 @@ void FS_SetArchiveProc(struct FSArchive * p_arc, FS_ARCHIVE_PROC_FUNC proc, u32
     p_arc->proc_flag = flags;
 }
 
-void FS_NotifyArchiveAsyncEnd(FSArchive *p_arc, FSResult ret)
+ARM_FUNC void FS_NotifyArchiveAsyncEnd(FSArchive *p_arc, FSResult ret)
 {
     if (FSi_IsArchiveAsync(p_arc))
     {
diff --git a/arm9/lib/src/FS_command.c b/arm9/lib/src/FS_command.c
index bc7839d8..818a65ea 100644
--- a/arm9/lib/src/FS_command.c
+++ b/arm9/lib/src/FS_command.c
@@ -3,7 +3,7 @@
 #include "FSi_util.h"
 #include "FS_command.h"
 
-void FSi_ReleaseCommand(FSFile * p_file, FSResult ret)
+ARM_FUNC void FSi_ReleaseCommand(FSFile * p_file, FSResult ret)
 {
     OSIntrMode bak_psr = OS_DisableInterrupts();
     FSi_CutFromList(p_file);
@@ -13,7 +13,7 @@ void FSi_ReleaseCommand(FSFile * p_file, FSResult ret)
     OS_RestoreInterrupts(bak_psr);
 }
 
-FSResult FSi_TranslateCommand(FSFile *p_file, FSCommandType command)
+ARM_FUNC FSResult FSi_TranslateCommand(FSFile *p_file, FSCommandType command)
 {
     FSResult ret;
 
diff --git a/arm9/lib/src/FS_command_default.c b/arm9/lib/src/FS_command_default.c
index 85287fa9..002e1d53 100644
--- a/arm9/lib/src/FS_command_default.c
+++ b/arm9/lib/src/FS_command_default.c
@@ -13,15 +13,15 @@ typedef struct
 }
 FSiSyncReadParam;
 
-FSResult FSi_ReadFileCommand(FSFile * p_file);
-FSResult FSi_WriteFileCommand(FSFile * p_file);
-FSResult FSi_SeekDirCommand(FSFile * p_file);
-FSResult FSi_ReadDirCommand(FSFile * p_file);
-FSResult FSi_FindPathCommand(FSFile * p_file);
-FSResult FSi_GetPathCommand(FSFile * p_file);
-FSResult FSi_OpenFileFastCommand(FSFile * p_file);
-FSResult FSi_OpenFileDirectCommand(FSFile * p_file);
-FSResult FSi_CloseFileCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_ReadFileCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_WriteFileCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_SeekDirCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_ReadDirCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_FindPathCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_GetPathCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_OpenFileFastCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_OpenFileDirectCommand(FSFile * p_file);
+ARM_FUNC FSResult FSi_CloseFileCommand(FSFile * p_file);
 
 FSResult (*const fsi_default_command[])(FSFile *) = {
     [FS_COMMAND_READFILE]       = FSi_ReadFileCommand,
@@ -36,7 +36,7 @@ FSResult (*const fsi_default_command[])(FSFile *) = {
 };
 
 // Case-insensitive string comparison
-u32 FSi_StrNICmp(const char * str1, const char * str2, u32 len)
+ARM_FUNC u32 FSi_StrNICmp(const char * str1, const char * str2, u32 len)
 {
     int i;
     for (i = 0; i < len; i++)
@@ -53,7 +53,7 @@ u32 FSi_StrNICmp(const char * str1, const char * str2, u32 len)
     return 0;
 }
 
-FSResult FSi_ReadTable(FSiSyncReadParam * p, void * dst, u32 len)
+ARM_FUNC FSResult FSi_ReadTable(FSiSyncReadParam * p, void * dst, u32 len)
 {
     FSResult ret;
     FSArchive * const p_arc = p->arc;
@@ -78,7 +78,7 @@ FSResult FSi_ReadTable(FSiSyncReadParam * p, void * dst, u32 len)
     return ret;
 }
 
-FSResult FSi_SeekDirDirect(FSFile * p_dir, u32 id)
+ARM_FUNC FSResult FSi_SeekDirDirect(FSFile * p_dir, u32 id)
 {
     p_dir->stat |= FS_FILE_STATUS_SYNC;
     p_dir->arg.seekdir.pos.arc = p_dir->arc;
@@ -89,7 +89,7 @@ FSResult FSi_SeekDirDirect(FSFile * p_dir, u32 id)
 }
 
 // The actual commands
-FSResult FSi_ReadFileCommand(FSFile * p_file)
+ARM_FUNC FSResult FSi_ReadFileCommand(FSFile * p_file)
 {
     FSArchive *const p_arc = p_file->arc;
     const u32 pos = p_file->prop.file.pos;
@@ -99,7 +99,7 @@ FSResult FSi_ReadFileCommand(FSFile * p_file)
     return (*p_arc->read_func)(p_arc, dst, pos, len);
 }
 
-FSResult FSi_WriteFileCommand(FSFile * p_file)
+ARM_FUNC FSResult FSi_WriteFileCommand(FSFile * p_file)
 {
     FSArchive *const p_arc = p_file->arc;
     const u32 pos = p_file->prop.file.pos;
@@ -109,7 +109,7 @@ FSResult FSi_WriteFileCommand(FSFile * p_file)
     return (*p_arc->write_func)(p_arc, src, pos, len);
 }
 
-FSResult FSi_SeekDirCommand(FSFile * p_dir)
+ARM_FUNC FSResult FSi_SeekDirCommand(FSFile * p_dir)
 {
     FSResult ret;
     FSArchive *const p_arc = p_dir->arc;
@@ -133,7 +133,7 @@ FSResult FSi_SeekDirCommand(FSFile * p_dir)
     return ret;
 }
 
-FSResult FSi_ReadDirCommand(FSFile *p_dir)
+ARM_FUNC FSResult FSi_ReadDirCommand(FSFile *p_dir)
 {
     FSDirEntry *p_entry = p_dir->arg.readdir.p_entry;
     FSResult ret;
@@ -187,7 +187,7 @@ FSResult FSi_ReadDirCommand(FSFile *p_dir)
     return ret;
 }
 
-FSResult FSi_FindPathCommand(FSFile *p_dir)
+ARM_FUNC FSResult FSi_FindPathCommand(FSFile *p_dir)
 {
     const char *path = p_dir->arg.findpath.path;
     const BOOL is_dir = p_dir->arg.findpath.find_directory;
@@ -262,7 +262,7 @@ FSResult FSi_FindPathCommand(FSFile *p_dir)
     return FS_RESULT_SUCCESS;
 }
 
-FSResult FSi_GetPathCommand(FSFile *p_file)
+ARM_FUNC FSResult FSi_GetPathCommand(FSFile *p_file)
 {
     FSArchive *const p_arc = p_file->arc;
 
@@ -425,7 +425,7 @@ FSResult FSi_GetPathCommand(FSFile *p_file)
     return FS_RESULT_SUCCESS;
 }
 
-FSResult FSi_OpenFileFastCommand(FSFile * p_file)
+ARM_FUNC FSResult FSi_OpenFileFastCommand(FSFile * p_file)
 {
     FSArchive *const p_arc = p_file->arc;
     const FSFileID *p_id = &p_file->arg.openfilefast.id;
@@ -453,7 +453,7 @@ FSResult FSi_OpenFileFastCommand(FSFile * p_file)
     }
 }
 
-FSResult FSi_OpenFileDirectCommand(FSFile * p_file)
+ARM_FUNC FSResult FSi_OpenFileDirectCommand(FSFile * p_file)
 {
     p_file->prop.file.top = p_file->arg.openfiledirect.top;
     p_file->prop.file.pos = p_file->arg.openfiledirect.top;
@@ -462,7 +462,7 @@ FSResult FSi_OpenFileDirectCommand(FSFile * p_file)
     return FS_RESULT_SUCCESS;
 }
 
-FSResult FSi_CloseFileCommand(FSFile * p_file)
+ARM_FUNC FSResult FSi_CloseFileCommand(FSFile * p_file)
 {
     return FS_RESULT_SUCCESS;
 }
diff --git a/arm9/lib/src/FS_file.c b/arm9/lib/src/FS_file.c
index 32c07187..5a540885 100644
--- a/arm9/lib/src/FS_file.c
+++ b/arm9/lib/src/FS_file.c
@@ -4,10 +4,10 @@
 #include "FS_file.h"
 #include "FSi_util.h"
 
-extern FSDirPos current_dir_pos;
+ARM_FUNC extern FSDirPos current_dir_pos;
 BOOL is_init = FALSE;
 
-void FS_Init(u32 default_dma_no)
+ARM_FUNC void FS_Init(u32 default_dma_no)
 {
     if (!is_init)
     {
@@ -16,12 +16,12 @@ void FS_Init(u32 default_dma_no)
     }
 }
 
-BOOL FS_IsAvailable(void)
+ARM_FUNC BOOL FS_IsAvailable(void)
 {
     return is_init;
 }
 
-void FS_InitFile(FSFile * p_file)
+ARM_FUNC void FS_InitFile(FSFile * p_file)
 {
     p_file->link.next = p_file->link.prev = NULL;
     OS_InitThreadQueue(p_file->queue);
@@ -88,34 +88,32 @@ static BOOL FSi_FindPath(FSFile * p_dir, const char * path, FSFileID * p_file_id
     return FSi_SendCommand(p_dir, FS_COMMAND_FINDPATH);
 }
 
-int FSi_ReadFileCore(FSFile * p_file, void * dst, s32 len, BOOL async)
+ARM_FUNC int FSi_ReadFileCore(FSFile * p_file, void * dst, s32 len, BOOL async)
 {
+    const s32 pos = p_file->prop.file.pos;
+    const s32 rest = p_file->prop.file.bottom - pos;
+    const u32 org = len;
+    if (len > rest)
+        len = rest;
+    if (len < 0)
+        len = 0;
+    p_file->arg.readfile.dst = dst;
+    p_file->arg.readfile.len_org = org;
+    p_file->arg.readfile.len = len;
+    if (!async)
+        p_file->stat |= FS_FILE_STATUS_SYNC;
+    FSi_SendCommand(p_file, FS_COMMAND_READFILE);
+    if (!async)
     {
-        const s32 pos = (s32)p_file->prop.file.pos;
-        const s32 rest = (s32)p_file->prop.file.bottom - pos;
-        const u32 org = (u32)len;
-        if (len > rest)
-            len = rest;
-        if (len < 0)
-            len = 0;
-        p_file->arg.readfile.dst = dst;
-        p_file->arg.readfile.len_org = org;
-        p_file->arg.readfile.len = (u32)(len);
-        if (!async)
-            p_file->stat |= FS_FILE_STATUS_SYNC;
-        (void)FSi_SendCommand(p_file, FS_COMMAND_READFILE);
-        if (!async)
-        {
-            if (FS_WaitAsync(p_file))
-                len = (s32)p_file->prop.file.pos - pos;
-            else
-                len = -1;
-        }
+        if (FS_WaitAsync(p_file))
+            len = p_file->prop.file.pos - pos;
+        else
+            len = -1;
     }
     return len;
 }
 
-BOOL FS_ConvertPathToFileID(FSFileID * p_file_id, const char * path)
+ARM_FUNC BOOL FS_ConvertPathToFileID(FSFileID * p_file_id, const char * path)
 {
     FSFile dir;
     FS_InitFile(&dir);
@@ -124,7 +122,7 @@ BOOL FS_ConvertPathToFileID(FSFileID * p_file_id, const char * path)
     return TRUE;
 }
 
-BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_top, u32 image_bottom, u32 file_index)
+ARM_FUNC BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_top, u32 image_bottom, u32 file_index)
 {
     p_file->arc = p_arc;
     p_file->arg.openfiledirect.index = file_index;
@@ -137,7 +135,7 @@ BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_top, u32 im
     return TRUE;
 }
 
-BOOL FS_OpenFileFast(FSFile * p_file, FSFileID file_id)
+ARM_FUNC BOOL FS_OpenFileFast(FSFile * p_file, FSFileID file_id)
 {
     if (!file_id.arc)
         return FALSE;
@@ -150,13 +148,13 @@ BOOL FS_OpenFileFast(FSFile * p_file, FSFileID file_id)
     return TRUE;
 }
 
-BOOL FS_OpenFile(FSFile * p_file, const char * path)
+ARM_FUNC BOOL FS_OpenFile(FSFile * p_file, const char * path)
 {
     FSFileID file_id;
     return FS_ConvertPathToFileID(&file_id, path) && FS_OpenFileFast(p_file, file_id);
 }
 
-BOOL FS_CloseFile(FSFile * p_file)
+ARM_FUNC BOOL FS_CloseFile(FSFile * p_file)
 {
     if (!FSi_SendCommand(p_file, FS_COMMAND_CLOSEFILE))
         return FALSE;
@@ -166,7 +164,7 @@ BOOL FS_CloseFile(FSFile * p_file)
     return TRUE;
 }
 
-BOOL FS_WaitAsync(FSFile * p_file)
+ARM_FUNC BOOL FS_WaitAsync(FSFile * p_file)
 {
     BOOL is_owner = FALSE;
     OSIntrMode bak_par = OS_DisableInterrupts();
@@ -198,17 +196,17 @@ BOOL FS_WaitAsync(FSFile * p_file)
     return FS_IsSucceeded(p_file);
 }
 
-int FS_ReadFileAsync(FSFile * p_file, void * dst, s32 len)
+ARM_FUNC int FS_ReadFileAsync(FSFile * p_file, void * dst, s32 len)
 {
     return FSi_ReadFileCore(p_file, dst, len, TRUE);
 }
 
-int FS_ReadFile(FSFile * p_file, void * dst, s32 len)
+ARM_FUNC int FS_ReadFile(FSFile * p_file, void * dst, s32 len)
 {
     return FSi_ReadFileCore(p_file, dst, len, FALSE);
 }
 
-BOOL FS_SeekFile(FSFile * p_file, int offset, FSSeekFileMode origin)
+ARM_FUNC BOOL FS_SeekFile(FSFile * p_file, int offset, FSSeekFileMode origin)
 {
     switch (origin)
     {
@@ -232,7 +230,7 @@ BOOL FS_SeekFile(FSFile * p_file, int offset, FSSeekFileMode origin)
     return TRUE;
 }
 
-BOOL FS_ChangeDir(const char * path)
+ARM_FUNC BOOL FS_ChangeDir(const char * path)
 {
     FSDirPos pos;
     FSFile dir;
diff --git a/arm9/lib/src/FS_overlay.c b/arm9/lib/src/FS_overlay.c
index d2a4677d..79a3b43e 100644
--- a/arm9/lib/src/FS_overlay.c
+++ b/arm9/lib/src/FS_overlay.c
@@ -3,6 +3,7 @@
 #include "DGT_dgt.h"
 #include "OS_cache.h"
 #include "OS_system.h"
+#include "OS_printf.h"
 #include "MI_memory.h"
 #include "MI_uncompress.h"
 #include "FS_rom.h"
@@ -14,7 +15,7 @@
 #define FS_OVERLAY_FLAG_AUTH    0x0002
 #define FS_OVERLAY_DIGEST_SIZE  DGT_HASH2_DIGEST_SIZE
 
-u32 FSi_GetOverlayBinarySize(FSOverlayInfo * p_ovi)
+ARM_FUNC u32 FSi_GetOverlayBinarySize(FSOverlayInfo * p_ovi)
 {
     u32 size = (p_ovi->header.flag & FS_OVERLAY_FLAG_COMP)
         ? p_ovi->header.compressed
@@ -22,7 +23,7 @@ u32 FSi_GetOverlayBinarySize(FSOverlayInfo * p_ovi)
     return size;
 }
 
-void FS_ClearOverlayImage(FSOverlayInfo * p_ovi)
+ARM_FUNC void FS_ClearOverlayImage(FSOverlayInfo * p_ovi)
 {
     u8 * const im_start = FS_GetOverlayAddress(p_ovi);
     u32 const ram_size = FS_GetOverlayImageSize(p_ovi);
@@ -33,7 +34,7 @@ void FS_ClearOverlayImage(FSOverlayInfo * p_ovi)
     MI_CpuFill8(im_start + ram_size, 0, total_size - ram_size);
 }
 
-FSFileID FS_GetOverlayFileID(FSOverlayInfo * p_ovi)
+ARM_FUNC FSFileID FS_GetOverlayFileID(FSOverlayInfo * p_ovi)
 {
     FSFileID ret;
     ret.arc = &fsi_arc_rom;
@@ -41,7 +42,7 @@ FSFileID FS_GetOverlayFileID(FSOverlayInfo * p_ovi)
     return ret;
 }
 
-BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id, FSArchive * arc, u32 offset_arm9, u32 len_arm9, u32 offset_arm7, u32 len_arm7)
+ARM_FUNC BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id, FSArchive * arc, u32 offset_arm9, u32 len_arm9, u32 offset_arm7, u32 len_arm7)
 {
     CARDRomRegion pr[1];
     u32 pos;
@@ -79,7 +80,7 @@ BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target, FSOverla
     return TRUE;
 }
 
-BOOL FS_LoadOverlayInfo(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id)
+ARM_FUNC BOOL FS_LoadOverlayInfo(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id)
 {
     CARDRomRegion * const pr = (target == MI_PROCESSOR_ARM9) ? &fsi_ovt9 : &fsi_ovt7;
     if (pr->offset)
@@ -106,7 +107,7 @@ BOOL FS_LoadOverlayInfo(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID i
     }
 }
 
-BOOL FS_LoadOverlayImageAsync(FSOverlayInfo * p_ovi, FSFile * p_file)
+ARM_FUNC BOOL FS_LoadOverlayImageAsync(FSOverlayInfo * p_ovi, FSFile * p_file)
 {
     FS_InitFile(p_file);
     if (!FS_OpenFileFast(p_file, FS_GetOverlayFileID(p_ovi)))
@@ -124,7 +125,7 @@ BOOL FS_LoadOverlayImageAsync(FSOverlayInfo * p_ovi, FSFile * p_file)
     }
 }
 
-BOOL FS_LoadOverlayImage(FSOverlayInfo * p_ovi)
+ARM_FUNC BOOL FS_LoadOverlayImage(FSOverlayInfo * p_ovi)
 {
     FSFile file[1];
     FS_InitFile(file);
@@ -169,7 +170,7 @@ static const u8 fsi_def_digest_key[64] = {
 static const void *fsi_digest_key_ptr = fsi_def_digest_key;
 static int fsi_digest_key_len = sizeof(fsi_def_digest_key);
 
-BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, int len)
+ARM_FUNC BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, int len)
 {
     int i;
     u8 digest[FS_OVERLAY_DIGEST_SIZE];
@@ -189,7 +190,7 @@ BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, int len)
 extern u8 SDK_OVERLAY_DIGEST[];
 extern u8 SDK_OVERLAY_DIGEST_END[];
 
-void FS_StartOverlay(FSOverlayInfo * p_ovi)
+ARM_FUNC void FS_StartOverlay(FSOverlayInfo * p_ovi)
 {
     u32 rare_size = FSi_GetOverlayBinarySize(p_ovi);
     if (MB_IsMultiBootChild())
@@ -229,7 +230,7 @@ void FS_StartOverlay(FSOverlayInfo * p_ovi)
     }
 }
 
-void FS_EndOverlay(FSOverlayInfo *p_ovi)
+ARM_FUNC void FS_EndOverlay(FSOverlayInfo *p_ovi)
 {
     for (;;)
     {
@@ -295,13 +296,13 @@ void FS_EndOverlay(FSOverlayInfo *p_ovi)
     }
 }
 
-BOOL FS_UnloadOverlayImage(FSOverlayInfo * p_ovi)
+ARM_FUNC BOOL FS_UnloadOverlayImage(FSOverlayInfo * p_ovi)
 {
     FS_EndOverlay(p_ovi);
     return TRUE;
 }
 
-BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id)
+ARM_FUNC BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id)
 {
     FSOverlayInfo ovi;
     if (!FS_LoadOverlayInfo(&ovi, target, id) || !FS_LoadOverlayImage(&ovi))
@@ -310,7 +311,7 @@ BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id)
     return TRUE;
 }
 
-BOOL FS_UnloadOverlay(MIProcessor target, FSOverlayID id)
+ARM_FUNC BOOL FS_UnloadOverlay(MIProcessor target, FSOverlayID id)
 {
     FSOverlayInfo ovi;
     if (!FS_LoadOverlayInfo(&ovi, target, id) || !FS_UnloadOverlayImage(&ovi))
diff --git a/arm9/lib/src/FS_rom.c b/arm9/lib/src/FS_rom.c
index 44d31a4a..32f66c10 100644
--- a/arm9/lib/src/FS_rom.c
+++ b/arm9/lib/src/FS_rom.c
@@ -9,23 +9,23 @@
 
 u32 fsi_default_dma_no;
 
-void FSi_OnRomReadDone(void * p_arc)
+ARM_FUNC void FSi_OnRomReadDone(void * p_arc)
 {
     FS_NotifyArchiveAsyncEnd(p_arc, CARD_IsPulledOut() ? FS_RESULT_ERROR : FS_RESULT_SUCCESS);
 }
 
-FSResult FSi_ReadRomCallback(FSArchive * p_arc, void * dst, u32 src, u32 len)
+ARM_FUNC FSResult FSi_ReadRomCallback(FSArchive * p_arc, void * dst, u32 src, u32 len)
 {
     CARD_ReadRomAsync(fsi_default_dma_no, (const void *)src, dst, len, FSi_OnRomReadDone, p_arc);
     return FS_RESULT_PROC_ASYNC;
 }
 
-FSResult FSi_WriteDummyCallback(FSArchive * p_arc, const void *src, u32 dst, u32 len)
+ARM_FUNC FSResult FSi_WriteDummyCallback(FSArchive * p_arc, const void *src, u32 dst, u32 len)
 {
     return FS_RESULT_FAILURE;
 }
 
-FSResult FSi_RomArchiveProc(FSFile * p_arc, FSCommandType cmd)
+ARM_FUNC FSResult FSi_RomArchiveProc(FSFile * p_arc, FSCommandType cmd)
 {
     switch (cmd)
     {
@@ -42,17 +42,17 @@ FSResult FSi_RomArchiveProc(FSFile * p_arc, FSCommandType cmd)
     }
 }
 
-FSResult FSi_ReadDummyCallback(FSArchive *p_arc, void *dst, u32 src, u32 len)
+ARM_FUNC FSResult FSi_ReadDummyCallback(FSArchive *p_arc, void *dst, u32 src, u32 len)
 {
     return FS_RESULT_FAILURE;
 }
 
-FSResult FSi_EmptyArchiveProc(FSFile *p_file, FSCommandType cmd)
+ARM_FUNC FSResult FSi_EmptyArchiveProc(FSFile *p_file, FSCommandType cmd)
 {
     return FS_RESULT_UNSUPPORTED;
 }
 
-void FSi_InitRom(u32 default_dma_no)
+ARM_FUNC void FSi_InitRom(u32 default_dma_no)
 {
     fsi_default_dma_no = default_dma_no;
     fsi_card_lock_id = OS_GetLockID();
@@ -99,7 +99,7 @@ void FSi_InitRom(u32 default_dma_no)
     }
 }
 
-u32 FS_SetDefaultDMA(u32 dma_no)
+ARM_FUNC u32 FS_SetDefaultDMA(u32 dma_no)
 {
     OSIntrMode bak_psr = OS_DisableInterrupts();
     u32 bak_dma_no = fsi_default_dma_no;
@@ -111,7 +111,7 @@ u32 FS_SetDefaultDMA(u32 dma_no)
     return bak_dma_no;
 }
 
-u32 FS_TryLoadTable(void * p_mem, u32 size)
+ARM_FUNC u32 FS_TryLoadTable(void * p_mem, u32 size)
 {
     return FS_LoadArchiveTables(&fsi_arc_rom, p_mem, size);
 }