diff --git a/Makefile b/Makefile
index 2de764b1..397825ce 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ include obj_files.mk
 
 O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(METROTRK_FILES) \
 	   $(METROIDPRIME) $(WORLDFORMAT) $(WEAPONS) $(METARENDER) $(GUISYS) $(COLLISION) \
-	   $(KYOTO) $(RODATA_O_FILES) $(SBSS_O_FILES) $(SDATA2_O_FILES) $(AI_FILES) \
+	   $(KYOTO) $(RODATA_O_FILES) $(SDATA2_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) \
 	   $(DTK_FILES) $(CARD_FILES) $(SI_FILES) $(EXI_FILES) $(THP_FILES) \
@@ -68,7 +68,12 @@ ifeq ($(WINDOWS),1)
   AS      := $(DEVKITPPC)/bin/powerpc-eabi-as.exe
   CPP     := $(DEVKITPPC)/bin/powerpc-eabi-cpp.exe -P
 else
-  WINE      ?= wine
+  WIBO   := $(shell command -v wibo 2> /dev/null)
+  ifdef WIBO
+    WINE ?= wibo
+  else
+    WINE ?= wine
+  endif
   DEVKITPPC ?= /opt/devkitpro/devkitPPC
   DEPENDS   := $(DEPENDS:.d=.d.unix)
   AS        := $(DEVKITPPC)/bin/powerpc-eabi-as
diff --git a/asm/Collision/CCollidableAABox.s b/asm/Collision/CCollidableAABox.s
index 1fbd7f01..47fe8045 100644
--- a/asm/Collision/CCollidableAABox.s
+++ b/asm/Collision/CCollidableAABox.s
@@ -30,7 +30,7 @@ sTableIndex__16CCollidableAABox:
 lbl_80479498:
 	.skip 0x48
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetTableIndex__16CCollidableAABoxCFv
 GetTableIndex__16CCollidableAABoxCFv:
diff --git a/asm/Collision/CCollidableCollisionSurface.s b/asm/Collision/CCollidableCollisionSurface.s
index 65000d9d..593ce6fa 100644
--- a/asm/Collision/CCollidableCollisionSurface.s
+++ b/asm/Collision/CCollidableCollisionSurface.s
@@ -8,7 +8,7 @@ lbl_805A86F0:
 	.4byte 0xFFFFFFFF
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetType__27CCollidableCollisionSurfaceFv
 GetType__27CCollidableCollisionSurfaceFv:
diff --git a/asm/Collision/CCollidableSphere.s b/asm/Collision/CCollidableSphere.s
index db20bb76..7308b0d1 100644
--- a/asm/Collision/CCollidableSphere.s
+++ b/asm/Collision/CCollidableSphere.s
@@ -79,7 +79,7 @@ lbl_805A86F8:
 lbl_80479558:
 	.skip 0x48
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetTableIndex__17CCollidableSphereCFv
 GetTableIndex__17CCollidableSphereCFv:
diff --git a/asm/Collision/CCollisionInfo.s b/asm/Collision/CCollisionInfo.s
index 7ba38a68..92e26098 100644
--- a/asm/Collision/CCollisionInfo.s
+++ b/asm/Collision/CCollisionInfo.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Swap__14CCollisionInfoFv
 Swap__14CCollisionInfoFv:
diff --git a/asm/Collision/CCollisionPrimitive.s b/asm/Collision/CCollisionPrimitive.s
index 1ee3e894..43739995 100644
--- a/asm/Collision/CCollisionPrimitive.s
+++ b/asm/Collision/CCollisionPrimitive.s
@@ -5,8 +5,50 @@
 .global lbl_804794E0
 lbl_804794E0:
 	.skip 0x30
+
+.section .sbss, "wa"
+
+.global lbl_805A9210
+lbl_805A9210:
+	.skip 0x4
+.global lbl_805A9214
+lbl_805A9214:
+	.skip 0x1
+.global lbl_805A9215
+lbl_805A9215:
+	.skip 0x1
+.global lbl_805A9216
+lbl_805A9216:
+	.skip 0x1
+.global lbl_805A9217
+lbl_805A9217:
+	.skip 0x1
+.global lbl_805A9218
+lbl_805A9218:
+	.skip 0x4
+.global lbl_805A921C
+lbl_805A921C:
+	.skip 0x4
+.global lbl_805A9220
+lbl_805A9220:
+	.skip 0x4
+.global lbl_805A9224
+lbl_805A9224:
+	.skip 0x4
+.global lbl_805A9228
+lbl_805A9228:
+	.skip 0x4
+.global lbl_805A922C
+lbl_805A922C:
+	.skip 0x4
+.global lbl_805A9230
+lbl_805A9230:
+	.skip 0x4
+.global lbl_805A9234
+lbl_805A9234:
+	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global InitAddMovingCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo_bPCcPCc
 InitAddMovingCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo_bPCcPCc:
diff --git a/asm/Collision/CMRay.s b/asm/Collision/CMRay.s
index dcfcbcf1..ebd24964 100644
--- a/asm/Collision/CMRay.s
+++ b/asm/Collision/CMRay.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetInvUnscaledTransformRay__5CMRayCFRC12CTransform4f
 GetInvUnscaledTransformRay__5CMRayCFRC12CTransform4f:
diff --git a/asm/Collision/CMaterialFilter.s b/asm/Collision/CMaterialFilter.s
index 7f3f5634..aa7b3545 100644
--- a/asm/Collision/CMaterialFilter.s
+++ b/asm/Collision/CMaterialFilter.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Passes__15CMaterialFilterCFRC13CMaterialList
 Passes__15CMaterialFilterCFRC13CMaterialList:
diff --git a/asm/Collision/CMaterialList.s b/asm/Collision/CMaterialList.s
index d432d687..8ee7b98e 100644
--- a/asm/Collision/CMaterialList.s
+++ b/asm/Collision/CMaterialList.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global BitPosition__13CMaterialListFUx
 BitPosition__13CMaterialListFUx:
diff --git a/asm/Collision/COBBox.s b/asm/Collision/COBBox.s
index 823e8f1b..995c3ce0 100644
--- a/asm/Collision/COBBox.s
+++ b/asm/Collision/COBBox.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global OBBIntersectsBox__6COBBoxCFRC6COBBox
 OBBIntersectsBox__6COBBoxCFRC6COBBox:
diff --git a/asm/Collision/CollisionUtil.s b/asm/Collision/CollisionUtil.s
index 3e6e802b..2edddd19 100644
--- a/asm/Collision/CollisionUtil.s
+++ b/asm/Collision/CollisionUtil.s
@@ -6,7 +6,7 @@
 lbl_80479510:
 	.skip 0x48
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global TriPointSqrDist__13CollisionUtilFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fPfPf
 TriPointSqrDist__13CollisionUtilFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fPfPf:
diff --git a/asm/Collision/InternalColliders.s b/asm/Collision/InternalColliders.s
index 7dade05b..c44a329a 100644
--- a/asm/Collision/InternalColliders.s
+++ b/asm/Collision/InternalColliders.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AddColliders__17InternalCollidersFv
 AddColliders__17InternalCollidersFv:
diff --git a/asm/Dolphin/GBA/GBA.s b/asm/Dolphin/GBA/GBA.s
index c79bb39f..34b14a5f 100644
--- a/asm/Dolphin/GBA/GBA.s
+++ b/asm/Dolphin/GBA/GBA.s
@@ -55,7 +55,7 @@ lbl_803F7170:
 	.byte 0x00
 	
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ShortCommandProc
 ShortCommandProc:
diff --git a/asm/Dolphin/GBA/GBAKey.s b/asm/Dolphin/GBA/GBAKey.s
index 9c0a2083..fb2d7c1e 100644
--- a/asm/Dolphin/GBA/GBAKey.s
+++ b/asm/Dolphin/GBA/GBAKey.s
@@ -67,7 +67,7 @@ lbl_803F7520:
 lbl_803F752C:
     .asciz "GBA - unexpected dsp call"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __GBASetDelay
 __GBASetDelay:
diff --git a/asm/Dolphin/GBA/GBARead.s b/asm/Dolphin/GBA/GBARead.s
index c82103d7..0087f2d0 100644
--- a/asm/Dolphin/GBA/GBARead.s
+++ b/asm/Dolphin/GBA/GBARead.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ReadProc
 ReadProc:
diff --git a/asm/Dolphin/GBA/GBAWrite.s b/asm/Dolphin/GBA/GBAWrite.s
index 4315920d..88fa5acf 100644
--- a/asm/Dolphin/GBA/GBAWrite.s
+++ b/asm/Dolphin/GBA/GBAWrite.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global WriteProc
 WriteProc:
diff --git a/asm/Dolphin/GBA/GBAXfer.s b/asm/Dolphin/GBA/GBAXfer.s
index 03d86a89..262f0397 100644
--- a/asm/Dolphin/GBA/GBAXfer.s
+++ b/asm/Dolphin/GBA/GBAXfer.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
     
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __GBAHandler
 __GBAHandler:
diff --git a/asm/Dolphin/pad/PadClamp.s b/asm/Dolphin/pad/PadClamp.s
index 37aaee35..79507bc8 100644
--- a/asm/Dolphin/pad/PadClamp.s
+++ b/asm/Dolphin/pad/PadClamp.s
@@ -5,7 +5,7 @@
 lbl_803D8588:
 	.incbin "baserom.dol", 0x3D5588, 0x10
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ClampStick
 ClampStick:
diff --git a/asm/Dolphin/pad/pad.s b/asm/Dolphin/pad/pad.s
index cfd45e47..79ef72f0 100644
--- a/asm/Dolphin/pad/pad.s
+++ b/asm/Dolphin/pad/pad.s
@@ -80,7 +80,7 @@ CmdReadOrigin:
 CmdCalibrate:
 	.4byte 0x42000000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global UpdateOrigin
 UpdateOrigin:
diff --git a/asm/Dolphin/thp/THPAudio.s b/asm/Dolphin/thp/THPAudio.s
index 50007e0c..7fc7662d 100644
--- a/asm/Dolphin/thp/THPAudio.s
+++ b/asm/Dolphin/thp/THPAudio.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global THPAudioDecode
 THPAudioDecode:
diff --git a/asm/Dolphin/thp/THPDec.s b/asm/Dolphin/thp/THPDec.s
index 5e5024ef..d2dd5e39 100644
--- a/asm/Dolphin/thp/THPDec.s
+++ b/asm/Dolphin/thp/THPDec.s
@@ -116,7 +116,7 @@ THPVersionStr:
 THPVersion:
 	.4byte THPVersionStr
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global THPVideoDecode
 THPVideoDecode:
diff --git a/asm/Dolphin/vi.s b/asm/Dolphin/vi.s
index 489df08c..5a9df743 100644
--- a/asm/Dolphin/vi.s
+++ b/asm/Dolphin/vi.s
@@ -71,7 +71,7 @@ lbl_805A99A8:
 lbl_805A99AC:
 	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __VIRetraceHandler
 __VIRetraceHandler:
diff --git a/asm/GuiSys/CAuiEnergyBarT01.s b/asm/GuiSys/CAuiEnergyBarT01.s
index c6e94581..1f1685e5 100644
--- a/asm/GuiSys/CAuiEnergyBarT01.s
+++ b/asm/GuiSys/CAuiEnergyBarT01.s
@@ -34,7 +34,7 @@ lbl_805A86DC:
 	# ROM: 0x3F607C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetWidgetTypeID__16CAuiEnergyBarT01CFv
 GetWidgetTypeID__16CAuiEnergyBarT01CFv:
diff --git a/asm/GuiSys/CAuiImagePane.s b/asm/GuiSys/CAuiImagePane.s
index 938d5b96..3a2d799a 100644
--- a/asm/GuiSys/CAuiImagePane.s
+++ b/asm/GuiSys/CAuiImagePane.s
@@ -30,7 +30,7 @@ lbl_805A86E0:
 	.4byte 0x3F800000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__13CAuiImagePaneFv
 __dt__13CAuiImagePaneFv:
diff --git a/asm/GuiSys/CAuiMain.s b/asm/GuiSys/CAuiMain.s
index fdf9034f..0557e69c 100644
--- a/asm/GuiSys/CAuiMain.s
+++ b/asm/GuiSys/CAuiMain.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global InitializeApplicationUI__FR7CGuiSys
 InitializeApplicationUI__FR7CGuiSys:
diff --git a/asm/GuiSys/CAuiMeter.s b/asm/GuiSys/CAuiMeter.s
index 50d92a1c..7d8b92fc 100644
--- a/asm/GuiSys/CAuiMeter.s
+++ b/asm/GuiSys/CAuiMeter.s
@@ -40,7 +40,7 @@ lbl_805A86B8:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__9CAuiMeterFv
 __dt__9CAuiMeterFv:
diff --git a/asm/GuiSys/CGuiGroup.s b/asm/GuiSys/CGuiGroup.s
index 2c661e13..09302be6 100644
--- a/asm/GuiSys/CGuiGroup.s
+++ b/asm/GuiSys/CGuiGroup.s
@@ -2,6 +2,12 @@
 
 #TODO: Split this up properly (need to split CGuiCamera and CGuiCompoundWidget)
 
+.section .sbss, "wa"
+
+.global lbl_805A91F8
+lbl_805A91F8:
+	.skip 0x8
+
 .section .data
 
 .global lbl_803EC738
@@ -73,7 +79,7 @@ lbl_803EC7C8:
 	.4byte OnActivate__9CGuiGroupFv
 	.4byte GetWorkerWidget__18CGuiCompoundWidgetFi
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__9CGuiGroupFv
 __dt__9CGuiGroupFv:
diff --git a/asm/GuiSys/CGuiHeadWidget.s b/asm/GuiSys/CGuiHeadWidget.s
index 046115ca..475551c8 100644
--- a/asm/GuiSys/CGuiHeadWidget.s
+++ b/asm/GuiSys/CGuiHeadWidget.s
@@ -22,7 +22,7 @@ lbl_803EC808:
 	.4byte OnActivate__10CGuiWidgetFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__14CGuiHeadWidgetFRCQ210CGuiWidget15CGuiWidgetParms
 __ct__14CGuiHeadWidgetFRCQ210CGuiWidget15CGuiWidgetParms:
diff --git a/asm/GuiSys/CGuiLight.s b/asm/GuiSys/CGuiLight.s
index 46d8d951..1a0a6641 100644
--- a/asm/GuiSys/CGuiLight.s
+++ b/asm/GuiSys/CGuiLight.s
@@ -22,7 +22,7 @@ lbl_803EC848:
 	.4byte OnActivate__10CGuiWidgetFv
 	.4byte SetIsVisible__9CGuiLightFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetWidgetTypeID__9CGuiLightCFv
 GetWidgetTypeID__9CGuiLightCFv:
diff --git a/asm/GuiSys/CGuiModel.s b/asm/GuiSys/CGuiModel.s
index 9e2c792d..dc321081 100644
--- a/asm/GuiSys/CGuiModel.s
+++ b/asm/GuiSys/CGuiModel.s
@@ -22,7 +22,7 @@ lbl_803EC888:
 	.4byte OnActivate__10CGuiWidgetFv
 	.4byte GetModelAssets__9CGuiModelCFv
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetWidgetTypeID__9CGuiModelCFv
 GetWidgetTypeID__9CGuiModelCFv:
diff --git a/asm/GuiSys/CGuiObject.s b/asm/GuiSys/CGuiObject.s
index 4b3981e3..79ad5de0 100644
--- a/asm/GuiSys/CGuiObject.s
+++ b/asm/GuiSys/CGuiObject.s
@@ -12,7 +12,7 @@ lbl_803EC8C8:
 	.4byte Draw__10CGuiObjectCFRC19CGuiWidgetDrawParms
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetO2WTransform__10CGuiObjectFRC12CTransform4f
 SetO2WTransform__10CGuiObjectFRC12CTransform4f:
diff --git a/asm/GuiSys/CGuiPane.s b/asm/GuiSys/CGuiPane.s
index 5a3225aa..30235a68 100644
--- a/asm/GuiSys/CGuiPane.s
+++ b/asm/GuiSys/CGuiPane.s
@@ -26,7 +26,7 @@ lbl_803EC8E0:
 	.4byte InitializeBuffers__8CGuiPaneFv
 	.4byte WriteData__8CGuiPaneCFR13COutputStreamb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetWidgetTypeID__8CGuiPaneCFv
 GetWidgetTypeID__8CGuiPaneCFv:
diff --git a/asm/GuiSys/CGuiSliderGroup.s b/asm/GuiSys/CGuiSliderGroup.s
index 3c595c6a..c6277c01 100644
--- a/asm/GuiSys/CGuiSliderGroup.s
+++ b/asm/GuiSys/CGuiSliderGroup.s
@@ -23,7 +23,7 @@ lbl_803EC930:
 	.4byte GetWorkerWidget__15CGuiSliderGroupFi
 	
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__15CGuiSliderGroupFv
 __dt__15CGuiSliderGroupFv:
diff --git a/asm/GuiSys/CGuiSys.s b/asm/GuiSys/CGuiSys.s
index fd46e09a..c4968c03 100644
--- a/asm/GuiSys/CGuiSys.s
+++ b/asm/GuiSys/CGuiSys.s
@@ -1,6 +1,12 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9200
+lbl_805A9200:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global nullsub_7
 nullsub_7:
diff --git a/asm/GuiSys/CGuiTableGroup.s b/asm/GuiSys/CGuiTableGroup.s
index d183f3e9..d76557cb 100644
--- a/asm/GuiSys/CGuiTableGroup.s
+++ b/asm/GuiSys/CGuiTableGroup.s
@@ -36,7 +36,7 @@ lbl_805A86C4:
 	# ROM: 0x3F6064
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AddWorkerWidget__14CGuiTableGroupFP10CGuiWidget
 AddWorkerWidget__14CGuiTableGroupFP10CGuiWidget:
diff --git a/asm/GuiSys/CGuiTextPane.s b/asm/GuiSys/CGuiTextPane.s
index 04c700cd..7df93c4e 100644
--- a/asm/GuiSys/CGuiTextPane.s
+++ b/asm/GuiSys/CGuiTextPane.s
@@ -28,7 +28,7 @@ lbl_803EC9B8:
 	.4byte sub_802c7638
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetWidgetTypeID__12CGuiTextPaneCFv
 GetWidgetTypeID__12CGuiTextPaneCFv:
diff --git a/asm/GuiSys/CGuiTextSupport.s b/asm/GuiSys/CGuiTextSupport.s
index fe97b46e..57424c82 100644
--- a/asm/GuiSys/CGuiTextSupport.s
+++ b/asm/GuiSys/CGuiTextSupport.s
@@ -22,7 +22,16 @@ lbl_805A86D4:
 	# ROM: 0x3F6074
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9208
+lbl_805A9208:
+	.skip 0x4
+.global lbl_805A920C
+lbl_805A920C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global sub_802c7cfc
 sub_802c7cfc:
diff --git a/asm/GuiSys/CGuiWidget.s b/asm/GuiSys/CGuiWidget.s
index 5a6882c5..f713bd97 100644
--- a/asm/GuiSys/CGuiWidget.s
+++ b/asm/GuiSys/CGuiWidget.s
@@ -23,7 +23,7 @@ lbl_803ECA10:
 	.4byte 0
 	
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global OnActivate__10CGuiWidgetFv
 OnActivate__10CGuiWidgetFv:
diff --git a/asm/GuiSys/CGuiWidgetDrawParms.s b/asm/GuiSys/CGuiWidgetDrawParms.s
index e40564c3..b9565e31 100644
--- a/asm/GuiSys/CGuiWidgetDrawParms.s
+++ b/asm/GuiSys/CGuiWidgetDrawParms.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __sinit_CGuiWidgetDrawParms_cpp
 __sinit_CGuiWidgetDrawParms_cpp:
diff --git a/asm/GuiSys/CGuiWidgetIdDB.s b/asm/GuiSys/CGuiWidgetIdDB.s
index a32a00c8..fa6aa252 100644
--- a/asm/GuiSys/CGuiWidgetIdDB.s
+++ b/asm/GuiSys/CGuiWidgetIdDB.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "FindWidgetID__14CGuiWidgetIdDBCFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
 "FindWidgetID__14CGuiWidgetIdDBCFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>":
diff --git a/asm/GuiSys/CRepeatState.s b/asm/GuiSys/CRepeatState.s
index 85d98aac..e656c113 100644
--- a/asm/GuiSys/CRepeatState.s
+++ b/asm/GuiSys/CRepeatState.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Update__Q214CGuiTableGroup12CRepeatStateFfb
 Update__Q214CGuiTableGroup12CRepeatStateFfb:
diff --git a/asm/Kyoto/Alloc/CCircularBuffer.s b/asm/Kyoto/Alloc/CCircularBuffer.s
index e89c9f78..cbb4a7ca 100644
--- a/asm/Kyoto/Alloc/CCircularBuffer.s
+++ b/asm/Kyoto/Alloc/CCircularBuffer.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetAllocatedAmount__15CCircularBufferCFv
 GetAllocatedAmount__15CCircularBufferCFv:
diff --git a/asm/Kyoto/Alloc/CGameAllocator.s b/asm/Kyoto/Alloc/CGameAllocator.s
index ed986b9e..38cb49af 100644
--- a/asm/Kyoto/Alloc/CGameAllocator.s
+++ b/asm/Kyoto/Alloc/CGameAllocator.s
@@ -22,7 +22,28 @@ lbl_803EF6D8:
 	.4byte OffsetFakeStatics__14CGameAllocatorFi
 	.4byte GetMetrics__14CGameAllocatorCFv
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A95D8
+lbl_805A95D8:
+	.skip 0x8
+.global lbl_805A95E0
+lbl_805A95E0:
+	.skip 0x4
+.global lbl_805A95E4
+lbl_805A95E4:
+	.skip 0x4
+.global lbl_805A95E8
+lbl_805A95E8:
+	.skip 0x1
+.global lbl_805A95E9
+lbl_805A95E9:
+	.skip 0x1
+.global lbl_805A95EA
+lbl_805A95EA:
+	.skip 0x6
+
+.section .text, "ax"
 
 .global OffsetFakeStatics__14CGameAllocatorFi
 OffsetFakeStatics__14CGameAllocatorFi:
diff --git a/asm/Kyoto/Alloc/CMediumAllocPool.s b/asm/Kyoto/Alloc/CMediumAllocPool.s
index f63d3931..5054f1b9 100644
--- a/asm/Kyoto/Alloc/CMediumAllocPool.s
+++ b/asm/Kyoto/Alloc/CMediumAllocPool.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_80350540
 sub_80350540:
diff --git a/asm/Kyoto/Alloc/CMemory.s b/asm/Kyoto/Alloc/CMemory.s
index d394a6fc..f4d74ee3 100644
--- a/asm/Kyoto/Alloc/CMemory.s
+++ b/asm/Kyoto/Alloc/CMemory.s
@@ -17,7 +17,19 @@ lbl_805A8868:
 	.4byte lbl_804BFD64
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9460
+lbl_805A9460:
+	.skip 0x4
+.global lbl_805A9464
+lbl_805A9464:
+	.skip 0x4
+.global lbl_805A9468
+lbl_805A9468:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global __nwa__FUlPCcPCc
 __nwa__FUlPCcPCc:
diff --git a/asm/Kyoto/Alloc/CSmallAllocPool.s b/asm/Kyoto/Alloc/CSmallAllocPool.s
index 4605cc8d..c89870fe 100644
--- a/asm/Kyoto/Alloc/CSmallAllocPool.s
+++ b/asm/Kyoto/Alloc/CSmallAllocPool.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Free__15CSmallAllocPoolFPCv
 Free__15CSmallAllocPoolFPCv:
diff --git a/asm/Kyoto/Alloc/IAllocator.s b/asm/Kyoto/Alloc/IAllocator.s
index fb898796..66b9851a 100644
--- a/asm/Kyoto/Alloc/IAllocator.s
+++ b/asm/Kyoto/Alloc/IAllocator.s
@@ -22,7 +22,7 @@ lbl_803ED9C0:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__10IAllocatorFv
 __dt__10IAllocatorFv:
diff --git a/asm/Kyoto/Animation/CAdditiveAnimPlayback.s b/asm/Kyoto/Animation/CAdditiveAnimPlayback.s
index 492183b9..eeab6256 100644
--- a/asm/Kyoto/Animation/CAdditiveAnimPlayback.s
+++ b/asm/Kyoto/Animation/CAdditiveAnimPlayback.s
@@ -28,7 +28,7 @@ lbl_805A8A08:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AddToSegStatementSet__21CAdditiveAnimPlaybackCFRC10CSegIdListRC15CCharLayoutInfoR16CSegStatementSet
 AddToSegStatementSet__21CAdditiveAnimPlaybackCFRC10CSegIdListRC15CCharLayoutInfoR16CSegStatementSet:
diff --git a/asm/Kyoto/Animation/CAdvancementDeltas.s b/asm/Kyoto/Animation/CAdvancementDeltas.s
index 5d839a62..304ded43 100644
--- a/asm/Kyoto/Animation/CAdvancementDeltas.s
+++ b/asm/Kyoto/Animation/CAdvancementDeltas.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Blend__18CAdvancementDeltasFRC18CAdvancementDeltasRC18CAdvancementDeltasf
 Blend__18CAdvancementDeltasFRC18CAdvancementDeltasRC18CAdvancementDeltasf:
diff --git a/asm/Kyoto/Animation/CAllFormatsAnimSource.s b/asm/Kyoto/Animation/CAllFormatsAnimSource.s
index 0ab0ced0..d86daa56 100644
--- a/asm/Kyoto/Animation/CAllFormatsAnimSource.s
+++ b/asm/Kyoto/Animation/CAllFormatsAnimSource.s
@@ -10,7 +10,7 @@ lbl_803ED568:
 	.4byte "__dt__49TObjOwnerDerivedFromIObj<21CAllFormatsAnimSource>Fv"
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__21CAllFormatsAnimSourceFv
 __dt__21CAllFormatsAnimSourceFv:
diff --git a/asm/Kyoto/Animation/CAnimCharacterSet.s b/asm/Kyoto/Animation/CAnimCharacterSet.s
index 3b6e9f92..f7de4448 100644
--- a/asm/Kyoto/Animation/CAnimCharacterSet.s
+++ b/asm/Kyoto/Animation/CAnimCharacterSet.s
@@ -10,7 +10,7 @@ lbl_803ECBD0:
 	.4byte sub_802d81c0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FAnimCharacterSet__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FAnimCharacterSet__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/Kyoto/Animation/CAnimMathUtils.s b/asm/Kyoto/Animation/CAnimMathUtils.s
index 3f6c39e7..0eacdd18 100644
--- a/asm/Kyoto/Animation/CAnimMathUtils.s
+++ b/asm/Kyoto/Animation/CAnimMathUtils.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SlerpLocal__14CAnimMathUtilsFRC11CQuaternionRC11CQuaternionf
 SlerpLocal__14CAnimMathUtilsFRC11CQuaternionRC11CQuaternionf:
diff --git a/asm/Kyoto/Animation/CAnimPOIData.s b/asm/Kyoto/Animation/CAnimPOIData.s
index 2276f441..c5177f96 100644
--- a/asm/Kyoto/Animation/CAnimPOIData.s
+++ b/asm/Kyoto/Animation/CAnimPOIData.s
@@ -10,7 +10,34 @@ lbl_803ECF48:
 	.4byte sub_802ebbf8
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A92E0
+lbl_805A92E0:
+	.skip 0x4
+.global lbl_805A92E4
+lbl_805A92E4:
+	.skip 0x4
+.global lbl_805A92E8
+lbl_805A92E8:
+	.skip 0x4
+.global lbl_805A92EC
+lbl_805A92EC:
+	.skip 0x4
+.global lbl_805A92F0
+lbl_805A92F0:
+	.skip 0x4
+.global lbl_805A92F4
+lbl_805A92F4:
+	.skip 0x4
+.global lbl_805A92F8
+lbl_805A92F8:
+	.skip 0x4
+.global lbl_805A92FC
+lbl_805A92FC:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global AnimPOIDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 AnimPOIDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/Kyoto/Animation/CAnimSource.s b/asm/Kyoto/Animation/CAnimSource.s
index 59feabe7..7c862176 100644
--- a/asm/Kyoto/Animation/CAnimSource.s
+++ b/asm/Kyoto/Animation/CAnimSource.s
@@ -18,7 +18,7 @@ lbl_805A8782:
 	.byte 0x01, 0x00
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSegStatementSet__11CAnimSourceCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime
 GetSegStatementSet__11CAnimSourceCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime:
diff --git a/asm/Kyoto/Animation/CAnimSourceReader.s b/asm/Kyoto/Animation/CAnimSourceReader.s
index e3eee24b..8ece189b 100644
--- a/asm/Kyoto/Animation/CAnimSourceReader.s
+++ b/asm/Kyoto/Animation/CAnimSourceReader.s
@@ -70,7 +70,7 @@ lbl_805A878C:
 	# ROM: 0x3F612C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global VGetAdvancementResults__17CAnimSourceReaderCFRC13CCharAnimTimeRC13CCharAnimTime
 VGetAdvancementResults__17CAnimSourceReaderCFRC13CCharAnimTimeRC13CCharAnimTime:
diff --git a/asm/Kyoto/Animation/CAnimSourceReaderBase.s b/asm/Kyoto/Animation/CAnimSourceReaderBase.s
index 5b9aee57..839c0c93 100644
--- a/asm/Kyoto/Animation/CAnimSourceReaderBase.s
+++ b/asm/Kyoto/Animation/CAnimSourceReaderBase.s
@@ -62,7 +62,7 @@ lbl_805A87A4:
 	# ROM: 0x3F6144
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global PostConstruct__21CAnimSourceReaderBaseFRC13CCharAnimTime
 PostConstruct__21CAnimSourceReaderBaseFRC13CCharAnimTime:
diff --git a/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s b/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s
index 3a7aa3ed..48f20b68 100644
--- a/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s
+++ b/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s
@@ -34,7 +34,7 @@ lbl_803ED068:
 	.4byte VGetBestUnblendedChild__28CAnimTreeAnimReaderContainerCFv
 	.4byte "VGetWeightedReaders__28CAnimTreeAnimReaderContainerFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__28CAnimTreeAnimReaderContainerFv
 __dt__28CAnimTreeAnimReaderContainerFv:
diff --git a/asm/Kyoto/Animation/CAnimTreeBlend.s b/asm/Kyoto/Animation/CAnimTreeBlend.s
index d0e22b94..012924c4 100644
--- a/asm/Kyoto/Animation/CAnimTreeBlend.s
+++ b/asm/Kyoto/Animation/CAnimTreeBlend.s
@@ -38,7 +38,7 @@ lbl_803ED0D8:
 	.4byte VReverseSimplified__18CAnimTreeTweenBaseFv
 	.4byte VGetBlendingWeight__14CAnimTreeBlendCFv
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__14CAnimTreeBlendFv
 __dt__14CAnimTreeBlendFv:
diff --git a/asm/Kyoto/Animation/CAnimTreeContinuousPhaseBlend.s b/asm/Kyoto/Animation/CAnimTreeContinuousPhaseBlend.s
index df1898df..d6c8db78 100644
--- a/asm/Kyoto/Animation/CAnimTreeContinuousPhaseBlend.s
+++ b/asm/Kyoto/Animation/CAnimTreeContinuousPhaseBlend.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__18CAnimTreeTimeScaleFv
 __dt__18CAnimTreeTimeScaleFv:
diff --git a/asm/Kyoto/Animation/CAnimTreeDoubleChild.s b/asm/Kyoto/Animation/CAnimTreeDoubleChild.s
index ea6c8d7d..1c4882ad 100644
--- a/asm/Kyoto/Animation/CAnimTreeDoubleChild.s
+++ b/asm/Kyoto/Animation/CAnimTreeDoubleChild.s
@@ -58,7 +58,7 @@ lbl_805A87B4:
 	# ROM: 0x3F6154
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "VGetWeightedReaders__20CAnimTreeDoubleChildFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>"
 "VGetWeightedReaders__20CAnimTreeDoubleChildFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>":
diff --git a/asm/Kyoto/Animation/CAnimTreeLoopIn.s b/asm/Kyoto/Animation/CAnimTreeLoopIn.s
index 2d53005e..462f7596 100644
--- a/asm/Kyoto/Animation/CAnimTreeLoopIn.s
+++ b/asm/Kyoto/Animation/CAnimTreeLoopIn.s
@@ -37,7 +37,7 @@ lbl_803ECBE0:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__15CAnimTreeLoopInFv
 __dt__15CAnimTreeLoopInFv:
diff --git a/asm/Kyoto/Animation/CAnimTreeNode.s b/asm/Kyoto/Animation/CAnimTreeNode.s
index dd1efe2d..87581bc3 100644
--- a/asm/Kyoto/Animation/CAnimTreeNode.s
+++ b/asm/Kyoto/Animation/CAnimTreeNode.s
@@ -34,7 +34,7 @@ lbl_803ED1D0:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsCAnimTreeNode__13CAnimTreeNodeCFv
 IsCAnimTreeNode__13CAnimTreeNodeCFv:
diff --git a/asm/Kyoto/Animation/CAnimTreeSequence.s b/asm/Kyoto/Animation/CAnimTreeSequence.s
index 765cc761..22442a46 100644
--- a/asm/Kyoto/Animation/CAnimTreeSequence.s
+++ b/asm/Kyoto/Animation/CAnimTreeSequence.s
@@ -48,7 +48,7 @@ lbl_805A8704:
 	# ROM: 0x3F60A4
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CAnimTreeSequenceFv
 __dt__17CAnimTreeSequenceFv:
diff --git a/asm/Kyoto/Animation/CAnimTreeSingleChild.s b/asm/Kyoto/Animation/CAnimTreeSingleChild.s
index 710f072b..7987a20a 100644
--- a/asm/Kyoto/Animation/CAnimTreeSingleChild.s
+++ b/asm/Kyoto/Animation/CAnimTreeSingleChild.s
@@ -34,7 +34,7 @@ lbl_803ED240:
 	.4byte 0
 	.4byte "VGetWeightedReaders__20CAnimTreeSingleChildFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "VGetWeightedReaders__20CAnimTreeSingleChildFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>"
 "VGetWeightedReaders__20CAnimTreeSingleChildFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>":
diff --git a/asm/Kyoto/Animation/CAnimTreeTimeScale.s b/asm/Kyoto/Animation/CAnimTreeTimeScale.s
index 58436f1c..19dca93a 100644
--- a/asm/Kyoto/Animation/CAnimTreeTimeScale.s
+++ b/asm/Kyoto/Animation/CAnimTreeTimeScale.s
@@ -56,7 +56,7 @@ lbl_805A87C4:
 	# ROM: 0x3F6164
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "CreatePrimitiveName__18CAnimTreeTimeScaleFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>fRC13CCharAnimTimef"
 "CreatePrimitiveName__18CAnimTreeTimeScaleFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>fRC13CCharAnimTimef":
diff --git a/asm/Kyoto/Animation/CAnimTreeTransition.s b/asm/Kyoto/Animation/CAnimTreeTransition.s
index 6a0365dd..c1b43a7b 100644
--- a/asm/Kyoto/Animation/CAnimTreeTransition.s
+++ b/asm/Kyoto/Animation/CAnimTreeTransition.s
@@ -50,7 +50,7 @@ lbl_805A87CC:
 	# ROM: 0x3F616C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global VGetBestUnblendedChild__19CAnimTreeTransitionCFv
 VGetBestUnblendedChild__19CAnimTreeTransitionCFv:
diff --git a/asm/Kyoto/Animation/CAnimTreeTweenBase.s b/asm/Kyoto/Animation/CAnimTreeTweenBase.s
index cd2c75b0..e458e691 100644
--- a/asm/Kyoto/Animation/CAnimTreeTweenBase.s
+++ b/asm/Kyoto/Animation/CAnimTreeTweenBase.s
@@ -38,7 +38,25 @@ lbl_803ED3A0:
 	.4byte VReverseSimplified__18CAnimTreeTweenBaseFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9300
+lbl_805A9300:
+	.skip 0x4
+.global lbl_805A9304
+lbl_805A9304:
+	.skip 0x4
+.global lbl_805A9308
+lbl_805A9308:
+	.skip 0x4
+.global lbl_805A930C
+lbl_805A930C:
+	.skip 0x4
+.global lbl_805A9310
+lbl_805A9310:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global "VGetWeightedReaders__18CAnimTreeTweenBaseFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>"
 "VGetWeightedReaders__18CAnimTreeTweenBaseFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>":
diff --git a/asm/Kyoto/Animation/CAnimation.s b/asm/Kyoto/Animation/CAnimation.s
index 99656b90..a011d935 100644
--- a/asm/Kyoto/Animation/CAnimation.s
+++ b/asm/Kyoto/Animation/CAnimation.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__10CAnimationFR12CInputStream
 __ct__10CAnimationFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CAnimationManager.s b/asm/Kyoto/Animation/CAnimationManager.s
index a194b054..f62ca9e1 100644
--- a/asm/Kyoto/Animation/CAnimationManager.s
+++ b/asm/Kyoto/Animation/CAnimationManager.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "NonConstCopy__28TToken<18CAnimationDatabase>CFv"
 "NonConstCopy__28TToken<18CAnimationDatabase>CFv":
diff --git a/asm/Kyoto/Animation/CAnimationSet.s b/asm/Kyoto/Animation/CAnimationSet.s
index 8e7c9acc..45aa426b 100644
--- a/asm/Kyoto/Animation/CAnimationSet.s
+++ b/asm/Kyoto/Animation/CAnimationSet.s
@@ -1,6 +1,30 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9250
+lbl_805A9250:
+	.skip 0x4
+.global lbl_805A9254
+lbl_805A9254:
+	.skip 0x4
+.global lbl_805A9258
+lbl_805A9258:
+	.skip 0x4
+.global lbl_805A925C
+lbl_805A925C:
+	.skip 0x4
+.global lbl_805A9260
+lbl_805A9260:
+	.skip 0x4
+.global lbl_805A9264
+lbl_805A9264:
+	.skip 0x4
+.global lbl_805A9268
+lbl_805A9268:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global StreamAnimResIdEventResIdList__13CAnimationSetFUsR12CInputStream
 StreamAnimResIdEventResIdList__13CAnimationSetFUsR12CInputStream:
