Split bss

2022-04-16 16:18:42 -07:00 · 2022-04-16 16:18:42 -07:00 · f6ecafb3a6
parent c1a80b4534
commit f6ecafb3a6
72 changed files with 595 additions and 399 deletions
--- a/2
+++ b/2
@ -54,7 +54,7 @@ endif

 O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(METROTRK_FILES) \
 	   $(METROIDPRIME) $(WORLDFORMAT) $(WEAPONS) $(METARENDER) $(GUISYS) $(COLLISION) \
-	   $(KYOTO) $(RODATA_O_FILES) $(DATA_O_FILES) $(BSS_O_FILES) $(SDATA_O_FILES) \
+	   $(KYOTO) $(RODATA_O_FILES) $(DATA_O_FILES) $(SDATA_O_FILES) \
 	   $(SBSS_O_FILES) $(SDATA2_O_FILES) $(SBSS2_O_FILES) $(AI_FILES) \
 	   $(AR_FILES) $(BASE_FILES) $(DB_FILES) $(DSP_FILES) $(DVD_FILES) $(GX_FILES) $(MTX_FILES) \
 	   $(OS_FILES) $(PAD_FILES) $(VI_FILES) $(MSL_PPCEABI_BARE_H) $(MUSYX_FILES) \
--- a/asm/Collision/CCollidableAABox.s
+++ b/asm/Collision/CCollidableAABox.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_80479498
+lbl_80479498:
+	.skip 0x48
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetTableIndex__16CCollidableAABoxCFv
--- a/asm/Collision/CCollidableSphere.s
+++ b/asm/Collision/CCollidableSphere.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_80479558
+lbl_80479558:
+	.skip 0x48
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetTableIndex__17CCollidableSphereCFv
--- a/asm/Collision/CCollisionPrimitive.s
+++ b/asm/Collision/CCollisionPrimitive.s
@ -1,7 +1,12 @@
 .include "macros.inc"

-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .bss

+.global lbl_804794E0
+lbl_804794E0:
+	.skip 0x30
+	
+.section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global InitAddMovingCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo_bPCcPCc
 InitAddMovingCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo_bPCcPCc:
--- a/asm/Collision/CollisionUtil.s
+++ b/asm/Collision/CollisionUtil.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_80479510
+lbl_80479510:
+	.skip 0x48
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global TriPointSqrDist__13CollisionUtilFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fPfPf
--- a/asm/Kyoto/Alloc/CMemory.s
+++ b/asm/Kyoto/Alloc/CMemory.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFD58
+lbl_804BFD58:
+	.skip 0xC
+.global lbl_804BFD64
+lbl_804BFD64:
+	.skip 0xC4
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __nwa__FUlPCcPCc
--- a/asm/Kyoto/Animation/DolphinCSkinnedModel.s
+++ b/asm/Kyoto/Animation/DolphinCSkinnedModel.s
@ -1,5 +1,17 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFFC0
+lbl_804BFFC0:
+	.skip 0x8000C
+.global lbl_8053FFCC
+lbl_8053FFCC:
+	.skip 0x28
+.global lbl_8053FFF4
+lbl_8053FFF4:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_80352668
--- a/asm/Kyoto/Audio/CDSPStreamManager.s
+++ b/asm/Kyoto/Audio/CDSPStreamManager.s
@ -1,5 +1,40 @@
 .include "macros.inc"

+.section .bss
+
+#TODO: Figure out what's going on with these, they're referenced in various locations
+
+.global lbl_80540004
+lbl_80540004:
+	.skip 0xC	
+.global lbl_80540010
+lbl_80540010:
+	.skip 0x10	
+.global lbl_80540020
+lbl_80540020:
+	.skip 0x500
+.global lbl_80540520
+lbl_80540520:
+	.skip 0x30	
+.global lbl_80540550
+lbl_80540550:
+	.skip 0x30	
+.global lbl_80540580
+lbl_80540580:
+	.skip 0x64
+.global lbl_805405E4
+lbl_805405E4:
+	.skip 0x5C
+.global lbl_80540640
+lbl_80540640:
+	.skip 0x3E0
+.global lbl_80540A20
+lbl_80540A20:
+	.skip 0xC
+.global lbl_80540A2C
+lbl_80540A2C:
+	.skip 0x14
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AllocateStream__17CDSPStreamManagerFv
--- a/asm/Kyoto/Audio/CMidiManager.s
+++ b/asm/Kyoto/Audio/CMidiManager.s
@ -1,5 +1,7 @@
 .include "macros.inc"

