Merge pull request #51 from red031000/master

match OS_protectionRegion

6 files changed, 7 insertions, 6 deletions

diff --git a/arm9/lib/include/os.h b/arm9/lib/include/OS.h
index 591d8db0..b152dfb8 100644
--- a/arm9/lib/include/os.h
+++ b/arm9/lib/include/OS.h
@@ -7,10 +7,10 @@
 
 #include "types.h"
 #include "consts.h"
-#include "os_protectionRegion.h"
-#include "os_arena.h"
-#include "os_alloc.h"
-#include "os_system.h"
+#include "OS_protectionRegion.h"
+#include "OS_arena.h"
+#include "OS_alloc.h"
+#include "OS_system.h"
 
 void OS_Init();
 
diff --git a/arm9/lib/include/os_alloc.h b/arm9/lib/include/OS_alloc.h
index 1c4b6122..08fb3224 100644
--- a/arm9/lib/include/os_alloc.h
+++ b/arm9/lib/include/OS_alloc.h
@@ -6,7 +6,7 @@
 #define POKEDIAMOND_OS_ALLOC_H
 
 #include "types.h"
-#include "os_arena.h"
+#include "OS_arena.h"
 
 typedef int OSHeapHandle;
 
diff --git a/arm9/lib/include/os_arena.h b/arm9/lib/include/OS_arena.h
index f1893a3d..f1893a3d 100644
--- a/arm9/lib/include/os_arena.h
+++ b/arm9/lib/include/OS_arena.h
diff --git a/arm9/lib/include/os_protectionRegion.h b/arm9/lib/include/OS_protectionRegion.h
index 7b212934..8e25420a 100644
--- a/arm9/lib/include/os_protectionRegion.h
+++ b/arm9/lib/include/OS_protectionRegion.h
@@ -8,6 +8,7 @@
 #include "types.h"
 #include "consts.h"
 
+void OS_SetDPermissionsForProtectionRegion(register u32 setMask, register u32 flags);
 void OS_SetProtectionRegion1(u32 param);
 void OS_SetProtectionRegion2(u32 param);
 
diff --git a/arm9/lib/include/os_system.h b/arm9/lib/include/OS_system.h
index c7f121bd..c7f121bd 100644
--- a/arm9/lib/include/os_system.h
+++ b/arm9/lib/include/OS_system.h
diff --git a/arm9/lib/include/nitro.h b/arm9/lib/include/nitro.h
index 8cf603f5..8d875653 100644
--- a/arm9/lib/include/nitro.h
+++ b/arm9/lib/include/nitro.h
@@ -8,7 +8,7 @@ extern "C" {
 // Include all nitro files
 #include "types.h"
 #include "consts.h"
-#include "os.h"
+#include "OS.h"
 #include "mmap.h"
 
 #ifdef __cplusplus