summaryrefslogtreecommitdiff
path: root/arm7/asm/OS_timer.s
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-02 14:58:16 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-02 14:58:16 -0400
commitda886eccda180fa10389a8299c1f99ea31ebdb9b (patch)
tree3f80e883b8b0f27dcb235bf0c63eeff3faa36222 /arm7/asm/OS_timer.s
parent38571ea575fe718f764803afe917ad973f0e2230 (diff)
parent176340dc54ddb0819390d492dbb88811e2dc5827 (diff)
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm7/asm/OS_timer.s')
-rw-r--r--arm7/asm/OS_timer.s14
1 files changed, 14 insertions, 0 deletions
diff --git a/arm7/asm/OS_timer.s b/arm7/asm/OS_timer.s
new file mode 100644
index 00000000..5794046e
--- /dev/null
+++ b/arm7/asm/OS_timer.s
@@ -0,0 +1,14 @@
+ .include "asm/macros.inc"
+ .include "global.inc"
+
+ .text
+
+ arm_func_start OSi_SetTimerReserved
+OSi_SetTimerReserved: ; 0x037FA348
+ ldr r1, _037FA360 ; =_0380791C
+ ldrh r3, [r1]
+ mov r2, #1
+ orr r0, r3, r2, lsl r0
+ strh r0, [r1]
+ bx lr
+_037FA360: .word _0380791C