+.section .bss
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global FMidiDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
--- a/asm/Kyoto/Audio/CSfxManager.s
+++ b/asm/Kyoto/Audio/CSfxManager.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_80479BA0
+lbl_80479BA0:
+	.skip 0x30
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__Q211CSfxManager11CSfxWrapperFv
--- a/asm/Kyoto/Audio/DolphinCAudioSys.s
+++ b/asm/Kyoto/Audio/DolphinCAudioSys.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFF90
+lbl_804BFF90:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_8034a7a4
--- a/asm/Kyoto/Basics/CBasics.s
+++ b/asm/Kyoto/Basics/CBasics.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804795A0
+lbl_804795A0:
+	.skip 0x200
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global Stringize__7CBasicsFPCce
--- a/asm/Kyoto/Basics/RAssertDolphin.s
+++ b/asm/Kyoto/Basics/RAssertDolphin.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804797A0
+lbl_804797A0:
+	.skip 0x400
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global rs_debugger_printf__FPCce
--- a/asm/Kyoto/CARAMManager.s
+++ b/asm/Kyoto/CARAMManager.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFF40
+lbl_804BFF40:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global CollectGarbage__12CARAMManagerFv
--- a/asm/Kyoto/CFrameDelayedKiller.s
+++ b/asm/Kyoto/CFrameDelayedKiller.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_80540A40
+lbl_80540A40:
+	.skip 0xC
+.global lbl_80540A4C
+lbl_80540A4C:
+	.skip 0x34
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_8036ca64
--- a/asm/Kyoto/DolphinCMemoryCardSys.s
+++ b/asm/Kyoto/DolphinCMemoryCardSys.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFFA0
+lbl_804BFFA0:
+	.skip 0xC
+.global lbl_804BFFAC
+lbl_804BFFAC:
+	.skip 0x14
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global FreeCardWorkArea__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort
--- a/asm/Kyoto/Graphics/CCubeMaterial.s
+++ b/asm/Kyoto/Graphics/CCubeMaterial.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFF50
+lbl_804BFF50:
+	.skip 0xC
+.global lbl_804BFF5C
+lbl_804BFF5C:
+	.skip 0x34
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetCompressedBlend__13CCubeMaterialCFv
--- a/asm/Kyoto/Graphics/CGX.s
+++ b/asm/Kyoto/Graphics/CGX.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_80479BD0
+lbl_80479BD0:
+	.skip 0xF0
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_80307bbc
--- a/asm/Kyoto/Graphics/DolphinCGraphics.s
+++ b/asm/Kyoto/Graphics/DolphinCGraphics.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_80479CC0
+lbl_80479CC0:
+	.skip 0x46000
+.global lbl_804BFCC0
+lbl_804BFCC0:
+	.skip 0x50
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_80309254
--- a/asm/Kyoto/Graphics/DolphinCTexture.s
+++ b/asm/Kyoto/Graphics/DolphinCTexture.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFD10
+lbl_804BFD10:
+	.skip 0x20
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_8030e10c
--- a/asm/Kyoto/Math/CQuaternion.s
+++ b/asm/Kyoto/Math/CQuaternion.s
@ -1,5 +1,17 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFD30
+lbl_804BFD30:
+	.skip 0xC
+.global lbl_804BFD3C
+lbl_804BFD3C:
+	.skip 0xC
+.global lbl_804BFD48
+lbl_804BFD48:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global FromNUQuaternion__11CQuaternionFRC13CNUQuaternion
--- a/asm/Kyoto/Particles/CElementGen.s
+++ b/asm/Kyoto/Particles/CElementGen.s
@ -1,5 +1,23 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFE28
+lbl_804BFE28:
+	.skip 0x20
+.global lbl_804BFE48
+lbl_804BFE48:
+	.skip 0x20
+.global lbl_804BFE68
+lbl_804BFE68:
+	.skip 0x4C
+.global lbl_804BFEB4
+lbl_804BFEB4:
+	.skip 0x4C
+.global lbl_804BFF00
+lbl_804BFF00:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetGlobalTranslation__11CElementGenCFv
--- a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s
+++ b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFF10
+lbl_804BFF10:
+	.skip 0xC
+.global lbl_804BFF1C
+lbl_804BFF1C:
+	.skip 0x14
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global LoadToken__Q224CSpawnSystemKeyframeData24CSpawnSystemKeyframeInfoFP11CSimplePool
--- a/asm/Kyoto/rstl/RstlExtras.s
+++ b/asm/Kyoto/rstl/RstlExtras.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_804BFF30
+lbl_804BFF30:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global "TokenizeString__13CStringExtrasFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>PCci"
--- a/asm/MetaRender/CCubeRenderer.s
+++ b/asm/MetaRender/CCubeRenderer.s
@ -1,5 +1,23 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046E200
+lbl_8046E200:
+	.skip 0xC	
+.global lbl_8046E20C
+lbl_8046E20C:
+	.skip 0x1DF8
+.global lbl_80470004
+lbl_80470004:
+	.skip 0x9168
+.global lbl_8047916C
+lbl_8047916C:
+	.skip 0xC
+.global lbl_80479178
+lbl_80479178:
+	.skip 0x320
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .bss
+
+.global lbl_8045B140
+lbl_8045B140:
+	.skip 0x40
+	
 .section .text, "ax"

 .global GetEventResourceIdForAnimResourceId__9CAnimDataCFi
