From aa6e5b3edc83c5223199fc52e8d92f2f0f4c338e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 9 May 2020 16:09:08 -0400
Subject: Module 01 static initializer; split module 04 ro/data

---
 arm9/lib/include/FS_overlay.h | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'arm9/lib/include/FS_overlay.h')

diff --git a/arm9/lib/include/FS_overlay.h b/arm9/lib/include/FS_overlay.h
index 6025d04a..fd1e2900 100644
--- a/arm9/lib/include/FS_overlay.h
+++ b/arm9/lib/include/FS_overlay.h
@@ -1,6 +1,10 @@
 #ifndef NITRO_FS_OVERLAY_H_
 #define NITRO_FS_OVERLAY_H_
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #include "nitro.h"
 #include "MI_exMemory.h"
 #include "FS_file.h"
@@ -8,7 +12,7 @@
 
 typedef u32 FSOverlayID;
 
-typedef void (*FSOverlayInitFunc) (void);
+typedef void (*FSOverlayInitFunc)(void);
 
 typedef struct FSOverlayInfoHeader
 {
@@ -19,8 +23,8 @@ typedef struct FSOverlayInfoHeader
     FSOverlayInitFunc *sinit_init;
     FSOverlayInitFunc *sinit_init_end;
     u32 file_id;
-    u32 compressed:24;
-    u32 flag:8;
+    u32 compressed: 24;
+    u32 flag: 8;
 } FSOverlayInfoHeader;
 
 typedef struct FSOverlayInfo
@@ -30,26 +34,35 @@ typedef struct FSOverlayInfo
     CARDRomRegion file_pos;
 } FSOverlayInfo;
 
-static inline u8 *const FS_GetOverlayAddress(FSOverlayInfo * p_ovi)
+static inline u8 *const FS_GetOverlayAddress(FSOverlayInfo *p_ovi)
 {
     return p_ovi->header.ram_address;
 }
 
-static inline u32 const FS_GetOverlayImageSize(FSOverlayInfo * p_ovi)
+static inline u32 const FS_GetOverlayImageSize(FSOverlayInfo *p_ovi)
 {
     return p_ovi->header.ram_size;
 }
 
-static inline u32 const FS_GetOverlayTotalSize(FSOverlayInfo * p_ovi)
+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);
 
+#if defined(__cplusplus)
+};
+#endif
+
 #endif //NITRO_FS_OVERLAY_H_
-- 
cgit v1.2.3


From 7b8a6275ebdbb2b6d5023fe8769e08be074f032a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 10 May 2020 14:12:15 -0400
Subject: Tocuh up main.c; key input

---
 arm9/lib/include/FS_overlay.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'arm9/lib/include/FS_overlay.h')

diff --git a/arm9/lib/include/FS_overlay.h b/arm9/lib/include/FS_overlay.h
index fd1e2900..14c7ce66 100644
--- a/arm9/lib/include/FS_overlay.h
+++ b/arm9/lib/include/FS_overlay.h
@@ -12,6 +12,9 @@ extern "C" {
 
 typedef u32 FSOverlayID;
 
+#define	FS_EXTERN_OVERLAY(name)	extern u32 SDK_OVERLAY_ ## name ## _ID[1]
+#define	FS_OVERLAY_ID(name)	((u32)&(SDK_OVERLAY_ ## name ## _ID))
+
 typedef void (*FSOverlayInitFunc)(void);
 
 typedef struct FSOverlayInfoHeader
-- 
cgit v1.2.3