Split sbss2.s

Former-commit-id: b9fc64bf52
2022-04-17 21:29:59 -07:00 · 2022-04-17 21:29:59 -07:00 · 4555042ac0
parent 45963b5ba7
commit 4555042ac0
11 changed files with 97 additions and 91 deletions
--- a/asm/Kyoto/CResLoader.s
+++ b/asm/Kyoto/CResLoader.s
@ -1,5 +1,26 @@
 .include "macros.inc"

+.section .sbss2, "", @nobits
+# CResLoader
+.global lbl_805AF4B0
+lbl_805AF4B0:
+	.skip 0x4
+.global lbl_805AF4B4
+lbl_805AF4B4:
+	.skip 0x4
+.global lbl_805AF4B8
+lbl_805AF4B8:
+	.skip 0x4
+.global lbl_805AF4BC
+lbl_805AF4BC:
+	.skip 0x4
+.global lbl_805AF4C0
+lbl_805AF4C0:
+	.skip 0x4
+.global lbl_805AF4C4
+lbl_805AF4C4:
+	.skip 0x4
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetPakFile__10CResLoaderCFi
--- a/asm/Kyoto/Graphics/CGX.s
+++ b/asm/Kyoto/Graphics/CGX.s
@ -5,7 +5,13 @@
 .global lbl_80479BD0
 lbl_80479BD0:
 	.skip 0xF0
-	
+
+.section .sbss2, "", @nobits
+# CGX
+.global lbl_805AF4A0
+lbl_805AF4A0:
+	.skip 0x8
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_80307bbc
--- a/asm/Kyoto/Math/CAABox.s
+++ b/asm/Kyoto/Math/CAABox.s
@ -30,6 +30,15 @@ lbl_803EE338:
 	.4byte lbl_80338138
 	.4byte lbl_80338220

+.section .sbss2, "", @nobits
+# CAABox
+.global lbl_805AF4A8
+lbl_805AF4A8:
+	.skip 0x4
+.global lbl_805AF4AC
+lbl_805AF4AC:
+	.skip 0x4
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global ClosestPointAlongVector__6CAABoxCFRC9CVector3f
--- a/asm/MetaRender/CCubeRenderer.s
+++ b/asm/MetaRender/CCubeRenderer.s
@ -78,6 +78,18 @@ lbl_803EC5D8:
 	.4byte "@4@AddParticleGen__13CCubeRendererFRC12CParticleGen"
 	.4byte 0
 	
+.section .sbss2, "", @nobits
+
+# CCubeRenderer
+.global lbl_805AF490
+lbl_805AF490:
+	.skip 0x4
+.global lbl_805AF494
+lbl_805AF494:
+	.skip 0x4
+.global lbl_805AF498
+lbl_805AF498:
+	.skip 0x8

 .section .bss

--- a/asm/MetroidPrime/CFluidPlaneCPU.s
+++ b/asm/MetroidPrime/CFluidPlaneCPU.s
@ -14,6 +14,12 @@ lbl_803E46C8:
 	.4byte nullsub_209
 	.4byte "Render__14CFluidPlaneCPUCFRC13CStateManagerRC6CAABoxRC12CTransform4fRC12CTransform4fbRC14CFrustumPlanesRCQ24rstl33optional_object<14CRippleManager>9TUniqueIdPCbiiRC9CVector3f"

+.section .sbss2, "", @nobits  # 0x805AF460 - 0x805AF4C7
+# CFluidPlaneCPU
+.global lbl_805AF460
+lbl_805AF460:
+	.skip 0x8
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global RenderCleanup__14CFluidPlaneCPUCFv
--- a/asm/MetroidPrime/CProjectedShadow.s
+++ b/asm/MetroidPrime/CProjectedShadow.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .sbss2, "", @nobits
+# CProjectedShadow
+.global lbl_805AF480
+lbl_805AF480:
+	.skip 0x8
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_8029d6c8
--- a/asm/MetroidPrime/CSlideShow.s
+++ b/asm/MetroidPrime/CSlideShow.s
@ -28,6 +28,15 @@ lbl_803EBFD4:
 	.4byte lbl_8029C028
 	.4byte lbl_8029C018

+.section .sbss2, "", @nobits
+# CSlideShow
+.global lbl_805AF478
+lbl_805AF478:
+	.skip 0x4
+.global lbl_805AF47C
+lbl_805AF47C:
+	.skip 0x4
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetIsContinueDraw__10CSlideShowFv
--- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s
+++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s
@ -2,7 +2,6 @@

 .section .data