--- a/asm/MetroidPrime/CDecalManager.s
+++ b/asm/MetroidPrime/CDecalManager.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C558
+lbl_8046C558:
+	.skip 0xC
+.global lbl_8046C564
+lbl_8046C564:
+	.skip 0xC
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .bss
+
+.global lbl_8046C3B8
+lbl_8046C3B8:
+	.skip 0x10
+	
 .section .text, "ax"

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

+.section .bss
+
+.global lbl_8046CB40
+lbl_8046CB40:
+	.skip 0x800
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .bss
+
+.global lbl_8046DCC0
+lbl_8046DCC0:
+	.skip 0x400
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .bss
+
+.global lbl_8045A1A8
+lbl_8045A1A8:
+	.skip 0xF98
+	
 .section .text, "ax"
 .global IsCameraActiveFlow__7CMFGameFv
 IsCameraActiveFlow__7CMFGameFv:
--- a/asm/MetroidPrime/CMapArea.s
+++ b/asm/MetroidPrime/CMapArea.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C3E0
+lbl_8046C3E0:
+	.skip 0x28
+	
 .section .text, "ax"

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

+.section .bss 
+
+.global lbl_8046C498
+lbl_8046C498:
+	.skip 0x60
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .bss
+
+.global lbl_8046C538
+lbl_8046C538:
+	.skip 0x20
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetNumMaterialSets__10CModelDataCFv
--- a/asm/MetroidPrime/CSamusDoll.s
+++ b/asm/MetroidPrime/CSamusDoll.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C470
+lbl_8046C470:
+	.skip 0xC
+.global lbl_8046C47C
+lbl_8046C47C:
+	.skip 0xC
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global SetRotationSfxPlaying__10CSamusDollFb
--- a/asm/MetroidPrime/CStateManager.s
+++ b/asm/MetroidPrime/CStateManager.s
@ -1,5 +1,26 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8045C550
+lbl_8045C550:
+	.skip 0x30
+.global lbl_8045C580
+lbl_8045C580:
+	.skip 0x18
+.global lbl_8045C598
+lbl_8045C598:
+	.skip 0xC
+.global lbl_8045C5A4
+lbl_8045C5A4:
+	.skip 0x10
+.global lbl_8045C5B4
+lbl_8045C5B4:
+	.skip 0xF3C8
+.global lbl_8046B97C
+lbl_8046B97C:
+	.skip 0xA3C
+	
 .section .text, "ax"

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

+.section .bss
+
+.global lbl_8046C450
+lbl_8046C450:
+	.skip 0x20
+	
 .section .text, "ax"

 .global ResetInterpolationTimer__17COrbitPointMarkerFf
--- a/asm/MetroidPrime/Cameras/CBallCamera.s
+++ b/asm/MetroidPrime/Cameras/CBallCamera.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C408
+lbl_8046C408:
+	.skip 0x18
+	
 .section .text, "ax"

 .global SplineIntersectTest__11CBallCameraCFR13CMaterialListR13CStateManager
