distribute bss

9 files changed, 112 insertions, 96 deletions

diff --git a/arm7/asm/PAD_xyButton.s b/arm7/asm/PAD_xyButton.s
index ff5d5e4e..66dc0a61 100644
--- a/arm7/asm/PAD_xyButton.s
+++ b/arm7/asm/PAD_xyButton.s
@@ -1,7 +1,17 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-    .text
+    .section .bss
+
+	.global PADi_XYButtonAvailable
+PADi_XYButtonAvailable: ;0x038079DC
+	.space 0x038079E0 - 0x038079DC
+
+	.global _038079E0
+_038079E0: ;0x038079E0
+	.space 0x03807A0C - 0x038079E0
+
+    .section .text
 
 	arm_func_start PAD_InitXYButton
 PAD_InitXYButton: ; 0x037FB96C
diff --git a/arm7/asm/SND.s b/arm7/asm/SND.s
index 75c5b32f..43e137e1 100644
--- a/arm7/asm/SND.s
+++ b/arm7/asm/SND.s
@@ -3,7 +3,21 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-    .text
+    .section .bss
+
+	.global sSurroundDecay
+sSurroundDecay: ;0x03807A0C
+	.space 0x03807A10 - 0x03807A0C
+
+	.global sOrgPan
+sOrgPan: ;0x03807A10
+	.space 0x03807A20 - 0x03807A10
+
+	.global sOrgVolume
+sOrgVolume: ;0x03807A20
+	.space 0x03807A30 - 0x03807A20
+
+    .section .text
 
 	arm_func_start SND_SetOutputSelector
 SND_SetOutputSelector: ; 0x037FBA0C
diff --git a/arm7/asm/SND_alarm.s b/arm7/asm/SND_alarm.s
index 9a582901..68740d65 100644
--- a/arm7/asm/SND_alarm.s
+++ b/arm7/asm/SND_alarm.s
@@ -1,7 +1,13 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-    .text
+    .section .bss
+
+	.global _03808EEC
+_03808EEC: ;0x03808EEC
+	.space 0x038090EC - 0x03808EEC
+
+    .section .text
 
 	arm_func_start AlarmHandler
 AlarmHandler: ; 0x037FF524
diff --git a/arm7/asm/SND_command.s b/arm7/asm/SND_command.s
index 3b49c224..ec1a5014 100644
--- a/arm7/asm/SND_command.s
+++ b/arm7/asm/SND_command.s
@@ -1,7 +1,17 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-    .text
+    .section .bss
+
+	.global _038090EC
+_038090EC: ;0x038090EC
+	.space 0x0380910C - 0x038090EC
+
+	.global _0380910C
+_0380910C: ;0x0380910C
+	.space 0x0380912C - 0x0380910C
+
+    .section .text
 
 	arm_func_start ReadDriverInfo
 ReadDriverInfo: ; 0x037FF6E4
diff --git a/arm7/asm/SND_lockChannel.s b/arm7/asm/SND_lockChannel.s
index cc568f66..b525e0d1 100644
--- a/arm7/asm/SND_lockChannel.s
+++ b/arm7/asm/SND_lockChannel.s
@@ -1,7 +1,13 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-    .text
+    .section .bss
+
+	.global _03807F48
+_03807F48: ;0x03807F48
+	.space 0x03807F4C - 0x03807F48
+
+    .section .text
 
 	arm_func_start SND_GetLockedChannel
 SND_GetLockedChannel: ; 0x037FC964
diff --git a/arm7/asm/SND_main.s b/arm7/asm/SND_main.s
index 4182b325..2353d2c2 100644
--- a/arm7/asm/SND_main.s
+++ b/arm7/asm/SND_main.s
@@ -1,7 +1,33 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-    .text
+    .section .bss
+
+	.global _03807A30
+_03807A30: ;0x03807A30
+	.space 0x03807A34 - 0x03807A30
+
+	.global _03807A34
+_03807A34: ;0x03807A34
+	.space 0x03807A54 - 0x03807A34
+
+	.global _03807A54
+_03807A54: ;0x03807A54
+	.space 0x03807A74 - 0x03807A54
+
+	.global _03807A74
+_03807A74: ;0x03807A74
+	.space 0x03807AA0 - 0x03807A74
+
+	.global _03807AA0
+_03807AA0: ;0x03807AA0
+	.space 0x03807F44 - 0x03807AA0
+
+	.global _03807F44
+_03807F44: ;0x03807F44
+	.space 0x03807F48 - 0x03807F44
+
+    .section .text
 
 	arm_func_start SndThread
 SndThread: ; 0x037FC2B0