-
 .global lbl_803E6308
 lbl_803E6308:
 	# ROM: 0x3E3308
@ -47,6 +46,15 @@ lbl_803E6374:
 	.4byte lbl_801EC3B8
 	.4byte 0

+.section .sbss2, "", @nobits  # 0x805AF460 - 0x805AF4C7
+# CWallCrawlerSwarm
+.global lbl_805AF468
+lbl_805AF468:
+	.skip 0x4
+.global lbl_805AF46C
+lbl_805AF46C:
+	.skip 0x4
+	
 .section .bss

 .global lbl_8046C938
--- a/asm/MetroidPrime/Player/CMorphBallShadow.s
+++ b/asm/MetroidPrime/Player/CMorphBallShadow.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .sbss2, "", @nobits
+# CMorphBallShadow
+.global lbl_805AF470
+lbl_805AF470:
+	.skip 0x4
+.global lbl_805AF474
+lbl_805AF474:
+	.skip 0x4
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AreasValid__16CMorphBallShadowCFRC13CStateManager
--- a/asm/WorldFormat/CMetroidAreaCollider.s
+++ b/asm/WorldFormat/CMetroidAreaCollider.s
@ -10,6 +10,15 @@ lbl_803EC428:
 	.4byte 0x00000002
 	.4byte 0

+.section .sbss2, "", @nobits
+# CMovingAABoxComponent
+.global lbl_805AF488
+lbl_805AF488:
+	.skip 0x4
+.global lbl_805AF48C
+lbl_805AF48C:
+	.skip 0x4
+
 .section .text, "ax"

 .global __ct__Q220CMetroidAreaCollider22CMovingAABoxComponentsFRC6CAABoxRC9CVector3f
--- a/asm/sbss2.s
+++ b/asm/sbss2.s
@ -1,89 +0,0 @@
-.include "macros.inc"
-
-.section .sbss2, "", @nobits  # 0x805AF460 - 0x805AF4C7
-
-# CFluidPlaneCPU
-.global lbl_805AF460
-lbl_805AF460:
-	.skip 0x8
-
-# CWallCrawlerSwarm
-.global lbl_805AF468
-lbl_805AF468:
-	.skip 0x4
-.global lbl_805AF46C
-lbl_805AF46C:
-	.skip 0x4
-
-# CMorphBallShadow
-.global lbl_805AF470
-lbl_805AF470:
-	.skip 0x4
-.global lbl_805AF474
-lbl_805AF474:
-	.skip 0x4
-
-# CSlideShow
-.global lbl_805AF478
-lbl_805AF478:
-	.skip 0x4
-.global lbl_805AF47C
-lbl_805AF47C:
-	.skip 0x4
-
-# CProjectedShadow
-.global lbl_805AF480
-lbl_805AF480:
-	.skip 0x8
-
-# CMovingAABoxComponent
-.global lbl_805AF488
-lbl_805AF488:
-	.skip 0x4
-.global lbl_805AF48C
-lbl_805AF48C:
-	.skip 0x4
-
-# CCubeRenderer
-.global lbl_805AF490
-lbl_805AF490:
-	.skip 0x4
-.global lbl_805AF494
-lbl_805AF494:
-	.skip 0x4
-.global lbl_805AF498
-lbl_805AF498:
-	.skip 0x8
-
-# CGX
-.global lbl_805AF4A0
-lbl_805AF4A0:
-	.skip 0x8
-
-# CAABox
-.global lbl_805AF4A8
-lbl_805AF4A8:
-	.skip 0x4
-.global lbl_805AF4AC
-lbl_805AF4AC:
-	.skip 0x4
-
-# CResLoader
-.global lbl_805AF4B0
-lbl_805AF4B0:
-	.skip 0x4
-.global lbl_805AF4B4
-lbl_805AF4B4:
-	.skip 0x4
-.global lbl_805AF4B8
-lbl_805AF4B8:
-	.skip 0x4
-.global lbl_805AF4BC
-lbl_805AF4BC:
-	.skip 0x4
-.global lbl_805AF4C0
-lbl_805AF4C0:
-	.skip 0x4
-.global lbl_805AF4C4
-lbl_805AF4C4:
-	.skip 0x4