diff --git a/asm/Kyoto/Animation/CBoolPOINode.s b/asm/Kyoto/Animation/CBoolPOINode.s
index 736c4a9a..16bed248 100644
--- a/asm/Kyoto/Animation/CBoolPOINode.s
+++ b/asm/Kyoto/Animation/CBoolPOINode.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CopyNodeMinusStartTime__12CBoolPOINodeFRC12CBoolPOINodeRC13CCharAnimTime
 CopyNodeMinusStartTime__12CBoolPOINodeFRC12CBoolPOINodeRC13CCharAnimTime:
diff --git a/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s b/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s
index 6f0aa53b..b7d71999 100644
--- a/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s
+++ b/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s
@@ -1,6 +1,12 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9318
+lbl_805A9318:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global SubtractFromTotalSize__22CCharAnimMemoryMetricsFUiQ222CCharAnimMemoryMetrics14EAnimSubSystem
 SubtractFromTotalSize__22CCharAnimMemoryMetricsFUiQ222CCharAnimMemoryMetrics14EAnimSubSystem:
diff --git a/asm/Kyoto/Animation/CCharAnimTime.s b/asm/Kyoto/Animation/CCharAnimTime.s
index 912d7567..92236147 100644
--- a/asm/Kyoto/Animation/CCharAnimTime.s
+++ b/asm/Kyoto/Animation/CCharAnimTime.s
@@ -42,7 +42,7 @@ lbl_805A8954:
 	# ROM: 0x3F62F4
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global PutTo__13CCharAnimTimeCFR13COutputStream
 PutTo__13CCharAnimTimeCFR13COutputStream:
diff --git a/asm/Kyoto/Animation/CCharLayoutInfo.s b/asm/Kyoto/Animation/CCharLayoutInfo.s
index 0d465230..c9bf6ef5 100644
--- a/asm/Kyoto/Animation/CCharLayoutInfo.s
+++ b/asm/Kyoto/Animation/CCharLayoutInfo.s
@@ -37,7 +37,22 @@ lbl_805A87D4:
 	# ROM: 0x3F6174
 	.4byte 0x01000000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9320
+lbl_805A9320:
+	.skip 0x4
+.global lbl_805A9324
+lbl_805A9324:
+	.skip 0x4
+.global lbl_805A9328
+lbl_805A9328:
+	.skip 0x4
+.global lbl_805A932C
+lbl_805A932C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global "GetSegIdFromString__15CCharLayoutInfoCFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
 "GetSegIdFromString__15CCharLayoutInfoCFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>":
diff --git a/asm/Kyoto/Animation/CCharacterInfo.s b/asm/Kyoto/Animation/CCharacterInfo.s
index 0f3674fc..075ca94c 100644
--- a/asm/Kyoto/Animation/CCharacterInfo.s
+++ b/asm/Kyoto/Animation/CCharacterInfo.s
@@ -18,7 +18,64 @@ lbl_805A870A:
 	.byte 0x01, 0x00
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9270
+lbl_805A9270:
+	.skip 0x4
+.global lbl_805A9274
+lbl_805A9274:
+	.skip 0x4
+.global lbl_805A9278
+lbl_805A9278:
+	.skip 0x4
+.global lbl_805A927C
+lbl_805A927C:
+	.skip 0x4
+.global lbl_805A9280
+lbl_805A9280:
+	.skip 0x4
+.global lbl_805A9284
+lbl_805A9284:
+	.skip 0x4
+.global lbl_805A9288
+lbl_805A9288:
+	.skip 0x4
+.global lbl_805A928C
+lbl_805A928C:
+	.skip 0x4
+.global lbl_805A9290
+lbl_805A9290:
+	.skip 0x4
+.global lbl_805A9294
+lbl_805A9294:
+	.skip 0x4
+.global lbl_805A9298
+lbl_805A9298:
+	.skip 0x4
+.global lbl_805A929C
+lbl_805A929C:
+	.skip 0x4
+.global lbl_805A92A0
+lbl_805A92A0:
+	.skip 0x4
+.global lbl_805A92A4
+lbl_805A92A4:
+	.skip 0x4
+.global lbl_805A92A8
+lbl_805A92A8:
+	.skip 0x4
+.global lbl_805A92AC
+lbl_805A92AC:
+	.skip 0x4
+.global lbl_805A92B0
+lbl_805A92B0:
+	.skip 0x4
+.global lbl_805A92B4
+lbl_805A92B4:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global sub_802dd89c
 sub_802dd89c:
diff --git a/asm/Kyoto/Animation/CCharacterSet.s b/asm/Kyoto/Animation/CCharacterSet.s
index e0888373..49704d61 100644
--- a/asm/Kyoto/Animation/CCharacterSet.s
+++ b/asm/Kyoto/Animation/CCharacterSet.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__13CCharacterSetFR12CInputStream
 __ct__13CCharacterSetFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CFBStreamedAnimReader.s b/asm/Kyoto/Animation/CFBStreamedAnimReader.s
index 971e3ec0..f5c970fb 100644
--- a/asm/Kyoto/Animation/CFBStreamedAnimReader.s
+++ b/asm/Kyoto/Animation/CFBStreamedAnimReader.s
@@ -73,7 +73,7 @@ lbl_805A87E8:
 	.4byte 0x3F800000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global VGetAdvancementResults__21CFBStreamedAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime
 VGetAdvancementResults__21CFBStreamedAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime:
diff --git a/asm/Kyoto/Animation/CFBStreamedCompression.s b/asm/Kyoto/Animation/CFBStreamedCompression.s
index a76677bf..5352361a 100644
--- a/asm/Kyoto/Animation/CFBStreamedCompression.s
+++ b/asm/Kyoto/Animation/CFBStreamedCompression.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetAnimationDuration__22CFBStreamedCompressionCFv
 GetAnimationDuration__22CFBStreamedCompressionCFv:
diff --git a/asm/Kyoto/Animation/CHalfTransition.s b/asm/Kyoto/Animation/CHalfTransition.s
index ed05f132..738097f6 100644
--- a/asm/Kyoto/Animation/CHalfTransition.s
+++ b/asm/Kyoto/Animation/CHalfTransition.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__15CHalfTransitionFR12CInputStream
 __ct__15CHalfTransitionFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s
index f7cf8b84..d8dd83fe 100644
--- a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s
+++ b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s
@@ -23,7 +23,7 @@ lbl_805A87F3:
 	.byte 0xFF
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_802fc358
 sub_802fc358:
diff --git a/asm/Kyoto/Animation/CInt32POINode.s b/asm/Kyoto/Animation/CInt32POINode.s
index 812a0365..c02be5d4 100644
--- a/asm/Kyoto/Animation/CInt32POINode.s
+++ b/asm/Kyoto/Animation/CInt32POINode.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CopyNodeMinusStartTime__13CInt32POINodeFRC13CInt32POINodeRC13CCharAnimTime
 CopyNodeMinusStartTime__13CInt32POINodeFRC13CInt32POINodeRC13CCharAnimTime:
diff --git a/asm/Kyoto/Animation/CMetaAnimBlend.s b/asm/Kyoto/Animation/CMetaAnimBlend.s
index 9bddd502..adb5ba2f 100644
--- a/asm/Kyoto/Animation/CMetaAnimBlend.s
+++ b/asm/Kyoto/Animation/CMetaAnimBlend.s
@@ -15,7 +15,7 @@ lbl_803ECCD0:
 	.4byte VGetAnimationTree__14CMetaAnimBlendCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders
 	
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__14CMetaAnimBlendFv
 __dt__14CMetaAnimBlendFv:
diff --git a/asm/Kyoto/Animation/CMetaAnimFactory.s b/asm/Kyoto/Animation/CMetaAnimFactory.s
index b77505ba..bcf66328 100644
--- a/asm/Kyoto/Animation/CMetaAnimFactory.s
+++ b/asm/Kyoto/Animation/CMetaAnimFactory.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CreateMetaAnim__16CMetaAnimFactoryFR12CInputStream
 CreateMetaAnim__16CMetaAnimFactoryFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s b/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s
index a2fb7aa7..2b2ee953 100644
--- a/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s
+++ b/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s
@@ -48,7 +48,7 @@ lbl_805A871C:
 	# ROM: 0x3F60BC
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__19CMetaAnimPhaseBlendFv
 __dt__19CMetaAnimPhaseBlendFv:
diff --git a/asm/Kyoto/Animation/CMetaAnimPlay.s b/asm/Kyoto/Animation/CMetaAnimPlay.s
index 74669e29..fff42060 100644
--- a/asm/Kyoto/Animation/CMetaAnimPlay.s
+++ b/asm/Kyoto/Animation/CMetaAnimPlay.s
@@ -32,7 +32,7 @@ lbl_805A8722:
 	.byte 0x01, 0x00
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__13CMetaAnimPlayFv
 __dt__13CMetaAnimPlayFv:
diff --git a/asm/Kyoto/Animation/CMetaAnimRandom.s b/asm/Kyoto/Animation/CMetaAnimRandom.s
index 53a46041..ae4a8493 100644
--- a/asm/Kyoto/Animation/CMetaAnimRandom.s
+++ b/asm/Kyoto/Animation/CMetaAnimRandom.s
@@ -14,7 +14,7 @@ lbl_803ECD50:
 	.4byte WriteAnimData__15CMetaAnimRandomCFR13COutputStream
 	.4byte VGetAnimationTree__15CMetaAnimRandomCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__15CMetaAnimRandomFv
 __dt__15CMetaAnimRandomFv:
diff --git a/asm/Kyoto/Animation/CMetaAnimSequence.s b/asm/Kyoto/Animation/CMetaAnimSequence.s
index f9d61f0e..e3e54c65 100644
--- a/asm/Kyoto/Animation/CMetaAnimSequence.s
+++ b/asm/Kyoto/Animation/CMetaAnimSequence.s
@@ -14,7 +14,7 @@ lbl_803ECD70:
 	.4byte WriteAnimData__17CMetaAnimSequenceCFR13COutputStream
 	.4byte VGetAnimationTree__17CMetaAnimSequenceCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CMetaAnimSequenceFv
 __dt__17CMetaAnimSequenceFv:
diff --git a/asm/Kyoto/Animation/CMetaTransFactory.s b/asm/Kyoto/Animation/CMetaTransFactory.s
index ce434a52..d86de8ba 100644
--- a/asm/Kyoto/Animation/CMetaTransFactory.s
+++ b/asm/Kyoto/Animation/CMetaTransFactory.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CreateMetaTrans__17CMetaTransFactoryFR12CInputStream
 CreateMetaTrans__17CMetaTransFactoryFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CMetaTransMetaAnim.s b/asm/Kyoto/Animation/CMetaTransMetaAnim.s
index 5d29d1ae..07d991ae 100644
--- a/asm/Kyoto/Animation/CMetaTransMetaAnim.s
+++ b/asm/Kyoto/Animation/CMetaTransMetaAnim.s
@@ -12,7 +12,7 @@ lbl_803ECD90:
 	.4byte GetType__18CMetaTransMetaAnimCFv
 	.4byte WriteTransData__18CMetaTransMetaAnimCFR13COutputStream
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__18CMetaTransMetaAnimFv
 __dt__18CMetaTransMetaAnimFv:
diff --git a/asm/Kyoto/Animation/CMetaTransPhaseTrans.s b/asm/Kyoto/Animation/CMetaTransPhaseTrans.s
index 60f1feea..cec7896a 100644
--- a/asm/Kyoto/Animation/CMetaTransPhaseTrans.s
+++ b/asm/Kyoto/Animation/CMetaTransPhaseTrans.s
@@ -34,7 +34,7 @@ lbl_805A8734:
 	# ROM: 0x3F60D4
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__20CMetaTransPhaseTransFv
 __dt__20CMetaTransPhaseTransFv:
diff --git a/asm/Kyoto/Animation/CMetaTransSnap.s b/asm/Kyoto/Animation/CMetaTransSnap.s
index 4b11167f..2c162120 100644
--- a/asm/Kyoto/Animation/CMetaTransSnap.s
+++ b/asm/Kyoto/Animation/CMetaTransSnap.s
@@ -12,7 +12,7 @@ lbl_803ECDC0:
 	.4byte GetType__14CMetaTransSnapCFv
 	.4byte WriteTransData__14CMetaTransSnapCFR13COutputStream
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__14CMetaTransSnapFv
 __dt__14CMetaTransSnapFv:
diff --git a/asm/Kyoto/Animation/CMetaTransTrans.s b/asm/Kyoto/Animation/CMetaTransTrans.s
index 78b2e770..9d8d2e9e 100644
--- a/asm/Kyoto/Animation/CMetaTransTrans.s
+++ b/asm/Kyoto/Animation/CMetaTransTrans.s
@@ -12,7 +12,7 @@ lbl_803ECDD8:
 	.4byte GetType__15CMetaTransTransCFv
 	.4byte WriteTransData__15CMetaTransTransCFR13COutputStream
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__15CMetaTransTransFv
 __dt__15CMetaTransTransFv:
diff --git a/asm/Kyoto/Animation/CPASAnimInfo.s b/asm/Kyoto/Animation/CPASAnimInfo.s
index f0ef21d2..443fff8f 100644
--- a/asm/Kyoto/Animation/CPASAnimInfo.s
+++ b/asm/Kyoto/Animation/CPASAnimInfo.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetAnimParmValue__12CPASAnimInfoCFUi
 GetAnimParmValue__12CPASAnimInfoCFUi:
diff --git a/asm/Kyoto/Animation/CPASAnimParm.s b/asm/Kyoto/Animation/CPASAnimParm.s
index 05ad59ea..057c10e1 100644
--- a/asm/Kyoto/Animation/CPASAnimParm.s
+++ b/asm/Kyoto/Animation/CPASAnimParm.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetEnumValue__12CPASAnimParmCFv
 GetEnumValue__12CPASAnimParmCFv:
diff --git a/asm/Kyoto/Animation/CPASAnimState.s b/asm/Kyoto/Animation/CPASAnimState.s
index d0f1c5cf..de29e75d 100644
--- a/asm/Kyoto/Animation/CPASAnimState.s
+++ b/asm/Kyoto/Animation/CPASAnimState.s
@@ -12,7 +12,7 @@ lbl_805A873C:
 	# ROM: 0x3F60DC
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global PickRandomAnimation__13CPASAnimStateCFR9CRandom16
 PickRandomAnimation__13CPASAnimStateCFR9CRandom16:
diff --git a/asm/Kyoto/Animation/CPASDatabase.s b/asm/Kyoto/Animation/CPASDatabase.s
index fed52eb6..d6b0a37a 100644
--- a/asm/Kyoto/Animation/CPASDatabase.s
+++ b/asm/Kyoto/Animation/CPASDatabase.s
@@ -22,7 +22,7 @@ lbl_805A874C:
 	# ROM: 0x3F60EC
 	.4byte 0xFFFFFFFF
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AddAnimState__12CPASDatabaseFRC13CPASAnimState
 AddAnimState__12CPASDatabaseFRC13CPASAnimState:
diff --git a/asm/Kyoto/Animation/CPASParmInfo.s b/asm/Kyoto/Animation/CPASParmInfo.s
index 907b68de..5810060f 100644
--- a/asm/Kyoto/Animation/CPASParmInfo.s
+++ b/asm/Kyoto/Animation/CPASParmInfo.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__12CPASParmInfoFR12CInputStream
 __ct__12CPASParmInfoFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CPOINode.s b/asm/Kyoto/Animation/CPOINode.s
index eab7289a..9c66c274 100644
--- a/asm/Kyoto/Animation/CPOINode.s
+++ b/asm/Kyoto/Animation/CPOINode.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global compare__8CPOINodeFPCvPCv
 compare__8CPOINodeFPCvPCv:
diff --git a/asm/Kyoto/Animation/CParticlePOINode.s b/asm/Kyoto/Animation/CParticlePOINode.s
index a5b41aad..c9b7132b 100644
--- a/asm/Kyoto/Animation/CParticlePOINode.s
+++ b/asm/Kyoto/Animation/CParticlePOINode.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CopyNodeMinusStartTime__16CParticlePOINodeFRC16CParticlePOINodeRC13CCharAnimTime
 CopyNodeMinusStartTime__16CParticlePOINodeFRC16CParticlePOINodeRC13CCharAnimTime:
diff --git a/asm/Kyoto/Animation/CPoseAsTransforms.s b/asm/Kyoto/Animation/CPoseAsTransforms.s
index be31d948..4ddecb02 100644
--- a/asm/Kyoto/Animation/CPoseAsTransforms.s
+++ b/asm/Kyoto/Animation/CPoseAsTransforms.s
@@ -32,7 +32,7 @@ lbl_805A8A5D:
 	# ROM: 0x3F63FD
 	.byte 0xFF, 0x00, 0x00
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Clear__17CPoseAsTransformsFv
 Clear__17CPoseAsTransformsFv:
diff --git a/asm/Kyoto/Animation/CPrimitive.s b/asm/Kyoto/Animation/CPrimitive.s
index 7b57491c..71bae03d 100644
--- a/asm/Kyoto/Animation/CPrimitive.s
+++ b/asm/Kyoto/Animation/CPrimitive.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__10CPrimitiveFR12CInputStream
 __ct__10CPrimitiveFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CSegIdList.s b/asm/Kyoto/Animation/CSegIdList.s
index ed1e8e68..a29fc633 100644
--- a/asm/Kyoto/Animation/CSegIdList.s
+++ b/asm/Kyoto/Animation/CSegIdList.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__10CSegIdListFR12CInputStream
 __ct__10CSegIdListFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CSegStatementSet.s b/asm/Kyoto/Animation/CSegStatementSet.s
index 791be442..2eaddb8a 100644
--- a/asm/Kyoto/Animation/CSegStatementSet.s
+++ b/asm/Kyoto/Animation/CSegStatementSet.s
@@ -24,7 +24,7 @@ lbl_805A87F8:
 	.4byte 0x0000001F
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__21CStackSegStatementSetFv
 __dt__21CStackSegStatementSetFv:
diff --git a/asm/Kyoto/Animation/CSequenceHelper.s b/asm/Kyoto/Animation/CSequenceHelper.s
index 86c61681..0cc5036e 100644
--- a/asm/Kyoto/Animation/CSequenceHelper.s
+++ b/asm/Kyoto/Animation/CSequenceHelper.s
@@ -22,7 +22,7 @@ lbl_805A875C:
 	# ROM: 0x3F60FC
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ComputeSequenceFundamentals__15CSequenceHelperCFv
 ComputeSequenceFundamentals__15CSequenceHelperCFv:
diff --git a/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s b/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s
index 8af4d304..0bb14b20 100644
--- a/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s
+++ b/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__27CSkinnedModelWithAvgNormalsFRC13CSkinnedModel
 __ct__27CSkinnedModelWithAvgNormalsFRC13CSkinnedModel:
diff --git a/asm/Kyoto/Animation/CTimeScaleFunctions.s b/asm/Kyoto/Animation/CTimeScaleFunctions.s
index aeccffce..b9b4613d 100644
--- a/asm/Kyoto/Animation/CTimeScaleFunctions.s
+++ b/asm/Kyoto/Animation/CTimeScaleFunctions.s
@@ -25,7 +25,7 @@ lbl_803ED4EC:
 	.4byte VGetFunctionMirrored__27CConstantAnimationTimeScaleCFRCf
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetType__25CLinearAnimationTimeScaleCFv
 GetType__25CLinearAnimationTimeScaleCFv:
diff --git a/asm/Kyoto/Animation/CTransition.s b/asm/Kyoto/Animation/CTransition.s
index 9e43de49..8a3a494f 100644
--- a/asm/Kyoto/Animation/CTransition.s
+++ b/asm/Kyoto/Animation/CTransition.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__11CTransitionFR12CInputStream
 __ct__11CTransitionFR12CInputStream:
diff --git a/asm/Kyoto/Animation/CTransitionManager.s b/asm/Kyoto/Animation/CTransitionManager.s
index 87f6ff38..24e23ff1 100644
--- a/asm/Kyoto/Animation/CTransitionManager.s
+++ b/asm/Kyoto/Animation/CTransitionManager.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "GetTransitionTree__18CTransitionManagerCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>"
 "GetTransitionTree__18CTransitionManagerCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>":
diff --git a/asm/Kyoto/Animation/CTreeUtils.s b/asm/Kyoto/Animation/CTreeUtils.s
index 6e67261f..3e5ec81f 100644
--- a/asm/Kyoto/Animation/CTreeUtils.s
+++ b/asm/Kyoto/Animation/CTreeUtils.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "GetTransitionTree__10CTreeUtilsFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext"
 "GetTransitionTree__10CTreeUtilsFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext":
diff --git a/asm/Kyoto/Animation/CVertexMorphEffect.s b/asm/Kyoto/Animation/CVertexMorphEffect.s
index 37f29c68..0a4e3ff3 100644
--- a/asm/Kyoto/Animation/CVertexMorphEffect.s
+++ b/asm/Kyoto/Animation/CVertexMorphEffect.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Reset__18CVertexMorphEffectFRC13CUnitVector3fRC9CVector3ff
 Reset__18CVertexMorphEffectFRC13CUnitVector3fRC9CVector3ff:
diff --git a/asm/Kyoto/Animation/DolphinCSkinRules.s b/asm/Kyoto/Animation/DolphinCSkinRules.s
index aa71e6d6..f9f43ebf 100644
--- a/asm/Kyoto/Animation/DolphinCSkinRules.s
+++ b/asm/Kyoto/Animation/DolphinCSkinRules.s
@@ -32,7 +32,46 @@ lbl_803EF728:
 	.4byte "__dt__20TToken<10CSkinRules>Fv"
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9608
+lbl_805A9608:
+	.skip 0x4
+.global lbl_805A960C
+lbl_805A960C:
+	.skip 0x4
+.global lbl_805A9610
+lbl_805A9610:
+	.skip 0x4
+.global lbl_805A9614
+lbl_805A9614:
+	.skip 0x4
+.global lbl_805A9618
+lbl_805A9618:
+	.skip 0x4
+.global lbl_805A961C
+lbl_805A961C:
+	.skip 0x4
+.global lbl_805A9620
+lbl_805A9620:
+	.skip 0x4
+.global lbl_805A9624
+lbl_805A9624:
+	.skip 0x4
+.global lbl_805A9628
+lbl_805A9628:
+	.skip 0x4
+.global lbl_805A962C
+lbl_805A962C:
+	.skip 0x4
+.global lbl_805A9630
+lbl_805A9630:
+	.skip 0x4
+.global lbl_805A9634
+lbl_805A9634:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global ProcessingNormals__10CSkinRulesFiPPUs
 ProcessingNormals__10CSkinRulesFiPPUs:
diff --git a/asm/Kyoto/Animation/DolphinCSkinnedModel.s b/asm/Kyoto/Animation/DolphinCSkinnedModel.s
index 8b5c2a07..427ea6ad 100644
--- a/asm/Kyoto/Animation/DolphinCSkinnedModel.s
+++ b/asm/Kyoto/Animation/DolphinCSkinnedModel.s
@@ -21,8 +21,29 @@ lbl_8053FFCC:
 .global lbl_8053FFF4
 lbl_8053FFF4:
 	.skip 0x10
+
+.section .sbss, "wa"
+
+.global lbl_805A95F0
+lbl_805A95F0:
+	.skip 0x4
+.global lbl_805A95F4
+lbl_805A95F4:
+	.skip 0x4
+.global lbl_805A95F8
+lbl_805A95F8:
+	.skip 0x4
+.global lbl_805A95FC
+lbl_805A95FC:
+	.skip 0x4
+.global lbl_805A9600
+lbl_805A9600:
+	.skip 0x1
+.global lbl_805A9601
+lbl_805A9601:
+	.skip 0x7
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_80352668
 sub_80352668:
diff --git a/asm/Kyoto/Animation/DolphinCVirtualBone.s b/asm/Kyoto/Animation/DolphinCVirtualBone.s
index 8745c912..9af64eaa 100644
--- a/asm/Kyoto/Animation/DolphinCVirtualBone.s
+++ b/asm/Kyoto/Animation/DolphinCVirtualBone.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 
 .global sub_8035470c
diff --git a/asm/Kyoto/Animation/IAnimReader.s b/asm/Kyoto/Animation/IAnimReader.s
index 45d0b743..86e93bd7 100644
--- a/asm/Kyoto/Animation/IAnimReader.s
+++ b/asm/Kyoto/Animation/IAnimReader.s
@@ -30,7 +30,7 @@ lbl_803ED508:
 	.4byte VGetAdvancementResults__11IAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsCAnimTreeNode__11IAnimReaderCFv
 IsCAnimTreeNode__11IAnimReaderCFv:
diff --git a/asm/Kyoto/Animation/IMetaAnim.s b/asm/Kyoto/Animation/IMetaAnim.s
index cd1b8d74..128f886b 100644
--- a/asm/Kyoto/Animation/IMetaAnim.s
+++ b/asm/Kyoto/Animation/IMetaAnim.s
@@ -26,7 +26,7 @@ lbl_805A8764:
 	# ROM: 0x3F6104
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AdvanceAnim__9IMetaAnimFR11IAnimReaderRC13CCharAnimTime
 AdvanceAnim__9IMetaAnimFR11IAnimReaderRC13CCharAnimTime:
diff --git a/asm/Kyoto/Audio/CDSPStreamManager.s b/asm/Kyoto/Audio/CDSPStreamManager.s
index 5c4f4c3c..603489a6 100644
--- a/asm/Kyoto/Audio/CDSPStreamManager.s
+++ b/asm/Kyoto/Audio/CDSPStreamManager.s
@@ -34,8 +34,14 @@ lbl_80540A20:
 .global lbl_80540A2C
 lbl_80540A2C:
 	.skip 0x14
+
+.section .sbss, "wa"
+
+.global lbl_805A9678
+lbl_805A9678:
+	.skip 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AllocateStream__17CDSPStreamManagerFv
 AllocateStream__17CDSPStreamManagerFv:
diff --git a/asm/Kyoto/Audio/CMidiManager.s b/asm/Kyoto/Audio/CMidiManager.s
index 7ad53802..c4d51c68 100644
--- a/asm/Kyoto/Audio/CMidiManager.s
+++ b/asm/Kyoto/Audio/CMidiManager.s
@@ -10,7 +10,7 @@ lbl_803EF788:
 	.4byte sub_80358ca4
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FMidiDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FMidiDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/Kyoto/Audio/CSfxHandle.s b/asm/Kyoto/Audio/CSfxHandle.s
index 2e5c2e6c..972d07c0 100644
--- a/asm/Kyoto/Audio/CSfxHandle.s
+++ b/asm/Kyoto/Audio/CSfxHandle.s
@@ -1,6 +1,12 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A92B8
+lbl_805A92B8:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global __ct__10CSfxHandleFUi
 __ct__10CSfxHandleFUi:
diff --git a/asm/Kyoto/Audio/CSfxManager.s b/asm/Kyoto/Audio/CSfxManager.s
index ff01eae0..fe707067 100644
--- a/asm/Kyoto/Audio/CSfxManager.s
+++ b/asm/Kyoto/Audio/CSfxManager.s
@@ -95,7 +95,6 @@ lbl_803ECEE4:
 	.4byte 0
 	.4byte 0
 	.4byte 0
-	
 
 .section .sdata
 
@@ -134,8 +133,29 @@ lbl_805A877C:
 .global lbl_80479BA0
 lbl_80479BA0:
 	.skip 0x30
-	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+
+.section .sbss, "wa"
+
+.global lbl_805A92C0
+lbl_805A92C0:
+	.skip 0x4
+.global lbl_805A92C4
+lbl_805A92C4:
+	.skip 0x4
+.global lbl_805A92C8
+lbl_805A92C8:
+	.skip 0x4
+.global lbl_805A92CC
+lbl_805A92CC:
+	.skip 0x4
+.global lbl_805A92D0
+lbl_805A92D0:
+	.skip 0x8
+.global lbl_805A92D8
+lbl_805A92D8:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global __dt__Q211CSfxManager11CSfxWrapperFv
 __dt__Q211CSfxManager11CSfxWrapperFv:
diff --git a/asm/Kyoto/Audio/CStaticAudioPlayer.s b/asm/Kyoto/Audio/CStaticAudioPlayer.s
index 1609a06b..c6a5f97f 100644
--- a/asm/Kyoto/Audio/CStaticAudioPlayer.s
+++ b/asm/Kyoto/Audio/CStaticAudioPlayer.s
@@ -1,6 +1,18 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A96A0
+lbl_805A96A0:
+	.skip 0x8
+.global lbl_805A96A8
+lbl_805A96A8:
+	.skip 0x4
+.global lbl_805A96AC
+lbl_805A96AC:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global SetVolume__18CStaticAudioPlayerFc
 SetVolume__18CStaticAudioPlayerFc:
diff --git a/asm/Kyoto/Audio/CStreamAudioManager.s b/asm/Kyoto/Audio/CStreamAudioManager.s
index ac0b7fea..b59fd91d 100644
--- a/asm/Kyoto/Audio/CStreamAudioManager.s
+++ b/asm/Kyoto/Audio/CStreamAudioManager.s
@@ -33,7 +33,19 @@ lbl_805A8A41:
 	.byte 0x01, 0x00, 0x00
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9680
+lbl_805A9680:
+	.skip 0x4
+.global lbl_805A9684
+lbl_805A9684:
+	.skip 0x4
+.global lbl_805A9688
+lbl_805A9688:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global sub_803653f8
 sub_803653f8:
diff --git a/asm/Kyoto/Audio/DolphinCAudioGroupSet.s b/asm/Kyoto/Audio/DolphinCAudioGroupSet.s
index 9ef79a49..f0576ab2 100644
--- a/asm/Kyoto/Audio/DolphinCAudioGroupSet.s
+++ b/asm/Kyoto/Audio/DolphinCAudioGroupSet.s
@@ -10,7 +10,7 @@ lbl_803EF670:
 	.4byte sub_8034a1b0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FAudioGroupSetLocDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FAudioGroupSetLocDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/Kyoto/Audio/DolphinCAudioSys.s b/asm/Kyoto/Audio/DolphinCAudioSys.s
index 32ab6a18..46de462c 100644
--- a/asm/Kyoto/Audio/DolphinCAudioSys.s
+++ b/asm/Kyoto/Audio/DolphinCAudioSys.s
@@ -72,8 +72,56 @@ lbl_805A89A7:
 .global lbl_804BFF90
 lbl_804BFF90:
 	.skip 0x10
+
+.section .sbss, "wa"
+
+.global lbl_805A9590
+lbl_805A9590:
+	.skip 0x1
+.global lbl_805A9591
+lbl_805A9591:
+	.skip 0x1
+.global lbl_805A9592
+lbl_805A9592:
+	.skip 0x1
+.global lbl_805A9593
+lbl_805A9593:
+	.skip 0x1
+.global lbl_805A9594
+lbl_805A9594:
+	.skip 0x4
+.global lbl_805A9598
+lbl_805A9598:
+	.skip 0x4
+.global lbl_805A959C
+lbl_805A959C:
+	.skip 0x4
+.global lbl_805A95A0
+lbl_805A95A0:
+	.skip 0x4
+.global lbl_805A95A4
+lbl_805A95A4:
+	.skip 0x4
+.global lbl_805A95A8
+lbl_805A95A8:
+	.skip 0x4
+.global lbl_805A95AC
+lbl_805A95AC:
+	.skip 0x4
+.global lbl_805A95B0
+lbl_805A95B0:
+	.skip 0x4
+.global lbl_805A95B4
+lbl_805A95B4:
+	.skip 0x4
+.global lbl_805A95B8
+lbl_805A95B8:
+	.skip 0x4
+.global lbl_805A95BC
+lbl_805A95BC:
+	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_8034a7a4
 sub_8034a7a4:
diff --git a/asm/Kyoto/Audio/SDSPStream.s b/asm/Kyoto/Audio/SDSPStream.s
index 7625cd26..9077ddc5 100644
--- a/asm/Kyoto/Audio/SDSPStream.s
+++ b/asm/Kyoto/Audio/SDSPStream.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ReadCompleted__10SDSPStreamFiP11DVDFileInfo
 ReadCompleted__10SDSPStreamFiP11DVDFileInfo:
diff --git a/asm/Kyoto/Audio/g721.s b/asm/Kyoto/Audio/g721.s
index d6ec895f..104fb030 100644
--- a/asm/Kyoto/Audio/g721.s
+++ b/asm/Kyoto/Audio/g721.s
@@ -46,7 +46,7 @@ lbl_803EF840:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global g721_decoder__FiP10g72x_state
 g721_decoder__FiP10g72x_state:
diff --git a/asm/Kyoto/Basics/CBasics.s b/asm/Kyoto/Basics/CBasics.s
index 8ba3f91a..665cee62 100644
--- a/asm/Kyoto/Basics/CBasics.s
+++ b/asm/Kyoto/Basics/CBasics.s
@@ -6,7 +6,7 @@
 lbl_804795A0:
 	.skip 0x200
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Stringize__7CBasicsFPCce
 Stringize__7CBasicsFPCce:
diff --git a/asm/Kyoto/Basics/CBasicsDolphin.s b/asm/Kyoto/Basics/CBasicsDolphin.s
index 4b7e8cdf..098ada40 100644
--- a/asm/Kyoto/Basics/CBasicsDolphin.s
+++ b/asm/Kyoto/Basics/CBasicsDolphin.s
@@ -1,6 +1,12 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9240
+lbl_805A9240:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global Init__7CBasicsFv
 Init__7CBasicsFv:
diff --git a/asm/Kyoto/Basics/CCallStackDolphin.s b/asm/Kyoto/Basics/CCallStackDolphin.s
index 260d09dc..11f57d0d 100644
--- a/asm/Kyoto/Basics/CCallStackDolphin.s
+++ b/asm/Kyoto/Basics/CCallStackDolphin.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetTypeText__10CCallStackCFv
 GetTypeText__10CCallStackCFv:
diff --git a/asm/Kyoto/Basics/COsContextDolphin.s b/asm/Kyoto/Basics/COsContextDolphin.s
index 240d00ae..718a6f1b 100644
--- a/asm/Kyoto/Basics/COsContextDolphin.s
+++ b/asm/Kyoto/Basics/COsContextDolphin.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_802d63e0
 sub_802d63e0:
diff --git a/asm/Kyoto/Basics/CSWDataDolphin.s b/asm/Kyoto/Basics/CSWDataDolphin.s
index f1b9e6e5..73f7fe58 100644
--- a/asm/Kyoto/Basics/CSWDataDolphin.s
+++ b/asm/Kyoto/Basics/CSWDataDolphin.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Initialize__Q210CStopwatch7CSWDataFv
 Initialize__Q210CStopwatch7CSWDataFv:
diff --git a/asm/Kyoto/Basics/CStopwatch.s b/asm/Kyoto/Basics/CStopwatch.s
index 99ff6dfe..392bb819 100644
--- a/asm/Kyoto/Basics/CStopwatch.s
+++ b/asm/Kyoto/Basics/CStopwatch.s
@@ -1,6 +1,15 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9238
+lbl_805A9238:
+	.skip 0x4
+.global lbl_805A923C
+lbl_805A923C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global GetGlobalTimerObj__10CStopwatchFv
 GetGlobalTimerObj__10CStopwatchFv:
diff --git a/asm/Kyoto/Basics/RAssertDolphin.s b/asm/Kyoto/Basics/RAssertDolphin.s
index 35c063e7..f8e55ad3 100644
--- a/asm/Kyoto/Basics/RAssertDolphin.s
+++ b/asm/Kyoto/Basics/RAssertDolphin.s
@@ -5,8 +5,17 @@
 .global lbl_804797A0
 lbl_804797A0:
 	.skip 0x400
-	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+
+.section .sbss, "wa"
+
+.global lbl_805A9248
+lbl_805A9248:
+	.skip 0x4
+.global lbl_805A924C
+lbl_805A924C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global rs_debugger_printf__FPCce
 rs_debugger_printf__FPCce:
diff --git a/asm/Kyoto/CARAMManager.s b/asm/Kyoto/CARAMManager.s
index 51e04475..bdb0bf4c 100644
--- a/asm/Kyoto/CARAMManager.s
+++ b/asm/Kyoto/CARAMManager.s
@@ -13,8 +13,32 @@ lbl_805A8920:
 .global lbl_804BFF40
 lbl_804BFF40:
 	.skip 0x10
-	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+
+.section .sbss, "wa"
+
+.global lbl_805A9520
+lbl_805A9520:
+	.skip 0x4
+.global lbl_805A9524
+lbl_805A9524:
+	.skip 0x4
+.global lbl_805A9528
+lbl_805A9528:
+	.skip 0x4
+.global lbl_805A952C
+lbl_805A952C:
+	.skip 0x4
+.global lbl_805A9530
+lbl_805A9530:
+	.skip 0x4
+.global lbl_805A9534
+lbl_805A9534:
+	.skip 0x4
+.global lbl_805A9538
+lbl_805A9538:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global CollectGarbage__12CARAMManagerFv
 CollectGarbage__12CARAMManagerFv:
diff --git a/asm/Kyoto/CARAMToken.s b/asm/Kyoto/CARAMToken.s
index 2f89dd64..927e58dc 100644
--- a/asm/Kyoto/CARAMToken.s
+++ b/asm/Kyoto/CARAMToken.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetMRAMSafe__10CARAMTokenFv
 GetMRAMSafe__10CARAMTokenFv:
diff --git a/asm/Kyoto/CCrc32.s b/asm/Kyoto/CCrc32.s
index d3fbbaaa..d12b4e51 100644
--- a/asm/Kyoto/CCrc32.s
+++ b/asm/Kyoto/CCrc32.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Calculate__6CCRC32FPCvUi
 Calculate__6CCRC32FPCvUi:
