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/asm/OS_emulator.s | |
| parent | 59b901298217b6aa2cde46a6f828fb20a23ac758 (diff) | |
| parent | 962b4e0e9505bdf1eafc7679b428977658726042 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
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 |