summaryrefslogtreecommitdiff
path: root/arm7/asm/OS_timer.s
diff options
context:
space:
mode:
authorCleverking2003 <30466983+Cleverking2003@users.noreply.github.com>2020-07-14 08:31:45 +0300
committerGitHub <noreply@github.com>2020-07-14 08:31:45 +0300
commite62dcb7dc070fab232b124510938473cc35a2e78 (patch)
treee559d4ac0279f78b740b443a8c3936138dbfd226 /arm7/asm/OS_timer.s
parent6ebca13d4c5a290e239364f90bf137c12f332a13 (diff)
parentd2ff9e5df70f2c6be6a0c822ba2e689f82911911 (diff)
Merge pull request #233 from red031000/master
palette padding changes + OS_timer
Diffstat (limited to 'arm7/asm/OS_timer.s')
-rw-r--r--arm7/asm/OS_timer.s20
1 files changed, 0 insertions, 20 deletions
diff --git a/arm7/asm/OS_timer.s b/arm7/asm/OS_timer.s
deleted file mode 100644
index 434be17a..00000000
--- a/arm7/asm/OS_timer.s
+++ /dev/null
@@ -1,20 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .section .bss
-
- .global _0380791C
-_0380791C: ;0x0380791C
- .space 0x03807920 - 0x0380791C
-
- .section .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