diff options
author | Made <made111@gmx.de> | 2020-05-08 23:06:05 +0200 |
---|---|---|
committer | Made <made111@gmx.de> | 2020-05-08 23:06:05 +0200 |
commit | ae744a2ea5a31f19330aedd1e264c88b97873c1c (patch) | |
tree | a30d34cbfba4e518eb6a7d4a52154ed86d41a428 /arm9/asm/OS_emulator.s | |
parent | 6d3d11491cf6e8289822d2c5ba9cd7e309a5ce11 (diff) | |
parent | f76cec09f8a2995244256d4b097d9eed2bebd34a (diff) |
Merge branch 'master' of https://github.com/martmists/pokediamond
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 |