Distribute bss_3.s among code files

15 files changed, 181 insertions, 181 deletions

diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 429695d8..0cfa9f61 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -666,7 +666,19 @@ SECTIONS {
 		OS_thread.o (.bss)
 		OS_arena.o (.bss)
 		OS_alloc.o (.bss)
-		bss_3.o (.bss)
+		OS_exception.o (.bss)
+		OS_timer.o (.bss)
+		OS_tick.o (.bss)
+		OS_alarm.o (.bss)
+		OS_valarm.o (.bss)
+		OS_reset.o (.bss)
+		OS_vramExclusive.o (.bss)
+		MI_dma_gxcommand.o (.bss)
+		SND_main.o (.bss)
+		SND_command.o (.bss)
+		SND_alarm.o (.bss)
+		SND_work.o (.bss)
+		PXI_fifo.o (.bss)
 		FS_archive.o (.bss)
 		FS_file.o (.bss)
 		FS_rom.o (.bss)
diff --git a/arm9/asm/MI_dma_gxcommand.s b/arm9/asm/MI_dma_gxcommand.s
index f72009c8..fdf51ac3 100644
--- a/arm9/asm/MI_dma_gxcommand.s
+++ b/arm9/asm/MI_dma_gxcommand.s
@@ -1,7 +1,11 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_021D37FC
+	.section .bss
+
+	.global UNK_021D37FC
+UNK_021D37FC: ; 0x021D37FC
+	.space 0x20
 
     .text
 
diff --git a/arm9/asm/OS_alarm.s b/arm9/asm/OS_alarm.s
index 62645cc7..9978bfbe 100644
--- a/arm9/asm/OS_alarm.s
+++ b/arm9/asm/OS_alarm.s
@@ -1,6 +1,16 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
+	.section .bss
+
+	.global OSi_UseAlarm
+OSi_UseAlarm: ; 0x021D37BC
+	.space 0x4
+
+	.global OSi_AlarmQueue
+OSi_AlarmQueue: ; 0x021D37C0
+	.space 0x8
+
     .text
 
 	arm_func_start OSi_AlarmHandler
diff --git a/arm9/asm/OS_exception.s b/arm9/asm/OS_exception.s
index 8a078de7..85b378d4 100644
--- a/arm9/asm/OS_exception.s
+++ b/arm9/asm/OS_exception.s
@@ -1,6 +1,24 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
+	.section .bss
+
+	.global OSi_UserExceptionHandler
+OSi_UserExceptionHandler: ; 0x021D371C
+	.space 0x4
+
+	.global OSi_UserExceptionHandlerArg
+OSi_UserExceptionHandlerArg: ; 0x021D3720
+	.space 0x4
+
+	.global OSi_DebuggerHandler
+OSi_DebuggerHandler: ; 0x021D3724
+	.space 0x4
+
+	.global OSi_ExContext
+OSi_ExContext: ; 0x021D3728
+	.space 0x80
+
     .text
 
 	arm_func_start OSi_ExceptionHandler
diff --git a/arm9/asm/OS_tick.s b/arm9/asm/OS_tick.s
index f43c45a1..3891f8c7 100644
--- a/arm9/asm/OS_tick.s
+++ b/arm9/asm/OS_tick.s
@@ -1,6 +1,20 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
+	.section .bss
+
+	.global OSi_UseTick
+OSi_UseTick: ; 0x021D37AC
+	.space 0x4
+
+	.global OSi_NeedResetTimer
+OSi_NeedResetTimer: ; 0x021D37B0
+	.space 0x4
+
+	.global OSi_TickCounter
+OSi_TickCounter: ; 0x021D37B4
+	.space 0x8
+
     .text
 
 	arm_func_start OS_GetTickLo
diff --git a/arm9/asm/OS_timer.s b/arm9/asm/OS_timer.s
index 1f4b8fdd..eeeda6ff 100644
--- a/arm9/asm/OS_timer.s
+++ b/arm9/asm/OS_timer.s
@@ -1,6 +1,12 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
+	.section .bss
+
+	.global OSi_TimerReserved
+OSi_TimerReserved: ; 0x021D37A8
+	.space 0x4
+
     .text
 
 	arm_func_start OSi_SetTimerReserved
diff --git a/arm9/asm/OS_valarm.s b/arm9/asm/OS_valarm.s
index beb9f29b..1b282c71 100644
--- a/arm9/asm/OS_valarm.s
+++ b/arm9/asm/OS_valarm.s
@@ -1,6 +1,24 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
+	.section .bss
+
+	.global OSi_UseVAlarm
+OSi_UseVAlarm: ; 0x021D37C8
+	.space 0x4
+
+	.global OSi_PreviousVCount
+OSi_PreviousVCount: ; 0x021D37CC
+	.space 0x4
+
+	.global OSi_VFrameCount
+OSi_VFrameCount: ; 0x021D37D0
+	.space 0x4
+
+	.global OSi_VAlarmQueue
+OSi_VAlarmQueue: ; 0x021D37D4
+	.space 0x8
+
     .text
 
 	arm_func_start OS_InitVAlarm
diff --git a/arm9/asm/OS_vramExclusive.s b/arm9/asm/OS_vramExclusive.s
index 7b780f69..ca2caade 100644
--- a/arm9/asm/OS_vramExclusive.s
+++ b/arm9/asm/OS_vramExclusive.s
@@ -1,6 +1,16 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
+	.section .bss
+
+	.global OSi_vramExclusive
+OSi_vramExclusive: ; 0x021D37E4
+	.space 0x4
+
+	.global OSi_vramLockId
+OSi_vramLockId: ; 0x021D37E8
+	.space 0x14
+
     .text
 
 	arm_func_start OsCountZeroBits
diff --git a/arm9/asm/PXI_fifo.s b/arm9/asm/PXI_fifo.s
index 2abbf1c3..c1980dea 100644
--- a/arm9/asm/PXI_fifo.s
+++ b/arm9/asm/PXI_fifo.s
@@ -1,8 +1,14 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
+	.section .bss
 
-	.extern UNK_021D5364
-	.extern UNK_021D5368
+	.global UNK_021D5364
+UNK_021D5364: ; 0x021D5364
+	.space 0x4
+
+	.global UNK_021D5368
+UNK_021D5368: ; 0x021D5368
+	.space 0x80
 
 	.text
 
diff --git a/arm9/asm/SND_alarm.s b/arm9/asm/SND_alarm.s
index 845e2a99..1a76b9de 100644
--- a/arm9/asm/SND_alarm.s
+++ b/arm9/asm/SND_alarm.s
@@ -1,7 +1,10 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-	.extern UNK_021D5300
+	.section .bss
+	.global UNK_021D5300
+UNK_021D5300: ; 0x021D5300
+	.space 0x60
 
     .text
 
diff --git a/arm9/asm/SND_command.s b/arm9/asm/SND_command.s
index 9ad93087..0da65567 100644
--- a/arm9/asm/SND_command.s
+++ b/arm9/asm/SND_command.s
@@ -1,21 +1,65 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_021D3880
 	.extern UNK_021D5360
-	.extern UNK_021D383C
-	.extern UNK_021D3854
-	.extern UNK_021D3844
-	.extern UNK_021D3B00
-	.extern UNK_021D384C
-	.extern UNK_021D3858
-	.extern UNK_021D3840
-	.extern UNK_021D3850
-	.extern UNK_021D385C
-	.extern UNK_021D4B00
-	.extern UNK_021D3848
-	.extern UNK_021D3838
-	.extern UNK_021D52E8
+
+	.section .bss
+
+	.global UNK_021D3838
+UNK_021D3838: ; 0x021D3838
+	.space 0x4
+
+	.global UNK_021D383C
+UNK_021D383C: ; 0x021D383C
+	.space 0x4
+
+	.global UNK_021D3840
+UNK_021D3840: ; 0x021D3840
+	.space 0x4
+
+	.global UNK_021D3844
+UNK_021D3844: ; 0x021D3844
+	.space 0x4
+
+	.global UNK_021D3848
+UNK_021D3848: ; 0x021D3848
+	.space 0x4
+
+	.global UNK_021D384C
+UNK_021D384C: ; 0x021D384C
+	.space 0x4
+
+	.global UNK_021D3850
+UNK_021D3850: ; 0x021D3850
+	.space 0x4
+
+	.global UNK_021D3854
+UNK_021D3854: ; 0x021D3854
+	.space 0x4
+
+	.global UNK_021D3858
+UNK_021D3858: ; 0x021D3858
+	.space 0x4
+
+	.global UNK_021D385C
+UNK_021D385C: ; 0x021D385C
+	.space 0x24
+
+	.global UNK_021D3880
+UNK_021D3880: ; 0x021D3880
+	.space 0x280
+
+	.global UNK_021D3B00
+UNK_021D3B00: ; 0x021D3B00
+	.space 0x1000
+
+	.global UNK_021D4B00
+UNK_021D4B00: ; 0x021D4B00
+	.space 0x7e8
+
+	.global UNK_021D52E8
+UNK_021D52E8: ; 0x021D52E8
+	.space 0x18
 
     .text
 
diff --git a/arm9/asm/SND_main.s b/arm9/asm/SND_main.s
index 1ef2f8b3..49db7a65 100644
--- a/arm9/asm/SND_main.s
+++ b/arm9/asm/SND_main.s
@@ -1,8 +1,15 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-	.extern UNK_021D3820
-	.extern UNK_021D381C
+	.section .bss
+
+	.global UNK_021D381C
+UNK_021D381C: ; 0x021D381C
+	.space 0x4
+
+	.global UNK_021D3820
+UNK_021D3820: ; 0x021D3820
+	.space 0x18
 
     .text
 
diff --git a/arm9/asm/SND_work.s b/arm9/asm/SND_work.s
index 262be68b..88ff04bb 100644
--- a/arm9/asm/SND_work.s
+++ b/arm9/asm/SND_work.s
@@ -1,7 +1,11 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-	.extern UNK_021D5360
+	.section .bss
+
+	.global UNK_021D5360
+UNK_021D5360: ; 0x021D5360
+	.space 0x4
 
     .text
 
diff --git a/arm9/data/bss_3.s b/arm9/data/bss_3.s
deleted file mode 100644
index 438d87f1..00000000
--- a/arm9/data/bss_3.s
+++ /dev/null
@@ -1,157 +0,0 @@
-	.section .bss
-
-	.global OSi_UserExceptionHandler
-OSi_UserExceptionHandler: ; 0x021D371C
-	.space 0x4
-
-	.global OSi_UserExceptionHandlerArg
-OSi_UserExceptionHandlerArg: ; 0x021D3720
-	.space 0x4
-
-	.global OSi_DebuggerHandler
-OSi_DebuggerHandler: ; 0x021D3724
-	.space 0x4
-
-	.global OSi_ExContext
-OSi_ExContext: ; 0x021D3728
-	.space 0x80
-
-	.global OSi_TimerReserved
-OSi_TimerReserved: ; 0x021D37A8
-	.space 0x4
-
-	.global OSi_UseTick
-OSi_UseTick: ; 0x021D37AC
-	.space 0x4
-
-	.global OSi_NeedResetTimer
-OSi_NeedResetTimer: ; 0x021D37B0
-	.space 0x4
-
-	.global OSi_TickCounter
-OSi_TickCounter: ; 0x021D37B4
-	.space 0x8
-
-	.global OSi_UseAlarm
-OSi_UseAlarm: ; 0x021D37BC
-	.space 0x4
-
-	.global OSi_AlarmQueue
-OSi_AlarmQueue: ; 0x021D37C0
-	.space 0x8
-
-	.global OSi_UseVAlarm
-OSi_UseVAlarm: ; 0x021D37C8
-	.space 0x4
-
-	.global OSi_PreviousVCount
-OSi_PreviousVCount: ; 0x021D37CC
-	.space 0x4
-
-	.global OSi_VFrameCount
-OSi_VFrameCount: ; 0x021D37D0
-	.space 0x4
-
-	.global OSi_VAlarmQueue
-OSi_VAlarmQueue: ; 0x021D37D4
-	.space 0x8
-
-	.global OSi_IsInitReset
-OSi_IsInitReset: ; 0x021D37DC
-	.space 0x4
-
-	.global OSi_IsResetOccurred
-OSi_IsResetOccurred: ; 0x021D37E0
-	.space 0x4
-
-	.global OSi_vramExclusive
-OSi_vramExclusive: ; 0x021D37E4
-	.space 0x4
-
-	.global OSi_vramLockId
-OSi_vramLockId: ; 0x021D37E8
-	.space 0x14
-
-	.global UNK_021D37FC
-UNK_021D37FC: ; 0x021D37FC
-	.space 0x20
-
-	.global UNK_021D381C
-UNK_021D381C: ; 0x021D381C
-	.space 0x4
-
-	.global UNK_021D3820
-UNK_021D3820: ; 0x021D3820
-	.space 0x18
-
-	.global UNK_021D3838
-UNK_021D3838: ; 0x021D3838
-	.space 0x4
-
-	.global UNK_021D383C
-UNK_021D383C: ; 0x021D383C
-	.space 0x4
-
-	.global UNK_021D3840
-UNK_021D3840: ; 0x021D3840
-	.space 0x4
-
-	.global UNK_021D3844
-UNK_021D3844: ; 0x021D3844
-	.space 0x4
-
-	.global UNK_021D3848
-UNK_021D3848: ; 0x021D3848
-	.space 0x4
-
-	.global UNK_021D384C
-UNK_021D384C: ; 0x021D384C
-	.space 0x4
-
-	.global UNK_021D3850
-UNK_021D3850: ; 0x021D3850
-	.space 0x4
-
-	.global UNK_021D3854
-UNK_021D3854: ; 0x021D3854
-	.space 0x4
-
-	.global UNK_021D3858
-UNK_021D3858: ; 0x021D3858
-	.space 0x4
-
-	.global UNK_021D385C
-UNK_021D385C: ; 0x021D385C
-	.space 0x24
-
-	.global UNK_021D3880
-UNK_021D3880: ; 0x021D3880
-	.space 0x280
-
-	.global UNK_021D3B00
-UNK_021D3B00: ; 0x021D3B00
-	.space 0x1000
-
-	.global UNK_021D4B00
-UNK_021D4B00: ; 0x021D4B00
-	.space 0x7e8
-
-	.global UNK_021D52E8
-UNK_021D52E8: ; 0x021D52E8
-	.space 0x18
-
-	.global UNK_021D5300
-UNK_021D5300: ; 0x021D5300
-	.space 0x60
-
-	.global UNK_021D5360
-UNK_021D5360: ; 0x021D5360
-	.space 0x4
-
-	.global UNK_021D5364
-UNK_021D5364: ; 0x021D5364
-	.space 0x4
-
-	.global UNK_021D5368
-UNK_021D5368: ; 0x021D5368
-	.space 0x80
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c
index d4254ce3..02498962 100644
--- a/arm9/lib/src/OS_reset.c
+++ b/arm9/lib/src/OS_reset.c
@@ -8,8 +8,9 @@
 #include "OS_terminate_proc.h"
 #include "OS_interrupt.h"
 
-extern u16 OSi_IsInitReset;
-extern vu16 OSi_IsResetOccurred;
+static u16 OSi_IsInitReset = 0;
+vu16 OSi_IsResetOccurred = 0;
+
 extern void PXI_Init();
 extern u32 PXI_IsCallbackReady(u32 param1, u32 param2);
 extern void PXI_SetFifoRecvCallback(u32 param1, void* callback);