diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
| commit | 8c8a5a07c5e6b1a2d0d0592a30be31ccd140fc1e (patch) | |
| tree | c23120a706d012bd19c4c2584af5009fd2016ecf /arm9/lib/src/OS_emulator.c | |
| parent | e643eddc0def8e4851a4195e8ed4de06c847f52d (diff) | |
| parent | 227da51c377f621f542ffdb52ef56bfb807f29ab (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/src/OS_emulator.c')
| -rw-r--r-- | arm9/lib/src/OS_emulator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/lib/src/OS_emulator.c b/arm9/lib/src/OS_emulator.c index c138b2bc..e92a7d9d 100644 --- a/arm9/lib/src/OS_emulator.c +++ b/arm9/lib/src/OS_emulator.c @@ -5,13 +5,13 @@ #include "OS_emulator.h" #include "function_target.h" -u32 OSi_ConsoleTypeCache = -1u; //todo fix bss +u32 OSi_ConsoleTypeCache = -1u; -ARM_FUNC BOOL OS_IsRunOnEmulator() { +ARM_FUNC BOOL OS_IsRunOnEmulator(void) { return FALSE; } -ARM_FUNC u32 OS_GetConsoleType() { +ARM_FUNC u32 OS_GetConsoleType(void) { OSi_ConsoleTypeCache = OS_CONSOLE_NITRO | OS_CONSOLE_DEV_CARD | OS_CONSOLE_SIZE_4MB; return OSi_ConsoleTypeCache; |