6 files changed, 19 insertions, 27 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
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
diff --git a/arm7/lib/src/OS_init.c b/arm7/lib/src/OS_init.c
index 271d067b..d465aa9a 100644
--- a/arm7/lib/src/OS_init.c
+++ b/arm7/lib/src/OS_init.c
@@ -2,9 +2,8 @@
 #include "OS_init.h"
 
 extern void PXI_Init(void);
-extern void OS_InitTick(void);
-extern void OS_InitAlarm(void);
 extern void OS_InitThread(void);
+extern void OS_InitAlarm(void);
 extern void CTRDG_Init(void);
 
 ARM_FUNC void OS_Init(void)
diff --git a/arm7/lib/src/OS_tick.c b/arm7/lib/src/OS_tick.c
index e45b6833..bc42a54f 100644
--- a/arm7/lib/src/OS_tick.c
+++ b/arm7/lib/src/OS_tick.c
@@ -4,8 +4,6 @@
 #include "OS_timer.h"
 #include "function_target.h"
 
-extern void OSi_SetTimerReserved(u32);
-
 static u16 OSi_UseTick;
 static OSTick OSi_TickCounter;
 static BOOL OSi_NeedResetTimer;
diff --git a/arm7/lib/src/OS_timer.c b/arm7/lib/src/OS_timer.c
new file mode 100644
index 00000000..69a1a6cd
--- /dev/null
+++ b/arm7/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);
+}