diff --git a/asm/Kyoto/CDependencyGroup.s b/asm/Kyoto/CDependencyGroup.s
index 889755b4..b2e56378 100644
--- a/asm/Kyoto/CDependencyGroup.s
+++ b/asm/Kyoto/CDependencyGroup.s
@@ -10,7 +10,7 @@ lbl_803EF830:
 	.4byte sub_8036505c
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FDependencyGroupFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FDependencyGroupFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/Kyoto/CDvdRequest.s b/asm/Kyoto/CDvdRequest.s
index af409c81..06145fd5 100644
--- a/asm/Kyoto/CDvdRequest.s
+++ b/asm/Kyoto/CDvdRequest.s
@@ -24,7 +24,13 @@ lbl_803ED594:
 	.4byte PostCancelRequest__15CRealDvdRequestFv
 	.4byte GetMediaType__15CRealDvdRequestCFv
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9330
+lbl_805A9330:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global __dt__15CARAMDvdRequestFv
 __dt__15CARAMDvdRequestFv:
diff --git a/asm/Kyoto/CFactoryMgr.s b/asm/Kyoto/CFactoryMgr.s
index 71751e74..c9fbbea0 100644
--- a/asm/Kyoto/CFactoryMgr.s
+++ b/asm/Kyoto/CFactoryMgr.s
@@ -37,7 +37,7 @@ lbl_805A8908:
 	# ROM: 0x3F62A8
 	.4byte 0x00000002
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FourCCToTypeIdx__11CFactoryMgrFUi
 FourCCToTypeIdx__11CFactoryMgrFUi:
diff --git a/asm/Kyoto/CFactoryStore.s b/asm/Kyoto/CFactoryStore.s
index 3f7e9265..5b4efd25 100644
--- a/asm/Kyoto/CFactoryStore.s
+++ b/asm/Kyoto/CFactoryStore.s
@@ -9,7 +9,7 @@ lbl_803EE3D8:
 	.4byte 0
 	.4byte "__dt__31TObjOwnerParam<P12IObjectStore>Fv"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "__dt__31TObjOwnerParam<P12IObjectStore>Fv"
 "__dt__31TObjOwnerParam<P12IObjectStore>Fv":
diff --git a/asm/Kyoto/CFinalInput.s b/asm/Kyoto/CFinalInput.s
index b4364e9b..d9502dc0 100644
--- a/asm/Kyoto/CFinalInput.s
+++ b/asm/Kyoto/CFinalInput.s
@@ -92,7 +92,7 @@ lbl_805A8994:
 	# ROM: 0x3F6334
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ScaleAnalogueSticks__11CFinalInputCFff
 ScaleAnalogueSticks__11CFinalInputCFff:
diff --git a/asm/Kyoto/CFrameDelayedKiller.s b/asm/Kyoto/CFrameDelayedKiller.s
index a2833c4c..0ec8c6f2 100644
--- a/asm/Kyoto/CFrameDelayedKiller.s
+++ b/asm/Kyoto/CFrameDelayedKiller.s
@@ -8,8 +8,14 @@ lbl_80540A40:
 .global lbl_80540A4C
 lbl_80540A4C:
 	.skip 0x34
+
+.section .sbss, "wa"
+
+.global lbl_805A96B0
+lbl_805A96B0:
+	.skip 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_8036ca64
 sub_8036ca64:
diff --git a/asm/Kyoto/CObjectReference.s b/asm/Kyoto/CObjectReference.s
index 15a1c564..6c6cc5e3 100644
--- a/asm/Kyoto/CObjectReference.s
+++ b/asm/Kyoto/CObjectReference.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsLoading__16CObjectReferenceCFv
 IsLoading__16CObjectReferenceCFv:
diff --git a/asm/Kyoto/CPakFile.s b/asm/Kyoto/CPakFile.s
index 38aa7c8f..8fcddf2d 100644
--- a/asm/Kyoto/CPakFile.s
+++ b/asm/Kyoto/CPakFile.s
@@ -27,7 +27,22 @@ lbl_805A8A54:
 	# ROM: 0x3F63F4
 	.4byte 0x00000040
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9690
+lbl_805A9690:
+	.skip 0x4
+.global lbl_805A9694
+lbl_805A9694:
+	.skip 0x4
+.global lbl_805A9698
+lbl_805A9698:
+	.skip 0x4
+.global lbl_805A969C
+lbl_805A969C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global EnsureWorldPakReady__8CPakFileFv
 EnsureWorldPakReady__8CPakFileFv:
diff --git a/asm/Kyoto/CRandom16.s b/asm/Kyoto/CRandom16.s
index 4b004a01..d7ddb83d 100644
--- a/asm/Kyoto/CRandom16.s
+++ b/asm/Kyoto/CRandom16.s
@@ -1,6 +1,15 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9450
+lbl_805A9450:
+	.skip 0x4
+.global lbl_805A9454
+lbl_805A9454:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global Float__9CRandom16Fv
 Float__9CRandom16Fv:
diff --git a/asm/Kyoto/CResFactory.s b/asm/Kyoto/CResFactory.s
index c8a58c68..c67fad77 100644
--- a/asm/Kyoto/CResFactory.s
+++ b/asm/Kyoto/CResFactory.s
@@ -31,7 +31,7 @@ lbl_805A890E:
 	# ROM: 0x3F62AE
 	.2byte 0x00000100
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_803394a8
 sub_803394a8:
diff --git a/asm/Kyoto/CResLoader.s b/asm/Kyoto/CResLoader.s
index fce61a1b..04f54c84 100644
--- a/asm/Kyoto/CResLoader.s
+++ b/asm/Kyoto/CResLoader.s
@@ -21,7 +21,7 @@ lbl_805AF4C0:
 lbl_805AF4C4:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetPakFile__10CResLoaderCFi
 GetPakFile__10CResLoaderCFi:
diff --git a/asm/Kyoto/CSimplePool.s b/asm/Kyoto/CSimplePool.s
index 245a2783..3a52b167 100644
--- a/asm/Kyoto/CSimplePool.s
+++ b/asm/Kyoto/CSimplePool.s
@@ -51,7 +51,13 @@ lbl_805A8912:
 	.byte 0x01, 0x00
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9508
+lbl_805A9508:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global GetFactory__11CSimplePoolCFv
 GetFactory__11CSimplePoolCFv:
diff --git a/asm/Kyoto/CTimeProvider.s b/asm/Kyoto/CTimeProvider.s
index 3f1b4f20..7d7d831c 100644
--- a/asm/Kyoto/CTimeProvider.s
+++ b/asm/Kyoto/CTimeProvider.s
@@ -1,6 +1,12 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9658
+lbl_805A9658:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global __dt__13CTimeProviderFv
 __dt__13CTimeProviderFv:
diff --git a/asm/Kyoto/CToken.s b/asm/Kyoto/CToken.s
index 0594cd23..bafc204f 100644
--- a/asm/Kyoto/CToken.s
+++ b/asm/Kyoto/CToken.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __as__6CTokenFRC6CToken
 __as__6CTokenFRC6CToken:
diff --git a/asm/Kyoto/DolphinCDvdFile.s b/asm/Kyoto/DolphinCDvdFile.s
index d5e429be..ad6be331 100644
--- a/asm/Kyoto/DolphinCDvdFile.s
+++ b/asm/Kyoto/DolphinCDvdFile.s
@@ -18,7 +18,13 @@ lbl_805A89B8:
 	.4byte 0x00010000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A95D0
+lbl_805A95D0:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global UpdateFilePos__8CDvdFileFi
 UpdateFilePos__8CDvdFileFi:
diff --git a/asm/Kyoto/DolphinCMemoryCardSys.s b/asm/Kyoto/DolphinCMemoryCardSys.s
index a9654638..33922c43 100644
--- a/asm/Kyoto/DolphinCMemoryCardSys.s
+++ b/asm/Kyoto/DolphinCMemoryCardSys.s
@@ -31,8 +31,17 @@ lbl_804BFFA0:
 .global lbl_804BFFAC
 lbl_804BFFAC:
 	.skip 0x14
+
+.section .sbss, "wa"
+
+.global lbl_805A95C0
+lbl_805A95C0:
+	.skip 0x1
+.global lbl_805A95C1
+lbl_805A95C1:
+	.skip 0x7
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FreeCardWorkArea__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort
 FreeCardWorkArea__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort:
diff --git a/asm/Kyoto/Graphics/CColor.s b/asm/Kyoto/Graphics/CColor.s
index 6d56521f..34587ea2 100644
--- a/asm/Kyoto/Graphics/CColor.s
+++ b/asm/Kyoto/Graphics/CColor.s
@@ -1,6 +1,36 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9568
+lbl_805A9568:
+	.skip 0x4
+.global lbl_805A956C
+lbl_805A956C:
+	.skip 0x4
+.global lbl_805A9570
+lbl_805A9570:
+	.skip 0x4
+.global lbl_805A9574
+lbl_805A9574:
+	.skip 0x4
+.global lbl_805A9578
+lbl_805A9578:
+	.skip 0x4
+.global lbl_805A957C
+lbl_805A957C:
+	.skip 0x4
+.global lbl_805A9580
+lbl_805A9580:
+	.skip 0x4
+.global lbl_805A9584
+lbl_805A9584:
+	.skip 0x4
+.global lbl_805A9588
+lbl_805A9588:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global Orange__6CColorFv
 Orange__6CColorFv:
diff --git a/asm/Kyoto/Graphics/CCubeMaterial.s b/asm/Kyoto/Graphics/CCubeMaterial.s
index 4b989778..348f65f0 100644
--- a/asm/Kyoto/Graphics/CCubeMaterial.s
+++ b/asm/Kyoto/Graphics/CCubeMaterial.s
@@ -60,8 +60,47 @@ lbl_804BFF50:
 .global lbl_804BFF5C
 lbl_804BFF5C:
 	.skip 0x34
+
+.section .sbss, "wa"
+
+.global lbl_805A9540
+lbl_805A9540:
+	.skip 0x4
+.global lbl_805A9544
+lbl_805A9544:
+	.skip 0x4
+.global lbl_805A9548
+lbl_805A9548:
+	.skip 0x4
+.global lbl_805A954C
+lbl_805A954C:
+	.skip 0x4
+.global lbl_805A9550
+lbl_805A9550:
+	.skip 0x4
+.global lbl_805A9554
+lbl_805A9554:
+	.skip 0x4
+.global lbl_805A9558
+lbl_805A9558:
+	.skip 0x1
+.global lbl_805A9559
+lbl_805A9559:
+	.skip 0x1
+.global lbl_805A955A
+lbl_805A955A:
+	.skip 0x2
+.global lbl_805A955C
+lbl_805A955C:
+	.skip 0x4
+.global lbl_805A9560
+lbl_805A9560:
+	.skip 0x1
+.global lbl_805A9561
+lbl_805A9561:
+	.skip 0x7
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetCompressedBlend__13CCubeMaterialCFv
 GetCompressedBlend__13CCubeMaterialCFv:
diff --git a/asm/Kyoto/Graphics/CCubeModel.s b/asm/Kyoto/Graphics/CCubeModel.s
index 45aac4a0..0d1e9919 100644
--- a/asm/Kyoto/Graphics/CCubeModel.s
+++ b/asm/Kyoto/Graphics/CCubeModel.s
@@ -1,6 +1,30 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9340
+lbl_805A9340:
+	.skip 0x1
+.global lbl_805A9341
+lbl_805A9341:
+	.skip 0x1
+.global lbl_805A9342
+lbl_805A9342:
+	.skip 0x2
+.global lbl_805A9344
+lbl_805A9344:
+	.skip 0x4
+.global lbl_805A9348
+lbl_805A9348:
+	.skip 0x4
+.global lbl_805A934C
+lbl_805A934C:
+	.skip 0x4
+.global lbl_805A9350
+lbl_805A9350:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global sub_80306630
 sub_80306630:
diff --git a/asm/Kyoto/Graphics/CCubeMoviePlayer.s b/asm/Kyoto/Graphics/CCubeMoviePlayer.s
index 1c5c27bd..bdef0522 100644
--- a/asm/Kyoto/Graphics/CCubeMoviePlayer.s
+++ b/asm/Kyoto/Graphics/CCubeMoviePlayer.s
@@ -23,7 +23,28 @@ lbl_805A89F0:
 	.4byte 0x7F000000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9660
+lbl_805A9660:
+	.skip 0x4
+.global lbl_805A9664
+lbl_805A9664:
+	.skip 0x4
+.global lbl_805A9668
+lbl_805A9668:
+	.skip 0x4
+.global lbl_805A966C
+lbl_805A966C:
+	.skip 0x4
+.global lbl_805A9670
+lbl_805A9670:
+	.skip 0x1
+.global lbl_805A9671
+lbl_805A9671:
+	.skip 0x7
+
+.section .text, "ax"
 
 .global SetSfxVolume__12CMoviePlayerFUc
 SetSfxVolume__12CMoviePlayerFUc:
diff --git a/asm/Kyoto/Graphics/CCubeSurface.s b/asm/Kyoto/Graphics/CCubeSurface.s
index 9949e4bd..08dd5e35 100644
--- a/asm/Kyoto/Graphics/CCubeSurface.s
+++ b/asm/Kyoto/Graphics/CCubeSurface.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetBounds__12CCubeSurfaceCFv
 GetBounds__12CCubeSurfaceCFv:
diff --git a/asm/Kyoto/Graphics/CGX.s b/asm/Kyoto/Graphics/CGX.s
index f0c4a642..36b98ac7 100644
--- a/asm/Kyoto/Graphics/CGX.s
+++ b/asm/Kyoto/Graphics/CGX.s
@@ -12,7 +12,7 @@ lbl_80479BD0:
 lbl_805AF4A0:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_80307bbc
 sub_80307bbc:
diff --git a/asm/Kyoto/Graphics/CLight.s b/asm/Kyoto/Graphics/CLight.s
index cb73fe8c..5c2f24bd 100644
--- a/asm/Kyoto/Graphics/CLight.s
+++ b/asm/Kyoto/Graphics/CLight.s
@@ -22,7 +22,7 @@ lbl_805A881C:
 	# ROM: 0x3F61BC
 	.4byte 0x3E4CCCCD
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetNormalIndependentLightingAtPoint__6CLightCFRC9CVector3f
 GetNormalIndependentLightingAtPoint__6CLightCFRC9CVector3f:
diff --git a/asm/Kyoto/Graphics/CTevCombiners.s b/asm/Kyoto/Graphics/CTevCombiners.s
index 7a4cc998..211ba9d7 100644
--- a/asm/Kyoto/Graphics/CTevCombiners.s
+++ b/asm/Kyoto/Graphics/CTevCombiners.s
@@ -17,7 +17,19 @@ lbl_805A8828:
 	# ROM: 0x3F61C8
 	.4byte 0x805A564C
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9358
+lbl_805A9358:
+	.skip 0x4
+.global lbl_805A935C
+lbl_805A935C:
+	.skip 0x4
+.global lbl_805A9360
+lbl_805A9360:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global ResetStates__13CTevCombinersFv
 ResetStates__13CTevCombinersFv:
diff --git a/asm/Kyoto/Graphics/DolphinCColor.s b/asm/Kyoto/Graphics/DolphinCColor.s
index 698fa94f..a91d6011 100644
--- a/asm/Kyoto/Graphics/DolphinCColor.s
+++ b/asm/Kyoto/Graphics/DolphinCColor.s
@@ -22,7 +22,7 @@ lbl_805A8A2C:
 	# ROM: 0x3F63CC
 	.4byte 0x000000FF
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ToRGB5A3__6CColorCFv
 ToRGB5A3__6CColorCFv:
diff --git a/asm/Kyoto/Graphics/DolphinCGraphics.s b/asm/Kyoto/Graphics/DolphinCGraphics.s
index a4fafe38..b49f63e3 100644
--- a/asm/Kyoto/Graphics/DolphinCGraphics.s
+++ b/asm/Kyoto/Graphics/DolphinCGraphics.s
@@ -36,7 +36,6 @@ lbl_803ED948:
 	.4byte lbl_8030AC34
 	.4byte lbl_8030AD80
 
-
 .section .sdata
 
 .global lbl_805A882C
@@ -102,8 +101,155 @@ lbl_80479CC0:
 .global lbl_804BFCC0
 lbl_804BFCC0:
 	.skip 0x50
+
+.section .sbss, "wa"
+
+.global lbl_805A9368
+lbl_805A9368:
+	.skip 0x8
+.global lbl_805A9370
+lbl_805A9370:
+	.skip 0x4
+.global lbl_805A9374
+lbl_805A9374:
+	.skip 0x4
+.global lbl_805A9378
+lbl_805A9378:
+	.skip 0x8
+.global lbl_805A9380
+lbl_805A9380:
+	.skip 0x4
+.global lbl_805A9384
+lbl_805A9384:
+	.skip 0x4
+.global lbl_805A9388
+lbl_805A9388:
+	.skip 0x4
+.global lbl_805A938C
+lbl_805A938C:
+	.skip 0x4
+.global lbl_805A9390
+lbl_805A9390:
+	.skip 0x4
+.global lbl_805A9394
+lbl_805A9394:
+	.skip 0x4
+.global lbl_805A9398
+lbl_805A9398:
+	.skip 0x4
+.global lbl_805A939C
+lbl_805A939C:
+	.skip 0x4
+.global lbl_805A93A0
+lbl_805A93A0:
+	.skip 0x4
+.global lbl_805A93A4
+lbl_805A93A4:
+	.skip 0x4
+.global lbl_805A93A8
+lbl_805A93A8:
+	.skip 0x4
+.global lbl_805A93AC
+lbl_805A93AC:
+	.skip 0x4
+.global lbl_805A93B0
+lbl_805A93B0:
+	.skip 0x4
+.global lbl_805A93B4
+lbl_805A93B4:
+	.skip 0x4
+.global lbl_805A93B8
+lbl_805A93B8:
+	.skip 0x4
+.global lbl_805A93BC
+lbl_805A93BC:
+	.skip 0x4
+.global lbl_805A93C0
+lbl_805A93C0:
+	.skip 0x4
+.global lbl_805A93C4
+lbl_805A93C4:
+	.skip 0x4
+.global lbl_805A93C8
+lbl_805A93C8:
+	.skip 0x4
+.global lbl_805A93CC
+lbl_805A93CC:
+	.skip 0x4
+.global lbl_805A93D0
+lbl_805A93D0:
+	.skip 0x4
+.global lbl_805A93D4
+lbl_805A93D4:
+	.skip 0x1
+.global lbl_805A93D5
+lbl_805A93D5:
+	.skip 0x1
+.global lbl_805A93D6
+lbl_805A93D6:
+	.skip 0x1
+.global lbl_805A93D7
+lbl_805A93D7:
+	.skip 0x1
+.global lbl_805A93D8
+lbl_805A93D8:
+	.skip 0x4
+.global lbl_805A93DC
+lbl_805A93DC:
+	.skip 0x4
+.global lbl_805A93E0
+lbl_805A93E0:
+	.skip 0x4
+.global lbl_805A93E4
+lbl_805A93E4:
+	.skip 0x4
+.global lbl_805A93E8
+lbl_805A93E8:
+	.skip 0x4
+.global lbl_805A93EC
+lbl_805A93EC:
+	.skip 0x4
+.global lbl_805A93F0
+lbl_805A93F0:
+	.skip 0x4
+.global lbl_805A93F4
+lbl_805A93F4:
+	.skip 0x4
+.global lbl_805A93F8
+lbl_805A93F8:
+	.skip 0x4
+.global lbl_805A93FC
+lbl_805A93FC:
+	.skip 0x4
+.global lbl_805A9400
+lbl_805A9400:
+	.skip 0x4
+.global lbl_805A9404
+lbl_805A9404:
+	.skip 0x4
+.global lbl_805A9408
+lbl_805A9408:
+	.skip 0x4
+.global lbl_805A940C
+lbl_805A940C:
+	.skip 0x4
+.global lbl_805A9410
+lbl_805A9410:
+	.skip 0x4
+.global lbl_805A9414
+lbl_805A9414:
+	.skip 0x4
+.global lbl_805A9418
+lbl_805A9418:
+	.skip 0x4
+.global lbl_805A941C
+lbl_805A941C:
+	.skip 0x4
+.global lbl_805A9420
+lbl_805A9420:
+	.skip 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_80309254
 sub_80309254:
diff --git a/asm/Kyoto/Graphics/DolphinCModel.s b/asm/Kyoto/Graphics/DolphinCModel.s
index 8bd8163e..4f54de03 100644
--- a/asm/Kyoto/Graphics/DolphinCModel.s
+++ b/asm/Kyoto/Graphics/DolphinCModel.s
@@ -18,7 +18,25 @@ lbl_803EF738:
 	.4byte "__dt__15TToken<6CModel>Fv"
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9638
+lbl_805A9638:
+	.skip 0x4
+.global lbl_805A963C
+lbl_805A963C:
+	.skip 0x4
+.global lbl_805A9640
+lbl_805A9640:
+	.skip 0x4
+.global lbl_805A9644
+lbl_805A9644:
+	.skip 0x4
+.global lbl_805A9648
+lbl_805A9648:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global UpdateLastFrame__6CModelFv
 UpdateLastFrame__6CModelFv:
diff --git a/asm/Kyoto/Graphics/DolphinCPalette.s b/asm/Kyoto/Graphics/DolphinCPalette.s
index 83b3fa06..8fdbd6f2 100644
--- a/asm/Kyoto/Graphics/DolphinCPalette.s
+++ b/asm/Kyoto/Graphics/DolphinCPalette.s
@@ -1,6 +1,12 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9428
+lbl_805A9428:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global UnLock__16CGraphicsPaletteFv
 UnLock__16CGraphicsPaletteFv:
diff --git a/asm/Kyoto/Graphics/DolphinCTexture.s b/asm/Kyoto/Graphics/DolphinCTexture.s
index d38899bb..325a9e03 100644
--- a/asm/Kyoto/Graphics/DolphinCTexture.s
+++ b/asm/Kyoto/Graphics/DolphinCTexture.s
@@ -38,8 +38,20 @@ lbl_803ED994:
 .global lbl_804BFD10
 lbl_804BFD10:
 	.skip 0x20
+
+.section .sbss, "wa"
+
+.global lbl_805A9430
+lbl_805A9430:
+	.skip 0x4
+.global lbl_805A9434
+lbl_805A9434:
+	.skip 0x4
+.global lbl_805A9438
+lbl_805A9438:
+	.skip 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_8030e10c
 sub_8030e10c:
diff --git a/asm/Kyoto/IObj.s b/asm/Kyoto/IObj.s
index 10ee694c..40b1129e 100644
--- a/asm/Kyoto/IObj.s
+++ b/asm/Kyoto/IObj.s
@@ -1,6 +1,15 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9510
+lbl_805A9510:
+	.skip 0x8
+.global lbl_805A9518
+lbl_805A9518:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global Type2Text__10SObjectTagFUi
 Type2Text__10SObjectTagFUi:
diff --git a/asm/Kyoto/Input/CDolphinController.s b/asm/Kyoto/Input/CDolphinController.s
index 9c973b62..4dcc95db 100644
--- a/asm/Kyoto/Input/CDolphinController.s
+++ b/asm/Kyoto/Input/CDolphinController.s
@@ -24,7 +24,7 @@ lbl_803EF6B8:
 	.4byte GetControllerType__18CDolphinControllerFi
 	.4byte SetMotorState__18CDolphinControllerF7EIOPort11EMotorState
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetAnalogStickMaxValue__18CDolphinControllerCF8EJoyAxis
 GetAnalogStickMaxValue__18CDolphinControllerCF8EJoyAxis:
diff --git a/asm/Kyoto/Input/CRumbleGenerator.s b/asm/Kyoto/Input/CRumbleGenerator.s
index 22fc76a1..bcb059d3 100644
--- a/asm/Kyoto/Input/CRumbleGenerator.s
+++ b/asm/Kyoto/Input/CRumbleGenerator.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetDisabled__14CRumbleManagerFb
 SetDisabled__14CRumbleManagerFb:
diff --git a/asm/Kyoto/Input/CRumbleVoice.s b/asm/Kyoto/Input/CRumbleVoice.s
index d3187105..68dc53ad 100644
--- a/asm/Kyoto/Input/CRumbleVoice.s
+++ b/asm/Kyoto/Input/CRumbleVoice.s
@@ -8,7 +8,7 @@ lbl_805A8A60:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CreateRumbleHandle__12CRumbleVoiceFs
 CreateRumbleHandle__12CRumbleVoiceFs:
diff --git a/asm/Kyoto/Input/DolphinIController.s b/asm/Kyoto/Input/DolphinIController.s
index e3fa87c2..b0e87254 100644
--- a/asm/Kyoto/Input/DolphinIController.s
+++ b/asm/Kyoto/Input/DolphinIController.s
@@ -14,7 +14,16 @@ lbl_803EF680:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A95C8
+lbl_805A95C8:
+	.skip 0x1
+.global lbl_805A95C9
+lbl_805A95C9:
+	.skip 0x7
+
+.section .text, "ax"
 
 .global Create__11IControllerFRC10COsContext
 Create__11IControllerFRC10COsContext:
diff --git a/asm/Kyoto/Input/RumbleAdsr.s b/asm/Kyoto/Input/RumbleAdsr.s
index 1401dfc8..531e64c5 100644
--- a/asm/Kyoto/Input/RumbleAdsr.s
+++ b/asm/Kyoto/Input/RumbleAdsr.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__9SAdsrDataFffffffbb
 __ct__9SAdsrDataFffffffbb:
diff --git a/asm/Kyoto/Math/CAABox.s b/asm/Kyoto/Math/CAABox.s
index d95ad228..4f146866 100644
--- a/asm/Kyoto/Math/CAABox.s
+++ b/asm/Kyoto/Math/CAABox.s
@@ -39,7 +39,7 @@ lbl_805AF4A8:
 lbl_805AF4AC:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ClosestPointAlongVector__6CAABoxCFRC9CVector3f
 ClosestPointAlongVector__6CAABoxCFRC9CVector3f:
diff --git a/asm/Kyoto/Math/CFrustumPlanes.s b/asm/Kyoto/Math/CFrustumPlanes.s
index 58e1133a..397cf937 100644
--- a/asm/Kyoto/Math/CFrustumPlanes.s
+++ b/asm/Kyoto/Math/CFrustumPlanes.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global PointInFrustumPlanes__14CFrustumPlanesCFRC9CVector3f
 PointInFrustumPlanes__14CFrustumPlanesCFRC9CVector3f:
diff --git a/asm/Kyoto/Math/CMatrix3f.s b/asm/Kyoto/Math/CMatrix3f.s
index 1bc1cc89..68935dff 100644
--- a/asm/Kyoto/Math/CMatrix3f.s
+++ b/asm/Kyoto/Math/CMatrix3f.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __as__9CMatrix3fFRC9CMatrix3f
 __as__9CMatrix3fFRC9CMatrix3f:
diff --git a/asm/Kyoto/Math/CMatrix4f.s b/asm/Kyoto/Math/CMatrix4f.s
index de918387..35334c45 100644
--- a/asm/Kyoto/Math/CMatrix4f.s
+++ b/asm/Kyoto/Math/CMatrix4f.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global MultiplyGetW__9CMatrix4fCFRC9CVector3f
 MultiplyGetW__9CMatrix4fCFRC9CVector3f:
diff --git a/asm/Kyoto/Math/CPlane.s b/asm/Kyoto/Math/CPlane.s
index cf01cef7..b732cc46 100644
--- a/asm/Kyoto/Math/CPlane.s
+++ b/asm/Kyoto/Math/CPlane.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ProjectedDeltaDist__RC6CPlaneRC9CVector3fRC9CVector3f
 ProjectedDeltaDist__RC6CPlaneRC9CVector3fRC9CVector3f:
diff --git a/asm/Kyoto/Math/CQuaternion.s b/asm/Kyoto/Math/CQuaternion.s
index 4b548f04..185a589d 100644
--- a/asm/Kyoto/Math/CQuaternion.s
+++ b/asm/Kyoto/Math/CQuaternion.s
@@ -44,7 +44,16 @@ lbl_805A8864:
 	# ROM: 0x3F6204
 	.4byte 0xBF800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9448
+lbl_805A9448:
+	.skip 0x4
+.global lbl_805A944C
+lbl_805A944C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global FromNUQuaternion__11CQuaternionFRC13CNUQuaternion
 FromNUQuaternion__11CQuaternionFRC13CNUQuaternion:
diff --git a/asm/Kyoto/Math/CSphere.s b/asm/Kyoto/Math/CSphere.s
index d168aae0..36e6ecb6 100644
--- a/asm/Kyoto/Math/CSphere.s
+++ b/asm/Kyoto/Math/CSphere.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSurfaceNormal__7CSphereCFRC9CVector3f
 GetSurfaceNormal__7CSphereCFRC9CVector3f:
diff --git a/asm/Kyoto/Math/CTransform4f.s b/asm/Kyoto/Math/CTransform4f.s
index 599dc6ff..be88c54a 100644
--- a/asm/Kyoto/Math/CTransform4f.s
+++ b/asm/Kyoto/Math/CTransform4f.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetInverse__12CTransform4fCFv
 GetInverse__12CTransform4fCFv:
diff --git a/asm/Kyoto/Math/CUnitVector3f.s b/asm/Kyoto/Math/CUnitVector3f.s
index 710dfeb4..584e6d12 100644
--- a/asm/Kyoto/Math/CUnitVector3f.s
+++ b/asm/Kyoto/Math/CUnitVector3f.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__13CUnitVector3fFRC9CVector3f
 __ct__13CUnitVector3fFRC9CVector3f:
diff --git a/asm/Kyoto/Math/CVector2f.s b/asm/Kyoto/Math/CVector2f.s
index 2dfedcf6..68c1eceb 100644
--- a/asm/Kyoto/Math/CVector2f.s
+++ b/asm/Kyoto/Math/CVector2f.s
@@ -1,6 +1,12 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+# skZero2f
+.global lbl_805A9458
+lbl_805A9458:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global __dv__FRC9CVector2fRCf
 __dv__FRC9CVector2fRCf:
diff --git a/asm/Kyoto/Math/CVector2i.s b/asm/Kyoto/Math/CVector2i.s
index 1f4646d4..8e4247f7 100644
--- a/asm/Kyoto/Math/CVector2i.s
+++ b/asm/Kyoto/Math/CVector2i.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dv__FRC9CVector2ii
 __dv__FRC9CVector2ii:
diff --git a/asm/Kyoto/Math/CVector3d.s b/asm/Kyoto/Math/CVector3d.s
index 717238aa..74907499 100644
--- a/asm/Kyoto/Math/CVector3d.s
+++ b/asm/Kyoto/Math/CVector3d.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ml__FdRC9CVector3d
 __ml__FdRC9CVector3d:
diff --git a/asm/Kyoto/Math/CVector3f.s b/asm/Kyoto/Math/CVector3f.s
index acc034a1..045cdfae 100644
--- a/asm/Kyoto/Math/CVector3f.s
+++ b/asm/Kyoto/Math/CVector3f.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsEqu__9CVector3fCFRC9CVector3ff
 IsEqu__9CVector3fCFRC9CVector3ff:
diff --git a/asm/Kyoto/Math/CloseEnough.s b/asm/Kyoto/Math/CloseEnough.s
index a9299e7e..fdf6068e 100644
--- a/asm/Kyoto/Math/CloseEnough.s
+++ b/asm/Kyoto/Math/CloseEnough.s
@@ -1,6 +1,12 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9440
+lbl_805A9440:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global close_enough__FRC9CVector2fRC9CVector2ff
 close_enough__FRC9CVector2fRC9CVector2ff:
@@ -58,7 +64,7 @@ __sinit_CloseEnough_cpp:
 /* 8030FFCC 0030CF2C  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8030FFD0 0030CF30  7C 08 02 A6 */	mflr r0
 /* 8030FFD4 0030CF34  C0 22 C8 48 */	lfs f1, lbl_805AE568@sda21(r2)
-/* 8030FFD8 0030CF38  38 6D A8 80 */	addi r3, r13, skZero2f@sda21
+/* 8030FFD8 0030CF38  38 6D A8 80 */	addi r3, r13, lbl_805A9440@sda21
 /* 8030FFDC 0030CF3C  90 01 00 14 */	stw r0, 0x14(r1)
 /* 8030FFE0 0030CF40  FC 40 08 90 */	fmr f2, f1
 /* 8030FFE4 0030CF44  48 00 42 1D */	bl __ct__9CVector2fFff
diff --git a/asm/Kyoto/Math/RMathUtils.s b/asm/Kyoto/Math/RMathUtils.s
index b1809976..191f7c5b 100644
--- a/asm/Kyoto/Math/RMathUtils.s
+++ b/asm/Kyoto/Math/RMathUtils.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FloorPowerOfTwo__5CMathFi
 FloorPowerOfTwo__5CMathFi:
diff --git a/asm/Kyoto/PVS/CPVSVisOctree.s b/asm/Kyoto/PVS/CPVSVisOctree.s
index 709f5668..86468a7e 100644
--- a/asm/Kyoto/PVS/CPVSVisOctree.s
+++ b/asm/Kyoto/PVS/CPVSVisOctree.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetNumChildren__13CPVSVisOctreeCFUc
 GetNumChildren__13CPVSVisOctreeCFUc:
diff --git a/asm/Kyoto/PVS/CPVSVisSet.s b/asm/Kyoto/PVS/CPVSVisSet.s
index 04fc936e..668f6f41 100644
--- a/asm/Kyoto/PVS/CPVSVisSet.s
+++ b/asm/Kyoto/PVS/CPVSVisSet.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetTestPoint__10CPVSVisSetFRC13CPVSVisOctreeRC9CVector3f
 SetTestPoint__10CPVSVisSetFRC13CPVSVisOctreeRC9CVector3f:
diff --git a/asm/Kyoto/Particles/CColorElement.s b/asm/Kyoto/Particles/CColorElement.s
index 5642c9d0..18dad682 100644
--- a/asm/Kyoto/Particles/CColorElement.s
+++ b/asm/Kyoto/Particles/CColorElement.s
@@ -148,7 +148,7 @@ lbl_805A88AC:
 	# ROM: 0x3F624C
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__16CCEParticleColor
 __dt__16CCEParticleColor:
diff --git a/asm/Kyoto/Particles/CEffectComponent.s b/asm/Kyoto/Particles/CEffectComponent.s
index 110be327..20bf63a2 100644
--- a/asm/Kyoto/Particles/CEffectComponent.s
+++ b/asm/Kyoto/Particles/CEffectComponent.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSObjectTagFromStream__16CEffectComponentFR12CInputStream
 GetSObjectTagFromStream__16CEffectComponentFR12CInputStream:
diff --git a/asm/Kyoto/Particles/CElectricDescription.s b/asm/Kyoto/Particles/CElectricDescription.s
index fd6326a6..ce995546 100644
--- a/asm/Kyoto/Particles/CElectricDescription.s
+++ b/asm/Kyoto/Particles/CElectricDescription.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__20CElectricDescriptionFv
 __dt__20CElectricDescriptionFv:
diff --git a/asm/Kyoto/Particles/CElementGen.s b/asm/Kyoto/Particles/CElementGen.s
index f8193d6f..450e2d6c 100644
--- a/asm/Kyoto/Particles/CElementGen.s
+++ b/asm/Kyoto/Particles/CElementGen.s
@@ -389,8 +389,47 @@ lbl_804BFEB4:
 .global lbl_804BFF00
 lbl_804BFF00:
 	.skip 0x10
+
+.section .sbss, "wa"
+# TODO this probably isn't split properly
+.global lbl_805A9470
+lbl_805A9470:
+	.skip 0x4
+.global lbl_805A9474
+lbl_805A9474:
+	.skip 0x4
+.global lbl_805A9478
+lbl_805A9478:
+	.skip 0x1
+.global lbl_805A9479
+lbl_805A9479:
+	.skip 0x1
+.global lbl_805A947A
+lbl_805A947A:
+	.skip 0x1
+.global lbl_805A947B
+lbl_805A947B:
+	.skip 0x1
+.global lbl_805A947C
+lbl_805A947C:
+	.skip 0x4
+.global lbl_805A9480
+lbl_805A9480:
+	.skip 0x4
+.global lbl_805A9484
+lbl_805A9484:
+	.skip 0x1
+.global lbl_805A9485
+lbl_805A9485:
+	.skip 0x3
+.global lbl_805A9488
+lbl_805A9488:
+	.skip 0x4
+.global lbl_805A948C
+lbl_805A948C:
+	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetGlobalTranslation__11CElementGenCFv
 GetGlobalTranslation__11CElementGenCFv:
diff --git a/asm/Kyoto/Particles/CEmitterElement.s b/asm/Kyoto/Particles/CEmitterElement.s
index a9d53ca6..c3264871 100644
--- a/asm/Kyoto/Particles/CEmitterElement.s
+++ b/asm/Kyoto/Particles/CEmitterElement.s
@@ -35,7 +35,7 @@ lbl_803EF778:
 	.4byte GetValue__16CEESimpleEmitterCFiR9CVector3fR9CVector3f
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetValue__14CVEAngleSphereCFiR9CVector3fR9CVector3f
 GetValue__14CVEAngleSphereCFiR9CVector3fR9CVector3f:
diff --git a/asm/Kyoto/Particles/CGenDescription.s b/asm/Kyoto/Particles/CGenDescription.s
index efb89ffa..d633318e 100644
--- a/asm/Kyoto/Particles/CGenDescription.s
+++ b/asm/Kyoto/Particles/CGenDescription.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__15CGenDescriptionFv
 __dt__15CGenDescriptionFv:
diff --git a/asm/Kyoto/Particles/CParticleData.s b/asm/Kyoto/Particles/CParticleData.s
index c707035e..158b49b4 100644
--- a/asm/Kyoto/Particles/CParticleData.s
+++ b/asm/Kyoto/Particles/CParticleData.s
@@ -1,6 +1,15 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9650
+lbl_805A9650:
+	.skip 0x4
+.global lbl_805A9654
+lbl_805A9654:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global __ct__13CParticleDataFR12CInputStream
 __ct__13CParticleDataFR12CInputStream:
diff --git a/asm/Kyoto/Particles/CParticleElectric.s b/asm/Kyoto/Particles/CParticleElectric.s
index 3aca5883..20cab14e 100644
--- a/asm/Kyoto/Particles/CParticleElectric.s
+++ b/asm/Kyoto/Particles/CParticleElectric.s
@@ -59,7 +59,7 @@ lbl_805A8A18:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetTranslation__17CParticleElectricCFv
 GetTranslation__17CParticleElectricCFv:
diff --git a/asm/Kyoto/Particles/CParticleElectricDataFactory.s b/asm/Kyoto/Particles/CParticleElectricDataFactory.s
index fe87498b..5a2f53d5 100644
--- a/asm/Kyoto/Particles/CParticleElectricDataFactory.s
+++ b/asm/Kyoto/Particles/CParticleElectricDataFactory.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CreateELSM__28CParticleElectricDataFactoryFP20CElectricDescriptionR12CInputStreamP11CSimplePool
 CreateELSM__28CParticleElectricDataFactoryFP20CElectricDescriptionR12CInputStreamP11CSimplePool:
diff --git a/asm/Kyoto/Particles/CParticleGen.s b/asm/Kyoto/Particles/CParticleGen.s
index 35c463b9..e3718cbd 100644
--- a/asm/Kyoto/Particles/CParticleGen.s
+++ b/asm/Kyoto/Particles/CParticleGen.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AddModifier__12CParticleGenFP5CWarp
 AddModifier__12CParticleGenFP5CWarp:
diff --git a/asm/Kyoto/Particles/CParticleGlobals.s b/asm/Kyoto/Particles/CParticleGlobals.s
index e66133aa..c0f957d8 100644
--- a/asm/Kyoto/Particles/CParticleGlobals.s
+++ b/asm/Kyoto/Particles/CParticleGlobals.s
@@ -1,6 +1,42 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9490
+lbl_805A9490:
+	.skip 0x4
+.global lbl_805A9494
+lbl_805A9494:
+	.skip 0x4
+.global lbl_805A9498
+lbl_805A9498:
+	.skip 0x4
+.global lbl_805A949C
+lbl_805A949C:
+	.skip 0x4
+.global lbl_805A94A0
+lbl_805A94A0:
+	.skip 0x4
+.global lbl_805A94A4
+lbl_805A94A4:
+	.skip 0x4
+.global lbl_805A94A8
+lbl_805A94A8:
+	.skip 0x4
+.global lbl_805A94AC
+lbl_805A94AC:
+	.skip 0x4
+.global lbl_805A94B0
+lbl_805A94B0:
+	.skip 0x4
+.global lbl_805A94B4
+lbl_805A94B4:
+	.skip 0x4
+.global lbl_805A94B8
+lbl_805A94B8:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global UpdateParticleLifetimeTweenValues__16CParticleGlobalsFi
 UpdateParticleLifetimeTweenValues__16CParticleGlobalsFi:
diff --git a/asm/Kyoto/Particles/CParticleSwoosh.s b/asm/Kyoto/Particles/CParticleSwoosh.s
index f7dedd3b..c896dea3 100644
--- a/asm/Kyoto/Particles/CParticleSwoosh.s
+++ b/asm/Kyoto/Particles/CParticleSwoosh.s
@@ -48,7 +48,7 @@ lbl_805A88DC:
 	# ROM: 0x3F627C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetTranslation__15CParticleSwooshCFv
 GetTranslation__15CParticleSwooshCFv:
diff --git a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s
index 73e7b0a4..fc0dd261 100644
--- a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s
+++ b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s
@@ -10,7 +10,7 @@ lbl_803EDDF8:
 	.4byte "__dt__46TObjOwnerDerivedFromIObj<18CSwooshDescription>Fv"
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CreateWPSM__26CParticleSwooshDataFactoryFP18CSwooshDescriptionR12CInputStreamP11CSimplePool
 CreateWPSM__26CParticleSwooshDataFactoryFP18CSwooshDescriptionR12CInputStreamP11CSimplePool:
diff --git a/asm/Kyoto/Particles/CRealElement.s b/asm/Kyoto/Particles/CRealElement.s
index 671baeec..4bb64a09 100644
--- a/asm/Kyoto/Particles/CRealElement.s
+++ b/asm/Kyoto/Particles/CRealElement.s
@@ -362,7 +362,7 @@ lbl_805A88E0:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetValue__15CREIntTimesRealCFiRf
 GetValue__15CREIntTimesRealCFiRf:
diff --git a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s
index ddf6ddd6..119754fa 100644
--- a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s
+++ b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s
@@ -8,8 +8,32 @@ lbl_804BFF10:
 .global lbl_804BFF1C
 lbl_804BFF1C:
 	.skip 0x14
-	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+
+.section .sbss, "wa"
+
+.global lbl_805A94C0
+lbl_805A94C0:
+	.skip 0x4
+.global lbl_805A94C4
+lbl_805A94C4:
+	.skip 0x4
+.global lbl_805A94C8
+lbl_805A94C8:
+	.skip 0x4
+.global lbl_805A94CC
+lbl_805A94CC:
+	.skip 0x4
+.global lbl_805A94D0
+lbl_805A94D0:
+	.skip 0x4
+.global lbl_805A94D4
+lbl_805A94D4:
+	.skip 0x1
+.global lbl_805A94D5
+lbl_805A94D5:
+	.skip 0x3
+
+.section .text, "ax"
 
 .global LoadToken__Q224CSpawnSystemKeyframeData24CSpawnSystemKeyframeInfoFP11CSimplePool
 LoadToken__Q224CSpawnSystemKeyframeData24CSpawnSystemKeyframeInfoFP11CSimplePool:
diff --git a/asm/Kyoto/Particles/CSwooshDescription.s b/asm/Kyoto/Particles/CSwooshDescription.s
index 28419fb1..4047b816 100644
--- a/asm/Kyoto/Particles/CSwooshDescription.s
+++ b/asm/Kyoto/Particles/CSwooshDescription.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__18CSwooshDescriptionFv
 __dt__18CSwooshDescriptionFv:
diff --git a/asm/Kyoto/Particles/CUVElement.s b/asm/Kyoto/Particles/CUVElement.s
index 8fef2c65..bbeaafe7 100644
--- a/asm/Kyoto/Particles/CUVElement.s
+++ b/asm/Kyoto/Particles/CUVElement.s
@@ -42,7 +42,7 @@ lbl_805A88F0:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global HasConstantTexture__15CUVEAnimTextureFv
 HasConstantTexture__15CUVEAnimTextureFv:
diff --git a/asm/Kyoto/Particles/CVectorElement.s b/asm/Kyoto/Particles/CVectorElement.s
index 63e53ee8..c571071a 100644
--- a/asm/Kyoto/Particles/CVectorElement.s
+++ b/asm/Kyoto/Particles/CVectorElement.s
@@ -200,7 +200,7 @@ lbl_805A88F8:
 	.4byte 0x3F800000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetValue__7CVECVTCCFiR9CVector3f
 GetValue__7CVECVTCCFiR9CVector3f:
diff --git a/asm/Kyoto/Particles/CWarp.s b/asm/Kyoto/Particles/CWarp.s
index b2867784..a89ec10c 100644
--- a/asm/Kyoto/Particles/CWarp.s
+++ b/asm/Kyoto/Particles/CWarp.s
@@ -14,7 +14,7 @@ lbl_803EE2F8:
 	.4byte 0
 	.4byte 0
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__5CWarpFv
 __dt__5CWarpFv:
diff --git a/asm/Kyoto/Streams/CInputStream.s b/asm/Kyoto/Streams/CInputStream.s
index 941b4d3b..86318454 100644
--- a/asm/Kyoto/Streams/CInputStream.s
+++ b/asm/Kyoto/Streams/CInputStream.s
@@ -10,7 +10,28 @@ lbl_803EE388:
 	.4byte __dt__12CInputStreamFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A94F0
+lbl_805A94F0:
+	.skip 0x2
+.global lbl_805A94F2
+lbl_805A94F2:
+	.skip 0x2
+.global lbl_805A94F4
+lbl_805A94F4:
+	.skip 0x4
+.global lbl_805A94F8
+lbl_805A94F8:
+	.skip 0x4
+.global lbl_805A94FC
+lbl_805A94FC:
+	.skip 0x4
+.global lbl_805A9500
+lbl_805A9500:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global ReadFloat__12CInputStreamFv
 ReadFloat__12CInputStreamFv:
diff --git a/asm/Kyoto/Streams/CMemoryInStream.s b/asm/Kyoto/Streams/CMemoryInStream.s
index 2fba8ea8..d04912dd 100644
--- a/asm/Kyoto/Streams/CMemoryInStream.s
+++ b/asm/Kyoto/Streams/CMemoryInStream.s
@@ -10,7 +10,7 @@ __vt__15CMemoryInStream:
 	.4byte __dt__15CMemoryInStreamFv
 	.4byte Read__15CMemoryInStreamFPvUl
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Read__15CMemoryInStreamFPvUl
 Read__15CMemoryInStreamFPvUl:
diff --git a/asm/Kyoto/Streams/CMemoryStreamOut.s b/asm/Kyoto/Streams/CMemoryStreamOut.s
index 81481893..ae7263b7 100644
--- a/asm/Kyoto/Streams/CMemoryStreamOut.s
+++ b/asm/Kyoto/Streams/CMemoryStreamOut.s
@@ -10,7 +10,7 @@ lbl_803EE3A8:
 	.4byte __dt__16CMemoryStreamOutFv
 	.4byte Write__16CMemoryStreamOutFPCvUl
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Write__16CMemoryStreamOutFPCvUl
 Write__16CMemoryStreamOutFPCvUl:
diff --git a/asm/Kyoto/Streams/COutputStream.s b/asm/Kyoto/Streams/COutputStream.s
index fda30922..49390273 100644
--- a/asm/Kyoto/Streams/COutputStream.s
+++ b/asm/Kyoto/Streams/COutputStream.s
@@ -10,7 +10,7 @@ lbl_803EE3B8:
 	.4byte __dt__13COutputStreamFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global WriteBits__13COutputStreamFii
 WriteBits__13COutputStreamFii:
diff --git a/asm/Kyoto/Streams/CZipInputStream.s b/asm/Kyoto/Streams/CZipInputStream.s
index 417e8b8c..ce099ec7 100644
--- a/asm/Kyoto/Streams/CZipInputStream.s
+++ b/asm/Kyoto/Streams/CZipInputStream.s
@@ -10,7 +10,7 @@ lbl_803EE3C8:
 	.4byte __dt__15CZipInputStreamFv
 	.4byte Read__15CZipInputStreamFPvUl
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Read__15CZipInputStreamFPvUl
 Read__15CZipInputStreamFPvUl:
diff --git a/asm/Kyoto/Streams/CZipSupport.s b/asm/Kyoto/Streams/CZipSupport.s
index 62eafbd9..7ff2d0f9 100644
--- a/asm/Kyoto/Streams/CZipSupport.s
+++ b/asm/Kyoto/Streams/CZipSupport.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Free__11CZipSupportFPvPv
 Free__11CZipSupportFPvPv:
diff --git a/asm/Kyoto/Text/CBlockInstruction.s b/asm/Kyoto/Text/CBlockInstruction.s
index 3d25be7f..ae85a9a2 100644
--- a/asm/Kyoto/Text/CBlockInstruction.s
+++ b/asm/Kyoto/Text/CBlockInstruction.s
@@ -28,7 +28,7 @@ lbl_803ED8E4:
 	.4byte lbl_80305F3C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CBlockInstructionFv
 __dt__17CBlockInstructionFv:
diff --git a/asm/Kyoto/Text/CColorInstruction.s b/asm/Kyoto/Text/CColorInstruction.s
index a275a23a..c8afae69 100644
--- a/asm/Kyoto/Text/CColorInstruction.s
+++ b/asm/Kyoto/Text/CColorInstruction.s
@@ -14,7 +14,7 @@ lbl_803ED5B0:
 	.4byte GetAssetCount__12CInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CColorInstructionFv
 __dt__17CColorInstructionFv:
diff --git a/asm/Kyoto/Text/CColorOverrideInstruction.s b/asm/Kyoto/Text/CColorOverrideInstruction.s
index 4e330250..b48da9f8 100644
--- a/asm/Kyoto/Text/CColorOverrideInstruction.s
+++ b/asm/Kyoto/Text/CColorOverrideInstruction.s
@@ -26,7 +26,7 @@ lbl_803ED5F0:
 	.4byte GetAssetCount__16CFontInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__25CColorOverrideInstructionFv
 __dt__25CColorOverrideInstructionFv:
diff --git a/asm/Kyoto/Text/CDrawStringOptions.s b/asm/Kyoto/Text/CDrawStringOptions.s
index 51a3c027..2ab7f076 100644
--- a/asm/Kyoto/Text/CDrawStringOptions.s
+++ b/asm/Kyoto/Text/CDrawStringOptions.s
@@ -8,7 +8,7 @@ lbl_805A8800:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__18CDrawStringOptionsFv
 __ct__18CDrawStringOptionsFv:
diff --git a/asm/Kyoto/Text/CFont.s b/asm/Kyoto/Text/CFont.s
index 7e88c925..1e2b1e90 100644
--- a/asm/Kyoto/Text/CFont.s
+++ b/asm/Kyoto/Text/CFont.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global DrawString__5CFontCFPCcllRC6CColor
 DrawString__5CFontCFPCcllRC6CColor:
diff --git a/asm/Kyoto/Text/CFontImageDef.s b/asm/Kyoto/Text/CFontImageDef.s
index 2ae8a948..4ba41661 100644
--- a/asm/Kyoto/Text/CFontImageDef.s
+++ b/asm/Kyoto/Text/CFontImageDef.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CalculateBaseline__13CFontImageDefFv
 CalculateBaseline__13CFontImageDefFv:
diff --git a/asm/Kyoto/Text/CFontInstruction.s b/asm/Kyoto/Text/CFontInstruction.s
index 145da81d..2e60b4cb 100644
--- a/asm/Kyoto/Text/CFontInstruction.s
+++ b/asm/Kyoto/Text/CFontInstruction.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__16CFontInstructionFv
 __dt__16CFontInstructionFv:
diff --git a/asm/Kyoto/Text/CFontRenderState.s b/asm/Kyoto/Text/CFontRenderState.s
index a4b2d4a5..6f6b274b 100644
--- a/asm/Kyoto/Text/CFontRenderState.s
+++ b/asm/Kyoto/Text/CFontRenderState.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ConvertToTextureSpace__16CFontRenderStateCFRC10CTextColor
 ConvertToTextureSpace__16CFontRenderStateCFRC10CTextColor:
diff --git a/asm/Kyoto/Text/CImageInstruction.s b/asm/Kyoto/Text/CImageInstruction.s
index 2f3ce6bf..600200e0 100644
--- a/asm/Kyoto/Text/CImageInstruction.s
+++ b/asm/Kyoto/Text/CImageInstruction.s
@@ -14,7 +14,7 @@ lbl_803EF798:
 	.4byte GetAssetCount__17CImageInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CImageInstructionFv
 __dt__17CImageInstructionFv:
diff --git a/asm/Kyoto/Text/CLineExtraSpaceInstruction.s b/asm/Kyoto/Text/CLineExtraSpaceInstruction.s
index e2a430b3..970acfc6 100644
--- a/asm/Kyoto/Text/CLineExtraSpaceInstruction.s
+++ b/asm/Kyoto/Text/CLineExtraSpaceInstruction.s
@@ -14,7 +14,7 @@ lbl_803ED610:
 	.4byte GetAssetCount__12CInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__26CLineExtraSpaceInstructionFv
 __dt__26CLineExtraSpaceInstructionFv:
diff --git a/asm/Kyoto/Text/CLineInstruction.s b/asm/Kyoto/Text/CLineInstruction.s
index 6ab471b7..7747c737 100644
--- a/asm/Kyoto/Text/CLineInstruction.s
+++ b/asm/Kyoto/Text/CLineInstruction.s
@@ -29,7 +29,7 @@ lbl_803ED64C:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__16CLineInstructionFv
 __dt__16CLineInstructionFv:
diff --git a/asm/Kyoto/Text/CLineSpacingInstruction.s b/asm/Kyoto/Text/CLineSpacingInstruction.s
index 7e3571f0..144cc65c 100644
--- a/asm/Kyoto/Text/CLineSpacingInstruction.s
+++ b/asm/Kyoto/Text/CLineSpacingInstruction.s
@@ -14,7 +14,7 @@ lbl_803ED678:
 	.4byte GetAssetCount__12CInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__23CLineSpacingInstructionFv
 __dt__23CLineSpacingInstructionFv:
diff --git a/asm/Kyoto/Text/CPopStateInstruction.s b/asm/Kyoto/Text/CPopStateInstruction.s
index 1bc37aec..5223de63 100644
--- a/asm/Kyoto/Text/CPopStateInstruction.s
+++ b/asm/Kyoto/Text/CPopStateInstruction.s
@@ -14,7 +14,7 @@ lbl_803ED698:
 	.4byte GetAssetCount__12CInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__20CPopStateInstructionFv
 __dt__20CPopStateInstructionFv:
diff --git a/asm/Kyoto/Text/CPushStateInstruction.s b/asm/Kyoto/Text/CPushStateInstruction.s
index b0985500..8cf4974b 100644
--- a/asm/Kyoto/Text/CPushStateInstruction.s
+++ b/asm/Kyoto/Text/CPushStateInstruction.s
@@ -14,7 +14,7 @@ lbl_803ED6B8:
 	.4byte GetAssetCount__12CInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__21CPushStateInstructionFv
 __dt__21CPushStateInstructionFv:
diff --git a/asm/Kyoto/Text/CRasterFont.s b/asm/Kyoto/Text/CRasterFont.s
index dd627b7d..b8cb565d 100644
--- a/asm/Kyoto/Text/CRasterFont.s
+++ b/asm/Kyoto/Text/CRasterFont.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_802ffed4
 sub_802ffed4:
diff --git a/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s b/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s
index 8990667c..bc1cff9c 100644
--- a/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s
+++ b/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s
@@ -14,7 +14,7 @@ lbl_803ED6D8:
 	.4byte GetAssetCount__12CInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__31CRemoveColorOverrideInstructionFv
 __dt__31CRemoveColorOverrideInstructionFv:
diff --git a/asm/Kyoto/Text/CSavableState.s b/asm/Kyoto/Text/CSavableState.s
index 8caa85a0..86d281c1 100644
--- a/asm/Kyoto/Text/CSavableState.s
+++ b/asm/Kyoto/Text/CSavableState.s
@@ -8,7 +8,7 @@ lbl_805A8808:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsFinishedLoading__14CSaveableStateFv
 IsFinishedLoading__14CSaveableStateFv:
diff --git a/asm/Kyoto/Text/CStringTable.s b/asm/Kyoto/Text/CStringTable.s
index 5eb8a4d4..62a3349e 100644
--- a/asm/Kyoto/Text/CStringTable.s
+++ b/asm/Kyoto/Text/CStringTable.s
@@ -8,7 +8,7 @@ lbl_805A89D8:
 	.asciz "ENGL"
 	.balign 4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FStringTableFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FStringTableFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/Kyoto/Text/CTextExecuteBuffer.s b/asm/Kyoto/Text/CTextExecuteBuffer.s
index 903b8f0e..011cc5a5 100644
--- a/asm/Kyoto/Text/CTextExecuteBuffer.s
+++ b/asm/Kyoto/Text/CTextExecuteBuffer.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global BuildRenderBufferPages__18CTextExecuteBufferFRC9CVector2i
 BuildRenderBufferPages__18CTextExecuteBufferFRC9CVector2i:
diff --git a/asm/Kyoto/Text/CTextInstruction.s b/asm/Kyoto/Text/CTextInstruction.s
index 811300cb..8ffe4e98 100644
--- a/asm/Kyoto/Text/CTextInstruction.s
+++ b/asm/Kyoto/Text/CTextInstruction.s
@@ -14,7 +14,7 @@ lbl_803ED6F8:
 	.4byte GetAssetCount__12CInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__16CTextInstructionFv
 __dt__16CTextInstructionFv:
diff --git a/asm/Kyoto/Text/CTextParser.s b/asm/Kyoto/Text/CTextParser.s
index 12cb01e1..afc9d497 100644
--- a/asm/Kyoto/Text/CTextParser.s
+++ b/asm/Kyoto/Text/CTextParser.s
@@ -32,7 +32,7 @@ lbl_803ED718:
 	.string16 "pop"
 	.balign 8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ParseColor__11CTextParserFPCwi
 ParseColor__11CTextParserFPCwi:
diff --git a/asm/Kyoto/Text/CTextRenderBuffer.s b/asm/Kyoto/Text/CTextRenderBuffer.s
index 3efdb224..7c93ba07 100644
--- a/asm/Kyoto/Text/CTextRenderBuffer.s
+++ b/asm/Kyoto/Text/CTextRenderBuffer.s
@@ -8,7 +8,7 @@ lbl_805A89E0:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AccumulateTextBounds__17CTextRenderBufferFv
 AccumulateTextBounds__17CTextRenderBufferFv:
diff --git a/asm/Kyoto/Text/CWordBreakTables.s b/asm/Kyoto/Text/CWordBreakTables.s
index 299fd90b..686b8ed6 100644
--- a/asm/Kyoto/Text/CWordBreakTables.s
+++ b/asm/Kyoto/Text/CWordBreakTables.s
@@ -1,6 +1,15 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9338
+lbl_805A9338:
+	.skip 0x4
+.global lbl_805A933C
+lbl_805A933C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global GetEndRank__16CWordBreakTablesFw
 GetEndRank__16CWordBreakTablesFw:
diff --git a/asm/Kyoto/Text/CWordInstruction.s b/asm/Kyoto/Text/CWordInstruction.s
index 40521a2d..7a9bdad9 100644
--- a/asm/Kyoto/Text/CWordInstruction.s
+++ b/asm/Kyoto/Text/CWordInstruction.s
@@ -14,7 +14,7 @@ lbl_803ED8A8:
 	.4byte GetAssetCount__12CInstructionCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__16CWordInstructionFv
 __dt__16CWordInstructionFv:
diff --git a/asm/Kyoto/rstl/RstlExtras.s b/asm/Kyoto/rstl/RstlExtras.s
index 41469cd1..4e204cfa 100644
--- a/asm/Kyoto/rstl/RstlExtras.s
+++ b/asm/Kyoto/rstl/RstlExtras.s
@@ -5,8 +5,14 @@
 .global lbl_804BFF30
 lbl_804BFF30:
 	.skip 0x10
+
+.section .sbss, "wa"
+
+.global lbl_805A94E8
+lbl_805A94E8:
+	.skip 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "TokenizeString__13CStringExtrasFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>PCci"
 "TokenizeString__13CStringExtrasFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>PCci":
diff --git a/asm/Kyoto/rstl/rstl_map.s b/asm/Kyoto/rstl/rstl_map.s
index 79a2cbc2..f52aba09 100644
--- a/asm/Kyoto/rstl/rstl_map.s
+++ b/asm/Kyoto/rstl/rstl_map.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global rbtree_traverse_forward__4rstlFPCvPv
 rbtree_traverse_forward__4rstlFPCvPv:
diff --git a/asm/Kyoto/rstl/rstl_strings.s b/asm/Kyoto/rstl/rstl_strings.s
index b25bcffd..54c6e460 100644
--- a/asm/Kyoto/rstl/rstl_strings.s
+++ b/asm/Kyoto/rstl/rstl_strings.s
@@ -1,6 +1,33 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global "_EmptyString__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
+"_EmptyString__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>":
+	.skip 0x2
+.global lbl_805A94DA
+lbl_805A94DA:
+	.skip 0x2
+.global lbl_805A94DC
+lbl_805A94DC:
+	.skip 0x2
+.global lbl_805A94DE
+lbl_805A94DE:
+	.skip 0x2
+.global lbl_805A94E0
+lbl_805A94E0:
+	.skip 0x1
+.global lbl_805A94E1
+lbl_805A94E1:
+	.skip 0x1
+.global lbl_805A94E2
+lbl_805A94E2:
+	.skip 0x1
+.global lbl_805A94E3
+lbl_805A94E3:
+	.skip 0x5
+
+.section .text, "ax"
 
 .global "internal_dereference__Q24rstl83basic_string<c,Q24rstl31case_insensitive_char_traits<c>,Q24rstl17rmemory_allocator>Fv"
 "internal_dereference__Q24rstl83basic_string<c,Q24rstl31case_insensitive_char_traits<c>,Q24rstl17rmemory_allocator>Fv":
diff --git a/asm/Kyoto/zlib/adler32.s b/asm/Kyoto/zlib/adler32.s
index cbb7edd7..5928b0dc 100644
--- a/asm/Kyoto/zlib/adler32.s
+++ b/asm/Kyoto/zlib/adler32.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global adler32
 adler32:
diff --git a/asm/Kyoto/zlib/infblock.s b/asm/Kyoto/zlib/infblock.s
index fb8c382f..f9dc1cb1 100644
--- a/asm/Kyoto/zlib/infblock.s
+++ b/asm/Kyoto/zlib/infblock.s
@@ -16,7 +16,7 @@ lbl_803EE440:
 	.4byte lbl_803420A8
 	.4byte lbl_803420E4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global inflate_blocks_free
 inflate_blocks_free:
diff --git a/asm/Kyoto/zlib/infcodes.s b/asm/Kyoto/zlib/infcodes.s
index 7f2cc6dc..7096e65c 100644
--- a/asm/Kyoto/zlib/infcodes.s
+++ b/asm/Kyoto/zlib/infcodes.s
@@ -16,7 +16,7 @@ lbl_803EE468:
 	.4byte lbl_80342C7C
 	.4byte lbl_80342CB8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global inflate_codes_free
 inflate_codes_free:
diff --git a/asm/Kyoto/zlib/inffast.s b/asm/Kyoto/zlib/inffast.s
index 95251671..a2fc1f32 100644
--- a/asm/Kyoto/zlib/inffast.s
+++ b/asm/Kyoto/zlib/inffast.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global inflate_fast
 inflate_fast:
diff --git a/asm/Kyoto/zlib/inflate.s b/asm/Kyoto/zlib/inflate.s
index 0a2df2bb..a2f745d1 100644
--- a/asm/Kyoto/zlib/inflate.s
+++ b/asm/Kyoto/zlib/inflate.s
@@ -20,7 +20,7 @@ lbl_803EE490:
 	.4byte lbl_8034392C
 	.4byte lbl_80343934
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global inflate
 inflate:
diff --git a/asm/Kyoto/zlib/inftrees.s b/asm/Kyoto/zlib/inftrees.s
index 247b7220..f90c1b47 100644
--- a/asm/Kyoto/zlib/inftrees.s
+++ b/asm/Kyoto/zlib/inftrees.s
@@ -1110,7 +1110,7 @@ lbl_805A891C:
 	# ROM: 0x3F62BC
 	.4byte 0x00000005
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global inflate_trees_fixed
 inflate_trees_fixed:
diff --git a/asm/Kyoto/zlib/infutil.s b/asm/Kyoto/zlib/infutil.s
index ae0dd398..39a47715 100644
--- a/asm/Kyoto/zlib/infutil.s
+++ b/asm/Kyoto/zlib/infutil.s
@@ -24,7 +24,7 @@ lbl_803EF5C8:
 	.4byte 0x0000FFFF
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global inflate_flush
 inflate_flush:
diff --git a/asm/MetaRender/CCubeRenderer.s b/asm/MetaRender/CCubeRenderer.s
index fbce823e..a56c1975 100644
--- a/asm/MetaRender/CCubeRenderer.s
+++ b/asm/MetaRender/CCubeRenderer.s
@@ -1,5 +1,53 @@
 .include "macros.inc"
 
+.section .sbss, "wa"
+
+.global lbl_805A91B0
+lbl_805A91B0:
+	.skip 0x4
+.global lbl_805A91B4
+lbl_805A91B4:
+	.skip 0x8
+.global lbl_805A91BC
+lbl_805A91BC:
+	.skip 0x8
+.global lbl_805A91C4
+lbl_805A91C4:
+	.skip 0x8
+.global lbl_805A91CC
+lbl_805A91CC:
+	.skip 0x4
+.global lbl_805A91D0
+lbl_805A91D0:
+	.skip 0x4
+.global lbl_805A91D4
+lbl_805A91D4:
+	.skip 0x8
+.global lbl_805A91DC
+lbl_805A91DC:
+	.skip 0x4
+.global lbl_805A91E0
+lbl_805A91E0:
+	.skip 0x4
+.global lbl_805A91E4
+lbl_805A91E4:
+	.skip 0x4
+.global lbl_805A91E8
+lbl_805A91E8:
+	.skip 0x1
+.global lbl_805A91E9
+lbl_805A91E9:
+	.skip 0x3
+.global lbl_805A91EC
+lbl_805A91EC:
+	.skip 0x4
+.global lbl_805A91F0
+lbl_805A91F0:
+	.skip 0x4
+.global lbl_805A91F4
+lbl_805A91F4:
+	.skip 0x4
+
 .section .data
 
 .global lbl_803EC5D8
@@ -221,7 +269,7 @@ lbl_8047916C:
 lbl_80479178:
 	.skip 0x320
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global DrawString__13CCubeRendererFPCcii
 DrawString__13CCubeRendererFPCcii:
diff --git a/asm/MetroidPrime/BodyState/CABSAim.s b/asm/MetroidPrime/BodyState/CABSAim.s
index c61412a4..8dcfab62 100644
--- a/asm/MetroidPrime/BodyState/CABSAim.s
+++ b/asm/MetroidPrime/BodyState/CABSAim.s
@@ -37,7 +37,7 @@ lbl_805A7DA4:
 	# ROM: 0x3F5744
 	.4byte 0xC1200000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__7CABSAimFv
 __dt__7CABSAimFv:
diff --git a/asm/MetroidPrime/BodyState/CABSFlinch.s b/asm/MetroidPrime/BodyState/CABSFlinch.s
index 50980ba4..61b10474 100644
--- a/asm/MetroidPrime/BodyState/CABSFlinch.s
+++ b/asm/MetroidPrime/BodyState/CABSFlinch.s
@@ -14,7 +14,7 @@ lbl_803E5C80:
 	.4byte UpdateBody__10CABSFlinchFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__10CABSFlinchFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__10CABSFlinchFv
 __dt__10CABSFlinchFv:
diff --git a/asm/MetroidPrime/BodyState/CABSIdle.s b/asm/MetroidPrime/BodyState/CABSIdle.s
index eaeb3e09..d8191875 100644
--- a/asm/MetroidPrime/BodyState/CABSIdle.s
+++ b/asm/MetroidPrime/BodyState/CABSIdle.s
@@ -14,7 +14,7 @@ lbl_803E5C60:
 	.4byte UpdateBody__8CABSIdleFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__8CABSIdleFR15CBodyController
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__8CABSIdleFv
 __dt__8CABSIdleFv:
diff --git a/asm/MetroidPrime/BodyState/CABSReaction.s b/asm/MetroidPrime/BodyState/CABSReaction.s
index 245d0d52..f1f819dc 100644
--- a/asm/MetroidPrime/BodyState/CABSReaction.s
+++ b/asm/MetroidPrime/BodyState/CABSReaction.s
@@ -13,7 +13,7 @@ lbl_803E6758:
 	.4byte UpdateBody__12CABSReactionFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__12CABSReactionFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CABSReactionFv
 __dt__12CABSReactionFv:
diff --git a/asm/MetroidPrime/BodyState/CBSAttack.s b/asm/MetroidPrime/BodyState/CBSAttack.s
index e106e06a..b13b5837 100644
--- a/asm/MetroidPrime/BodyState/CBSAttack.s
+++ b/asm/MetroidPrime/BodyState/CBSAttack.s
@@ -32,7 +32,7 @@ lbl_805A7714:
 	# ROM: 0x3F50B4
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__9CBSAttackFv
 __dt__9CBSAttackFv:
diff --git a/asm/MetroidPrime/BodyState/CBSCover.s b/asm/MetroidPrime/BodyState/CBSCover.s
index e194a798..4f50aa5c 100644
--- a/asm/MetroidPrime/BodyState/CBSCover.s
+++ b/asm/MetroidPrime/BodyState/CBSCover.s
@@ -20,7 +20,7 @@ lbl_803E3E48:
 	.4byte UpdateBody__8CBSCoverFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__8CBSCoverFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__8CBSCoverFv
 __dt__8CBSCoverFv:
diff --git a/asm/MetroidPrime/BodyState/CBSDie.s b/asm/MetroidPrime/BodyState/CBSDie.s
index 48b915f5..2d13bade 100644
--- a/asm/MetroidPrime/BodyState/CBSDie.s
+++ b/asm/MetroidPrime/BodyState/CBSDie.s
@@ -20,7 +20,7 @@ lbl_803E13A8:
 	.4byte UpdateBody__6CBSDieFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__6CBSDieFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__6CBSDieFv
 __dt__6CBSDieFv:
diff --git a/asm/MetroidPrime/BodyState/CBSFall.s b/asm/MetroidPrime/BodyState/CBSFall.s
index dc7d2205..1fafc39a 100644
--- a/asm/MetroidPrime/BodyState/CBSFall.s
+++ b/asm/MetroidPrime/BodyState/CBSFall.s
@@ -20,7 +20,7 @@ lbl_803E13E0:
 	.4byte UpdateBody__7CBSFallFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__7CBSFallFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__7CBSFallFv
 __dt__7CBSFallFv:
diff --git a/asm/MetroidPrime/BodyState/CBSGenerate.s b/asm/MetroidPrime/BodyState/CBSGenerate.s
index 855789c1..791ce97f 100644
--- a/asm/MetroidPrime/BodyState/CBSGenerate.s
+++ b/asm/MetroidPrime/BodyState/CBSGenerate.s
@@ -20,7 +20,7 @@ lbl_803E2040:
 	.4byte UpdateBody__11CBSGenerateFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__11CBSGenerateFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__11CBSGenerateFv
 __dt__11CBSGenerateFv:
diff --git a/asm/MetroidPrime/BodyState/CBSGetup.s b/asm/MetroidPrime/BodyState/CBSGetup.s
index f02fb16c..82a3a4c8 100644
--- a/asm/MetroidPrime/BodyState/CBSGetup.s
+++ b/asm/MetroidPrime/BodyState/CBSGetup.s
@@ -20,7 +20,7 @@ lbl_803E1418:
 	.4byte UpdateBody__8CBSGetupFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__8CBSGetupFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__8CBSGetupFv
 __dt__8CBSGetupFv:
diff --git a/asm/MetroidPrime/BodyState/CBSGroundHit.s b/asm/MetroidPrime/BodyState/CBSGroundHit.s
index 5c3ee0e0..6a16c1b0 100644
--- a/asm/MetroidPrime/BodyState/CBSGroundHit.s
+++ b/asm/MetroidPrime/BodyState/CBSGroundHit.s
@@ -20,7 +20,7 @@ lbl_803E18B0:
 	.4byte UpdateBody__12CBSGroundHitFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__12CBSGroundHitFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CBSGroundHitFv
 __dt__12CBSGroundHitFv:
diff --git a/asm/MetroidPrime/BodyState/CBSHurled.s b/asm/MetroidPrime/BodyState/CBSHurled.s
index 832333b3..468683b6 100644
--- a/asm/MetroidPrime/BodyState/CBSHurled.s
+++ b/asm/MetroidPrime/BodyState/CBSHurled.s
@@ -32,7 +32,7 @@ lbl_803E1FE8:
 	.4byte lbl_80145064
 	.4byte lbl_80145064
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__9CBSHurledFv
 __dt__9CBSHurledFv:
diff --git a/asm/MetroidPrime/BodyState/CBSJump.s b/asm/MetroidPrime/BodyState/CBSJump.s
index 193c1411..a872d50f 100644
--- a/asm/MetroidPrime/BodyState/CBSJump.s
+++ b/asm/MetroidPrime/BodyState/CBSJump.s
@@ -20,7 +20,7 @@ lbl_803E2008:
 	.4byte UpdateBody__7CBSJumpFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__7CBSJumpFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__7CBSJumpFv
 __dt__7CBSJumpFv:
diff --git a/asm/MetroidPrime/BodyState/CBSKnockBack.s b/asm/MetroidPrime/BodyState/CBSKnockBack.s
index 55155125..5754537b 100644
--- a/asm/MetroidPrime/BodyState/CBSKnockBack.s
+++ b/asm/MetroidPrime/BodyState/CBSKnockBack.s
@@ -20,7 +20,7 @@ lbl_803E1450:
 	.4byte UpdateBody__12CBSKnockBackFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__12CBSKnockBackFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CBSKnockBackFv
 __dt__12CBSKnockBackFv:
diff --git a/asm/MetroidPrime/BodyState/CBSLieOnGround.s b/asm/MetroidPrime/BodyState/CBSLieOnGround.s
index 7e6c59c8..f2f51995 100644
--- a/asm/MetroidPrime/BodyState/CBSLieOnGround.s
+++ b/asm/MetroidPrime/BodyState/CBSLieOnGround.s
@@ -20,7 +20,7 @@ lbl_803E1488:
 	.4byte UpdateBody__14CBSLieOnGroundFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__14CBSLieOnGroundFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__14CBSLieOnGroundFv
 __dt__14CBSLieOnGroundFv:
diff --git a/asm/MetroidPrime/BodyState/CBSLocomotion.s b/asm/MetroidPrime/BodyState/CBSLocomotion.s
index 3c7dbe0f..1a1b6215 100644
--- a/asm/MetroidPrime/BodyState/CBSLocomotion.s
+++ b/asm/MetroidPrime/BodyState/CBSLocomotion.s
@@ -243,7 +243,7 @@ lbl_805A7738:
 lbl_805A8F80:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__28CBSRestrictedFlyerLocomotionFv
 __dt__28CBSRestrictedFlyerLocomotionFv:
diff --git a/asm/MetroidPrime/BodyState/CBSLoopAttack.s b/asm/MetroidPrime/BodyState/CBSLoopAttack.s
index 65980edd..c5bc608c 100644
--- a/asm/MetroidPrime/BodyState/CBSLoopAttack.s
+++ b/asm/MetroidPrime/BodyState/CBSLoopAttack.s
@@ -20,7 +20,7 @@ lbl_803E17C8:
 	.4byte UpdateBody__13CBSLoopAttackFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__13CBSLoopAttackFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__13CBSLoopAttackFv
 __dt__13CBSLoopAttackFv:
