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

2 files changed, 19 insertions, 1 deletions

diff --git a/arm9/lib/src/OS_arena.c b/arm9/lib/src/OS_arena.c
index eb04e60b..ae05b49c 100644
--- a/arm9/lib/src/OS_arena.c
+++ b/arm9/lib/src/OS_arena.c
@@ -5,8 +5,8 @@
 #include "consts.h"

 #include "OS_arena.h"

 #include "OS_protectionRegion.h"

+#include "OS_emulator.h"

 

-extern u32 OS_GetConsoleType();

 extern BOOL OSi_MainExArenaEnabled;

 extern BOOL OSi_Initialized;  // TODO: located at 0x021d36f0

 void SDK_MAIN_ARENA_LO(); // TODO: technically this should be defined in the lcf

diff --git a/arm9/lib/src/OS_emulator.c b/arm9/lib/src/OS_emulator.c
new file mode 100644
index 00000000..1be0e163
--- /dev/null
+++ b/arm9/lib/src/OS_emulator.c
@@ -0,0 +1,18 @@
+//
+// Created by red031000 on 2020-05-05.
+//
+
+#include "OS_emulator.h"
+#include "function_target.h"
+
+extern u32 OSi_ConsoleTypeCache; //todo fix bss
+
+ARM_FUNC BOOL OS_IsRunOnEmulator() {
+    return FALSE;
+}
+
+ARM_FUNC u32 OS_GetConsoleType() {
+    OSi_ConsoleTypeCache = OS_CONSOLE_NITRO | OS_CONSOLE_DEV_CARD | OS_CONSOLE_SIZE_4MB;
+
+    return OSi_ConsoleTypeCache;
+}