diff options
| author | red031000 <rubenru09@aol.com> | 2020-05-12 23:12:35 +0100 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2020-05-12 23:12:35 +0100 |
| commit | 59171916421e659bcb35b1b47eaf748fac2fea6d (patch) | |
| tree | fd5886b4a76002766c94a5d33a1a42fd14335e0e /arm9/asm/OS_emulator.s | |
| parent | 26b7a78d02b261256e420f149bb7bae66e392ee7 (diff) | |
| parent | f4ea052ed0b4e3b0d6a3c12bce46ee53228a9bc0 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into overlay69
Diffstat (limited to 'arm9/asm/OS_emulator.s')
| -rw-r--r-- | arm9/asm/OS_emulator.s | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arm9/asm/OS_emulator.s b/arm9/asm/OS_emulator.s deleted file mode 100644 index 69207a5e..00000000 --- a/arm9/asm/OS_emulator.s +++ /dev/null @@ -1,19 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start OS_GetConsoleType -OS_GetConsoleType: ; 0x020CBBC0 - ldr r0, _020CBBD0 ; =0x82000001 - ldr r1, _020CBBD4 ; =0x02106828 - str r0, [r1, #0x0] - bx lr - .balign 4 -_020CBBD0: .word 0x82000001 -_020CBBD4: .word 0x02106828 - - arm_func_start OS_IsRunOnEmulator -OS_IsRunOnEmulator: - mov r0, #0x0 - bx lr |