--- a/asm/MetroidPrime/Cameras/CCameraShakeData.s
+++ b/asm/MetroidPrime/Cameras/CCameraShakeData.s
@ -1,5 +1,10 @@
 .include "macros.inc"

+.section .bss
+.global lbl_8046C7D0
+lbl_8046C7D0:
+	.skip 0x78
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetSomething2__16CCameraShakeDataFv
--- a/asm/MetroidPrime/Cameras/CPathCamera.s
+++ b/asm/MetroidPrime/Cameras/CPathCamera.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C720
+lbl_8046C720:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AcceptScriptMsg__11CPathCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager
--- a/asm/MetroidPrime/Enemies/CChozoGhost.s
+++ b/asm/MetroidPrime/Enemies/CChozoGhost.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C748
+lbl_8046C748:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__11CChozoGhostFv
--- a/asm/MetroidPrime/Enemies/CDrone.s
+++ b/asm/MetroidPrime/Enemies/CDrone.s
@ -1,5 +1,23 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C848
+lbl_8046C848:
+	.skip 0x18
+.global lbl_8046C860
+lbl_8046C860:
+	.skip 0x18
+.global lbl_8046C878
+lbl_8046C878:
+	.skip 0x18
+.global lbl_8046C890
+lbl_8046C890:
+	.skip 0x18
+.global lbl_8046C8A8
+lbl_8046C8A8:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__6CDroneFv
--- a/asm/MetroidPrime/Enemies/CFlyingPirate.s
+++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C950
+lbl_8046C950:
+	.skip 0xFC
+.global lbl_8046CA4C
+lbl_8046CA4C:
+	.skip 0xF4
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global FixedRandom__10CPatternedFR13CStateManagerf
--- a/asm/MetroidPrime/Enemies/CJellyZap.s
+++ b/asm/MetroidPrime/Enemies/CJellyZap.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C920
+lbl_8046C920:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__9CJellyZapFv
--- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
+++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046E0C0
+lbl_8046E0C0:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__16CMetroidPrimeExo
--- a/asm/MetroidPrime/Enemies/CParasite.s
+++ b/asm/MetroidPrime/Enemies/CParasite.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .bss
+.global lbl_8046C770
+lbl_8046C770:
+	.skip 0x18
+.global lbl_8046C788
+lbl_8046C788:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__9CParasiteFv
--- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s
+++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C758
+lbl_8046C758:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__16CPuddleToadGammaFv
--- a/asm/MetroidPrime/Enemies/CRidley.s
+++ b/asm/MetroidPrime/Enemies/CRidley.s
@ -1,5 +1,20 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046D3A8
+lbl_8046D3A8:
+	.skip 0x150
+.global lbl_8046D4F8
+lbl_8046D4F8:
+	.skip 0x2E8
+.global lbl_8046D7E0
+lbl_8046D7E0:
+	.skip 0x1E0
+.global lbl_8046D9C0
+lbl_8046D9C0:
+	.skip 0x2D0
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__7CRidleyFv
--- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s
+++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046D360
+lbl_8046D360:
+	.skip 0x18
+.global lbl_8046D378
+lbl_8046D378:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__15CSnakeWeedSwarmFv
--- a/asm/MetroidPrime/Enemies/CSpacePirate.s
+++ b/asm/MetroidPrime/Enemies/CSpacePirate.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C570
+lbl_8046C570:
+	.skip 0xA8
+.global lbl_8046C618
+lbl_8046C618:
+	.skip 0x108
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__12CSpacePirateFv
--- a/asm/MetroidPrime/Enemies/CTryclops.s
+++ b/asm/MetroidPrime/Enemies/CTryclops.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046DC90
+lbl_8046DC90:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_8025dbc0
--- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s
+++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C938
+lbl_8046C938:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global UpdateEffects__17CWallCrawlerSwarmFR13CStateManagerR9CAnimData
--- a/asm/MetroidPrime/HUD/CSamusHud.s
+++ b/asm/MetroidPrime/HUD/CSamusHud.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C3C8
+lbl_8046C3C8:
+	.skip 0x18
+	
 .section .text, "ax"

 .global "SetMessage__9CSamusHudFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>RC13CHUDMemoParms"
--- a/asm/MetroidPrime/Player/CMorphBall.s
+++ b/asm/MetroidPrime/Player/CMorphBall.s
@ -1,5 +1,14 @@
 .include "macros.inc"