diff --git a/asm/MetroidPrime/BodyState/CBSLoopReaction.s b/asm/MetroidPrime/BodyState/CBSLoopReaction.s
index 3ac41ffc..9f7a4396 100644
--- a/asm/MetroidPrime/BodyState/CBSLoopReaction.s
+++ b/asm/MetroidPrime/BodyState/CBSLoopReaction.s
@@ -20,7 +20,7 @@ lbl_803E1878:
 	.4byte UpdateBody__15CBSLoopReactionFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__15CBSLoopReactionFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__15CBSLoopReactionFv
 __dt__15CBSLoopReactionFv:
diff --git a/asm/MetroidPrime/BodyState/CBSProjectileAttack.s b/asm/MetroidPrime/BodyState/CBSProjectileAttack.s
index d9caa92e..0c8c2fc0 100644
--- a/asm/MetroidPrime/BodyState/CBSProjectileAttack.s
+++ b/asm/MetroidPrime/BodyState/CBSProjectileAttack.s
@@ -20,7 +20,7 @@ lbl_803E27D0:
 	.4byte UpdateBody__19CBSProjectileAttackFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__19CBSProjectileAttackFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__19CBSProjectileAttackFv
 __dt__19CBSProjectileAttackFv:
diff --git a/asm/MetroidPrime/BodyState/CBSScripted.s b/asm/MetroidPrime/BodyState/CBSScripted.s
index 7a724f36..8a230d16 100644
--- a/asm/MetroidPrime/BodyState/CBSScripted.s
+++ b/asm/MetroidPrime/BodyState/CBSScripted.s
@@ -20,7 +20,7 @@ lbl_803E24A8:
 	.4byte UpdateBody__11CBSScriptedFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__11CBSScriptedFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__11CBSScriptedFv
 __dt__11CBSScriptedFv:
diff --git a/asm/MetroidPrime/BodyState/CBSSlide.s b/asm/MetroidPrime/BodyState/CBSSlide.s
index 4ea2b3e2..137a7281 100644
--- a/asm/MetroidPrime/BodyState/CBSSlide.s
+++ b/asm/MetroidPrime/BodyState/CBSSlide.s
@@ -20,7 +20,7 @@ lbl_803E1F78:
 	.4byte UpdateBody__8CBSSlideFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__8CBSSlideFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__8CBSSlideFv
 __dt__8CBSSlideFv:
diff --git a/asm/MetroidPrime/BodyState/CBSStep.s b/asm/MetroidPrime/BodyState/CBSStep.s
index 1997ea9b..c6eae2d5 100644
--- a/asm/MetroidPrime/BodyState/CBSStep.s
+++ b/asm/MetroidPrime/BodyState/CBSStep.s
@@ -20,7 +20,7 @@ lbl_803E1718:
 	.4byte UpdateBody__7CBSStepFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__7CBSStepFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__7CBSStepFv
 __dt__7CBSStepFv:
diff --git a/asm/MetroidPrime/BodyState/CBSTaunt.s b/asm/MetroidPrime/BodyState/CBSTaunt.s
index 1ad5a5f0..2dfa0d25 100644
--- a/asm/MetroidPrime/BodyState/CBSTaunt.s
+++ b/asm/MetroidPrime/BodyState/CBSTaunt.s
@@ -20,7 +20,7 @@ lbl_803E2390:
 	.4byte UpdateBody__8CBSTauntFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__8CBSTauntFR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__8CBSTauntFv
 __dt__8CBSTauntFv:
diff --git a/asm/MetroidPrime/BodyState/CBSTurn.s b/asm/MetroidPrime/BodyState/CBSTurn.s
index 9174fda7..4639e688 100644
--- a/asm/MetroidPrime/BodyState/CBSTurn.s
+++ b/asm/MetroidPrime/BodyState/CBSTurn.s
@@ -40,7 +40,7 @@ lbl_803E178C:
 	.4byte Shutdown__7CBSTurnFR15CBodyController
 	.4byte GetBodyStateTransition__7CBSTurnFfR15CBodyController
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CBSFlyerTurnFv
 __dt__12CBSFlyerTurnFv:
diff --git a/asm/MetroidPrime/BodyState/CBSWallHang.s b/asm/MetroidPrime/BodyState/CBSWallHang.s
index 061524f2..ef917bff 100644
--- a/asm/MetroidPrime/BodyState/CBSWallHang.s
+++ b/asm/MetroidPrime/BodyState/CBSWallHang.s
@@ -35,7 +35,7 @@ lbl_803E43D8:
 	.4byte lbl_8018E854
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__11CBSWallHangFv
 __dt__11CBSWallHangFv:
diff --git a/asm/MetroidPrime/BodyState/CBodyController.s b/asm/MetroidPrime/BodyState/CBodyController.s
index 4bb1b67c..aa0b0523 100644
--- a/asm/MetroidPrime/BodyState/CBodyController.s
+++ b/asm/MetroidPrime/BodyState/CBodyController.s
@@ -8,7 +8,7 @@ lbl_805A7740:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global UpdateFrozenInfo__15CBodyControllerFfR13CStateManager
 UpdateFrozenInfo__15CBodyControllerFfR13CStateManager:
diff --git a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s
index bf5c5873..0b509b74 100644
--- a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s
+++ b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s
@@ -24,7 +24,7 @@ lbl_803E10C8:
 	.4byte __dt__22CBCAdditiveReactionCmdFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global DeliverCmd__16CBodyStateCmdMgrF13EBodyStateCmd
 DeliverCmd__16CBodyStateCmdMgrF13EBodyStateCmd:
diff --git a/asm/MetroidPrime/BodyState/CBodyStateInfo.s b/asm/MetroidPrime/BodyState/CBodyStateInfo.s
index 9bed65db..10872d5e 100644
--- a/asm/MetroidPrime/BodyState/CBodyStateInfo.s
+++ b/asm/MetroidPrime/BodyState/CBodyStateInfo.s
@@ -251,7 +251,7 @@ lbl_805A770E:
 	# ROM: 0x3F50AE
 	.2byte 0x00000100
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetupRestrictedFlyerBodyStates__14CBodyStateInfoFiR6CActor
 SetupRestrictedFlyerBodyStates__14CBodyStateInfoFiR6CActor:
diff --git a/asm/MetroidPrime/CAABoxFilter.s b/asm/MetroidPrime/CAABoxFilter.s
index 949a0e7c..5f2b575d 100644
--- a/asm/MetroidPrime/CAABoxFilter.s
+++ b/asm/MetroidPrime/CAABoxFilter.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Filter__12CAABoxFilterCFRC18CCollisionInfoListR18CCollisionInfoList
 Filter__12CAABoxFilterCFRC18CCollisionInfoListR18CCollisionInfoList:
diff --git a/asm/MetroidPrime/CActorLights.s b/asm/MetroidPrime/CActorLights.s
index 78507ab1..c377c218 100644
--- a/asm/MetroidPrime/CActorLights.s
+++ b/asm/MetroidPrime/CActorLights.s
@@ -38,7 +38,7 @@ lbl_805A8F10:
 lbl_805A8F14:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global BuildConstantAmbientLighting__12CActorLightsFv
 BuildConstantAmbientLighting__12CActorLightsFv:
diff --git a/asm/MetroidPrime/CActorParameters.s b/asm/MetroidPrime/CActorParameters.s
index 20d094b3..b95173c3 100644
--- a/asm/MetroidPrime/CActorParameters.s
+++ b/asm/MetroidPrime/CActorParameters.s
@@ -32,7 +32,7 @@ lbl_805A758C:
 	# ROM: 0x3F4F2C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global MakeDamageableTriggerActorParms__FRC16CActorParametersRC16CVisorParameters
 MakeDamageableTriggerActorParms__FRC16CActorParametersRC16CVisorParameters:
diff --git a/asm/MetroidPrime/CActorParticles.s b/asm/MetroidPrime/CActorParticles.s
index 093dd8a9..6b1d669a 100644
--- a/asm/MetroidPrime/CActorParticles.s
+++ b/asm/MetroidPrime/CActorParticles.s
@@ -22,7 +22,7 @@ lbl_805A7DF4:
 	# ROM: 0x3F5794
 	.4byte 0x00000004
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetAshyTexture__20CActorModelParticlesFR5CActor
 GetAshyTexture__20CActorModelParticlesFR5CActor:
diff --git a/asm/MetroidPrime/CArtifactDoll.s b/asm/MetroidPrime/CArtifactDoll.s
index bdd129cf..204047a5 100644
--- a/asm/MetroidPrime/CArtifactDoll.s
+++ b/asm/MetroidPrime/CArtifactDoll.s
@@ -22,7 +22,16 @@ lbl_805A85DC:
 	# ROM: 0x3F5F7C
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9170
+lbl_805A9170:
+	.skip 0x4
+.global lbl_805A9174
+lbl_805A9174:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global GetArtifactHeadScanIndex__13CArtifactDollFUi
 GetArtifactHeadScanIndex__13CArtifactDollFUi:
diff --git a/asm/MetroidPrime/CAudioStateWin.s b/asm/MetroidPrime/CAudioStateWin.s
index 77b776b0..a55f199e 100644
--- a/asm/MetroidPrime/CAudioStateWin.s
+++ b/asm/MetroidPrime/CAudioStateWin.s
@@ -14,7 +14,7 @@ lbl_803E02A8:
 	.4byte PreDraw__6CIOWinCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__14CAudioStateWinFv
 __dt__14CAudioStateWinFv:
diff --git a/asm/MetroidPrime/CBallFilter.s b/asm/MetroidPrime/CBallFilter.s
index 8f1961f6..ba725316 100644
--- a/asm/MetroidPrime/CBallFilter.s
+++ b/asm/MetroidPrime/CBallFilter.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Filter__11CBallFilterCFRC18CCollisionInfoListR18CCollisionInfoList
 Filter__11CBallFilterCFRC18CCollisionInfoListR18CCollisionInfoList:
diff --git a/asm/MetroidPrime/CBoneTracking.s b/asm/MetroidPrime/CBoneTracking.s
index 5a0cfdcb..69fd45fd 100644
--- a/asm/MetroidPrime/CBoneTracking.s
+++ b/asm/MetroidPrime/CBoneTracking.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetNoHorizontalAim__13CBoneTrackingFb
 SetNoHorizontalAim__13CBoneTrackingFb:
diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s
index 91b89dd7..bbd08866 100644
--- a/asm/MetroidPrime/CCollisionActor.s
+++ b/asm/MetroidPrime/CCollisionActor.s
@@ -148,7 +148,16 @@ lbl_805A7C30:
 	.4byte 0x00000026
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9050
+lbl_805A9050:
+	.skip 0x4
+.global lbl_805A9054
+lbl_805A9054:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global __dt__15CCollisionActorFv
 __dt__15CCollisionActorFv:
diff --git a/asm/MetroidPrime/CCollisionActorManager.s b/asm/MetroidPrime/CCollisionActorManager.s
index 1e2172c9..a51895ce 100644
--- a/asm/MetroidPrime/CCollisionActorManager.s
+++ b/asm/MetroidPrime/CCollisionActorManager.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetMovable__22CCollisionActorManagerFb
 SetMovable__22CCollisionActorManagerFb:
diff --git a/asm/MetroidPrime/CConsoleOutputWindow.s b/asm/MetroidPrime/CConsoleOutputWindow.s
index 7b1a7cc4..cbcbb65a 100644
--- a/asm/MetroidPrime/CConsoleOutputWindow.s
+++ b/asm/MetroidPrime/CConsoleOutputWindow.s
@@ -33,7 +33,7 @@ lbl_805A7544:
 lbl_805A8F00:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Draw__20CConsoleOutputWindowCFv
 Draw__20CConsoleOutputWindowCFv:
diff --git a/asm/MetroidPrime/CDamageInfo.s b/asm/MetroidPrime/CDamageInfo.s
index 7e43cfef..0acba1e9 100644
--- a/asm/MetroidPrime/CDamageInfo.s
+++ b/asm/MetroidPrime/CDamageInfo.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__11CDamageInfoFRC11CDamageInfof
 __ct__11CDamageInfoFRC11CDamageInfof:
diff --git a/asm/MetroidPrime/CDamageVulnerability.s b/asm/MetroidPrime/CDamageVulnerability.s
index d19c43c0..993ea2d5 100644
--- a/asm/MetroidPrime/CDamageVulnerability.s
+++ b/asm/MetroidPrime/CDamageVulnerability.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetDeflectionType__20CDamageVulnerabilityCFRC11CWeaponMode
 GetDeflectionType__20CDamageVulnerabilityCFRC11CWeaponMode:
diff --git a/asm/MetroidPrime/CDecalManager.s b/asm/MetroidPrime/CDecalManager.s
index afd641a5..1e029215 100644
--- a/asm/MetroidPrime/CDecalManager.s
+++ b/asm/MetroidPrime/CDecalManager.s
@@ -28,7 +28,7 @@ lbl_805A8F34:
 lbl_805A8F38:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AddToRenderer__13CDecalManagerFRC14CFrustumPlanesRC13CStateManager
 AddToRenderer__13CDecalManagerFRC14CFrustumPlanesRC13CStateManager:
diff --git a/asm/MetroidPrime/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s
index 48e484b5..9a4640e8 100644
--- a/asm/MetroidPrime/CEnvFxManager.s
+++ b/asm/MetroidPrime/CEnvFxManager.s
@@ -57,8 +57,17 @@ lbl_805A809C:
 .global lbl_8046CB40
 lbl_8046CB40:
 	.skip 0x800
+
+.section .sbss, "wa"
+
+.global lbl_805A90B0
+lbl_805A90B0:
+	.skip 0x4
+.global lbl_805A90B4
+lbl_805A90B4:
+	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AreaLoaded__13CEnvFxManagerFv
 AreaLoaded__13CEnvFxManagerFv:
diff --git a/asm/MetroidPrime/CErrorOutputWindow.s b/asm/MetroidPrime/CErrorOutputWindow.s
index 6b7b7654..62246ba0 100644
--- a/asm/MetroidPrime/CErrorOutputWindow.s
+++ b/asm/MetroidPrime/CErrorOutputWindow.s
@@ -258,7 +258,16 @@ lbl_803EA410:
 	.4byte 0x006F006E
 	.4byte 0x002E0000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9128
+lbl_805A9128:
+	.skip 0x4
+.global lbl_805A912C
+lbl_805A912C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global sub_80269478
 sub_80269478:
diff --git a/asm/MetroidPrime/CFlameWarp.s b/asm/MetroidPrime/CFlameWarp.s
index 4a02cd79..0593771e 100644
--- a/asm/MetroidPrime/CFlameWarp.s
+++ b/asm/MetroidPrime/CFlameWarp.s
@@ -26,7 +26,7 @@ lbl_805A7C94:
 	# ROM: 0x3F5634
 	.4byte 0x00000012
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Get4CharID__10CFlameWarpFv
 Get4CharID__10CFlameWarpFv:
diff --git a/asm/MetroidPrime/CFluidPlane.s b/asm/MetroidPrime/CFluidPlane.s
index e476ccae..b4a4e348 100644
--- a/asm/MetroidPrime/CFluidPlane.s
+++ b/asm/MetroidPrime/CFluidPlane.s
@@ -33,7 +33,7 @@ lbl_805A76D0:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global nullsub_209
 nullsub_209:
diff --git a/asm/MetroidPrime/CFluidPlaneCPU.s b/asm/MetroidPrime/CFluidPlaneCPU.s
index 08c98e9a..ce7347e6 100644
--- a/asm/MetroidPrime/CFluidPlaneCPU.s
+++ b/asm/MetroidPrime/CFluidPlaneCPU.s
@@ -42,13 +42,22 @@ lbl_805A7BA8:
 	.4byte 0x00000007
 	.4byte 0
 
+.section .sbss, "wa"
+
+.global lbl_805A9040
+lbl_805A9040:
+	.skip 0x1
+.global lbl_805A9041
+lbl_805A9041:
+	.skip 0x7
+
 .section .sbss2, "", @nobits  # 0x805AF460 - 0x805AF4C7
 # CFluidPlaneCPU
 .global lbl_805AF460
 lbl_805AF460:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global RenderCleanup__14CFluidPlaneCPUCFv
 RenderCleanup__14CFluidPlaneCPUCFv:
diff --git a/asm/MetroidPrime/CFluidPlaneDoor.s b/asm/MetroidPrime/CFluidPlaneDoor.s
index 61fc825f..321d168b 100644
--- a/asm/MetroidPrime/CFluidPlaneDoor.s
+++ b/asm/MetroidPrime/CFluidPlaneDoor.s
@@ -22,7 +22,7 @@ lbl_805A7BB0:
 	.4byte 0xFFFFFFFF
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global nullsub_143
 nullsub_143:
diff --git a/asm/MetroidPrime/CFluidPlaneManager.s b/asm/MetroidPrime/CFluidPlaneManager.s
index 787754ba..3c5b55b0 100644
--- a/asm/MetroidPrime/CFluidPlaneManager.s
+++ b/asm/MetroidPrime/CFluidPlaneManager.s
@@ -12,7 +12,7 @@ lbl_805A76DC:
 	# ROM: 0x3F507C
 	.4byte 0x000000FF
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetupRippleMap__18CFluidPlaneManagerFv
 SetupRippleMap__18CFluidPlaneManagerFv:
diff --git a/asm/MetroidPrime/CFluidPlaneRender.s b/asm/MetroidPrime/CFluidPlaneRender.s
index 7c54687e..141e02ab 100644
--- a/asm/MetroidPrime/CFluidPlaneRender.s
+++ b/asm/MetroidPrime/CFluidPlaneRender.s
@@ -17,8 +17,23 @@ lbl_805A840C:
 .global lbl_8046DCC0
 lbl_8046DCC0:
 	.skip 0x400
+
+.section .sbss, "wa"
+
+.global lbl_805A9130
+lbl_805A9130:
+	.skip 0x4
+.global lbl_805A9134
+lbl_805A9134:
+	.skip 0x4
+.global lbl_805A9138
+lbl_805A9138:
+	.skip 0x4
+.global lbl_805A913C
+lbl_805A913C:
+	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global RenderPatch__FRCQ220CFluidPlaneCPURender10SPatchInfob
 RenderPatch__FRCQ220CFluidPlaneCPURender10SPatchInfob:
diff --git a/asm/MetroidPrime/CFluidUVMotion.s b/asm/MetroidPrime/CFluidUVMotion.s
index bbc83d1c..49a1b9c4 100644
--- a/asm/MetroidPrime/CFluidUVMotion.s
+++ b/asm/MetroidPrime/CFluidUVMotion.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CalculateFluidTextureOffset__14CFluidUVMotionCFfPA2_f
 CalculateFluidTextureOffset__14CFluidUVMotionCFfPA2_f:
diff --git a/asm/MetroidPrime/CGBASupport.s b/asm/MetroidPrime/CGBASupport.s
index 7fa20425..395c6b21 100644
--- a/asm/MetroidPrime/CGBASupport.s
+++ b/asm/MetroidPrime/CGBASupport.s
@@ -28,7 +28,13 @@ lbl_805A82BC:
 	# ROM: 0x3F5C5C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9110
+lbl_805A9110:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global PollResponse__11CGBASupportFv
 PollResponse__11CGBASupportFv:
diff --git a/asm/MetroidPrime/CGameCollision.s b/asm/MetroidPrime/CGameCollision.s
index 527e179b..c9e8cf06 100644
--- a/asm/MetroidPrime/CGameCollision.s
+++ b/asm/MetroidPrime/CGameCollision.s
@@ -105,7 +105,7 @@ lbl_805A7A60:
 	.4byte 0x0000001F
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_8017fb84
 sub_8017fb84:
diff --git a/asm/MetroidPrime/CGameCubeDoll.s b/asm/MetroidPrime/CGameCubeDoll.s
index 05c6ea1b..ee2f7cf1 100644
--- a/asm/MetroidPrime/CGameCubeDoll.s
+++ b/asm/MetroidPrime/CGameCubeDoll.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Draw__13CGameCubeDollFf
 Draw__13CGameCubeDollFf:
diff --git a/asm/MetroidPrime/CGroundMovement.s b/asm/MetroidPrime/CGroundMovement.s
index d9b90b8e..ae65e134 100644
--- a/asm/MetroidPrime/CGroundMovement.s
+++ b/asm/MetroidPrime/CGroundMovement.s
@@ -56,7 +56,31 @@ lbl_805A7A98:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9020
+lbl_805A9020:
+	.skip 0x8
+.global lbl_805A9028
+lbl_805A9028:
+	.skip 0x4
+.global lbl_805A902C
+lbl_805A902C:
+	.skip 0x4
+.global lbl_805A9030
+lbl_805A9030:
+	.skip 0x4
+.global lbl_805A9034
+lbl_805A9034:
+	.skip 0x4
+.global lbl_805A9038
+lbl_805A9038:
+	.skip 0x4
+.global lbl_805A903C
+lbl_805A903C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global "MoveObjectAnalytical__15CGroundMovementFR13CStateManagerR13CPhysicsActorfRCQ24rstl32reserved_vector<9TUniqueId,1024>R19CAreaCollisionCacheRfRCQ215CGroundMovement16SMovementOptions"
 "MoveObjectAnalytical__15CGroundMovementFR13CStateManagerR13CPhysicsActorfRCQ24rstl32reserved_vector<9TUniqueId,1024>R19CAreaCollisionCacheRfRCQ215CGroundMovement16SMovementOptions":
diff --git a/asm/MetroidPrime/CHealthInfo.s b/asm/MetroidPrime/CHealthInfo.s
index 9ca80b14..381066ee 100644
--- a/asm/MetroidPrime/CHealthInfo.s
+++ b/asm/MetroidPrime/CHealthInfo.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__11CHealthInfoFR12CInputStream
 __ct__11CHealthInfoFR12CInputStream:
diff --git a/asm/MetroidPrime/CIkChain.s b/asm/MetroidPrime/CIkChain.s
index da25b4ef..541e1b81 100644
--- a/asm/MetroidPrime/CIkChain.s
+++ b/asm/MetroidPrime/CIkChain.s
@@ -42,7 +42,7 @@ lbl_805A811C:
 	# ROM: 0x3F5ABC
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Update__8CIkChainFf
 Update__8CIkChainFf:
diff --git a/asm/MetroidPrime/CInGameGuiManager.s b/asm/MetroidPrime/CInGameGuiManager.s
index 11a1891e..44d5e589 100644
--- a/asm/MetroidPrime/CInGameGuiManager.s
+++ b/asm/MetroidPrime/CInGameGuiManager.s
@@ -68,7 +68,7 @@ lbl_805A75C0:
 	.4byte 0x3F800000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global TryReloadAreaTextures__17CInGameGuiManagerFv
 TryReloadAreaTextures__17CInGameGuiManagerFv:
diff --git a/asm/MetroidPrime/CInGameTweakManager.s b/asm/MetroidPrime/CInGameTweakManager.s
index c4955f61..28af8620 100644
--- a/asm/MetroidPrime/CInGameTweakManager.s
+++ b/asm/MetroidPrime/CInGameTweakManager.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_8021c164
 sub_8021c164:
diff --git a/asm/MetroidPrime/CInventoryScreen.s b/asm/MetroidPrime/CInventoryScreen.s
index b1fe5410..a32ef0c2 100644
--- a/asm/MetroidPrime/CInventoryScreen.s
+++ b/asm/MetroidPrime/CInventoryScreen.s
@@ -108,7 +108,7 @@ lbl_805A7F48:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsRightLogDynamic__16CInventoryScreenCFv
 IsRightLogDynamic__16CInventoryScreenCFv:
diff --git a/asm/MetroidPrime/CLightParameters.s b/asm/MetroidPrime/CLightParameters.s
index 84733679..c15e6ec7 100644
--- a/asm/MetroidPrime/CLightParameters.s
+++ b/asm/MetroidPrime/CLightParameters.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global MakeActorLights__16CLightParametersCFv
 MakeActorLights__16CLightParametersCFv:
diff --git a/asm/MetroidPrime/CLogBookScreen.s b/asm/MetroidPrime/CLogBookScreen.s
index 7295fc34..a5cf433e 100644
--- a/asm/MetroidPrime/CLogBookScreen.s
+++ b/asm/MetroidPrime/CLogBookScreen.s
@@ -72,7 +72,13 @@ lbl_805A82B4:
 	# ROM: 0x3F5C54
 	.4byte 0x00000005
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9108
+lbl_805A9108:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global IsScanComplete__14CLogBookScreenF13EScanCategoryUiRC12CPlayerState
 IsScanComplete__14CLogBookScreenF13EScanCategoryUiRC12CPlayerState:
diff --git a/asm/MetroidPrime/CMapUniverse.s b/asm/MetroidPrime/CMapUniverse.s
index 73ae5eb2..4dc0ecf4 100644
--- a/asm/MetroidPrime/CMapUniverse.s
+++ b/asm/MetroidPrime/CMapUniverse.s
@@ -18,7 +18,7 @@ lbl_805A7F08:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FMapUniverseFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FMapUniverseFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/MetroidPrime/CMapWorldInfo.s b/asm/MetroidPrime/CMapWorldInfo.s
index 3f9c704f..15ce4b3d 100644
--- a/asm/MetroidPrime/CMapWorldInfo.s
+++ b/asm/MetroidPrime/CMapWorldInfo.s
@@ -12,7 +12,7 @@ lbl_805A794C:
 	# ROM: 0x3F52EC
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsAnythingSet__13CMapWorldInfoFv
 IsAnythingSet__13CMapWorldInfoFv:
diff --git a/asm/MetroidPrime/CMappableObject.s b/asm/MetroidPrime/CMappableObject.s
index dd7d1ea3..331cd3c8 100644
--- a/asm/MetroidPrime/CMappableObject.s
+++ b/asm/MetroidPrime/CMappableObject.s
@@ -66,7 +66,7 @@ lbl_805A7374:
 lbl_8046C498:
 	.skip 0x60
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AdjustTransformForType__15CMappableObjectFv
 AdjustTransformForType__15CMappableObjectFv:
diff --git a/asm/MetroidPrime/CMemoryCardDriver.s b/asm/MetroidPrime/CMemoryCardDriver.s
index 13958fe4..7fae1b1c 100644
--- a/asm/MetroidPrime/CMemoryCardDriver.s
+++ b/asm/MetroidPrime/CMemoryCardDriver.s
@@ -59,7 +59,13 @@ lbl_805A82D3:
 	.balign 4
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9118
+lbl_805A9118:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global GetCardFreeBytes__17CMemoryCardDriverFv
 GetCardFreeBytes__17CMemoryCardDriverFv:
diff --git a/asm/MetroidPrime/CMemoryDrawEnum.s b/asm/MetroidPrime/CMemoryDrawEnum.s
index 008e442b..67ba759f 100644
--- a/asm/MetroidPrime/CMemoryDrawEnum.s
+++ b/asm/MetroidPrime/CMemoryDrawEnum.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__Q210IAllocator8SMetricsFRCQ210IAllocator8SMetrics
 __ct__Q210IAllocator8SMetricsFRCQ210IAllocator8SMetrics:
diff --git a/asm/MetroidPrime/CMessageScreen.s b/asm/MetroidPrime/CMessageScreen.s
index e8dd01db..038ad89b 100644
--- a/asm/MetroidPrime/CMessageScreen.s
+++ b/asm/MetroidPrime/CMessageScreen.s
@@ -23,7 +23,7 @@ lbl_805A7E3C:
 	.4byte 0x3F800000
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Draw__14CMessageScreenCFv
 Draw__14CMessageScreenCFv:
diff --git a/asm/MetroidPrime/CModelData.s b/asm/MetroidPrime/CModelData.s
index 776f37a9..27fc0516 100644
--- a/asm/MetroidPrime/CModelData.s
+++ b/asm/MetroidPrime/CModelData.s
@@ -6,7 +6,7 @@
 lbl_8046C538:
 	.skip 0x20
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetNumMaterialSets__10CModelDataCFv
 GetNumMaterialSets__10CModelDataCFv:
diff --git a/asm/MetroidPrime/CNESEmulator.s b/asm/MetroidPrime/CNESEmulator.s
index ef41dd8f..de03f965 100644
--- a/asm/MetroidPrime/CNESEmulator.s
+++ b/asm/MetroidPrime/CNESEmulator.s
@@ -18,7 +18,13 @@ lbl_803EBC60:
 	.4byte 0x0D000000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9160
+lbl_805A9160:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global GetPassword__12CNESEmulatorFv
 GetPassword__12CNESEmulatorFv:
diff --git a/asm/MetroidPrime/CPauseScreenBlur.s b/asm/MetroidPrime/CPauseScreenBlur.s
index d448eaea..dc968fc3 100644
--- a/asm/MetroidPrime/CPauseScreenBlur.s
+++ b/asm/MetroidPrime/CPauseScreenBlur.s
@@ -22,7 +22,7 @@ lbl_805A839C:
 	# ROM: 0x3F5D3C
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetBlurAmt__16CPauseScreenBlurCFv
 GetBlurAmt__16CPauseScreenBlurCFv:
diff --git a/asm/MetroidPrime/CPauseScreenFrame.s b/asm/MetroidPrime/CPauseScreenFrame.s
index 3697c62c..255d5428 100644
--- a/asm/MetroidPrime/CPauseScreenFrame.s
+++ b/asm/MetroidPrime/CPauseScreenFrame.s
@@ -152,7 +152,7 @@ lbl_805A829C:
 	# ROM: 0x3F5C3C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global DoSliderChange__21SOptionsFrontEndFrameFP15CGuiSliderGroup
 DoSliderChange__21SOptionsFrontEndFrameFP15CGuiSliderGroup:
diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s
index 63278c23..2c6b067a 100644
--- a/asm/MetroidPrime/CPhysicsActor.s
+++ b/asm/MetroidPrime/CPhysicsActor.s
@@ -53,7 +53,7 @@ lbl_805A7634:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetMaximumCollisionVelocity__13CPhysicsActorCFv
 GetMaximumCollisionVelocity__13CPhysicsActorCFv:
diff --git a/asm/MetroidPrime/CPhysicsState.s b/asm/MetroidPrime/CPhysicsState.s
index 2feab809..6e96dff2 100644
--- a/asm/MetroidPrime/CPhysicsState.s
+++ b/asm/MetroidPrime/CPhysicsState.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__13CPhysicsStateFRC9CVector3fRC11CQuaternionRC9CVector3fRC10CAxisAngleRC9CVector3fRC9CVector3fRC9CVector3fRC10CAxisAngleRC10CAxisAngle
 __ct__13CPhysicsStateFRC9CVector3fRC11CQuaternionRC9CVector3fRC10CAxisAngleRC9CVector3fRC9CVector3fRC9CVector3fRC10CAxisAngleRC10CAxisAngle:
diff --git a/asm/MetroidPrime/CPreFrontEnd.s b/asm/MetroidPrime/CPreFrontEnd.s
index 792c9008..1c194e41 100644
--- a/asm/MetroidPrime/CPreFrontEnd.s
+++ b/asm/MetroidPrime/CPreFrontEnd.s
@@ -14,7 +14,7 @@ lbl_803EC010:
 	.4byte PreDraw__6CIOWinCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CPreFrontEndFv
 __dt__12CPreFrontEndFv:
diff --git a/asm/MetroidPrime/CProjectedShadow.s b/asm/MetroidPrime/CProjectedShadow.s
index cb8e2616..ac1d6e2f 100644
--- a/asm/MetroidPrime/CProjectedShadow.s
+++ b/asm/MetroidPrime/CProjectedShadow.s
@@ -14,7 +14,7 @@ lbl_805A85E0:
 lbl_805AF480:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_8029d6c8
 sub_8029d6c8:
diff --git a/asm/MetroidPrime/CRagDoll.s b/asm/MetroidPrime/CRagDoll.s
index 54b1b108..2477a76a 100644
--- a/asm/MetroidPrime/CRagDoll.s
+++ b/asm/MetroidPrime/CRagDoll.s
@@ -60,7 +60,7 @@ lbl_805A7FD8:
 	.4byte 0x00000020
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global PreRender__8CRagDollFRC9CVector3fR10CModelData
 PreRender__8CRagDollFRC9CVector3fR10CModelData:
diff --git a/asm/MetroidPrime/CRainSplashGenerator.s b/asm/MetroidPrime/CRainSplashGenerator.s
index f4635fb2..d52cb0c2 100644
--- a/asm/MetroidPrime/CRainSplashGenerator.s
+++ b/asm/MetroidPrime/CRainSplashGenerator.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetPoint__Q220CRainSplashGenerator11SRainSplashFRC9CVector3f
 SetPoint__Q220CRainSplashGenerator11SRainSplashFRC9CVector3f:
diff --git a/asm/MetroidPrime/CRipple.s b/asm/MetroidPrime/CRipple.s
index 6ae928b7..2f658563 100644
--- a/asm/MetroidPrime/CRipple.s
+++ b/asm/MetroidPrime/CRipple.s
@@ -10,7 +10,7 @@ lbl_805A8F58:
 lbl_805A8F5C:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__7CRippleF9TUniqueIdRC9CVector3ff
 __ct__7CRippleF9TUniqueIdRC9CVector3ff:
diff --git a/asm/MetroidPrime/CRippleManager.s b/asm/MetroidPrime/CRippleManager.s
index fa0befb6..c4b18e5a 100644
--- a/asm/MetroidPrime/CRippleManager.s
+++ b/asm/MetroidPrime/CRippleManager.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AddRipple__14CRippleManagerFRC7CRipple
 AddRipple__14CRippleManagerFRC7CRipple:
diff --git a/asm/MetroidPrime/CRumbleManager.s b/asm/MetroidPrime/CRumbleManager.s
index 3c188b32..25f80026 100644
--- a/asm/MetroidPrime/CRumbleManager.s
+++ b/asm/MetroidPrime/CRumbleManager.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Update__14CRumbleManagerFf
 Update__14CRumbleManagerFf:
diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s
index 7ff30008..d397536a 100644
--- a/asm/MetroidPrime/CSamusDoll.s
+++ b/asm/MetroidPrime/CSamusDoll.s
@@ -121,7 +121,7 @@ lbl_8046C470:
 lbl_8046C47C:
 	.skip 0xC
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetRotationSfxPlaying__10CSamusDollFb
 SetRotationSfxPlaying__10CSamusDollFb:
diff --git a/asm/MetroidPrime/CSaveGameScreen.s b/asm/MetroidPrime/CSaveGameScreen.s
index 1c305672..f8ee3188 100644
--- a/asm/MetroidPrime/CSaveGameScreen.s
+++ b/asm/MetroidPrime/CSaveGameScreen.s
@@ -73,7 +73,7 @@ lbl_805A82D8:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetInGame__15CSaveGameScreenb
 SetInGame__15CSaveGameScreenb:
diff --git a/asm/MetroidPrime/CSimpleShadow.s b/asm/MetroidPrime/CSimpleShadow.s
index 84f493cb..cdf5f789 100644
--- a/asm/MetroidPrime/CSimpleShadow.s
+++ b/asm/MetroidPrime/CSimpleShadow.s
@@ -12,7 +12,7 @@ lbl_805A757C:
 	# ROM: 0x3F4F1C
 	.4byte 0x00000031
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Valid__13CSimpleShadowCFv
 Valid__13CSimpleShadowCFv:
diff --git a/asm/MetroidPrime/CSlideShow.s b/asm/MetroidPrime/CSlideShow.s
index 31410459..bddbd1e8 100644
--- a/asm/MetroidPrime/CSlideShow.s
+++ b/asm/MetroidPrime/CSlideShow.s
@@ -115,7 +115,13 @@ lbl_805A85C8:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9168
+lbl_805A9168:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global GetIsContinueDraw__10CSlideShowFv
 GetIsContinueDraw__10CSlideShowFv:
diff --git a/asm/MetroidPrime/CSortedLists.s b/asm/MetroidPrime/CSortedLists.s
index bbb8ee63..c8864fc1 100644
--- a/asm/MetroidPrime/CSortedLists.s
+++ b/asm/MetroidPrime/CSortedLists.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "BuildNearList__Q22SL18CSortedListManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor"
 "BuildNearList__Q22SL18CSortedListManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor":
diff --git a/asm/MetroidPrime/CSteeringBehaviors.s b/asm/MetroidPrime/CSteeringBehaviors.s
index 6031a411..3edcd3a1 100644
--- a/asm/MetroidPrime/CSteeringBehaviors.s
+++ b/asm/MetroidPrime/CSteeringBehaviors.s
@@ -18,7 +18,7 @@ lbl_805A7750:
 	.4byte 0x41000000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ProjectOrbitalPosition__18CSteeringBehaviorsFRC9CVector3fRC9CVector3fRC9CVector3ff
 ProjectOrbitalPosition__18CSteeringBehaviorsFRC9CVector3fRC9CVector3fRC9CVector3ff:
diff --git a/asm/MetroidPrime/CVisorFlare.s b/asm/MetroidPrime/CVisorFlare.s
index 14ad20ec..67503120 100644
--- a/asm/MetroidPrime/CVisorFlare.s
+++ b/asm/MetroidPrime/CVisorFlare.s
@@ -32,7 +32,7 @@ lbl_805A7F64:
 	# ROM: 0x3F5904
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_802075fc
 sub_802075fc:
diff --git a/asm/MetroidPrime/CWorldShadow.s b/asm/MetroidPrime/CWorldShadow.s
index 4e2da343..4b1ce1f8 100644
--- a/asm/MetroidPrime/CWorldShadow.s
+++ b/asm/MetroidPrime/CWorldShadow.s
@@ -16,7 +16,7 @@ lbl_805A8F20:
 lbl_805A8F24:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ResetBlur__12CWorldShadowFv
 ResetBlur__12CWorldShadowFv:
diff --git a/asm/MetroidPrime/CWorldTransManager.s b/asm/MetroidPrime/CWorldTransManager.s
index 2b03caa6..094ee0f3 100644
--- a/asm/MetroidPrime/CWorldTransManager.s
+++ b/asm/MetroidPrime/CWorldTransManager.s
@@ -58,7 +58,16 @@ lbl_805A7FB0:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A90A8
+lbl_805A90A8:
+	.skip 0x4
+.global lbl_805A90AC
+lbl_805A90AC:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global WaitForModelsAndTextures__18CWorldTransManagerFv
 WaitForModelsAndTextures__18CWorldTransManagerFv:
