Fix style inconsistencies

1 files changed, 14 insertions, 13 deletions

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))