diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-05 18:09:25 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-05 18:09:25 -0400 |
commit | ecf2ab880b03992b59ca409f933f50f5111165fd (patch) | |
tree | 94ea2cff04f3f82277cc0751c53cd9407e2d787e /arm9/lib/src/OS_arena.c | |
parent | 59b901298217b6aa2cde46a6f828fb20a23ac758 (diff) | |
parent | 962b4e0e9505bdf1eafc7679b428977658726042 (diff) |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/src/OS_arena.c')
-rw-r--r-- | arm9/lib/src/OS_arena.c | 2 |
1 files changed, 1 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
|