Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work

3 files changed, 31 insertions, 4 deletions

diff --git a/arm9/lib/src/OS_alloc.c b/arm9/lib/src/OS_alloc.c
index 242c5571..e883656e 100644
--- a/arm9/lib/src/OS_alloc.c
+++ b/arm9/lib/src/OS_alloc.c
@@ -2,9 +2,9 @@
 // Created by mart on 4/23/20.

 //

 #include "function_target.h"

-#include "os_alloc.h"

+#include "OS_alloc.h"

 #include "consts.h"

-#include "os_system.h"

+#include "OS_system.h"

 

 void* OSiHeapInfo[OS_ARENA_MAX];

 

diff --git a/arm9/lib/src/OS_arena.c b/arm9/lib/src/OS_arena.c
index 58b338f1..eb04e60b 100644
--- a/arm9/lib/src/OS_arena.c
+++ b/arm9/lib/src/OS_arena.c
@@ -3,8 +3,8 @@
 //

 #include "function_target.h"

 #include "consts.h"

-#include "os_arena.h"

-#include "os_protectionRegion.h"

+#include "OS_arena.h"

+#include "OS_protectionRegion.h"

 

 extern u32 OS_GetConsoleType();

 extern BOOL OSi_MainExArenaEnabled;

diff --git a/arm9/lib/src/OS_protectionRegion.c b/arm9/lib/src/OS_protectionRegion.c
new file mode 100644
index 00000000..4d6cf974
--- /dev/null
+++ b/arm9/lib/src/OS_protectionRegion.c
@@ -0,0 +1,27 @@
+//
+// Created by red031000 on 2020-04-24.
+//
+
+#include "function_target.h"
+#include "OS_protectionRegion.h"
+
+ARM_FUNC asm void OS_SetDPermissionsForProtectionRegion(register u32 setMask, register u32 flags)
+{
+    mrc p15, 0x0, r2, c5, c0, 0x2
+    bic r2, r2, r0
+    orr r2, r2, r1
+    mcr p15, 0x0, r2, c5, c0, 0x2
+    bx lr
+}
+
+ARM_FUNC asm void OS_SetProtectionRegion1(u32 param)
+{
+    mcr p15, 0x0, r0, c6, c1, 0x0
+    bx lr
+}
+
+ARM_FUNC asm void OS_SetProtectionRegion2(u32 param)
+{
+    mcr p15, 0x0, r0, c6, c2, 0x0
+    bx lr
+}