+.section .bss 
+
+.global lbl_8046C4F8
+lbl_8046C4F8:
+	.skip 0xC
+.global lbl_8046C504
+lbl_8046C504:
+	.skip 0x1C
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global DeleteBallShadow__10CMorphBallFv
--- a/asm/MetroidPrime/Player/CPlayerDynamics.s
+++ b/asm/MetroidPrime/Player/CPlayerDynamics.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046E0D8
+lbl_8046E0D8:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .bss
+
+.global lbl_8045C518
+lbl_8045C518:
+	.skip 0x18
+.global lbl_8045C530
+lbl_8045C530:
+	.skip 0x20
+	
 .section .text, "ax"

 .global CModelDataNull__10CModelDataFv
--- a/asm/MetroidPrime/Player/CPlayerOrbit.s
+++ b/asm/MetroidPrime/Player/CPlayerOrbit.s
@ -1,5 +1,17 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C8C0
+lbl_8046C8C0:
+	.skip 0x18
+.global lbl_8046C8D8
+lbl_8046C8D8:
+	.skip 0x18
+.global lbl_8046C8F0
+lbl_8046C8F0:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global UpdateGrappleArmTransform__7CPlayerFRC9CVector3fR13CStateManagerf
--- a/asm/MetroidPrime/Player/CSamusFaceReflection.s
+++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C7A0
+lbl_8046C7A0:
+	.skip 0x30
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .bss
+
+.global lbl_8046D340
+lbl_8046D340:
+	.skip 0xC
+.global lbl_8046D34C
+lbl_8046D34C:
+	.skip 0x14
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global nullsub_5
--- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s
+++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C738
+lbl_8046C738:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global Accept__19CHUDBillboardEffectFR8IVisitor
--- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C438
+lbl_8046C438:
+	.skip 0x18
+	
 .section .text, "ax"

 .global GetOccludedVolumeAmount__12CScriptSoundFRC9CVector3fRC13CStateManager
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s
@ -1,5 +1,10 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046D390
+lbl_8046D390:
+	.skip 0x18
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AcceptScriptMsg__20CScriptSpindleCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager
--- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C520
+lbl_8046C520:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetPatchRenderFlags__12CScriptWaterCFii
--- a/asm/MetroidPrime/Tweaks/CTweaks.s
+++ b/asm/MetroidPrime/Tweaks/CTweaks.s
@ -1,5 +1,44 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8045B180
+lbl_8045B180:
+	.skip 0x5C
+.global lbl_8045B1DC
+lbl_8045B1DC:
+	.skip 0xF4
+.global lbl_8045B2D0
+lbl_8045B2D0:
+	.skip 0xC8
+.global lbl_8045B398
+lbl_8045B398:
+	.skip 0x120
+.global lbl_8045B4B8
+lbl_8045B4B8:
+	.skip 0x228
+.global lbl_8045B6E0
+lbl_8045B6E0:
+	.skip 0x254
+.global lbl_8045B934
+lbl_8045B934:
+	.skip 0x368
+.global lbl_8045BC9C
+lbl_8045BC9C:
+	.skip 0x298
+.global lbl_8045BF34
+lbl_8045BF34:
+	.skip 0x34
+.global lbl_8045BF68
+lbl_8045BF68:
+	.skip 0x68
+.global lbl_8045BFD0
+lbl_8045BFD0:
+	.skip 0x238
+.global lbl_8045C208
+lbl_8045C208:
+	.skip 0x310
+	
 .section .text, "ax"

 .global RegisterResourceTweaks__7CTweaksFv
--- a/asm/MetroidPrime/Weapons/CBomb.s
+++ b/asm/MetroidPrime/Weapons/CBomb.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C420
+lbl_8046C420:
+	.skip 0x18
+	
 .section .text, "ax"

 .global sub_8008faf0
--- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s
+++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046DCA8
+lbl_8046DCA8:
+	.skip 0x18
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__16CNewFlameThrowerFv
--- a/asm/MetroidPrime/Weapons/CPlasmaBeam.s
+++ b/asm/MetroidPrime/Weapons/CPlasmaBeam.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046C488
+lbl_8046C488:
+	.skip 0x10
+	
 .section .text, "ax"

 .global SetWorldLighting__11CPlasmaBeamFR13CStateManager7TAreaIdff
