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 /arm7/lib/include | |
| parent | 6ebca13d4c5a290e239364f90bf137c12f332a13 (diff) | |
| parent | d2ff9e5df70f2c6be6a0c822ba2e689f82911911 (diff) | |
Merge pull request #233 from red031000/master
palette padding changes + OS_timer
Diffstat (limited to 'arm7/lib/include')
| -rw-r--r-- | arm7/lib/include/OS_init.h | 3 | ||||
| -rw-r--r-- | arm7/lib/include/OS_timer.h | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arm7/lib/include/OS_init.h b/arm7/lib/include/OS_init.h index 03d64ae1..6b70d2d8 100644 --- a/arm7/lib/include/OS_init.h +++ b/arm7/lib/include/OS_init.h @@ -2,6 +2,7 @@ #define POKEDIAMOND_ARM7_OS_INIT_H #include "nitro/types.h" +#include "consts.h" #include "OS_system.h" #include "OS_arena.h" #include "OS_alloc.h" @@ -10,6 +11,8 @@ #include "OS_spinLock.h" #include "OS_context.h" #include "OS_interrupt.h" +#include "OS_timer.h" +#include "OS_tick.h" void OS_Init(void); diff --git a/arm7/lib/include/OS_timer.h b/arm7/lib/include/OS_timer.h index fee42c6f..4eddd0c1 100644 --- a/arm7/lib/include/OS_timer.h +++ b/arm7/lib/include/OS_timer.h @@ -1,6 +1,9 @@ -#ifndef POKEDIAMOND_OS_TIMER_H -#define POKEDIAMOND_OS_TIMER_H +#ifndef POKEDIAMOND_ARM7_OS_TIMER_H +#define POKEDIAMOND_ARM7_OS_TIMER_H #include "nitro/OS_timer_shared.h" +#include "nitro/types.h" -#endif +void OSi_SetTimerReserved(s32 timerNum); + +#endif //POKEDIAMOND_ARM7_OS_TIMER_H |