diff --git a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s
index a3f9128f..39124271 100644
--- a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s
+++ b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s
@@ -53,7 +53,7 @@ lbl_805A826C:
 	.4byte 0x3F800000
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global nullsub_19
 nullsub_19:
diff --git a/asm/MetroidPrime/Cameras/CCameraFilter.s b/asm/MetroidPrime/Cameras/CCameraFilter.s
index fc219cad..24e9fc61 100644
--- a/asm/MetroidPrime/Cameras/CCameraFilter.s
+++ b/asm/MetroidPrime/Cameras/CCameraFilter.s
@@ -53,7 +53,7 @@ lbl_805A73E0:
 lbl_805A8EE0:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FreePersistentFbTexture__15CCameraBlurPassFv
 FreePersistentFbTexture__15CCameraBlurPassFv:
diff --git a/asm/MetroidPrime/Cameras/CCameraHint.s b/asm/MetroidPrime/Cameras/CCameraHint.s
index 1171d2d5..3346fa2a 100644
--- a/asm/MetroidPrime/Cameras/CCameraHint.s
+++ b/asm/MetroidPrime/Cameras/CCameraHint.s
@@ -9,7 +9,7 @@ lbl_803DF6F4:
 	.4byte 0
 	.4byte __dt__11CCameraHintFv
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__11CCameraHintFv
 __dt__11CCameraHintFv:
diff --git a/asm/MetroidPrime/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s
index 93df9452..86e9b99e 100644
--- a/asm/MetroidPrime/Cameras/CCameraManager.s
+++ b/asm/MetroidPrime/Cameras/CCameraManager.s
@@ -117,7 +117,7 @@ lbl_805A6BE8:
 lbl_803CC028:
 	.incbin "baserom.dol", 0x3C9028, 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 
 .global GetCameraBobMagnitude__14CCameraManagerCFv
diff --git a/asm/MetroidPrime/Cameras/CCameraShakeData.s b/asm/MetroidPrime/Cameras/CCameraShakeData.s
index f038e42b..09ce2412 100644
--- a/asm/MetroidPrime/Cameras/CCameraShakeData.s
+++ b/asm/MetroidPrime/Cameras/CCameraShakeData.s
@@ -37,7 +37,7 @@ lbl_805A789C:
 lbl_8046C7D0:
 	.skip 0x78
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSomething2__16CCameraShakeDataFv
 GetSomething2__16CCameraShakeDataFv:
diff --git a/asm/MetroidPrime/Cameras/CInterpolationCamera.s b/asm/MetroidPrime/Cameras/CInterpolationCamera.s
index ee3c8b32..5e49cdd6 100644
--- a/asm/MetroidPrime/Cameras/CInterpolationCamera.s
+++ b/asm/MetroidPrime/Cameras/CInterpolationCamera.s
@@ -36,7 +36,7 @@ lbl_803E9D80:
 	.4byte Reset__20CInterpolationCameraFRC12CTransform4fR13CStateManager
 	.4byte 0
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AcceptScriptMsg__20CInterpolationCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__20CInterpolationCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s
index 17375a37..05565f5b 100644
--- a/asm/MetroidPrime/Cameras/CPathCamera.s
+++ b/asm/MetroidPrime/Cameras/CPathCamera.s
@@ -86,7 +86,7 @@ lbl_805A8F68:
 lbl_805A8F6C:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AcceptScriptMsg__11CPathCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__11CPathCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/Enemies/CActorContraption.s b/asm/MetroidPrime/Enemies/CActorContraption.s
index aade1796..b40f9afc 100644
--- a/asm/MetroidPrime/Enemies/CActorContraption.s
+++ b/asm/MetroidPrime/Enemies/CActorContraption.s
@@ -40,7 +40,7 @@ lbl_803E85E8:
 	.4byte GetWeight__13CPhysicsActorCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CActorContraption
 __dt__17CActorContraption:
diff --git a/asm/MetroidPrime/Enemies/CAmbientAI.s b/asm/MetroidPrime/Enemies/CAmbientAI.s
index 392963ff..64a1dcc1 100644
--- a/asm/MetroidPrime/Enemies/CAmbientAI.s
+++ b/asm/MetroidPrime/Enemies/CAmbientAI.s
@@ -40,7 +40,7 @@ lbl_803E8CB0:
 	.4byte GetWeight__13CPhysicsActorCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__10CAmbientAIFv
 __dt__10CAmbientAIFv:
diff --git a/asm/MetroidPrime/Enemies/CAtomicAlpha.s b/asm/MetroidPrime/Enemies/CAtomicAlpha.s
index 7e9195c5..757ab4b1 100644
--- a/asm/MetroidPrime/Enemies/CAtomicAlpha.s
+++ b/asm/MetroidPrime/Enemies/CAtomicAlpha.s
@@ -198,7 +198,7 @@ lbl_805A82A4:
 	# ROM: 0x3F5C44
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CAtomicAlphaFv
 __dt__12CAtomicAlphaFv:
diff --git a/asm/MetroidPrime/Enemies/CAtomicBeta.s b/asm/MetroidPrime/Enemies/CAtomicBeta.s
index aca0f159..a609a709 100644
--- a/asm/MetroidPrime/Enemies/CAtomicBeta.s
+++ b/asm/MetroidPrime/Enemies/CAtomicBeta.s
@@ -194,7 +194,7 @@ lbl_805A82E0:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetDamageVulnerability__11CAtomicBetaFv
 GetDamageVulnerability__11CAtomicBetaFv:
diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s
index 197e4df9..580703c6 100644
--- a/asm/MetroidPrime/Enemies/CBabygoth.s
+++ b/asm/MetroidPrime/Enemies/CBabygoth.s
@@ -305,7 +305,7 @@ lbl_805A80F0:
 	.4byte 0x00000015
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_8021d43c
 sub_8021d43c:
diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s
index edfc3ea4..855bb710 100644
--- a/asm/MetroidPrime/Enemies/CBeetle.s
+++ b/asm/MetroidPrime/Enemies/CBeetle.s
@@ -287,7 +287,7 @@ lbl_805A8EC8:
 lbl_805A8ECC:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSearchPath__7CBeetleFv
 GetSearchPath__7CBeetleFv:
diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s
index 8fc92a35..f699ca3d 100644
--- a/asm/MetroidPrime/Enemies/CBloodFlower.s
+++ b/asm/MetroidPrime/Enemies/CBloodFlower.s
@@ -224,7 +224,7 @@ lbl_805A8F40:
 lbl_805A8F44:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CBloodFlowerFv
 __dt__12CBloodFlowerFv:
diff --git a/asm/MetroidPrime/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s
index 01f6a639..14d87de4 100644
--- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s
+++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s
@@ -98,7 +98,19 @@ lbl_805A81A0:
 	.4byte 0x00000020
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A90D8
+lbl_805A90D8:
+	.skip 0x8
+.global lbl_805A90E0
+lbl_805A90E0:
+	.skip 0x4
+.global lbl_805A90E4
+lbl_805A90E4:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global __dt__14CBouncyGrenadeFv
 __dt__14CBouncyGrenadeFv:
diff --git a/asm/MetroidPrime/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s
index 949f1be5..195b0961 100644
--- a/asm/MetroidPrime/Enemies/CBurrower.s
+++ b/asm/MetroidPrime/Enemies/CBurrower.s
@@ -214,7 +214,7 @@ lbl_803EA7C4:
 	.4byte PhazeOut__10CPatternedFR13CStateManager
 	.4byte sub_8026fb50
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSearchPath__9CBurrowerFv
 GetSearchPath__9CBurrowerFv:
diff --git a/asm/MetroidPrime/Enemies/CBurstFire.s b/asm/MetroidPrime/Enemies/CBurstFire.s
index 029e34e4..130805ef 100644
--- a/asm/MetroidPrime/Enemies/CBurstFire.s
+++ b/asm/MetroidPrime/Enemies/CBurstFire.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetMaxZError__10CBurstFireCFv
 GetMaxZError__10CBurstFireCFv:
diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s
index 9f2747a6..211fd913 100644
--- a/asm/MetroidPrime/Enemies/CChozoGhost.s
+++ b/asm/MetroidPrime/Enemies/CChozoGhost.s
@@ -314,7 +314,7 @@ lbl_805A7778:
 lbl_8046C748:
 	.skip 0x10
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__11CChozoGhostFv
 __dt__11CChozoGhostFv:
diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s
index 711075de..fa171dc3 100644
--- a/asm/MetroidPrime/Enemies/CDrone.s
+++ b/asm/MetroidPrime/Enemies/CDrone.s
@@ -510,7 +510,7 @@ lbl_805A8FE3:
 .global lbl_805A8FE4
 lbl_805A8FE4:
 	.skip 0x4
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__6CDroneFv
 __dt__6CDroneFv:
diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s
index 4f665bc4..2fe41bf2 100644
--- a/asm/MetroidPrime/Enemies/CElitePirate.s
+++ b/asm/MetroidPrime/Enemies/CElitePirate.s
@@ -370,7 +370,7 @@ lbl_805A8174:
 	.4byte 0x00000021
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSearchPath__12CElitePirateFv
 GetSearchPath__12CElitePirateFv:
diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s
index 32be6533..ecf51879 100644
--- a/asm/MetroidPrime/Enemies/CEyeBall.s
+++ b/asm/MetroidPrime/Enemies/CEyeBall.s
@@ -226,7 +226,16 @@ lbl_805A80F8:
 	.4byte 0x803D3248
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A90D0
+lbl_805A90D0:
+	.skip 0x4
+.global lbl_805A90D4
+lbl_805A90D4:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global __dt__8CEyeBallFv
 __dt__8CEyeBallFv:
diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s
index f44d3a3c..260dea67 100644
--- a/asm/MetroidPrime/Enemies/CFireFlea.s
+++ b/asm/MetroidPrime/Enemies/CFireFlea.s
@@ -252,7 +252,7 @@ lbl_805A8F98:
 lbl_805A8F9C:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__9CFireFleaFv
 __dt__9CFireFleaFv:
diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s
index 5aef0654..e0356c39 100644
--- a/asm/MetroidPrime/Enemies/CFlaahgra.s
+++ b/asm/MetroidPrime/Enemies/CFlaahgra.s
@@ -428,7 +428,16 @@ lbl_805A7C8C:
 	# ROM: 0x3F562C
 	.4byte 0x00000021
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9058
+lbl_805A9058:
+	.skip 0x4
+.global lbl_805A905C
+lbl_805A905C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global __dt__17CFlaahgraRendererFv
 __dt__17CFlaahgraRendererFv:
diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s
index c7bbfb0f..1195b265 100644
--- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s
+++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s
@@ -72,7 +72,7 @@ lbl_805A7F80:
 	.4byte 0x00000021
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AcceptScriptMsg__15CFlaahgraPlantsF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__15CFlaahgraPlantsF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s
index eb59a1d9..0eacd56a 100644
--- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s
+++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s
@@ -259,7 +259,7 @@ lbl_805A7E58:
 	# ROM: 0x3F57F8
 	.4byte 0x00000013
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SaveBombSlotInfo__17CFlaahgraTentacleFR13CStateManager
 SaveBombSlotInfo__17CFlaahgraTentacleFR13CStateManager:
diff --git a/asm/MetroidPrime/Enemies/CFlickerBat.s b/asm/MetroidPrime/Enemies/CFlickerBat.s
index 9f7fbfd6..82c49026 100644
--- a/asm/MetroidPrime/Enemies/CFlickerBat.s
+++ b/asm/MetroidPrime/Enemies/CFlickerBat.s
@@ -198,7 +198,7 @@ lbl_805A76F4:
 	# ROM: 0x3F5094
 	.4byte 0x0000001A
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Attack__11CFlickerBatFR13CStateManager9EStateMsgf
 Attack__11CFlickerBatFR13CStateManager9EStateMsgf:
diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s
index 58ac9c1f..ae1a4221 100644
--- a/asm/MetroidPrime/Enemies/CFlyingPirate.s
+++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s
@@ -456,7 +456,7 @@ lbl_8046C950:
 lbl_8046CA4C:
 	.skip 0xF4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FixedRandom__10CPatternedFR13CStateManagerf
 FixedRandom__10CPatternedFR13CStateManagerf:
diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s
index a07dc0b9..7c6f8aae 100644
--- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s
+++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s
@@ -149,8 +149,15 @@ lbl_805A81E0:
 	.4byte 0x3F800000
 	.4byte 0
 
+.section .sbss, "wa"
+.global lbl_805A90E8
+lbl_805A90E8:
+	.skip 0x4
+.global lbl_805A90EC
+lbl_805A90EC:
+	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global HealthInfo__16CGrenadeLauncherFR13CStateManager
 HealthInfo__16CGrenadeLauncherFR13CStateManager:
diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s
index b87a3409..cec8146c 100644
--- a/asm/MetroidPrime/Enemies/CIceSheegoth.s
+++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s
@@ -334,7 +334,7 @@ lbl_805A7BE8:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSearchPath__12CIceSheegothFv
 GetSearchPath__12CIceSheegothFv:
diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s
index fb8dd30b..e7e7096c 100644
--- a/asm/MetroidPrime/Enemies/CJellyZap.s
+++ b/asm/MetroidPrime/Enemies/CJellyZap.s
@@ -229,8 +229,14 @@ lbl_805A7D90:
 .global lbl_8046C920
 lbl_8046C920:
 	.skip 0x18
+
+.section .sbss, "wa"
+
+.global lbl_805A9070
+lbl_805A9070:
+	.skip 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__9CJellyZapFv
 __dt__9CJellyZapFv:
diff --git a/asm/MetroidPrime/Enemies/CKnockBackController.s b/asm/MetroidPrime/Enemies/CKnockBackController.s
index 96782b77..ec7a8cca 100644
--- a/asm/MetroidPrime/Enemies/CKnockBackController.s
+++ b/asm/MetroidPrime/Enemies/CKnockBackController.s
@@ -43,7 +43,7 @@ lbl_805A81FC:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global DoKnockBackAnimation__20CKnockBackControllerFRC9CVector3fR13CStateManagerR10CPatternedf
 DoKnockBackAnimation__20CKnockBackControllerFRC9CVector3fR13CStateManagerR10CPatternedf:
diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s
index d11fe380..b64a1ff8 100644
--- a/asm/MetroidPrime/Enemies/CMagdolite.s
+++ b/asm/MetroidPrime/Enemies/CMagdolite.s
@@ -344,7 +344,7 @@ lbl_805A822C:
 	# ROM: 0x3F5BCC
 	.4byte 0x00000012
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__10CMagdoliteFv
 __dt__10CMagdoliteFv:
diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s
index 30f6d1a7..dd6ff6f0 100644
--- a/asm/MetroidPrime/Enemies/CMetaree.s
+++ b/asm/MetroidPrime/Enemies/CMetaree.s
@@ -204,7 +204,7 @@ lbl_805A7800:
 	.4byte 0x00000020
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__8CMetareeFv
 __dt__8CMetareeFv:
diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s
index 17bfca32..3644dfe9 100644
--- a/asm/MetroidPrime/Enemies/CMetroid.s
+++ b/asm/MetroidPrime/Enemies/CMetroid.s
@@ -384,7 +384,7 @@ lbl_805A8FF0:
 lbl_805A8FF4:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSearchPath__8CMetroidFv
 GetSearchPath__8CMetroidFv:
diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s
index 98936e56..cc0a7afa 100644
--- a/asm/MetroidPrime/Enemies/CMetroidBeta.s
+++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s
@@ -365,7 +365,19 @@ lbl_805A7D44:
 	# ROM: 0x3F56E4
 	.4byte 0x00003FFF
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9060
+lbl_805A9060:
+	.skip 0x8
+.global lbl_805A9068
+lbl_805A9068:
+	.skip 0x4
+.global lbl_805A906C
+lbl_805A906C:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global IsListening__12CMetroidBetaCFv
 IsListening__12CMetroidBetaCFv:
diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s
index 82ff1c49..fb54fdbe 100644
--- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s
+++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s
@@ -404,7 +404,7 @@ lbl_805A84E4:
 	# ROM: 0x3F5E84
 	.4byte 0x00000012
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSearchPath__20CMetroidPrimeEssenceFv
 GetSearchPath__20CMetroidPrimeEssenceFv:
diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
index 4e68c4ef..dc639380 100644
--- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
+++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
@@ -705,8 +705,20 @@ lbl_805A849C:
 .global lbl_8046E0C0
 lbl_8046E0C0:
 	.skip 0x18
+
+.section .sbss, "wa"
+
+.global lbl_805A9140
+lbl_805A9140:
+	.skip 0x4
+.global lbl_805A9144
+lbl_805A9144:
+	.skip 0x4
+.global lbl_805A9148
+lbl_805A9148:
+	.skip 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__16CMetroidPrimeExo
 __dt__16CMetroidPrimeExo:
diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s
index 26c8e2cc..3ec0ee62 100644
--- a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s
+++ b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s
@@ -36,7 +36,7 @@ lbl_803EC390:
 	.4byte Explode__23CMetroidPrimeProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__23CMetroidPrimeProjectileFv
 __dt__23CMetroidPrimeProjectileFv:
diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s
index 4f7949f0..009c4afb 100644
--- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s
+++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s
@@ -14,7 +14,7 @@ lbl_803EB638:
 	.4byte AcceptScriptMsg__18CMetroidPrimeRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__18CMetroidPrimeRelayFv
 __dt__18CMetroidPrimeRelayFv:
diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s
index 051173e0..57c92457 100644
--- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s
+++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s
@@ -199,7 +199,7 @@ lbl_805A7AA4:
 	.4byte 0x3F800000
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__13CNewIntroBossFv
 __dt__13CNewIntroBossFv:
diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s
index 49216670..1019d720 100644
--- a/asm/MetroidPrime/Enemies/COmegaPirate.s
+++ b/asm/MetroidPrime/Enemies/COmegaPirate.s
@@ -407,7 +407,7 @@ lbl_805A857C:
 	# ROM: 0x3F5F1C
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__Q212COmegaPirate6CFlashFv
 __dt__Q212COmegaPirate6CFlashFv:
diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s
index 114c13e7..8b89ce2d 100644
--- a/asm/MetroidPrime/Enemies/CParasite.s
+++ b/asm/MetroidPrime/Enemies/CParasite.s
@@ -270,7 +270,7 @@ lbl_8046C770:
 lbl_8046C788:
 	.skip 0x18
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__9CParasiteFv
 __dt__9CParasiteFv:
diff --git a/asm/MetroidPrime/Enemies/CPatternedInfo.s b/asm/MetroidPrime/Enemies/CPatternedInfo.s
index bc5209b9..571a49b3 100644
--- a/asm/MetroidPrime/Enemies/CPatternedInfo.s
+++ b/asm/MetroidPrime/Enemies/CPatternedInfo.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global HasCorrectParameterCount__14CPatternedInfoFR12CInputStream
 HasCorrectParameterCount__14CPatternedInfoFR12CInputStream:
diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s
index a823b048..810c51ca 100644
--- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s
+++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s
@@ -228,7 +228,7 @@ lbl_805A8588:
 	.4byte 0x00000021
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__20CPhazonHealingNoduleFv
 __dt__20CPhazonHealingNoduleFv:
diff --git a/asm/MetroidPrime/Enemies/CPhazonPool.s b/asm/MetroidPrime/Enemies/CPhazonPool.s
index 2ba33492..444fc806 100644
--- a/asm/MetroidPrime/Enemies/CPhazonPool.s
+++ b/asm/MetroidPrime/Enemies/CPhazonPool.s
@@ -83,7 +83,7 @@ lbl_805A8580:
 	.4byte 0x01000000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_802925e0
 sub_802925e0:
diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s
index c9d233c6..27f41418 100644
--- a/asm/MetroidPrime/Enemies/CPuddleSpore.s
+++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s
@@ -222,7 +222,7 @@ lbl_805A77A0:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CPuddleSporeFv
 __dt__12CPuddleSporeFv:
diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s
index ad558cfa..258ce953 100644
--- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s
+++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s
@@ -241,7 +241,7 @@ lbl_8046C758:
 lbl_805A8FA0:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__16CPuddleToadGammaFv
 __dt__16CPuddleToadGammaFv:
diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s
index d08b8b4d..64f4b8a0 100644
--- a/asm/MetroidPrime/Enemies/CPuffer.s
+++ b/asm/MetroidPrime/Enemies/CPuffer.s
@@ -204,7 +204,7 @@ lbl_805A8388:
 	.4byte 0x00000026
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Think__7CPufferFfR13CStateManager
 Think__7CPufferFfR13CStateManager:
diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s
index 88a409d3..5dae4409 100644
--- a/asm/MetroidPrime/Enemies/CRidley.s
+++ b/asm/MetroidPrime/Enemies/CRidley.s
@@ -610,7 +610,7 @@ lbl_8046D7E0:
 lbl_8046D9C0:
 	.skip 0x2D0
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__7CRidleyFv
 __dt__7CRidleyFv:
diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s
index 37e1978b..d737041d 100644
--- a/asm/MetroidPrime/Enemies/CRipper.s
+++ b/asm/MetroidPrime/Enemies/CRipper.s
@@ -208,7 +208,7 @@ lbl_805A7884:
 	# ROM: 0x3F5224
 	.4byte 0x00000031
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global RemovePlatform__7CRipperFR13CStateManager
 RemovePlatform__7CRipperFR13CStateManager:
diff --git a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s
index 3908a841..3a42d61c 100644
--- a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s
+++ b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s
@@ -42,7 +42,7 @@ lbl_803E80C0:
 	.4byte Move__25CRipperControlledPlatformFR13CStateManager
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__25CRipperControlledPlatformFv
 __dt__25CRipperControlledPlatformFv:
diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s
index 6a1ca527..00b877b9 100644
--- a/asm/MetroidPrime/Enemies/CSeedling.s
+++ b/asm/MetroidPrime/Enemies/CSeedling.s
@@ -208,7 +208,7 @@ lbl_805A83F8:
 	.4byte 0x00000013
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSearchPath__9CSeedlingFv
 GetSearchPath__9CSeedlingFv:
diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s
index efc12f49..92aa6aff 100644
--- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s
+++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s
@@ -74,8 +74,17 @@ lbl_8046D360:
 .global lbl_8046D378
 lbl_8046D378:
 	.skip 0x18
-	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+
+.section .sbss, "wa"
+
+.global lbl_805A90F0
+lbl_805A90F0:
+	.skip 0x1
+.global lbl_805A90F1
+lbl_805A90F1:
+	.skip 0x7
+
+.section .text, "ax"
 
 .global __dt__15CSnakeWeedSwarmFv
 __dt__15CSnakeWeedSwarmFv:
diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s
index 1dfc5887..4be7ceec 100644
--- a/asm/MetroidPrime/Enemies/CSpacePirate.s
+++ b/asm/MetroidPrime/Enemies/CSpacePirate.s
@@ -527,7 +527,7 @@ lbl_8046C570:
 lbl_8046C618:
 	.skip 0x108
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__12CSpacePirateFv
 __dt__12CSpacePirateFv:
diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s
index 93c446f9..e490ed07 100644
--- a/asm/MetroidPrime/Enemies/CSpankWeed.s
+++ b/asm/MetroidPrime/Enemies/CSpankWeed.s
@@ -214,7 +214,7 @@ lbl_805A7848:
 	.4byte 0x0000002B
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__10CSpankWeedFv
 __dt__10CSpankWeedFv:
diff --git a/asm/MetroidPrime/Enemies/CTeamAiMgr.s b/asm/MetroidPrime/Enemies/CTeamAiMgr.s
index 8b6bfa98..1b71759b 100644
--- a/asm/MetroidPrime/Enemies/CTeamAiMgr.s
+++ b/asm/MetroidPrime/Enemies/CTeamAiMgr.s
@@ -14,7 +14,7 @@ lbl_803E8558:
 	.4byte AcceptScriptMsg__10CTeamAiMgrF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__10CTeamAiMgr
 __dt__10CTeamAiMgr:
diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s
index 9da42b8f..3c195df6 100644
--- a/asm/MetroidPrime/Enemies/CThardus.s
+++ b/asm/MetroidPrime/Enemies/CThardus.s
@@ -494,7 +494,13 @@ lbl_805A7DE4:
 	# ROM: 0x3F5784
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9078
+lbl_805A9078:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global __dt__8CThardusFv
 __dt__8CThardusFv:
diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s
index 2fc5d558..3d9fe768 100644
--- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s
+++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s
@@ -249,7 +249,7 @@ lbl_805A7F3C:
 	.4byte 0x00000013
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__22CThardusRockProjectileFv
 __dt__22CThardusRockProjectileFv:
diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s
index 49d35f24..9268bc5a 100644
--- a/asm/MetroidPrime/Enemies/CTryclops.s
+++ b/asm/MetroidPrime/Enemies/CTryclops.s
@@ -2,7 +2,6 @@
 
 .section .data
 
-
 .global lbl_803E9A10
 lbl_803E9A10:
 	# ROM: 0x3E6A10
@@ -272,8 +271,14 @@ lbl_805A83C4:
 .global lbl_8046DC90
 lbl_8046DC90:
 	.skip 0x18
-	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+
+.section .sbss, "wa"
+
+.global lbl_805A9120
+lbl_805A9120:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global sub_8025dbc0
 sub_8025dbc0:
diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s
index a591f0f7..3cf11f08 100644
--- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s
+++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s
@@ -104,6 +104,36 @@ lbl_805A7E20:
 	.4byte 0x0000007F
 	.4byte 0
 
+.section .sbss, "wa"
+
+.global lbl_805A9080
+lbl_805A9080:
+	.skip 0x4
+.global lbl_805A9084
+lbl_805A9084:
+	.skip 0x4
+.global lbl_805A9088
+lbl_805A9088:
+	.skip 0x4
+.global lbl_805A908C
+lbl_805A908C:
+	.skip 0x4
+.global lbl_805A9090
+lbl_805A9090:
+	.skip 0x4
+.global lbl_805A9094
+lbl_805A9094:
+	.skip 0x4
+.global lbl_805A9098
+lbl_805A9098:
+	.skip 0x4
+.global lbl_805A909C
+lbl_805A909C:
+	.skip 0x4
+.global lbl_805A90A0
+lbl_805A90A0:
+	.skip 0x8
+
 .section .sbss2, "", @nobits  # 0x805AF460 - 0x805AF4C7
 # CWallCrawlerSwarm
 .global lbl_805AF468
@@ -119,7 +149,7 @@ lbl_805AF46C:
 lbl_8046C938:
 	.skip 0x18
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global UpdateEffects__17CWallCrawlerSwarmFR13CStateManagerR9CAnimData
 UpdateEffects__17CWallCrawlerSwarmFR13CStateManagerR9CAnimData:
diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s
index ff45ecdc..957acdce 100644
--- a/asm/MetroidPrime/Enemies/CWallWalker.s
+++ b/asm/MetroidPrime/Enemies/CWallWalker.s
@@ -187,7 +187,7 @@ lbl_803EA0F0:
 	.4byte 0
 	
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Think__11CWallWalkerFfR13CStateManager
 Think__11CWallWalkerFfR13CStateManager:
diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s
index 2d1fa586..14698629 100644
--- a/asm/MetroidPrime/Enemies/CWarWasp.s
+++ b/asm/MetroidPrime/Enemies/CWarWasp.s
@@ -257,7 +257,7 @@ lbl_805A75E8:
 	.4byte 0x00000020
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetSearchPath__8CWarWaspFv
 GetSearchPath__8CWarWaspFv:
diff --git a/asm/MetroidPrime/Enemies/SPositionHistory.s b/asm/MetroidPrime/Enemies/SPositionHistory.s
index 956a1a83..338e2885 100644
--- a/asm/MetroidPrime/Enemies/SPositionHistory.s
+++ b/asm/MetroidPrime/Enemies/SPositionHistory.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_802a07f0
 sub_802a07f0:
diff --git a/asm/MetroidPrime/Factories/CSaveWorldFactory.s b/asm/MetroidPrime/Factories/CSaveWorldFactory.s
index 163b0c44..91b64ba1 100644
--- a/asm/MetroidPrime/Factories/CSaveWorldFactory.s
+++ b/asm/MetroidPrime/Factories/CSaveWorldFactory.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FSaveWorldFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FSaveWorldFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/MetroidPrime/Factories/CScannableObjectInfo.s b/asm/MetroidPrime/Factories/CScannableObjectInfo.s
index 4e0ece01..866bb9e0 100644
--- a/asm/MetroidPrime/Factories/CScannableObjectInfo.s
+++ b/asm/MetroidPrime/Factories/CScannableObjectInfo.s
@@ -10,7 +10,7 @@ lbl_803E3AC8:
 	.4byte sub_80169a70
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FScannableObjectInfoFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FScannableObjectInfoFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/MetroidPrime/GameObjectLists.s b/asm/MetroidPrime/GameObjectLists.s
index bf9d2f3b..90540130 100644
--- a/asm/MetroidPrime/GameObjectLists.s
+++ b/asm/MetroidPrime/GameObjectLists.s
@@ -52,7 +52,7 @@ lbl_803E52A0:
 	.4byte IsQualified__10CActorListFRC7CEntity
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsQualified__14CGameLightListFRC7CEntity
 IsQualified__14CGameLightListFRC7CEntity:
diff --git a/asm/MetroidPrime/HUD/CHUDMemoParms.s b/asm/MetroidPrime/HUD/CHUDMemoParms.s
index d7cbb2e3..72ad522b 100644
--- a/asm/MetroidPrime/HUD/CHUDMemoParms.s
+++ b/asm/MetroidPrime/HUD/CHUDMemoParms.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__13CHUDMemoParmsFR12CInputStream
 __ct__13CHUDMemoParmsFR12CInputStream:
diff --git a/asm/MetroidPrime/HUD/CHudBallInterface.s b/asm/MetroidPrime/HUD/CHudBallInterface.s
index 2da6138b..1163bbac 100644
--- a/asm/MetroidPrime/HUD/CHudBallInterface.s
+++ b/asm/MetroidPrime/HUD/CHudBallInterface.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global UpdatePowerBombReadoutColors__17CHudBallInterfaceFv
 UpdatePowerBombReadoutColors__17CHudBallInterfaceFv:
diff --git a/asm/MetroidPrime/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s
index 9541472a..fac190ed 100644
--- a/asm/MetroidPrime/HUD/CHudDecoInterface.s
+++ b/asm/MetroidPrime/HUD/CHudDecoInterface.s
@@ -376,7 +376,7 @@ lbl_805A7B8C:
 	# ROM: 0x3F552C
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Update__23CHudBossEnergyInterfaceFf
 Update__23CHudBossEnergyInterfaceFf:
diff --git a/asm/MetroidPrime/PathFinding/CPathFindArea.s b/asm/MetroidPrime/PathFinding/CPathFindArea.s
index 585621f9..bc6a4038 100644
--- a/asm/MetroidPrime/PathFinding/CPathFindArea.s
+++ b/asm/MetroidPrime/PathFinding/CPathFindArea.s
@@ -10,7 +10,7 @@ lbl_803E5718:
 	.4byte sub_801ca284
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global "FPathFindAreaFactory__FRC10SObjectTagRCQ24rstl12auto_ptr<Uc>iRC15CVParamTransfer"
 "FPathFindAreaFactory__FRC10SObjectTagRCQ24rstl12auto_ptr<Uc>iRC15CVParamTransfer":
diff --git a/asm/MetroidPrime/PathFinding/CPathFindRegion.s b/asm/MetroidPrime/PathFinding/CPathFindRegion.s
index d65e406b..e27054be 100644
--- a/asm/MetroidPrime/PathFinding/CPathFindRegion.s
+++ b/asm/MetroidPrime/PathFinding/CPathFindRegion.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FitThroughLink3d__9CPFRegionCFRC9CVector3fRC7CPFLinkfRC9CVector3fff
 FitThroughLink3d__9CPFRegionCFRC9CVector3fRC7CPFLinkfRC9CVector3fff:
diff --git a/asm/MetroidPrime/PathFinding/CPathFindSearch.s b/asm/MetroidPrime/PathFinding/CPathFindSearch.s
index c85a9c16..f2220c73 100644
--- a/asm/MetroidPrime/PathFinding/CPathFindSearch.s
+++ b/asm/MetroidPrime/PathFinding/CPathFindSearch.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global OnPath__15CPathFindSearchCFRC9CVector3f
 OnPath__15CPathFindSearchCFRC9CVector3f:
diff --git a/asm/MetroidPrime/Player/CFaceplateDecoration.s b/asm/MetroidPrime/Player/CFaceplateDecoration.s
index 2f8f67d9..17ca6304 100644
--- a/asm/MetroidPrime/Player/CFaceplateDecoration.s
+++ b/asm/MetroidPrime/Player/CFaceplateDecoration.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Draw__20CFaceplateDecorationCFRC13CStateManager
 Draw__20CFaceplateDecorationCFRC13CStateManager:
diff --git a/asm/MetroidPrime/Player/CFidget.s b/asm/MetroidPrime/Player/CFidget.s
index c6e18dfe..356315e9 100644
--- a/asm/MetroidPrime/Player/CFidget.s
+++ b/asm/MetroidPrime/Player/CFidget.s
@@ -12,7 +12,7 @@ lbl_805A7834:
 	# ROM: 0x3F51D4
 	.4byte 0x41A00000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Update__7CFidgetFibbfR13CStateManager
 Update__7CFidgetFibbfR13CStateManager:
diff --git a/asm/MetroidPrime/Player/CGameHintInfo.s b/asm/MetroidPrime/Player/CGameHintInfo.s
index 1a8b22ee..4447fb69 100644
--- a/asm/MetroidPrime/Player/CGameHintInfo.s
+++ b/asm/MetroidPrime/Player/CGameHintInfo.s
@@ -18,7 +18,7 @@ lbl_805A8400:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FHintFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FHintFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/MetroidPrime/Player/CGameOptions.s b/asm/MetroidPrime/Player/CGameOptions.s
index fe7b96d6..208dea2e 100644
--- a/asm/MetroidPrime/Player/CGameOptions.s
+++ b/asm/MetroidPrime/Player/CGameOptions.s
@@ -183,7 +183,7 @@ lbl_805A8068:
 	.4byte 0x8ADA8184
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetControls__12CGameOptionsFi
 SetControls__12CGameOptionsFi:
diff --git a/asm/MetroidPrime/Player/CGameState.s b/asm/MetroidPrime/Player/CGameState.s
index 4fbfa7dd..7b5de719 100644
--- a/asm/MetroidPrime/Player/CGameState.s
+++ b/asm/MetroidPrime/Player/CGameState.s
@@ -63,7 +63,7 @@ lbl_805A7D70:
 	.4byte 0
 	.4byte 0
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetDeferPowerupInit__10CGameStateFb
 SetDeferPowerupInit__10CGameStateFb:
diff --git a/asm/MetroidPrime/Player/CGrappleArm.s b/asm/MetroidPrime/Player/CGrappleArm.s
index 4d6593ba..725c93b1 100644
--- a/asm/MetroidPrime/Player/CGrappleArm.s
+++ b/asm/MetroidPrime/Player/CGrappleArm.s
@@ -58,7 +58,7 @@ lbl_805A7648:
 	.4byte 0xFFFF0000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global DisconnectGrappleBeam__11CGrappleArmFv
 DisconnectGrappleBeam__11CGrappleArmFv:
diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s
index 16faad0f..442351ee 100644
--- a/asm/MetroidPrime/Player/CMorphBall.s
+++ b/asm/MetroidPrime/Player/CMorphBall.s
@@ -279,7 +279,7 @@ lbl_805A8EF8:
 lbl_805A8EFC:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global DeleteBallShadow__10CMorphBallFv
 DeleteBallShadow__10CMorphBallFv:
diff --git a/asm/MetroidPrime/Player/CMorphBallShadow.s b/asm/MetroidPrime/Player/CMorphBallShadow.s
index 1cbd3168..b0011f5b 100644
--- a/asm/MetroidPrime/Player/CMorphBallShadow.s
+++ b/asm/MetroidPrime/Player/CMorphBallShadow.s
@@ -9,7 +9,7 @@ lbl_805AF470:
 lbl_805AF474:
 	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AreasValid__16CMorphBallShadowCFRC13CStateManager
 AreasValid__16CMorphBallShadowCFRC13CStateManager:
diff --git a/asm/MetroidPrime/Player/CPlayerCameraBob.s b/asm/MetroidPrime/Player/CPlayerCameraBob.s
index 6cdbecf1..03818450 100644
--- a/asm/MetroidPrime/Player/CPlayerCameraBob.s
+++ b/asm/MetroidPrime/Player/CPlayerCameraBob.s
@@ -135,7 +135,7 @@ lbl_805A8ED4:
 lbl_805A8ED8:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetViewWanderTransform__16CPlayerCameraBobCFv
 GetViewWanderTransform__16CPlayerCameraBobCFv:
diff --git a/asm/MetroidPrime/Player/CPlayerDynamics.s b/asm/MetroidPrime/Player/CPlayerDynamics.s
index caec1ff2..3cc82233 100644
--- a/asm/MetroidPrime/Player/CPlayerDynamics.s
+++ b/asm/MetroidPrime/Player/CPlayerDynamics.s
@@ -103,8 +103,23 @@ lbl_805A8530:
 .global lbl_8046E0D8
 lbl_8046E0D8:
 	.skip 0x18
+
+.section .sbss, "wa"
+
+.global lbl_805A9150
+lbl_805A9150:
+	.skip 0x4
+.global lbl_805A9154
+lbl_805A9154:
+	.skip 0x4
+.global lbl_805A9158
+lbl_805A9158:
+	.skip 0x4
+.global lbl_805A915C
+lbl_805A915C:
+	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global UpdateMorphBallTransition__7CPlayerFfR13CStateManager
 UpdateMorphBallTransition__7CPlayerFfR13CStateManager:
diff --git a/asm/MetroidPrime/Player/CPlayerEnergyDrain.s b/asm/MetroidPrime/Player/CPlayerEnergyDrain.s
index 2be018d1..8b402eca 100644
--- a/asm/MetroidPrime/Player/CPlayerEnergyDrain.s
+++ b/asm/MetroidPrime/Player/CPlayerEnergyDrain.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ProcessEnergyDrain__18CPlayerEnergyDrainFRC13CStateManagerf
 ProcessEnergyDrain__18CPlayerEnergyDrainFRC13CStateManagerf:
diff --git a/asm/MetroidPrime/Player/CPlayerInputFilter.s b/asm/MetroidPrime/Player/CPlayerInputFilter.s
index 3188cdd2..6feb382c 100644
--- a/asm/MetroidPrime/Player/CPlayerInputFilter.s
+++ b/asm/MetroidPrime/Player/CPlayerInputFilter.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Reset__Q27CPlayer12CInputFilterFv
 Reset__Q27CPlayer12CInputFilterFv:
diff --git a/asm/MetroidPrime/Player/CPlayerOrbit.s b/asm/MetroidPrime/Player/CPlayerOrbit.s
index be55d41b..f0e37857 100644
--- a/asm/MetroidPrime/Player/CPlayerOrbit.s
+++ b/asm/MetroidPrime/Player/CPlayerOrbit.s
@@ -83,8 +83,35 @@ lbl_8046C8D8:
 .global lbl_8046C8F0
 lbl_8046C8F0:
 	.skip 0x18
+
+.section .sbss, "wa"
+
+.global lbl_805A9000
+lbl_805A9000:
+	.skip 0x4
+.global lbl_805A9004
+lbl_805A9004:
+	.skip 0x4
+.global lbl_805A9008
+lbl_805A9008:
+	.skip 0x4
+.global lbl_805A900C
+lbl_805A900C:
+	.skip 0x4
+.global lbl_805A9010
+lbl_805A9010:
+	.skip 0x4
+.global lbl_805A9014
+lbl_805A9014:
+	.skip 0x4
+.global lbl_805A9018
+lbl_805A9018:
+	.skip 0x4
+.global lbl_805A901C
+lbl_805A901C:
+	.skip 0x4
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global UpdateGrappleArmTransform__7CPlayerFRC9CVector3fR13CStateManagerf
 UpdateGrappleArmTransform__7CPlayerFRC9CVector3fR13CStateManagerf:
diff --git a/asm/MetroidPrime/Player/CPlayerVisor.s b/asm/MetroidPrime/Player/CPlayerVisor.s
index ac0d2ad4..cef87402 100644
--- a/asm/MetroidPrime/Player/CPlayerVisor.s
+++ b/asm/MetroidPrime/Player/CPlayerVisor.s
@@ -62,7 +62,7 @@ lbl_805A761C:
 	# ROM: 0x3F4FBC
 	.4byte 0x3F800000
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FindEmptyInactiveScanTarget__12CPlayerVisorCFv
 FindEmptyInactiveScanTarget__12CPlayerVisorCFv:
diff --git a/asm/MetroidPrime/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s
index 835bb1fb..52077921 100644
--- a/asm/MetroidPrime/Player/CSamusFaceReflection.s
+++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s
@@ -18,7 +18,7 @@ lbl_805A786C:
 lbl_8046C7A0:
 	.skip 0x30
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Draw__20CSamusFaceReflectionCFRC13CStateManager
 Draw__20CSamusFaceReflectionCFRC13CStateManager:
diff --git a/asm/MetroidPrime/Player/CSaveWorld.s b/asm/MetroidPrime/Player/CSaveWorld.s
index 7f6a877a..5f0ec29b 100644
--- a/asm/MetroidPrime/Player/CSaveWorld.s
+++ b/asm/MetroidPrime/Player/CSaveWorld.s
@@ -12,7 +12,7 @@ lbl_805A82C4:
 	# ROM: 0x3F5C64
 	.4byte 0xFFFFFFFF
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_80248ddc
 sub_80248ddc:
diff --git a/asm/MetroidPrime/Player/CScanDisplay.s b/asm/MetroidPrime/Player/CScanDisplay.s
index 3c887f2c..c6afa85a 100644
--- a/asm/MetroidPrime/Player/CScanDisplay.s
+++ b/asm/MetroidPrime/Player/CScanDisplay.s
@@ -48,7 +48,7 @@ lbl_805A7A00:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetDownloadFraction__12CScanDisplayFif
 GetDownloadFraction__12CScanDisplayFif:
diff --git a/asm/MetroidPrime/Player/CStaticInterference.s b/asm/MetroidPrime/Player/CStaticInterference.s
index 0d3441a4..09bcaf54 100644
--- a/asm/MetroidPrime/Player/CStaticInterference.s
+++ b/asm/MetroidPrime/Player/CStaticInterference.s
@@ -18,7 +18,7 @@ lbl_805A7CE0:
 	.4byte 0x3F800000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Update__19CStaticInterferenceFR13CStateManagerf
 Update__19CStaticInterferenceFR13CStateManagerf:
diff --git a/asm/MetroidPrime/Player/CWorldLayerState.s b/asm/MetroidPrime/Player/CWorldLayerState.s
index 02678925..1c0d23d3 100644
--- a/asm/MetroidPrime/Player/CWorldLayerState.s
+++ b/asm/MetroidPrime/Player/CWorldLayerState.s
@@ -18,7 +18,7 @@ lbl_8046D340:
 lbl_8046D34C:
 	.skip 0x14
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global nullsub_5
 nullsub_5:
diff --git a/asm/MetroidPrime/RumbleFxTable.s b/asm/MetroidPrime/RumbleFxTable.s
index 1dd28917..128f5885 100644
--- a/asm/MetroidPrime/RumbleFxTable.s
+++ b/asm/MetroidPrime/RumbleFxTable.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __sinit_RumbleFxTable_cpp
 __sinit_RumbleFxTable_cpp:
diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s
index 8cfa346e..0557b712 100644
--- a/asm/MetroidPrime/ScriptLoader.s
+++ b/asm/MetroidPrime/ScriptLoader.s
@@ -48,7 +48,7 @@ lbl_805A72C0:
 	.4byte 0x00000032
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global LoadEnergyBall__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo
 LoadEnergyBall__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo:
diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s
index aa5436a1..1a0cbf38 100644
--- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s
+++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s
@@ -243,7 +243,7 @@ lbl_805A8608:
 	.4byte 0x00000013
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_8029f318
 sub_8029f318:
diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s
index 56ff2797..c86ab571 100644
--- a/asm/MetroidPrime/ScriptObjects/CFire.s
+++ b/asm/MetroidPrime/ScriptObjects/CFire.s
@@ -46,7 +46,7 @@ lbl_805A8394:
 	# ROM: 0x3F5D34
 	.4byte 0x00000023
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AcceptScriptMsg__5CFireF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__5CFireF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s
index fe2b55b2..915a9c42 100644
--- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s
+++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s
@@ -86,7 +86,7 @@ lbl_805A7D54:
 	# ROM: 0x3F56F4
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__10CFishCloudFv
 __dt__10CFishCloudFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s
index daccd1de..cce802ed 100644
--- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s
+++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s
@@ -61,7 +61,7 @@ lbl_805A8F74:
 lbl_805A8F78:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__19CHUDBillboardEffectFR8IVisitor
 Accept__19CHUDBillboardEffectFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s
index 1d3d4c7b..62741d6d 100644
--- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s
+++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s
@@ -43,7 +43,7 @@ lbl_805A8070:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__9CRepulsorFv
 __dt__9CRepulsorFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s
index d930962e..ad1bf374 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s
@@ -22,7 +22,7 @@ lbl_803DFE40:
 	.4byte __dt__14CBCScriptedCmdFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__20CScriptActorKeyframeFv
 __dt__20CScriptActorKeyframeFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s
index 8f8b62aa..ec281e66 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s
@@ -15,7 +15,7 @@ lbl_803E2D08:
 	.4byte SetActive__7CEntityFb
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__18CScriptActorRotateFv
 __dt__18CScriptActorRotateFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s
index 14f973f3..c7d659aa 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s
@@ -42,7 +42,7 @@ lbl_805A7E28:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__18CScriptAiJumpPointFv
 __dt__18CScriptAiJumpPointFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s
index 89b99d72..dcc2a628 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s
@@ -14,7 +14,7 @@ lbl_803E52F8:
 	.4byte AcceptScriptMsg__21CScriptAreaAttributesF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__21CScriptAreaAttributesFv
 __dt__21CScriptAreaAttributesFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s
index 74f81213..e2fa952f 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s
@@ -38,7 +38,7 @@ lbl_803E3E80:
 	.4byte InhabitantRejected__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AcceptScriptMsg__18CScriptBallTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__18CScriptBallTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s
index fff2f1dd..87c72bcd 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s
@@ -35,7 +35,7 @@ lbl_803EB180:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__11CScriptBeamFv
 __dt__11CScriptBeamFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s
index 16e9b3d0..46be9964 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s
@@ -14,7 +14,7 @@ lbl_803DFCA0:
 	.4byte AcceptScriptMsg__25CScriptCameraBlurKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__25CScriptCameraBlurKeyframeFR8IVisitor
 Accept__25CScriptCameraBlurKeyframeFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s
index 4aaa380d..d2eb6776 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s
@@ -14,7 +14,7 @@ lbl_803DFC80:
 	.4byte AcceptScriptMsg__27CScriptCameraFilterKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__27CScriptCameraFilterKeyframeFR8IVisitor
 Accept__27CScriptCameraFilterKeyframeFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s
index ea2659cf..4cb91911 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s
@@ -42,7 +42,7 @@ lbl_805A7298:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__17CScriptCameraHintFR8IVisitor
 Accept__17CScriptCameraHintFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s
index a03e544a..1cd11346 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s
@@ -42,7 +42,7 @@ lbl_805A82C8:
 	.4byte 0x00000022
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__24CScriptCameraHintTriggerFv
 __dt__24CScriptCameraHintTriggerFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s
index a647ace8..b241d38e 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s
@@ -43,7 +43,7 @@ lbl_805A8120:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__24CScriptCameraPitchVolumeFv
 __dt__24CScriptCameraPitchVolumeFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s
index c3e6bc13..adcd3cf5 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s
@@ -14,7 +14,7 @@ lbl_803DFE00:
 	.4byte AcceptScriptMsg__19CScriptCameraShakerF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__19CScriptCameraShakerFv
 __dt__19CScriptCameraShakerFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s
index aa9ae7bb..6cbecf26 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s
@@ -26,7 +26,7 @@ lbl_805A7F04:
 	.4byte 0x3F800000
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__20CScriptColorModulateFv
 __dt__20CScriptColorModulateFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s
index 1a0c642d..f964dc06 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s
@@ -14,7 +14,7 @@ lbl_803E5C20:
 	.4byte AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__23CScriptControllerActionFv
 __dt__23CScriptControllerActionFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s
index 2247736f..4309735d 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s
@@ -42,7 +42,7 @@ lbl_805A76A8:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CScriptCoverPointFv
 __dt__17CScriptCoverPointFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s
index 60ef4092..b1eb3e90 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s
@@ -82,7 +82,7 @@ lbl_805A74D0:
 	.4byte 0x00000038
 	.4byte 0
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__24CScriptDamageableTriggerFR8IVisitor
 Accept__24CScriptDamageableTriggerFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s
index aecd6517..3dedfbfc 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s
@@ -168,7 +168,7 @@ lbl_805A7538:
 	.4byte 0x00000023
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CollidedWith__13CScriptDebrisFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager
 CollidedWith__13CScriptDebrisFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s
index a2266b20..6163b510 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s
@@ -41,7 +41,7 @@ lbl_805A77A8:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__26CScriptDebugCameraWaypointFv
 __dt__26CScriptDebugCameraWaypointFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s
index 98b02980..408b8046 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s
@@ -14,7 +14,7 @@ lbl_803E27B0:
 	.4byte AcceptScriptMsg__18CScriptDistanceFogF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AcceptScriptMsg__18CScriptDistanceFogF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__18CScriptDistanceFogF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s
index 9c042eb7..ee77ca79 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s
@@ -99,7 +99,7 @@ lbl_805A7294:
 	.4byte 0x00000030
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetCurrentConnectedAreaId__11CScriptDockCFRC13CStateManager
 GetCurrentConnectedAreaId__11CScriptDockCFRC13CStateManager:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s
index 24971340..1be803fc 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s
@@ -14,7 +14,7 @@ lbl_803E2B48:
 	.4byte AcceptScriptMsg__21CScriptDockAreaChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__21CScriptDockAreaChangeFv
 __dt__21CScriptDockAreaChangeFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s
index fa1bbfa2..217e94b8 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s
@@ -42,7 +42,7 @@ lbl_805A7AB0:
 	.4byte 0x00000023
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__14CScriptEMPulseFv
 __dt__14CScriptEMPulseFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s
index d9896039..d1f6f180 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s
@@ -42,7 +42,7 @@ lbl_805A76E0:
 	.4byte 0x00000029
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__19CScriptGrapplePointFR8IVisitor
 Accept__19CScriptGrapplePointFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s
index 117a37a5..d6c787dd 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s
@@ -186,8 +186,22 @@ lbl_805A80D4:
 	# ROM: 0x3F5A74
 	.4byte 0x00000014
 
+.section .sbss, "wa"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.global lbl_805A90C0
+lbl_805A90C0:
+	.skip 0x4
+.global lbl_805A90C4
+lbl_805A90C4:
+	.skip 0x4
+.global lbl_805A90C8
+lbl_805A90C8:
+	.skip 0x4
+.global lbl_805A90CC
+lbl_805A90CC:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global HealthInfo__16CScriptGunTurretFR13CStateManager
 HealthInfo__16CScriptGunTurretFR13CStateManager:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s
index 1ba4e239..1acfd86e 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s
@@ -22,7 +22,7 @@ lbl_805A7360:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__14CScriptHUDMemoFR8IVisitor
 Accept__14CScriptHUDMemoFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s
index 81b10f76..3eb74513 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s
@@ -34,7 +34,7 @@ lbl_803EB658:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__15CScriptMazeNodeFv
 __dt__15CScriptMazeNodeFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s
index ad6d8434..438ff308 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s
@@ -14,7 +14,7 @@ lbl_803E86E8:
 	.4byte AcceptScriptMsg__18CScriptMemoryRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__18CScriptMemoryRelayFR8IVisitor
 Accept__18CScriptMemoryRelayFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s
index 16271125..d76e665d 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s
@@ -14,7 +14,7 @@ lbl_803E7048:
 	.4byte AcceptScriptMsg__11CScriptMidiF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global StopInternal__11CScriptMidiFf
 StopInternal__11CScriptMidiFf:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s
index a15bd1ed..8d984288 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s
@@ -22,7 +22,7 @@ lbl_805A78A0:
 	.4byte 0x00000001
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__22CScriptPickupGeneratorFR8IVisitor
 Accept__22CScriptPickupGeneratorFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s
index 1408546f..9c4cd79e 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s
@@ -93,7 +93,7 @@ lbl_805A7C3C:
 	.4byte 0x40000000
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__18CScriptPlayerActorFv
 __dt__18CScriptPlayerActorFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s
index 529426ca..c110b4e1 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s
@@ -43,7 +43,7 @@ lbl_805A7870:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CScriptPlayerHintFv
 __dt__17CScriptPlayerHintFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s
index 4dc79cbe..37040c44 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s
@@ -13,7 +13,7 @@ lbl_803E5CC0:
 	.4byte AcceptScriptMsg__24CScriptPlayerStateChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__24CScriptPlayerStateChangeFv
 __dt__24CScriptPlayerStateChangeFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s
index 483ba37a..f75a7d7d 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s
@@ -42,7 +42,7 @@ lbl_805A78A8:
 	.4byte 0x00000029
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CalculateRenderBounds__22CScriptPointOfInterestFv
 CalculateRenderBounds__22CScriptPointOfInterestFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s
index e44b0fc7..7948547d 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s
@@ -34,7 +34,7 @@ lbl_803EC030:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__22CScriptShadowProjectorFv
 __dt__22CScriptShadowProjectorFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s
index 926ff990..0722760b 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s
@@ -27,7 +27,7 @@ lbl_805A7334:
 	.4byte 0x00000064
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__18CScriptRandomRelayFR8IVisitor
 Accept__18CScriptRandomRelayFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s
index 0f8c1d94..b546b247 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s
@@ -14,7 +14,7 @@ lbl_803E3E28:
 	.4byte AcceptScriptMsg__13CScriptRippleF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__13CScriptRippleFR8IVisitor
 Accept__13CScriptRippleFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s
index 29d6da4f..c15422a7 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s
@@ -14,7 +14,13 @@ lbl_803E4708:
 	.4byte AcceptScriptMsg__20CScriptRoomAcousticsF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A9048
+lbl_805A9048:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global __dt__20CScriptRoomAcousticsFv
 __dt__20CScriptRoomAcousticsFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s
index 902ec485..7c1a12ce 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s
@@ -14,7 +14,7 @@ lbl_803DF850:
 	.4byte AcceptScriptMsg__17CScriptSpawnPointF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__17CScriptSpawnPointFR8IVisitor
 Accept__17CScriptSpawnPointFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s
index 3e795e37..d4c7d38b 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s
@@ -170,7 +170,7 @@ lbl_805A782C:
 	# ROM: 0x3F51CC
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__22CScriptSpecialFunctionFv
 __dt__22CScriptSpecialFunctionFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s
index 2ea33a41..ae141712 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s
@@ -43,7 +43,7 @@ lbl_805A77B0:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__34CScriptSpiderBallAttractionSurfaceFR8IVisitor
 Accept__34CScriptSpiderBallAttractionSurfaceFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s
index 38e9b5b2..eb84c502 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s
@@ -42,7 +42,7 @@ lbl_805A7620:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetTouchBounds__25CScriptSpiderBallWaypointCFv
 GetTouchBounds__25CScriptSpiderBallWaypointCFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s
index 7db686fd..86e1b11a 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s
@@ -83,7 +83,23 @@ lbl_805A828C:
 .global lbl_8046D390
 lbl_8046D390:
 	.skip 0x18
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+
+.section .sbss, "wa"
+
+.global lbl_805A90F8
+lbl_805A90F8:
+	.skip 0x4
+.global lbl_805A90FC
+lbl_805A90FC:
+	.skip 0x4
+.global lbl_805A9100
+lbl_805A9100:
+	.skip 0x4
+.global lbl_805A9104
+lbl_805A9104:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global AcceptScriptMsg__20CScriptSpindleCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__20CScriptSpindleCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s
index a06c7d98..7b1719b8 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s
@@ -38,7 +38,7 @@ lbl_803E3DA8:
 	.4byte InhabitantRejected__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__12CScriptSteamFR8IVisitor
 Accept__12CScriptSteamFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s
index 3e2170b5..a95001d7 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s
@@ -36,7 +36,7 @@ lbl_803E7088:
 	.4byte lbl_8020C598
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__20CScriptStreamedMusicFv
 __dt__20CScriptStreamedMusicFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s
index 05d9bb37..7ef859d3 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s
@@ -14,7 +14,7 @@ lbl_803E5C40:
 	.4byte AcceptScriptMsg__13CScriptSwitchF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__13CScriptSwitchFv
 __dt__13CScriptSwitchFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s
index a991588a..c5ee5729 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s
@@ -43,7 +43,7 @@ lbl_805A7AA8:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__21CScriptTargetingPointFv
 __dt__21CScriptTargetingPointFv:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s
index a1a83741..85221f1d 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s
@@ -42,7 +42,7 @@ lbl_805A7D78:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Render__17CScriptVisorFlareCFRC13CStateManager
 Render__17CScriptVisorFlareCFRC13CStateManager:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s
index 83c79ad1..00d93459 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s
@@ -42,7 +42,7 @@ lbl_805A7D80:
 	.4byte 0x42B40000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global Accept__15CScriptVisorGooFR8IVisitor
 Accept__15CScriptVisorGooFR8IVisitor:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s
index 9b43ba83..36e57bbe 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s
@@ -73,7 +73,7 @@ lbl_8046C520:
 lbl_805A8F08:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetPatchRenderFlags__12CScriptWaterCFii
 GetPatchRenderFlags__12CScriptWaterCFii:
diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s
index b04c690f..6b57beae 100644
--- a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s
@@ -14,7 +14,7 @@ lbl_803E58A0:
 	.4byte AcceptScriptMsg__22CScriptWorldTeleporterF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global StartTransition__22CScriptWorldTeleporterFv
 StartTransition__22CScriptWorldTeleporterFv:
diff --git a/asm/MetroidPrime/TGameTypes.s b/asm/MetroidPrime/TGameTypes.s
index 2a69bd0e..2a34978a 100644
--- a/asm/MetroidPrime/TGameTypes.s
+++ b/asm/MetroidPrime/TGameTypes.s
@@ -16,7 +16,7 @@ kInvalidAreaId:
 lbl_805A8F54:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__9TEditorIdFR12CInputStream
 __ct__9TEditorIdFR12CInputStream:
diff --git a/asm/MetroidPrime/Tweaks/CTweakGuiColors.s b/asm/MetroidPrime/Tweaks/CTweakGuiColors.s
index 1b09e79d..75cd1ade 100644
--- a/asm/MetroidPrime/Tweaks/CTweakGuiColors.s
+++ b/asm/MetroidPrime/Tweaks/CTweakGuiColors.s
@@ -10,7 +10,7 @@ lbl_803E5748:
 	.4byte __dt__15CTweakGuiColorsFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__15CTweakGuiColorsFR12CInputStream
 __ct__15CTweakGuiColorsFR12CInputStream:
diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s b/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s
index ffe3990e..e77563f7 100644
--- a/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s
+++ b/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s
@@ -10,7 +10,7 @@ lbl_803E4CF8:
 	.4byte __dt__15CTweakPlayerResFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetCinematicBeamResId__15CTweakPlayerResCFQ212CPlayerState7EBeamId
 GetCinematicBeamResId__15CTweakPlayerResCFQ212CPlayerState7EBeamId:
diff --git a/asm/MetroidPrime/Tweaks/CTweakSlideShow.s b/asm/MetroidPrime/Tweaks/CTweakSlideShow.s
index 3a6f4832..870e85ce 100644
--- a/asm/MetroidPrime/Tweaks/CTweakSlideShow.s
+++ b/asm/MetroidPrime/Tweaks/CTweakSlideShow.s
@@ -10,7 +10,7 @@ lbl_803EC000:
 	.4byte sub_8029c7cc
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__15CTweakSlideShowFR12CInputStream
 __ct__15CTweakSlideShowFR12CInputStream:
diff --git a/asm/MetroidPrime/Weapons/CAuxWeapon.s b/asm/MetroidPrime/Weapons/CAuxWeapon.s
index 829ea6fa..b227d172 100644
--- a/asm/MetroidPrime/Weapons/CAuxWeapon.s
+++ b/asm/MetroidPrime/Weapons/CAuxWeapon.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global LoadIdle__10CAuxWeaponFv
 LoadIdle__10CAuxWeaponFv:
diff --git a/asm/MetroidPrime/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s
index 27dc1456..33dd1e5a 100644
--- a/asm/MetroidPrime/Weapons/CBeamProjectile.s
+++ b/asm/MetroidPrime/Weapons/CBeamProjectile.s
@@ -47,7 +47,7 @@ lbl_805A7B90:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global UpdateFx__15CBeamProjectileFRC12CTransform4ffR13CStateManager
 UpdateFx__15CBeamProjectileFRC12CTransform4ffR13CStateManager:
diff --git a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s
index 5a77154b..b01dec6e 100644
--- a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s
+++ b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s
@@ -46,7 +46,7 @@ lbl_805A82E8:
 	.4byte 0x3F800000
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__23CElectricBeamProjectileFv
 __dt__23CElectricBeamProjectileFv:
diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s
index b86be5dd..cfaa6db2 100644
--- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s
+++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s
@@ -36,7 +36,16 @@ lbl_803E7158:
 	.4byte Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A90B8
+lbl_805A90B8:
+	.skip 0x4
+.global lbl_805A90BC
+lbl_805A90BC:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global SetCameraShake__17CEnergyProjectileFRC16CCameraShakeData
 SetCameraShake__17CEnergyProjectileFRC16CCameraShakeData:
diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s
index a7a21d12..0f84b28e 100644
--- a/asm/MetroidPrime/Weapons/CFlameThrower.s
+++ b/asm/MetroidPrime/Weapons/CFlameThrower.s
@@ -34,7 +34,7 @@ lbl_803E45D8:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__13CFlameThrowerFv
 __dt__13CFlameThrowerFv:
diff --git a/asm/MetroidPrime/Weapons/CIceBeam.s b/asm/MetroidPrime/Weapons/CIceBeam.s
index 0d28a51a..eefda8b5 100644
--- a/asm/MetroidPrime/Weapons/CIceBeam.s
+++ b/asm/MetroidPrime/Weapons/CIceBeam.s
@@ -24,7 +24,7 @@ lbl_803DF7E8:
 	.4byte IsLoaded__8CIceBeamCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global EnableFx__8CIceBeamFb
 EnableFx__8CIceBeamFb:
diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s
index 85b62bd1..86dabfe1 100644
--- a/asm/MetroidPrime/Weapons/CIceImpact.s
+++ b/asm/MetroidPrime/Weapons/CIceImpact.s
@@ -83,7 +83,7 @@ lbl_805A7CB8:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SubdivideAndGenerateParticles__10CIceImpactFR13CStateManagerRC9CVector3fRC9CVector3fRC9CVector3fRC7CSphereRC7CSphere
 SubdivideAndGenerateParticles__10CIceImpactFR13CStateManagerRC9CVector3fRC9CVector3fRC9CVector3fRC7CSphereRC7CSphere:
diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s
index 0812c589..6616fb95 100644
--- a/asm/MetroidPrime/Weapons/CIceProjectile.s
+++ b/asm/MetroidPrime/Weapons/CIceProjectile.s
@@ -77,7 +77,7 @@ lbl_805A7E78:
 	.4byte 0x0000001E
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ExplosionFinished__Q220CIceAttackProjectile12CTrailObjectCFv
 ExplosionFinished__Q220CIceAttackProjectile12CTrailObjectCFv:
diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s
index 08b3604c..8dd2582f 100644
--- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s
+++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s
@@ -98,7 +98,7 @@ lbl_805A83F0:
 lbl_8046DCA8:
 	.skip 0x18
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__16CNewFlameThrowerFv
 __dt__16CNewFlameThrowerFv:
diff --git a/asm/MetroidPrime/Weapons/CPhazonBeam.s b/asm/MetroidPrime/Weapons/CPhazonBeam.s
index 0f04fe8f..37498c47 100644
--- a/asm/MetroidPrime/Weapons/CPhazonBeam.s
+++ b/asm/MetroidPrime/Weapons/CPhazonBeam.s
@@ -24,7 +24,7 @@ lbl_803E42E8:
 	.4byte IsLoaded__11CPhazonBeamCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AcceptScriptMsg__11CPhazonBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__11CPhazonBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s
index a8c0f5c1..d7a9739e 100644
--- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s
+++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s
@@ -44,7 +44,7 @@ lbl_803E3F00:
 lbl_805A8FF8:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__17CPlasmaProjectileFv
 __dt__17CPlasmaProjectileFv:
diff --git a/asm/MetroidPrime/Weapons/CPlayerGun.s b/asm/MetroidPrime/Weapons/CPlayerGun.s
index c3b9e45c..193e1273 100644
--- a/asm/MetroidPrime/Weapons/CPlayerGun.s
+++ b/asm/MetroidPrime/Weapons/CPlayerGun.s
@@ -24,7 +24,7 @@ lbl_803E52B0:
 	.4byte IsLoaded__10CGunWeaponCFv
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global DrawClipCube__FRC6CAABox
 DrawClipCube__FRC6CAABox:
diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s
index 459caab5..241089df 100644
--- a/asm/MetroidPrime/Weapons/CPowerBomb.s
+++ b/asm/MetroidPrime/Weapons/CPowerBomb.s
@@ -79,7 +79,7 @@ lbl_805A77F0:
 lbl_805A8FA8:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global AcceptScriptMsg__10CPowerBombF20EScriptObjectMessage9TUniqueIdR13CStateManager
 AcceptScriptMsg__10CPowerBombF20EScriptObjectMessage9TUniqueIdR13CStateManager:
diff --git a/asm/MetroidPrime/Weapons/CProjectileInfo.s b/asm/MetroidPrime/Weapons/CProjectileInfo.s
index 2e85ad27..9b84a89e 100644
--- a/asm/MetroidPrime/Weapons/CProjectileInfo.s
+++ b/asm/MetroidPrime/Weapons/CProjectileInfo.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global PredictInterceptPos__15CProjectileInfoFRC9CVector3fRC9CVector3fRC7CPlayerbff
 PredictInterceptPos__15CProjectileInfoFRC9CVector3fRC9CVector3fRC7CPlayerbff:
diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s
index e0307876..3af0b5c4 100644
--- a/asm/MetroidPrime/Weapons/CShockWave.s
+++ b/asm/MetroidPrime/Weapons/CShockWave.s
@@ -53,7 +53,7 @@ lbl_805A81F0:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__10CShockwaveFv
 __dt__10CShockwaveFv:
diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s
index d1cc104f..8f15c397 100644
--- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s
+++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s
@@ -47,7 +47,7 @@ lbl_805A8F88:
 lbl_805A8F8C:
 	.skip 0x4
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__21CTargetableProjectileFv
 __dt__21CTargetableProjectileFv:
diff --git a/asm/MetroidPrime/Weapons/CWaveBeam.s b/asm/MetroidPrime/Weapons/CWaveBeam.s
index 85aa9747..4bbb519a 100644
--- a/asm/MetroidPrime/Weapons/CWaveBeam.s
+++ b/asm/MetroidPrime/Weapons/CWaveBeam.s
@@ -31,7 +31,7 @@ lbl_803DF7A0:
 lbl_805A8EB8:
 	.skip 0x8
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global EnableSecondaryFx__9CWaveBeamFQ210CGunWeapon16ESecondaryFxType
 EnableSecondaryFx__9CWaveBeamFQ210CGunWeapon16ESecondaryFxType:
diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s
index cf2b5734..67bcc138 100644
--- a/asm/MetroidPrime/Weapons/CWaveBuster.s
+++ b/asm/MetroidPrime/Weapons/CWaveBuster.s
@@ -70,7 +70,7 @@ lbl_8046C908:
 lbl_8046C914:
 	.skip 0xC
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global sub_801bd69c
 sub_801bd69c:
diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s
index 2f775dc3..d70be3b7 100644
--- a/asm/MetroidPrime/Weapons/CWeapon.s
+++ b/asm/MetroidPrime/Weapons/CWeapon.s
@@ -55,7 +55,7 @@ lbl_805A7558:
 	.4byte 0
 
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei
 GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei:
diff --git a/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s b/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s
index 123f7707..b21c4b31 100644
--- a/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s
+++ b/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetAnim__12CGSComboFireFR9CAnimDataiiR13CStateManagerf
 SetAnim__12CGSComboFireFR9CAnimDataiiR13CStateManagerf:
diff --git a/asm/MetroidPrime/Weapons/GunController/CGSFidget.s b/asm/MetroidPrime/Weapons/GunController/CGSFidget.s
index e240ed9e..eb8e67cc 100644
--- a/asm/MetroidPrime/Weapons/GunController/CGSFidget.s
+++ b/asm/MetroidPrime/Weapons/GunController/CGSFidget.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global IsAnimLoaded__9CGSFidgetCFv
 IsAnimLoaded__9CGSFidgetCFv:
diff --git a/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s b/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s
index 95b57024..5ace179a 100644
--- a/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s
+++ b/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global SetAnim__11CGSFreeLookFR9CAnimDataiiiR13CStateManagerf
 SetAnim__11CGSFreeLookFR9CAnimDataiiiR13CStateManagerf:
diff --git a/asm/MetroidPrime/Weapons/GunController/CGunController.s b/asm/MetroidPrime/Weapons/GunController/CGunController.s
index ca065de0..e47973ad 100644
--- a/asm/MetroidPrime/Weapons/GunController/CGunController.s
+++ b/asm/MetroidPrime/Weapons/GunController/CGunController.s
@@ -14,7 +14,7 @@ lbl_803E5728:
 	.4byte lbl_801CC730
 	.4byte lbl_801CC798
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global ReturnToBasePosition__14CGunControllerFR13CStateManager
 ReturnToBasePosition__14CGunControllerFR13CStateManager:
diff --git a/asm/MetroidPrime/Weapons/GunController/CGunMotion.s b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s
index 8506636d..3e6568bf 100644
--- a/asm/MetroidPrime/Weapons/GunController/CGunMotion.s
+++ b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global LoadAnimations__10CGunMotionFv
 LoadAnimations__10CGunMotionFv:
diff --git a/asm/MetroidPrime/Weapons/WeaponTypes.s b/asm/MetroidPrime/Weapons/WeaponTypes.s
index b471cba5..7df6dfcc 100644
--- a/asm/MetroidPrime/Weapons/WeaponTypes.s
+++ b/asm/MetroidPrime/Weapons/WeaponTypes.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global get_current_suit__12NWeaponTypesFRC13CStateManager
 get_current_suit__12NWeaponTypesFRC13CStateManager:
diff --git a/asm/MetroidPrime/text_80008894_80009144.s b/asm/MetroidPrime/text_80008894_80009144.s
index 8a4f4a42..64c94933 100644
--- a/asm/MetroidPrime/text_80008894_80009144.s
+++ b/asm/MetroidPrime/text_80008894_80009144.s
@@ -13,7 +13,7 @@ lbl_805A9D80:
 	.4byte 0x43300000
 	.4byte 0x80000000
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 
 # CPlayer?
diff --git a/asm/Weapons/CCollisionResponseData.s b/asm/Weapons/CCollisionResponseData.s
index 5fb14bcd..99857256 100644
--- a/asm/Weapons/CCollisionResponseData.s
+++ b/asm/Weapons/CCollisionResponseData.s
@@ -10,7 +10,7 @@ lbl_803EC518:
 	.4byte "__dt__50TObjOwnerDerivedFromIObj<22CCollisionResponseData>Fv"
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global FCollisionResponseDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
 FCollisionResponseDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
diff --git a/asm/Weapons/CDecal.s b/asm/Weapons/CDecal.s
index e176ad20..2cc46409 100644
--- a/asm/Weapons/CDecal.s
+++ b/asm/Weapons/CDecal.s
@@ -1,6 +1,15 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .sbss, "wa"
+
+.global lbl_805A91A8
+lbl_805A91A8:
+	.skip 0x4
+.global lbl_805A91AC
+lbl_805A91AC:
+	.skip 0x4
+
+.section .text, "ax"
 
 .global Update__6CDecalFf
 Update__6CDecalFf:
diff --git a/asm/Weapons/CDecalDataFactory.s b/asm/Weapons/CDecalDataFactory.s
index 40bda85d..2aa3e35f 100644
--- a/asm/Weapons/CDecalDataFactory.s
+++ b/asm/Weapons/CDecalDataFactory.s
@@ -62,7 +62,7 @@ lbl_803EC5B4:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CreateDPSM__17CDecalDataFactoryFP17CDecalDescriptionR12CInputStreamP11CSimplePool
 CreateDPSM__17CDecalDataFactoryFP17CDecalDescriptionR12CInputStreamP11CSimplePool:
diff --git a/asm/Weapons/CDecalDescription.s b/asm/Weapons/CDecalDescription.s
index 13cf4324..3f65ac04 100644
--- a/asm/Weapons/CDecalDescription.s
+++ b/asm/Weapons/CDecalDescription.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__17CDecalDescriptionFv
 __ct__17CDecalDescriptionFv:
diff --git a/asm/Weapons/CProjectileWeapon.s b/asm/Weapons/CProjectileWeapon.s
index 0dd5c0e2..12dcec53 100644
--- a/asm/Weapons/CProjectileWeapon.s
+++ b/asm/Weapons/CProjectileWeapon.s
@@ -34,7 +34,7 @@ lbl_805A8648:
 	.4byte 0x00000063
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetBounds__17CProjectileWeaponCFv
 GetBounds__17CProjectileWeaponCFv:
diff --git a/asm/Weapons/CProjectileWeaponDataFactory.s b/asm/Weapons/CProjectileWeaponDataFactory.s
index a4c308f8..f5c0c951 100644
--- a/asm/Weapons/CProjectileWeaponDataFactory.s
+++ b/asm/Weapons/CProjectileWeaponDataFactory.s
@@ -10,7 +10,7 @@ lbl_803EC508:
 	.4byte "__dt__46TObjOwnerDerivedFromIObj<18CWeaponDescription>Fv"
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global CreateWPSM__28CProjectileWeaponDataFactoryFP18CWeaponDescriptionR12CInputStreamP11CSimplePool
 CreateWPSM__28CProjectileWeaponDataFactoryFP18CWeaponDescriptionR12CInputStreamP11CSimplePool:
diff --git a/asm/Weapons/CWeaponDescription.s b/asm/Weapons/CWeaponDescription.s
index 90d8ca30..bbb7eb40 100644
--- a/asm/Weapons/CWeaponDescription.s
+++ b/asm/Weapons/CWeaponDescription.s
@@ -10,7 +10,7 @@ lbl_803EC5C8:
 	.4byte __dt__17CModVectorElement
 	.4byte 0
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __dt__18CWeaponDescriptionFv
 __dt__18CWeaponDescriptionFv:
diff --git a/asm/Weapons/IWeaponRenderer.s b/asm/Weapons/IWeaponRenderer.s
index e79da6e8..67e3b2ee 100644
--- a/asm/Weapons/IWeaponRenderer.s
+++ b/asm/Weapons/IWeaponRenderer.s
@@ -32,8 +32,14 @@ sWeaponRenderer__15IWeaponRenderer:
 .global lbl_8046E1F0
 lbl_8046E1F0:
 	.skip 0x10
+
+.section .sbss, "wa"
+
+.global lbl_805A91A0
+lbl_805A91A0:
+	.skip 0x8
 	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __sinit_IWeaponRenderer_cpp
 __sinit_IWeaponRenderer_cpp:
diff --git a/asm/WorldFormat/CAreaBspTree.s b/asm/WorldFormat/CAreaBspTree.s
index 319d040c..3cef94d1 100644
--- a/asm/WorldFormat/CAreaBspTree.s
+++ b/asm/WorldFormat/CAreaBspTree.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global __ct__12CAreaBspTreeFR12CInputStreamRC12CTransform4f
 __ct__12CAreaBspTreeFR12CInputStreamRC12CTransform4f:
diff --git a/asm/WorldFormat/CAreaOctTree.s b/asm/WorldFormat/CAreaOctTree.s
index 866e849f..bf54724c 100644
--- a/asm/WorldFormat/CAreaOctTree.s
+++ b/asm/WorldFormat/CAreaOctTree.s
@@ -14,7 +14,7 @@ lbl_803EC408:
 	.4byte lbl_802A3030
 	.4byte lbl_802A3070
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetTriangleEdgeIndices__12CAreaOctTreeCFUs
 GetTriangleEdgeIndices__12CAreaOctTreeCFUs:
diff --git a/asm/WorldFormat/CAreaOctTree_Tests.s b/asm/WorldFormat/CAreaOctTree_Tests.s
index a0aacf6e..91855c73 100644
--- a/asm/WorldFormat/CAreaOctTree_Tests.s
+++ b/asm/WorldFormat/CAreaOctTree_Tests.s
@@ -5,8 +5,14 @@
 .global lbl_8046E0F0
 lbl_8046E0F0:
 	.skip 0x100
-	
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+
+.section .sbss, "wa"
+
+.global lbl_805A9178
+lbl_805A9178:
+	.skip 0x8
+
+.section .text, "ax"
 
 .global LineTestExInternal__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterRQ212CAreaOctTree10SRayResultfffRC9CVector3f
 LineTestExInternal__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterRQ212CAreaOctTree10SRayResultfffRC9CVector3f:
diff --git a/asm/WorldFormat/CAreaRenderOctTree.s b/asm/WorldFormat/CAreaRenderOctTree.s
index 2b17a4a7..422b3b25 100644
--- a/asm/WorldFormat/CAreaRenderOctTree.s
+++ b/asm/WorldFormat/CAreaRenderOctTree.s
@@ -22,7 +22,7 @@ lbl_805A8640:
 	.4byte 0
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global TestBit__13CCubeRendererFPCUii
 TestBit__13CCubeRendererFPCUii:
diff --git a/asm/WorldFormat/CCollidableOBBTreeGroup.s b/asm/WorldFormat/CCollidableOBBTreeGroup.s
index 58d6a2d6..dcd74638 100644
--- a/asm/WorldFormat/CCollidableOBBTreeGroup.s
+++ b/asm/WorldFormat/CCollidableOBBTreeGroup.s
@@ -32,7 +32,7 @@ lbl_805A8638:
 	.4byte 0xFFFFFFFF
 	.4byte 0
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetTableIndex__23CCollidableOBBTreeGroupCFv
 GetTableIndex__23CCollidableOBBTreeGroupCFv:
diff --git a/asm/WorldFormat/CCollisionSurface.s b/asm/WorldFormat/CCollisionSurface.s
index bee0a4fc..94fa4cc2 100644
--- a/asm/WorldFormat/CCollisionSurface.s
+++ b/asm/WorldFormat/CCollisionSurface.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetPlane__17CCollisionSurfaceCFv
 GetPlane__17CCollisionSurfaceCFv:
diff --git a/asm/WorldFormat/CMetroidAreaCollider.s b/asm/WorldFormat/CMetroidAreaCollider.s
index bc3cdf8e..8d0d3eb1 100644
--- a/asm/WorldFormat/CMetroidAreaCollider.s
+++ b/asm/WorldFormat/CMetroidAreaCollider.s
@@ -10,6 +10,24 @@ lbl_803EC428:
 	.4byte 0x00000002
 	.4byte 0
 
+.section .sbss, "wa"
+
+.global lbl_805A9180
+lbl_805A9180:
+	.skip 0x4
+.global lbl_805A9184
+lbl_805A9184:
+	.skip 0x4
+.global lbl_805A9188
+lbl_805A9188:
+	.skip 0x4
+.global lbl_805A918C
+lbl_805A918C:
+	.skip 0x4
+.global lbl_805A9190
+lbl_805A9190:
+	.skip 0x8
+
 .section .sbss2, "", @nobits
 # CMovingAABoxComponent
 .global lbl_805AF488
diff --git a/asm/WorldFormat/COBBTree.s b/asm/WorldFormat/COBBTree.s
index acec0044..e99670ec 100644
--- a/asm/WorldFormat/COBBTree.s
+++ b/asm/WorldFormat/COBBTree.s
@@ -22,6 +22,12 @@ lbl_805A862C:
 	# ROM: 0x3F5FCC
 	.4byte 0
 
+.section .sbss, "wa"
+
+.global lbl_805A9198
+lbl_805A9198:
+	.skip 0x8
+
 .section .text, "ax"
 
 .global Alloc__Q28COBBTree16CSimpleAllocatorFUl
diff --git a/asm/WorldFormat/CPVSVisOctree.s b/asm/WorldFormat/CPVSVisOctree.s
index 8b7109e4..d20202e0 100644
--- a/asm/WorldFormat/CPVSVisOctree.s
+++ b/asm/WorldFormat/CPVSVisOctree.s
@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.section .text, "ax"  # 0x80003640 - 0x803CB1C0
+.section .text, "ax"
 
 .global GetEntityIdByIndex__13CPVSVisOctreeFi
 GetEntityIdByIndex__13CPVSVisOctreeFi:
diff --git a/asm/sbss.s b/asm/sbss.s
deleted file mode 100644
index 02299d04..00000000
--- a/asm/sbss.s
+++ /dev/null
@@ -1,1195 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "wa"  # 0x805A8C20 - 0x805A9D1F
-
-.global lbl_805A9000
-lbl_805A9000:
-	.skip 0x4
-.global lbl_805A9004
-lbl_805A9004:
-	.skip 0x4
-.global lbl_805A9008
-lbl_805A9008:
-	.skip 0x4
-.global lbl_805A900C
-lbl_805A900C:
-	.skip 0x4
-.global lbl_805A9010
-lbl_805A9010:
-	.skip 0x4
-.global lbl_805A9014
-lbl_805A9014:
-	.skip 0x4
-.global lbl_805A9018
-lbl_805A9018:
-	.skip 0x4
-.global lbl_805A901C
-lbl_805A901C:
-	.skip 0x4
-.global lbl_805A9020
-lbl_805A9020:
-	.skip 0x8
-.global lbl_805A9028
-lbl_805A9028:
-	.skip 0x4
-.global lbl_805A902C
-lbl_805A902C:
-	.skip 0x4
-.global lbl_805A9030
-lbl_805A9030:
-	.skip 0x4
-.global lbl_805A9034
-lbl_805A9034:
-	.skip 0x4
-.global lbl_805A9038
-lbl_805A9038:
-	.skip 0x4
-.global lbl_805A903C
-lbl_805A903C:
-	.skip 0x4
-.global lbl_805A9040
-lbl_805A9040:
-	.skip 0x1
-.global lbl_805A9041
-lbl_805A9041:
-	.skip 0x7
-.global lbl_805A9048
-lbl_805A9048:
-	.skip 0x8
-.global lbl_805A9050
-lbl_805A9050:
-	.skip 0x4
-.global lbl_805A9054
-lbl_805A9054:
-	.skip 0x4
-.global lbl_805A9058
-lbl_805A9058:
-	.skip 0x4
-.global lbl_805A905C
-lbl_805A905C:
-	.skip 0x4
-.global lbl_805A9060
-lbl_805A9060:
-	.skip 0x8
-.global lbl_805A9068
-lbl_805A9068:
-	.skip 0x4
-.global lbl_805A906C
-lbl_805A906C:
-	.skip 0x4
-.global lbl_805A9070
-lbl_805A9070:
-	.skip 0x8
-.global lbl_805A9078
-lbl_805A9078:
-	.skip 0x8
-.global lbl_805A9080
-lbl_805A9080:
-	.skip 0x4
-.global lbl_805A9084
-lbl_805A9084:
-	.skip 0x4
-.global lbl_805A9088
-lbl_805A9088:
-	.skip 0x4
-.global lbl_805A908C
-lbl_805A908C:
-	.skip 0x4
-.global lbl_805A9090
-lbl_805A9090:
-	.skip 0x4
-.global lbl_805A9094
-lbl_805A9094:
-	.skip 0x4
-.global lbl_805A9098
-lbl_805A9098:
-	.skip 0x4
-.global lbl_805A909C
-lbl_805A909C:
-	.skip 0x4
-.global lbl_805A90A0
-lbl_805A90A0:
-	.skip 0x8
-.global lbl_805A90A8
-lbl_805A90A8:
-	.skip 0x4
-.global lbl_805A90AC
-lbl_805A90AC:
-	.skip 0x4
-.global lbl_805A90B0
-lbl_805A90B0:
-	.skip 0x4
-.global lbl_805A90B4
-lbl_805A90B4:
-	.skip 0x4
-.global lbl_805A90B8
-lbl_805A90B8:
-	.skip 0x4
-.global lbl_805A90BC
-lbl_805A90BC:
-	.skip 0x4
-.global lbl_805A90C0
-lbl_805A90C0:
-	.skip 0x4
-.global lbl_805A90C4
-lbl_805A90C4:
-	.skip 0x4
-.global lbl_805A90C8
-lbl_805A90C8:
-	.skip 0x4
-.global lbl_805A90CC
-lbl_805A90CC:
-	.skip 0x4
-.global lbl_805A90D0
-lbl_805A90D0:
-	.skip 0x4
-.global lbl_805A90D4
-lbl_805A90D4:
-	.skip 0x4
-.global lbl_805A90D8
-lbl_805A90D8:
-	.skip 0x8
-.global lbl_805A90E0
-lbl_805A90E0:
-	.skip 0x4
-.global lbl_805A90E4
-lbl_805A90E4:
-	.skip 0x4
-.global lbl_805A90E8
-lbl_805A90E8:
-	.skip 0x4
-.global lbl_805A90EC
-lbl_805A90EC:
-	.skip 0x4
-.global lbl_805A90F0
-lbl_805A90F0:
-	.skip 0x1
-.global lbl_805A90F1
-lbl_805A90F1:
-	.skip 0x7
-.global lbl_805A90F8
-lbl_805A90F8:
-	.skip 0x4
-.global lbl_805A90FC
-lbl_805A90FC:
-	.skip 0x4
-.global lbl_805A9100
-lbl_805A9100:
-	.skip 0x4
-.global lbl_805A9104
-lbl_805A9104:
-	.skip 0x4
-.global lbl_805A9108
-lbl_805A9108:
-	.skip 0x8
-.global lbl_805A9110
-lbl_805A9110:
-	.skip 0x8
-.global lbl_805A9118
-lbl_805A9118:
-	.skip 0x8
-.global lbl_805A9120
-lbl_805A9120:
-	.skip 0x8
-.global lbl_805A9128
-lbl_805A9128:
-	.skip 0x4
-.global lbl_805A912C
-lbl_805A912C:
-	.skip 0x4
-.global lbl_805A9130
-lbl_805A9130:
-	.skip 0x4
-.global lbl_805A9134
-lbl_805A9134:
-	.skip 0x4
-.global lbl_805A9138
-lbl_805A9138:
-	.skip 0x4
-.global lbl_805A913C
-lbl_805A913C:
-	.skip 0x4
-.global lbl_805A9140
-lbl_805A9140:
-	.skip 0x4
-.global lbl_805A9144
-lbl_805A9144:
-	.skip 0x4
-.global lbl_805A9148
-lbl_805A9148:
-	.skip 0x8
-.global lbl_805A9150
-lbl_805A9150:
-	.skip 0x4
-.global lbl_805A9154
-lbl_805A9154:
-	.skip 0x4
-.global lbl_805A9158
-lbl_805A9158:
-	.skip 0x4
-.global lbl_805A915C
-lbl_805A915C:
-	.skip 0x4
-.global lbl_805A9160
-lbl_805A9160:
-	.skip 0x8
-.global lbl_805A9168
-lbl_805A9168:
-	.skip 0x8
-.global lbl_805A9170
-lbl_805A9170:
-	.skip 0x4
-.global lbl_805A9174
-lbl_805A9174:
-	.skip 0x4
-.global lbl_805A9178
-lbl_805A9178:
-	.skip 0x8
-.global lbl_805A9180
-lbl_805A9180:
-	.skip 0x4
-.global lbl_805A9184
-lbl_805A9184:
-	.skip 0x4
-.global lbl_805A9188
-lbl_805A9188:
-	.skip 0x4
-.global lbl_805A918C
-lbl_805A918C:
-	.skip 0x4
-.global lbl_805A9190
-lbl_805A9190:
-	.skip 0x8
-.global lbl_805A9198
-lbl_805A9198:
-	.skip 0x8
-.global lbl_805A91A0
-lbl_805A91A0:
-	.skip 0x8
-.global lbl_805A91A8
-lbl_805A91A8:
-	.skip 0x4
-.global lbl_805A91AC
-lbl_805A91AC:
-	.skip 0x4
-.global lbl_805A91B0
-lbl_805A91B0:
-	.skip 0x4
-.global lbl_805A91B4
-lbl_805A91B4:
-	.skip 0x8
-.global lbl_805A91BC
-lbl_805A91BC:
-	.skip 0x8
-.global lbl_805A91C4
-lbl_805A91C4:
-	.skip 0x8
-.global lbl_805A91CC
-lbl_805A91CC:
-	.skip 0x4
-.global lbl_805A91D0
-lbl_805A91D0:
-	.skip 0x4
-.global lbl_805A91D4
-lbl_805A91D4:
-	.skip 0x8
-.global lbl_805A91DC
-lbl_805A91DC:
-	.skip 0x4
-.global lbl_805A91E0
-lbl_805A91E0:
-	.skip 0x4
-.global lbl_805A91E4
-lbl_805A91E4:
-	.skip 0x4
-.global lbl_805A91E8
-lbl_805A91E8:
-	.skip 0x1
-.global lbl_805A91E9
-lbl_805A91E9:
-	.skip 0x3
-.global lbl_805A91EC
-lbl_805A91EC:
-	.skip 0x4
-.global lbl_805A91F0
-lbl_805A91F0:
-	.skip 0x4
-.global lbl_805A91F4
-lbl_805A91F4:
-	.skip 0x4
-.global lbl_805A91F8
-lbl_805A91F8:
-	.skip 0x8
-.global lbl_805A9200
-lbl_805A9200:
-	.skip 0x8
-.global lbl_805A9208
-lbl_805A9208:
-	.skip 0x4
-.global lbl_805A920C
-lbl_805A920C:
-	.skip 0x4
-.global lbl_805A9210
-lbl_805A9210:
-	.skip 0x4
-.global lbl_805A9214
-lbl_805A9214:
-	.skip 0x1
-.global lbl_805A9215
-lbl_805A9215:
-	.skip 0x1
-.global lbl_805A9216
-lbl_805A9216:
-	.skip 0x1
-.global lbl_805A9217
-lbl_805A9217:
-	.skip 0x1
-.global lbl_805A9218
-lbl_805A9218:
-	.skip 0x4
-.global lbl_805A921C
-lbl_805A921C:
-	.skip 0x4
-.global lbl_805A9220
-lbl_805A9220:
-	.skip 0x4
-.global lbl_805A9224
-lbl_805A9224:
-	.skip 0x4
-.global lbl_805A9228
-lbl_805A9228:
-	.skip 0x4
-.global lbl_805A922C
-lbl_805A922C:
-	.skip 0x4
-.global lbl_805A9230
-lbl_805A9230:
-	.skip 0x4
-.global lbl_805A9234
-lbl_805A9234:
-	.skip 0x4
-.global lbl_805A9238
-lbl_805A9238:
-	.skip 0x4
-.global lbl_805A923C
-lbl_805A923C:
-	.skip 0x4
-.global lbl_805A9240
-lbl_805A9240:
-	.skip 0x8
-.global lbl_805A9248
-lbl_805A9248:
-	.skip 0x4
-.global lbl_805A924C
-lbl_805A924C:
-	.skip 0x4
-.global lbl_805A9250
-lbl_805A9250:
-	.skip 0x4
-.global lbl_805A9254
-lbl_805A9254:
-	.skip 0x4
-.global lbl_805A9258
-lbl_805A9258:
-	.skip 0x4
-.global lbl_805A925C
-lbl_805A925C:
-	.skip 0x4
-.global lbl_805A9260
-lbl_805A9260:
-	.skip 0x4
-.global lbl_805A9264
-lbl_805A9264:
-	.skip 0x4
-.global lbl_805A9268
-lbl_805A9268:
-	.skip 0x8
-.global lbl_805A9270
-lbl_805A9270:
-	.skip 0x4
-.global lbl_805A9274
-lbl_805A9274:
-	.skip 0x4
-.global lbl_805A9278
-lbl_805A9278:
-	.skip 0x4
-.global lbl_805A927C
-lbl_805A927C:
-	.skip 0x4
-.global lbl_805A9280
-lbl_805A9280:
-	.skip 0x4
-.global lbl_805A9284
-lbl_805A9284:
-	.skip 0x4
-.global lbl_805A9288
-lbl_805A9288:
-	.skip 0x4
-.global lbl_805A928C
-lbl_805A928C:
-	.skip 0x4
-.global lbl_805A9290
-lbl_805A9290:
-	.skip 0x4
-.global lbl_805A9294
-lbl_805A9294:
-	.skip 0x4
-.global lbl_805A9298
-lbl_805A9298:
-	.skip 0x4
-.global lbl_805A929C
-lbl_805A929C:
-	.skip 0x4
-.global lbl_805A92A0
-lbl_805A92A0:
-	.skip 0x4
-.global lbl_805A92A4
-lbl_805A92A4:
-	.skip 0x4
-.global lbl_805A92A8
-lbl_805A92A8:
-	.skip 0x4
-.global lbl_805A92AC
-lbl_805A92AC:
-	.skip 0x4
-.global lbl_805A92B0
-lbl_805A92B0:
-	.skip 0x4
-.global lbl_805A92B4
-lbl_805A92B4:
-	.skip 0x4
-.global lbl_805A92B8
-lbl_805A92B8:
-	.skip 0x8
-.global lbl_805A92C0
-lbl_805A92C0:
-	.skip 0x4
-.global lbl_805A92C4
-lbl_805A92C4:
-	.skip 0x4
-.global lbl_805A92C8
-lbl_805A92C8:
-	.skip 0x4
-.global lbl_805A92CC
-lbl_805A92CC:
-	.skip 0x4
-.global lbl_805A92D0
-lbl_805A92D0:
-	.skip 0x8
-.global lbl_805A92D8
-lbl_805A92D8:
-	.skip 0x8
-.global lbl_805A92E0
-lbl_805A92E0:
-	.skip 0x4
-.global lbl_805A92E4
-lbl_805A92E4:
-	.skip 0x4
-.global lbl_805A92E8
-lbl_805A92E8:
-	.skip 0x4
-.global lbl_805A92EC
-lbl_805A92EC:
-	.skip 0x4
-.global lbl_805A92F0
-lbl_805A92F0:
-	.skip 0x4
-.global lbl_805A92F4
-lbl_805A92F4:
-	.skip 0x4
-.global lbl_805A92F8
-lbl_805A92F8:
-	.skip 0x4
-.global lbl_805A92FC
-lbl_805A92FC:
-	.skip 0x4
-.global lbl_805A9300
-lbl_805A9300:
-	.skip 0x4
-.global lbl_805A9304
-lbl_805A9304:
-	.skip 0x4
-.global lbl_805A9308
-lbl_805A9308:
-	.skip 0x4
-.global lbl_805A930C
-lbl_805A930C:
-	.skip 0x4
-.global lbl_805A9310
-lbl_805A9310:
-	.skip 0x8
-.global lbl_805A9318
-lbl_805A9318:
-	.skip 0x8
-.global lbl_805A9320
-lbl_805A9320:
-	.skip 0x4
-.global lbl_805A9324
-lbl_805A9324:
-	.skip 0x4
-.global lbl_805A9328
-lbl_805A9328:
-	.skip 0x4
-.global lbl_805A932C
-lbl_805A932C:
-	.skip 0x4
-.global lbl_805A9330
-lbl_805A9330:
-	.skip 0x8
-.global lbl_805A9338
-lbl_805A9338:
-	.skip 0x4
-.global lbl_805A933C
-lbl_805A933C:
-	.skip 0x4
-.global lbl_805A9340
-lbl_805A9340:
-	.skip 0x1
-.global lbl_805A9341
-lbl_805A9341:
-	.skip 0x1
-.global lbl_805A9342
-lbl_805A9342:
-	.skip 0x2
-.global lbl_805A9344
-lbl_805A9344:
-	.skip 0x4
-.global lbl_805A9348
-lbl_805A9348:
-	.skip 0x4
-.global lbl_805A934C
-lbl_805A934C:
-	.skip 0x4
-.global lbl_805A9350
-lbl_805A9350:
-	.skip 0x8
-.global lbl_805A9358
-lbl_805A9358:
-	.skip 0x4
-.global lbl_805A935C
-lbl_805A935C:
-	.skip 0x4
-.global lbl_805A9360
-lbl_805A9360:
-	.skip 0x8
-.global lbl_805A9368
-lbl_805A9368:
-	.skip 0x8
-.global lbl_805A9370
-lbl_805A9370:
-	.skip 0x4
-.global lbl_805A9374
-lbl_805A9374:
-	.skip 0x4
-.global lbl_805A9378
-lbl_805A9378:
-	.skip 0x8
-.global lbl_805A9380
-lbl_805A9380:
-	.skip 0x4
-.global lbl_805A9384
-lbl_805A9384:
-	.skip 0x4
-.global lbl_805A9388
-lbl_805A9388:
-	.skip 0x4
-.global lbl_805A938C
-lbl_805A938C:
-	.skip 0x4
-.global lbl_805A9390
-lbl_805A9390:
-	.skip 0x4
-.global lbl_805A9394
-lbl_805A9394:
-	.skip 0x4
-.global lbl_805A9398
-lbl_805A9398:
-	.skip 0x4
-.global lbl_805A939C
-lbl_805A939C:
-	.skip 0x4
-.global lbl_805A93A0
-lbl_805A93A0:
-	.skip 0x4
-.global lbl_805A93A4
-lbl_805A93A4:
-	.skip 0x4
-.global lbl_805A93A8
-lbl_805A93A8:
-	.skip 0x4
-.global lbl_805A93AC
-lbl_805A93AC:
-	.skip 0x4
-.global lbl_805A93B0
-lbl_805A93B0:
-	.skip 0x4
-.global lbl_805A93B4
-lbl_805A93B4:
-	.skip 0x4
-.global lbl_805A93B8
-lbl_805A93B8:
-	.skip 0x4
-.global lbl_805A93BC
-lbl_805A93BC:
-	.skip 0x4
-.global lbl_805A93C0
-lbl_805A93C0:
-	.skip 0x4
-.global lbl_805A93C4
-lbl_805A93C4:
-	.skip 0x4
-.global lbl_805A93C8
-lbl_805A93C8:
-	.skip 0x4
-.global lbl_805A93CC
-lbl_805A93CC:
-	.skip 0x4
-.global lbl_805A93D0
-lbl_805A93D0:
-	.skip 0x4
-.global lbl_805A93D4
-lbl_805A93D4:
-	.skip 0x1
-.global lbl_805A93D5
-lbl_805A93D5:
-	.skip 0x1
-.global lbl_805A93D6
-lbl_805A93D6:
-	.skip 0x1
-.global lbl_805A93D7
-lbl_805A93D7:
-	.skip 0x1
-.global lbl_805A93D8
-lbl_805A93D8:
-	.skip 0x4
-.global lbl_805A93DC
-lbl_805A93DC:
-	.skip 0x4
-.global lbl_805A93E0
-lbl_805A93E0:
-	.skip 0x4
-.global lbl_805A93E4
-lbl_805A93E4:
-	.skip 0x4
-.global lbl_805A93E8
-lbl_805A93E8:
-	.skip 0x4
-.global lbl_805A93EC
-lbl_805A93EC:
-	.skip 0x4
-.global lbl_805A93F0
-lbl_805A93F0:
-	.skip 0x4
-.global lbl_805A93F4
-lbl_805A93F4:
-	.skip 0x4
-.global lbl_805A93F8
-lbl_805A93F8:
-	.skip 0x4
-.global lbl_805A93FC
-lbl_805A93FC:
-	.skip 0x4
-.global lbl_805A9400
-lbl_805A9400:
-	.skip 0x4
-.global lbl_805A9404
-lbl_805A9404:
-	.skip 0x4
-.global lbl_805A9408
-lbl_805A9408:
-	.skip 0x4
-.global lbl_805A940C
-lbl_805A940C:
-	.skip 0x4
-.global lbl_805A9410
-lbl_805A9410:
-	.skip 0x4
-.global lbl_805A9414
-lbl_805A9414:
-	.skip 0x4
-.global lbl_805A9418
-lbl_805A9418:
-	.skip 0x4
-.global lbl_805A941C
-lbl_805A941C:
-	.skip 0x4
-.global lbl_805A9420
-lbl_805A9420:
-	.skip 0x8
-.global lbl_805A9428
-lbl_805A9428:
-	.skip 0x8
-.global lbl_805A9430
-lbl_805A9430:
-	.skip 0x4
-.global lbl_805A9434
-lbl_805A9434:
-	.skip 0x4
-.global lbl_805A9438
-lbl_805A9438:
-	.skip 0x8
-.global skZero2f
-skZero2f:
-	.skip 0x8
-.global lbl_805A9448
-lbl_805A9448:
-	.skip 0x4
-.global lbl_805A944C
-lbl_805A944C:
-	.skip 0x4
-.global lbl_805A9450
-lbl_805A9450:
-	.skip 0x4
-.global lbl_805A9454
-lbl_805A9454:
-	.skip 0x4
-.global lbl_805A9458
-lbl_805A9458:
-	.skip 0x8
-.global lbl_805A9460
-lbl_805A9460:
-	.skip 0x4
-.global lbl_805A9464
-lbl_805A9464:
-	.skip 0x4
-.global lbl_805A9468
-lbl_805A9468:
-	.skip 0x8
-.global lbl_805A9470
-lbl_805A9470:
-	.skip 0x4
-.global lbl_805A9474
-lbl_805A9474:
-	.skip 0x4
-.global lbl_805A9478
-lbl_805A9478:
-	.skip 0x1
-.global lbl_805A9479
-lbl_805A9479:
-	.skip 0x1
-.global lbl_805A947A
-lbl_805A947A:
-	.skip 0x1
-.global lbl_805A947B
-lbl_805A947B:
-	.skip 0x1
-.global lbl_805A947C
-lbl_805A947C:
-	.skip 0x4
-.global lbl_805A9480
-lbl_805A9480:
-	.skip 0x4
-.global lbl_805A9484
-lbl_805A9484:
-	.skip 0x1
-.global lbl_805A9485
-lbl_805A9485:
-	.skip 0x3
-.global lbl_805A9488
-lbl_805A9488:
-	.skip 0x4
-.global lbl_805A948C
-lbl_805A948C:
-	.skip 0x4
-.global lbl_805A9490
-lbl_805A9490:
-	.skip 0x4
-.global lbl_805A9494
-lbl_805A9494:
-	.skip 0x4
-.global lbl_805A9498
-lbl_805A9498:
-	.skip 0x4
-.global lbl_805A949C
-lbl_805A949C:
-	.skip 0x4
-.global lbl_805A94A0
-lbl_805A94A0:
-	.skip 0x4
-.global lbl_805A94A4
-lbl_805A94A4:
-	.skip 0x4
-.global lbl_805A94A8
-lbl_805A94A8:
-	.skip 0x4
-.global lbl_805A94AC
-lbl_805A94AC:
-	.skip 0x4
-.global lbl_805A94B0
-lbl_805A94B0:
-	.skip 0x4
-.global lbl_805A94B4
-lbl_805A94B4:
-	.skip 0x4
-.global lbl_805A94B8
-lbl_805A94B8:
-	.skip 0x8
-.global lbl_805A94C0
-lbl_805A94C0:
-	.skip 0x4
-.global lbl_805A94C4
-lbl_805A94C4:
-	.skip 0x4
-.global lbl_805A94C8
-lbl_805A94C8:
-	.skip 0x4
-.global lbl_805A94CC
-lbl_805A94CC:
-	.skip 0x4
-.global lbl_805A94D0
-lbl_805A94D0:
-	.skip 0x4
-.global lbl_805A94D4
-lbl_805A94D4:
-	.skip 0x1
-.global lbl_805A94D5
-lbl_805A94D5:
-	.skip 0x3
-.global "_EmptyString__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
-"_EmptyString__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>":
-	.skip 0x2
-.global lbl_805A94DA
-lbl_805A94DA:
-	.skip 0x2
-.global lbl_805A94DC
-lbl_805A94DC:
-	.skip 0x2
-.global lbl_805A94DE
-lbl_805A94DE:
-	.skip 0x2
-.global lbl_805A94E0
-lbl_805A94E0:
-	.skip 0x1
-.global lbl_805A94E1
-lbl_805A94E1:
-	.skip 0x1
-.global lbl_805A94E2
-lbl_805A94E2:
-	.skip 0x1
-.global lbl_805A94E3
-lbl_805A94E3:
-	.skip 0x5
-.global lbl_805A94E8
-lbl_805A94E8:
-	.skip 0x8
-.global lbl_805A94F0
-lbl_805A94F0:
-	.skip 0x2
-.global lbl_805A94F2
-lbl_805A94F2:
-	.skip 0x2
-.global lbl_805A94F4
-lbl_805A94F4:
-	.skip 0x4
-.global lbl_805A94F8
-lbl_805A94F8:
-	.skip 0x4
-.global lbl_805A94FC
-lbl_805A94FC:
-	.skip 0x4
-.global lbl_805A9500
-lbl_805A9500:
-	.skip 0x8
-.global lbl_805A9508
-lbl_805A9508:
-	.skip 0x8
-.global lbl_805A9510
-lbl_805A9510:
-	.skip 0x8
-.global lbl_805A9518
-lbl_805A9518:
-	.skip 0x8
-.global lbl_805A9520
-lbl_805A9520:
-	.skip 0x4
-.global lbl_805A9524
-lbl_805A9524:
-	.skip 0x4
-.global lbl_805A9528
-lbl_805A9528:
-	.skip 0x4
-.global lbl_805A952C
-lbl_805A952C:
-	.skip 0x4
-.global lbl_805A9530
-lbl_805A9530:
-	.skip 0x4
-.global lbl_805A9534
-lbl_805A9534:
-	.skip 0x4
-.global lbl_805A9538
-lbl_805A9538:
-	.skip 0x8
-.global lbl_805A9540
-lbl_805A9540:
-	.skip 0x4
-.global lbl_805A9544
-lbl_805A9544:
-	.skip 0x4
-.global lbl_805A9548
-lbl_805A9548:
-	.skip 0x4
-.global lbl_805A954C
-lbl_805A954C:
-	.skip 0x4
-.global lbl_805A9550
-lbl_805A9550:
-	.skip 0x4
-.global lbl_805A9554
-lbl_805A9554:
-	.skip 0x4
-.global lbl_805A9558
-lbl_805A9558:
-	.skip 0x1
-.global lbl_805A9559
-lbl_805A9559:
-	.skip 0x1
-.global lbl_805A955A
-lbl_805A955A:
-	.skip 0x2
-.global lbl_805A955C
-lbl_805A955C:
-	.skip 0x4
-.global lbl_805A9560
-lbl_805A9560:
-	.skip 0x1
-.global lbl_805A9561
-lbl_805A9561:
-	.skip 0x7
-.global lbl_805A9568
-lbl_805A9568:
-	.skip 0x4
-.global lbl_805A956C
-lbl_805A956C:
-	.skip 0x4
-.global lbl_805A9570
-lbl_805A9570:
-	.skip 0x4
-.global lbl_805A9574
-lbl_805A9574:
-	.skip 0x4
-.global lbl_805A9578
-lbl_805A9578:
-	.skip 0x4
-.global lbl_805A957C
-lbl_805A957C:
-	.skip 0x4
-.global lbl_805A9580
-lbl_805A9580:
-	.skip 0x4
-.global lbl_805A9584
-lbl_805A9584:
-	.skip 0x4
-.global lbl_805A9588
-lbl_805A9588:
-	.skip 0x8
-.global lbl_805A9590
-lbl_805A9590:
-	.skip 0x1
-.global lbl_805A9591
-lbl_805A9591:
-	.skip 0x1
-.global lbl_805A9592
-lbl_805A9592:
-	.skip 0x1
-.global lbl_805A9593
-lbl_805A9593:
-	.skip 0x1
-.global lbl_805A9594
-lbl_805A9594:
-	.skip 0x4
-.global lbl_805A9598
-lbl_805A9598:
-	.skip 0x4
-.global lbl_805A959C
-lbl_805A959C:
-	.skip 0x4
-.global lbl_805A95A0
-lbl_805A95A0:
-	.skip 0x4
-.global lbl_805A95A4
-lbl_805A95A4:
-	.skip 0x4
-.global lbl_805A95A8
-lbl_805A95A8:
-	.skip 0x4
-.global lbl_805A95AC
-lbl_805A95AC:
-	.skip 0x4
-.global lbl_805A95B0
-lbl_805A95B0:
-	.skip 0x4
-.global lbl_805A95B4
-lbl_805A95B4:
-	.skip 0x4
-.global lbl_805A95B8
-lbl_805A95B8:
-	.skip 0x4
-.global lbl_805A95BC
-lbl_805A95BC:
-	.skip 0x4
-.global lbl_805A95C0
-lbl_805A95C0:
-	.skip 0x1
-.global lbl_805A95C1
-lbl_805A95C1:
-	.skip 0x7
-.global lbl_805A95C8
-lbl_805A95C8:
-	.skip 0x1
-.global lbl_805A95C9
-lbl_805A95C9:
-	.skip 0x7
-.global lbl_805A95D0
-lbl_805A95D0:
-	.skip 0x8
-.global lbl_805A95D8
-lbl_805A95D8:
-	.skip 0x8
-.global lbl_805A95E0
-lbl_805A95E0:
-	.skip 0x4
-.global lbl_805A95E4
-lbl_805A95E4:
-	.skip 0x4
-.global lbl_805A95E8
-lbl_805A95E8:
-	.skip 0x1
-.global lbl_805A95E9
-lbl_805A95E9:
-	.skip 0x1
-.global lbl_805A95EA
-lbl_805A95EA:
-	.skip 0x6
-.global lbl_805A95F0
-lbl_805A95F0:
-	.skip 0x4
-.global lbl_805A95F4
-lbl_805A95F4:
-	.skip 0x4
-.global lbl_805A95F8
-lbl_805A95F8:
-	.skip 0x4
-.global lbl_805A95FC
-lbl_805A95FC:
-	.skip 0x4
-.global lbl_805A9600
-lbl_805A9600:
-	.skip 0x1
-.global lbl_805A9601
-lbl_805A9601:
-	.skip 0x7
-.global lbl_805A9608
-lbl_805A9608:
-	.skip 0x4
-.global lbl_805A960C
-lbl_805A960C:
-	.skip 0x4
-.global lbl_805A9610
-lbl_805A9610:
-	.skip 0x4
-.global lbl_805A9614
-lbl_805A9614:
-	.skip 0x4
-.global lbl_805A9618
-lbl_805A9618:
-	.skip 0x4
-.global lbl_805A961C
-lbl_805A961C:
-	.skip 0x4
-.global lbl_805A9620
-lbl_805A9620:
-	.skip 0x4
-.global lbl_805A9624
-lbl_805A9624:
-	.skip 0x4
-.global lbl_805A9628
-lbl_805A9628:
-	.skip 0x4
-.global lbl_805A962C
-lbl_805A962C:
-	.skip 0x4
-.global lbl_805A9630
-lbl_805A9630:
-	.skip 0x4
-.global lbl_805A9634
-lbl_805A9634:
-	.skip 0x4
-.global lbl_805A9638
-lbl_805A9638:
-	.skip 0x4
-.global lbl_805A963C
-lbl_805A963C:
-	.skip 0x4
-.global lbl_805A9640
-lbl_805A9640:
-	.skip 0x4
-.global lbl_805A9644
-lbl_805A9644:
-	.skip 0x4
-.global lbl_805A9648
-lbl_805A9648:
-	.skip 0x8
-.global lbl_805A9650
-lbl_805A9650:
-	.skip 0x4
-.global lbl_805A9654
-lbl_805A9654:
-	.skip 0x4
-.global lbl_805A9658
-lbl_805A9658:
-	.skip 0x8
-.global lbl_805A9660
-lbl_805A9660:
-	.skip 0x4
-.global lbl_805A9664
-lbl_805A9664:
-	.skip 0x4
-.global lbl_805A9668
-lbl_805A9668:
-	.skip 0x4
-.global lbl_805A966C
-lbl_805A966C:
-	.skip 0x4
-.global lbl_805A9670
-lbl_805A9670:
-	.skip 0x1
-.global lbl_805A9671
-lbl_805A9671:
-	.skip 0x7
-.global lbl_805A9678
-lbl_805A9678:
-	.skip 0x8
-.global lbl_805A9680
-lbl_805A9680:
-	.skip 0x4
-.global lbl_805A9684
-lbl_805A9684:
-	.skip 0x4
-.global lbl_805A9688
-lbl_805A9688:
-	.skip 0x8
-.global lbl_805A9690
-lbl_805A9690:
-	.skip 0x4
-.global lbl_805A9694
-lbl_805A9694:
-	.skip 0x4
-.global lbl_805A9698
-lbl_805A9698:
-	.skip 0x4
-.global lbl_805A969C
-lbl_805A969C:
-	.skip 0x4
-.global lbl_805A96A0
-lbl_805A96A0:
-	.skip 0x8
-.global lbl_805A96A8
-lbl_805A96A8:
-	.skip 0x4
-.global lbl_805A96AC
-lbl_805A96AC:
-	.skip 0x4
-.global lbl_805A96B0
-lbl_805A96B0:
-	.skip 0x8
diff --git a/obj_files.mk b/obj_files.mk
index 2a5f5a0e..94ab619b 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -870,9 +870,6 @@ DTORS_O_FILES :=\
 RODATA_O_FILES :=\
 	$(BUILD_DIR)/asm/rodata.o
 
-SBSS_O_FILES :=\
-	$(BUILD_DIR)/asm/sbss.o
-
 SDATA2_O_FILES :=\
 	$(BUILD_DIR)/asm/sdata2.o