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/lib/src | |
| parent | 6ebca13d4c5a290e239364f90bf137c12f332a13 (diff) | |
| parent | d2ff9e5df70f2c6be6a0c822ba2e689f82911911 (diff) | |
Merge pull request #233 from red031000/master
palette padding changes + OS_timer
Diffstat (limited to 'arm9/lib/src')
| -rw-r--r-- | arm9/lib/src/OS_init.c | 4 | ||||
| -rw-r--r-- | arm9/lib/src/OS_tick.c | 2 | ||||
| -rw-r--r-- | arm9/lib/src/OS_timer.c | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/arm9/lib/src/OS_init.c b/arm9/lib/src/OS_init.c index f919f521..a8f36f00 100644 --- a/arm9/lib/src/OS_init.c +++ b/arm9/lib/src/OS_init.c @@ -1,7 +1,3 @@ -// -// Created by mart on 4/12/20. -// - #include "function_target.h" #include "OS_init.h" diff --git a/arm9/lib/src/OS_tick.c b/arm9/lib/src/OS_tick.c index f5f2df30..17192117 100644 --- a/arm9/lib/src/OS_tick.c +++ b/arm9/lib/src/OS_tick.c @@ -8,8 +8,6 @@ static u16 OSi_UseTick = FALSE; vu64 OSi_TickCounter; BOOL OSi_NeedResetTimer = FALSE; -extern void OSi_SetTimerReserved(u32 param1); - ARM_FUNC void OS_InitTick(void) { if (OSi_UseTick) diff --git a/arm9/lib/src/OS_timer.c b/arm9/lib/src/OS_timer.c new file mode 100644 index 00000000..69a1a6cd --- /dev/null +++ b/arm9/lib/src/OS_timer.c @@ -0,0 +1,9 @@ +#include "OS_timer.h" +#include "function_target.h" + +static u16 OSi_TimerReserved = 0; + +ARM_FUNC void OSi_SetTimerReserved(s32 timerNum) +{ + OSi_TimerReserved |= (1 << timerNum); +} |