diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-07-14 08:31:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 08:31:45 +0300 |
| commit | e62dcb7dc070fab232b124510938473cc35a2e78 (patch) | |
| tree | e559d4ac0279f78b740b443a8c3936138dbfd226 /arm9/asm/OS_timer.s | |
| parent | 6ebca13d4c5a290e239364f90bf137c12f332a13 (diff) | |
| parent | d2ff9e5df70f2c6be6a0c822ba2e689f82911911 (diff) | |
Merge pull request #233 from red031000/master
palette padding changes + OS_timer
Diffstat (limited to 'arm9/asm/OS_timer.s')
| -rw-r--r-- | arm9/asm/OS_timer.s | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arm9/asm/OS_timer.s b/arm9/asm/OS_timer.s deleted file mode 100644 index eeeda6ff..00000000 --- a/arm9/asm/OS_timer.s +++ /dev/null @@ -1,21 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .bss - - .global OSi_TimerReserved -OSi_TimerReserved: ; 0x021D37A8 - .space 0x4 - - .text - - arm_func_start OSi_SetTimerReserved -OSi_SetTimerReserved: ; 0x020CCBF0 - ldr r1, _020CCC08 ; =OSi_TimerReserved - mov r2, #0x1 - ldrh r3, [r1, #0x0] - orr r0, r3, r2, lsl r0 - strh r0, [r1, #0x0] - bx lr - .balign 4 -_020CCC08: .word OSi_TimerReserved |