--- a/asm/MetroidPrime/Weapons/CWaveBuster.s
+++ b/asm/MetroidPrime/Weapons/CWaveBuster.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .bss
+.global lbl_8046C908
+lbl_8046C908:
+	.skip 0xC
+.global lbl_8046C914
+lbl_8046C914:
+	.skip 0xC
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_801bd69c
--- a/asm/Weapons/IWeaponRenderer.s
+++ b/asm/Weapons/IWeaponRenderer.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046E1F0
+lbl_8046E1F0:
+	.skip 0x10
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __sinit_IWeaponRenderer_cpp
--- a/asm/WorldFormat/CAreaOctTree_Tests.s
+++ b/asm/WorldFormat/CAreaOctTree_Tests.s
@ -1,5 +1,11 @@
 .include "macros.inc"

+.section .bss
+
+.global lbl_8046E0F0
+lbl_8046E0F0:
+	.skip 0x100
+	
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global LineTestExInternal__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterRQ212CAreaOctTree10SRayResultfffRC9CVector3f
--- a/asm/bss.s
+++ b/asm/bss.s
@ -1,394 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "wa"  # 0x803F7560 - 0x805A6BBF
-
-.global lbl_8045A1A8
-lbl_8045A1A8:
-	.skip 0xF98
-.global lbl_8045B140
-lbl_8045B140:
-	.skip 0x40
-.global lbl_8045B180
-lbl_8045B180:
-	.skip 0x5C
-.global lbl_8045B1DC
-lbl_8045B1DC:
-	.skip 0xF4
-.global lbl_8045B2D0
-lbl_8045B2D0:
-	.skip 0xC8
-.global lbl_8045B398
-lbl_8045B398:
-	.skip 0x120
-.global lbl_8045B4B8
-lbl_8045B4B8:
-	.skip 0x228
-.global lbl_8045B6E0
-lbl_8045B6E0:
-	.skip 0x254
-.global lbl_8045B934
-lbl_8045B934:
-	.skip 0x368
-.global lbl_8045BC9C
-lbl_8045BC9C:
-	.skip 0x298
-.global lbl_8045BF34
-lbl_8045BF34:
-	.skip 0x34
-.global lbl_8045BF68
-lbl_8045BF68:
-	.skip 0x68
-.global lbl_8045BFD0
-lbl_8045BFD0:
-	.skip 0x238
-.global lbl_8045C208
-lbl_8045C208:
-	.skip 0x310
-.global lbl_8045C518
-lbl_8045C518:
-	.skip 0x18
-.global lbl_8045C530
-lbl_8045C530:
-	.skip 0x20
-.global lbl_8045C550
-lbl_8045C550:
-	.skip 0x30
-.global lbl_8045C580
-lbl_8045C580:
-	.skip 0x18
-.global lbl_8045C598
-lbl_8045C598:
-	.skip 0xC
-.global lbl_8045C5A4
-lbl_8045C5A4:
-	.skip 0x10
-.global lbl_8045C5B4
-lbl_8045C5B4:
-	.skip 0xF3C8
-.global lbl_8046B97C
-lbl_8046B97C:
-	.skip 0xA3C
-.global lbl_8046C3B8
-lbl_8046C3B8:
-	.skip 0x10
-.global lbl_8046C3C8
-lbl_8046C3C8:
-	.skip 0x18
-.global lbl_8046C3E0
-lbl_8046C3E0:
-	.skip 0x28
-.global lbl_8046C408
-lbl_8046C408:
-	.skip 0x18
-.global lbl_8046C420
-lbl_8046C420:
-	.skip 0x18
-.global lbl_8046C438
-lbl_8046C438:
-	.skip 0x18
-.global lbl_8046C450
-lbl_8046C450:
-	.skip 0x20
-.global lbl_8046C470
-lbl_8046C470:
-	.skip 0xC
-.global lbl_8046C47C
-lbl_8046C47C:
-	.skip 0xC
-.global lbl_8046C488
-lbl_8046C488:
-	.skip 0x10
-.global lbl_8046C498
-lbl_8046C498:
-	.skip 0x60
-.global lbl_8046C4F8
-lbl_8046C4F8:
-	.skip 0xC
-.global lbl_8046C504
-lbl_8046C504:
-	.skip 0x1C
-.global lbl_8046C520
-lbl_8046C520:
-	.skip 0x18
-.global lbl_8046C538
-lbl_8046C538:
-	.skip 0x20
-.global lbl_8046C558
-lbl_8046C558:
-	.skip 0xC
-.global lbl_8046C564
-lbl_8046C564:
-	.skip 0xC
-.global lbl_8046C570
-lbl_8046C570:
-	.skip 0xA8
-.global lbl_8046C618
-lbl_8046C618:
-	.skip 0x108
-.global lbl_8046C720
-lbl_8046C720:
-	.skip 0x18
-.global lbl_8046C738
-lbl_8046C738:
-	.skip 0x10
-.global lbl_8046C748
-lbl_8046C748:
-	.skip 0x10
-.global lbl_8046C758
-lbl_8046C758:
-	.skip 0x18
-.global lbl_8046C770
-lbl_8046C770:
-	.skip 0x18
-.global lbl_8046C788
-lbl_8046C788:
-	.skip 0x18
-.global lbl_8046C7A0
-lbl_8046C7A0:
-	.skip 0x30
-.global lbl_8046C7D0
-lbl_8046C7D0:
-	.skip 0x78
-.global lbl_8046C848
-lbl_8046C848:
-	.skip 0x18
-.global lbl_8046C860
-lbl_8046C860:
-	.skip 0x18
-.global lbl_8046C878
-lbl_8046C878:
-	.skip 0x18
-.global lbl_8046C890
-lbl_8046C890:
-	.skip 0x18
-.global lbl_8046C8A8
-lbl_8046C8A8:
-	.skip 0x18
-.global lbl_8046C8C0
-lbl_8046C8C0:
-	.skip 0x18
-.global lbl_8046C8D8
-lbl_8046C8D8:
-	.skip 0x18
-.global lbl_8046C8F0
-lbl_8046C8F0:
-	.skip 0x18
-.global lbl_8046C908
-lbl_8046C908:
-	.skip 0xC
-.global lbl_8046C914
-lbl_8046C914:
-	.skip 0xC
-.global lbl_8046C920
-lbl_8046C920:
-	.skip 0x18
-.global lbl_8046C938
-lbl_8046C938:
-	.skip 0x18
-.global lbl_8046C950
-lbl_8046C950:
-	.skip 0xFC
-.global lbl_8046CA4C
-lbl_8046CA4C:
-	.skip 0xF4
-.global lbl_8046CB40
-lbl_8046CB40:
-	.skip 0x800
-.global lbl_8046D340
-lbl_8046D340:
-	.skip 0xC
-.global lbl_8046D34C
-lbl_8046D34C:
-	.skip 0x14
-.global lbl_8046D360
-lbl_8046D360:
-	.skip 0x18
-.global lbl_8046D378
-lbl_8046D378:
-	.skip 0x18
-.global lbl_8046D390
-lbl_8046D390:
-	.skip 0x18
-.global lbl_8046D3A8
-lbl_8046D3A8:
-	.skip 0x150
-.global lbl_8046D4F8
-lbl_8046D4F8:
-	.skip 0x2E8
-.global lbl_8046D7E0
-lbl_8046D7E0:
-	.skip 0x1E0
-.global lbl_8046D9C0
-lbl_8046D9C0:
-	.skip 0x2D0
-.global lbl_8046DC90
-lbl_8046DC90:
-	.skip 0x18
-.global lbl_8046DCA8
-lbl_8046DCA8:
-	.skip 0x18
-.global lbl_8046DCC0
-lbl_8046DCC0:
-	.skip 0x400
-.global lbl_8046E0C0
-lbl_8046E0C0:
-	.skip 0x18
-.global lbl_8046E0D8
-lbl_8046E0D8:
-	.skip 0x18
-.global lbl_8046E0F0
-lbl_8046E0F0:
-	.skip 0x100
-.global lbl_8046E1F0
-lbl_8046E1F0:
-	.skip 0x10
-.global lbl_8046E200
-lbl_8046E200:
-	.skip 0xC
-.global lbl_8046E20C
-lbl_8046E20C:
-	.skip 0x1DF8
-.global lbl_80470004
-lbl_80470004:
-	.skip 0x9168
-.global lbl_8047916C
-lbl_8047916C:
-	.skip 0xC
-.global lbl_80479178
-lbl_80479178:
-	.skip 0x320
-.global lbl_80479498
-lbl_80479498:
-	.skip 0x48
-.global lbl_804794E0
-lbl_804794E0:
-	.skip 0x30
-.global lbl_80479510
-lbl_80479510:
-	.skip 0x48
-.global lbl_80479558
-lbl_80479558:
-	.skip 0x48
-.global lbl_804795A0
-lbl_804795A0:
-	.skip 0x200
-.global lbl_804797A0
-lbl_804797A0:
-	.skip 0x400
-.global lbl_80479BA0
-lbl_80479BA0:
-	.skip 0x30
-.global lbl_80479BD0
-lbl_80479BD0:
-	.skip 0xF0
-.global lbl_80479CC0
-lbl_80479CC0:
-	.skip 0x46000
-.global lbl_804BFCC0
-lbl_804BFCC0:
-	.skip 0x50
-.global lbl_804BFD10
-lbl_804BFD10:
-	.skip 0x20
-.global lbl_804BFD30
-lbl_804BFD30:
-	.skip 0xC
-.global lbl_804BFD3C
-lbl_804BFD3C:
-	.skip 0xC
-.global lbl_804BFD48
-lbl_804BFD48:
-	.skip 0x10
-.global lbl_804BFD58
-lbl_804BFD58:
-	.skip 0xC
-.global lbl_804BFD64
-lbl_804BFD64:
-	.skip 0xC4
-.global lbl_804BFE28
-lbl_804BFE28:
-	.skip 0x20
-.global lbl_804BFE48
-lbl_804BFE48:
-	.skip 0x20
-.global lbl_804BFE68
-lbl_804BFE68:
-	.skip 0x4C
-.global lbl_804BFEB4
-lbl_804BFEB4:
-	.skip 0x4C
-.global lbl_804BFF00
-lbl_804BFF00:
-	.skip 0x10
-.global lbl_804BFF10
-lbl_804BFF10:
-	.skip 0xC
-.global lbl_804BFF1C
-lbl_804BFF1C:
-	.skip 0x14
-.global lbl_804BFF30
-lbl_804BFF30:
-	.skip 0x10
-.global lbl_804BFF40
-lbl_804BFF40:
-	.skip 0x10
-.global lbl_804BFF50
-lbl_804BFF50:
-	.skip 0xC
-.global lbl_804BFF5C
-lbl_804BFF5C:
-	.skip 0x34
-.global lbl_804BFF90
-lbl_804BFF90:
-	.skip 0x10
-.global lbl_804BFFA0
-lbl_804BFFA0:
-	.skip 0xC
-.global lbl_804BFFAC
-lbl_804BFFAC:
-	.skip 0x14
-.global lbl_804BFFC0
-lbl_804BFFC0:
-	.skip 0x8000C
-.global lbl_8053FFCC
-lbl_8053FFCC:
-	.skip 0x28
-.global lbl_8053FFF4
-lbl_8053FFF4:
-	.skip 0x10
-.global lbl_80540004
-lbl_80540004:
-	.skip 0xC
-.global lbl_80540010
-lbl_80540010:
-	.skip 0x10
-.global lbl_80540020
-lbl_80540020:
-	.skip 0x500
-.global lbl_80540520
-lbl_80540520:
-	.skip 0x30
-.global lbl_80540550
-lbl_80540550:
-	.skip 0x30
-.global lbl_80540580
-lbl_80540580:
-	.skip 0x64
-.global lbl_805405E4
-lbl_805405E4:
-	.skip 0x5C
-.global lbl_80540640
-lbl_80540640:
-	.skip 0x3E0
-.global lbl_80540A20
-lbl_80540A20:
-	.skip 0xC
-.global lbl_80540A2C
-lbl_80540A2C:
-	.skip 0x14
-.global lbl_80540A40
-lbl_80540A40:
-	.skip 0xC
-.global lbl_80540A4C
-lbl_80540A4C:
-	.skip 0x34
--- a/obj_files.mk
+++ b/obj_files.mk
@ -874,9 +874,6 @@ RODATA_O_FILES :=\
 DATA_O_FILES :=\
 	$(BUILD_DIR)/asm/data.o

-BSS_O_FILES :=\
-	$(BUILD_DIR)/asm/bss.o
-
 SDATA_O_FILES :=\
 	$(BUILD_DIR)/asm/sdata.o