5 files changed, 16 insertions, 11 deletions
diff --git a/arm9/lib/include/OS_init.h b/arm9/lib/include/OS_init.h
index 03ff26d2..7cf21709 100644
--- a/arm9/lib/include/OS_init.h
+++ b/arm9/lib/include/OS_init.h
@@ -6,6 +6,7 @@
 #include "OS_tcm.h"
 #include "OS_spinLock.h"
 #include "OS_context.h"
+#include "OS_timer.h"
 #include "OS_tick.h"
 #include "OS_alarm.h"
 #include "OS_mutex.h"
@@ -22,8 +23,6 @@
 #include "OS_irqTable.h"
 #include "OS_interrupt.h"
 #include "OS_reset.h"
-#include "OS_spinLock.h"
-#include "OS_tick.h"
 
 void OS_Init(void);
 
diff --git a/arm9/lib/include/OS_timer.h b/arm9/lib/include/OS_timer.h
index effa5fc0..4a10041b 100644
--- a/arm9/lib/include/OS_timer.h
+++ b/arm9/lib/include/OS_timer.h
@@ -1,6 +1,9 @@
-#ifndef POKEDIAMOND_OS_TIMER_H
-#define POKEDIAMOND_OS_TIMER_H
+#ifndef POKEDIAMOND_ARM9_OS_TIMER_H
+#define POKEDIAMOND_ARM9_OS_TIMER_H
 
 #include "nitro/OS_timer_shared.h"
+#include "nitro/types.h"
 
-#endif //POKEDIAMOND_OS_TIMER_H
+void OSi_SetTimerReserved(s32 timerNum);
+
+#endif //POKEDIAMOND_ARM9_OS_TIMER_H
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);
+}