diff --git a/arm7/asm/SND_unk_037FD440.s b/arm7/asm/SND_unk_037FD440.s
index f680881b..14e4bda9 100644
--- a/arm7/asm/SND_unk_037FD440.s
+++ b/arm7/asm/SND_unk_037FD440.s
@@ -2,7 +2,25 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-    .text
+    .section .bss
+
+	.global _03807F4C
+_03807F4C: ;0x03807F4C
+	.space 0x03807F50 - 0x03807F4C
+
+	.global _03807F50
+_03807F50: ;0x03807F50
+	.space 0x03807F58 - 0x03807F50
+
+	.global _03807F58
+_03807F58: ;0x03807F58
+	.space 0x03807F68 - 0x03807F58
+
+	.global SNDi_SharedWork
+SNDi_SharedWork: ;0x03807F68
+	.space 0x03807F6C - 0x03807F68
+
+    .section .text
 
 	arm_func_start FUN_037FD440
 FUN_037FD440: ; 0x037FD440
diff --git a/arm7/asm/SND_work.s b/arm7/asm/SND_work.s
index 0965b37a..fb7f51e9 100644
--- a/arm7/asm/SND_work.s
+++ b/arm7/asm/SND_work.s
@@ -1,7 +1,21 @@
 	.include "asm/macros.inc"
 	.include "global.inc"
 
-    .text
+    .section .bss
+
+	.global SNDi_Work
+SNDi_Work: ;0x03807F6C
+	.space 0x038084AC - 0x03807F6C
+#todo unsure if these two belong here
+	.global _038084AC
+_038084AC: ;0x038084AC
+	.space 0x038086EC - 0x038084AC
+
+	.global _038086EC
+_038086EC: ;0x038086EC
+	.space 0x03808EEC - 0x038086EC
+
+    .section .text
 
 	arm_func_start SND_UpdateSharedWork
 SND_UpdateSharedWork: ; 0x037FF448
diff --git a/arm7/asm/dtcm_bss.s b/arm7/asm/dtcm_bss.s
index 516b5508..e485943f 100644
--- a/arm7/asm/dtcm_bss.s
+++ b/arm7/asm/dtcm_bss.s
@@ -2,94 +2,6 @@
 	.include "global.inc"
 	.section .bss
 
-	.global PADi_XYButtonAvailable
-PADi_XYButtonAvailable: ;0x038079DC
-	.space 0x038079E0 - 0x038079DC
-
-	.global _038079E0
-_038079E0: ;0x038079E0
-	.space 0x03807A0C - 0x038079E0
-
-	.global sSurroundDecay
-sSurroundDecay: ;0x03807A0C
-	.space 0x03807A10 - 0x03807A0C
-
-	.global sOrgPan
-sOrgPan: ;0x03807A10
-	.space 0x03807A20 - 0x03807A10
-
-	.global sOrgVolume
-sOrgVolume: ;0x03807A20
-	.space 0x03807A30 - 0x03807A20
-
-	.global _03807A30
-_03807A30: ;0x03807A30
-	.space 0x03807A34 - 0x03807A30
-
-	.global _03807A34
-_03807A34: ;0x03807A34
-	.space 0x03807A54 - 0x03807A34
-
-	.global _03807A54
-_03807A54: ;0x03807A54
-	.space 0x03807A74 - 0x03807A54
-
-	.global _03807A74
-_03807A74: ;0x03807A74
-	.space 0x03807AA0 - 0x03807A74
-
-	.global _03807AA0
-_03807AA0: ;0x03807AA0
-	.space 0x03807F44 - 0x03807AA0
-
-	.global _03807F44
-_03807F44: ;0x03807F44
-	.space 0x03807F48 - 0x03807F44
-
-	.global _03807F48
-_03807F48: ;0x03807F48
-	.space 0x03807F4C - 0x03807F48
-
-	.global _03807F4C
-_03807F4C: ;0x03807F4C
-	.space 0x03807F50 - 0x03807F4C
-
-	.global _03807F50
-_03807F50: ;0x03807F50
-	.space 0x03807F58 - 0x03807F50
-
-	.global _03807F58
-_03807F58: ;0x03807F58
-	.space 0x03807F68 - 0x03807F58
-
-	.global SNDi_SharedWork
-SNDi_SharedWork: ;0x03807F68
-	.space 0x03807F6C - 0x03807F68
-
-	.global SNDi_Work
-SNDi_Work: ;0x03807F6C
-	.space 0x038084AC - 0x03807F6C
-
-	.global _038084AC
-_038084AC: ;0x038084AC
-	.space 0x038086EC - 0x038084AC
-
-	.global _038086EC
-_038086EC: ;0x038086EC
-	.space 0x03808EEC - 0x038086EC
-
-	.global _03808EEC
-_03808EEC: ;0x03808EEC
-	.space 0x038090EC - 0x03808EEC
-
-	.global _038090EC
-_038090EC: ;0x038090EC
-	.space 0x0380910C - 0x038090EC
-
-	.global _0380910C
-_0380910C: ;0x0380910C
-	.space 0x0380912C - 0x0380910C
-
 	.global _0380912C
 _0380912C: ;0x0380912C
 	.space 0x03809140 - 0x0380912C