Finish splitting sdata.s

2022-04-23 00:19:32 -07:00 · 2022-04-23 00:19:32 -07:00 · 757e6d48f9
parent 813b9e6e01
commit 757e6d48f9
141 changed files with 4364 additions and 4086 deletions
--- a/2
+++ b/2
@ -54,7 +54,7 @@ endif

 O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(METROTRK_FILES) \
 	   $(METROIDPRIME) $(WORLDFORMAT) $(WEAPONS) $(METARENDER) $(GUISYS) $(COLLISION) \
-	   $(KYOTO) $(RODATA_O_FILES) $(SDATA_O_FILES) $(SBSS_O_FILES) $(SDATA2_O_FILES) $(AI_FILES) \
+	   $(KYOTO) $(RODATA_O_FILES) $(SBSS_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) \
--- a/asm/Collision/CCollidableAABox.s
+++ b/asm/Collision/CCollidableAABox.s
@ -16,6 +16,14 @@ lbl_803ECAD0:
 	.4byte __dt__16CCollidableAABoxFv
 	.4byte CastRayInternal__16CCollidableAABoxCFRC25CInternalRayCastStructure

+.section .sdata
+
+.global sTableIndex__16CCollidableAABox
+sTableIndex__16CCollidableAABox:
+	# ROM: 0x3F6088
+	.4byte 0xFFFFFFFF
+	.4byte 0
+
 .section .bss

 .global lbl_80479498
@ -26,7 +34,7 @@ lbl_80479498:

 .global GetTableIndex__16CCollidableAABoxCFv
 GetTableIndex__16CCollidableAABoxCFv:
-/* 802CD4C8 002CA428  80 6D 9B 28 */	lwz r3, lbl_805A86E8@sda21(r13)
+/* 802CD4C8 002CA428  80 6D 9B 28 */	lwz r3, sTableIndex__16CCollidableAABox@sda21(r13)
 /* 802CD4CC 002CA42C  4E 80 00 20 */	blr 

 .global GetPrimType__16CCollidableAABoxCFv
@ -801,7 +809,7 @@ GetType__16CCollidableAABoxFv:

 .global SetStaticTableIndex__16CCollidableAABoxFUi
 SetStaticTableIndex__16CCollidableAABoxFUi:
-/* 802CE030 002CAF90  90 6D 9B 28 */	stw r3, lbl_805A86E8@sda21(r13)
+/* 802CE030 002CAF90  90 6D 9B 28 */	stw r3, sTableIndex__16CCollidableAABox@sda21(r13)
 /* 802CE034 002CAF94  4E 80 00 20 */	blr 

 .global __sinit_CCollidableAABox_cpp
--- a/asm/Collision/CCollidableCollisionSurface.s
+++ b/asm/Collision/CCollidableCollisionSurface.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A86F0
+lbl_805A86F0:
+	# ROM: 0x3F6090
+	.4byte 0xFFFFFFFF
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetType__27CCollidableCollisionSurfaceFv
--- a/asm/Collision/CCollidableSphere.s
+++ b/asm/Collision/CCollidableSphere.s
@ -64,6 +64,15 @@ lbl_803ECB20:
 	.4byte lbl_802D4DF0
 	.4byte 0

+.section .sdata
+
+.global lbl_805A86F8
+lbl_805A86F8:
+	# ROM: 0x3F6098
+	.4byte 0xFFFFFFFF
+	.4byte 0
+
+
 .section .bss

 .global lbl_80479558
--- a/asm/GuiSys/CAuiEnergyBarT01.s
+++ b/asm/GuiSys/CAuiEnergyBarT01.s
@ -22,6 +22,18 @@ lbl_803ECA50:
 	.4byte OnActivate__10CGuiWidgetFv
 	.4byte 0

+.section .sdata
+
+.global lbl_805A86D8
+lbl_805A86D8:
+	# ROM: 0x3F6078
+	.4byte 0
+
+.global lbl_805A86DC
+lbl_805A86DC:
+	# ROM: 0x3F607C
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetWidgetTypeID__16CAuiEnergyBarT01CFv
--- a/asm/GuiSys/CAuiImagePane.s
+++ b/asm/GuiSys/CAuiImagePane.s
@ -22,6 +22,13 @@ lbl_803ECA90:
 	.4byte OnActivate__10CGuiWidgetFv
 	.4byte WriteData__13CAuiImagePaneCFR13COutputStreamb

+.section .sdata
+
+.global lbl_805A86E0
+lbl_805A86E0:
+	# ROM: 0x3F6080
+	.4byte 0x3F800000
+	.4byte 0

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

--- a/asm/GuiSys/CAuiMeter.s
+++ b/asm/GuiSys/CAuiMeter.s
@ -22,6 +22,24 @@ lbl_803EC6F8:
 	.4byte OnActivate__9CGuiGroupFv
 	.4byte GetWorkerWidget__9CAuiMeterFi

+.section .sdata
+
+.global lbl_805A86B0
+lbl_805A86B0:
+	# ROM: 0x3F6050
+	.4byte 0
+
+.global lbl_805A86B4
+lbl_805A86B4:
+	# ROM: 0x3F6054
+	.4byte 0
+
+.global lbl_805A86B8
+lbl_805A86B8:
+	# ROM: 0x3F6058
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__9CAuiMeterFv
--- a/asm/GuiSys/CGuiTableGroup.s
+++ b/asm/GuiSys/CGuiTableGroup.s
@ -24,6 +24,18 @@ lbl_803EC970:
 	.4byte sub_802c7124
 	.4byte 0

+.section .sdata
+
+.global lbl_805A86C0
+lbl_805A86C0:
+	# ROM: 0x3F6060
+	.4byte 0xFFFFFFFF
+
+.global lbl_805A86C4
+lbl_805A86C4:
+	# ROM: 0x3F6064
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AddWorkerWidget__14CGuiTableGroupFP10CGuiWidget
--- a/asm/GuiSys/CGuiTextSupport.s
+++ b/asm/GuiSys/CGuiTextSupport.s
@ -1,5 +1,27 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A86C8
+lbl_805A86C8:
+	# ROM: 0x3F6068
+	.4byte 0
+
+.global lbl_805A86CC
+lbl_805A86CC:
+	# ROM: 0x3F606C
+	.4byte 0x3F800000
+
+.global lbl_805A86D0
+lbl_805A86D0:
+	# ROM: 0x3F6070
+	.4byte 0x38D1B717
+
+.global lbl_805A86D4
+lbl_805A86D4:
+	# ROM: 0x3F6074
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_802c7cfc
--- a/asm/Kyoto/Alloc/CMemory.s
+++ b/asm/Kyoto/Alloc/CMemory.s
@ -9,6 +9,14 @@ lbl_804BFD58:
 lbl_804BFD64:
 	.skip 0xC4
 	
+.section .sdata
+
+.global lbl_805A8868
+lbl_805A8868:
+	# ROM: 0x3F6208
+	.4byte lbl_804BFD64
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .sdata
+
+.global lbl_805A89F8
+lbl_805A89F8:
+	# ROM: 0x3F6398
+	.4byte 0x3F800000
+
+.global lbl_805A89FC
+lbl_805A89FC:
+	# ROM: 0x3F639C
+	.4byte 0
+
+.global lbl_805A8A00
+lbl_805A8A00:
+	# ROM: 0x3F63A0
+	.4byte 0x3F800000
+
+.global lbl_805A8A04
+lbl_805A8A04:
+	# ROM: 0x3F63A4
+	.4byte 0
+
+.global lbl_805A8A08
+lbl_805A8A08:
+	# ROM: 0x3F63A8
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AddToSegStatementSet__21CAdditiveAnimPlaybackCFRC10CSegIdListRC15CCharLayoutInfoR16CSegStatementSet
--- a/asm/Kyoto/Animation/CAnimSource.s
+++ b/asm/Kyoto/Animation/CAnimSource.s
@ -1,5 +1,23 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8780
+lbl_805A8780:
+	# ROM: 0x3F6120
+	.byte 0x01
+
+.global lbl_805A8781
+lbl_805A8781:
+	# ROM: 0x3F6121
+	.byte 0x00
+
+.global lbl_805A8782
+lbl_805A8782:
+	# ROM: 0x3F6122
+	.byte 0x01, 0x00
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetSegStatementSet__11CAnimSourceCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime
--- a/asm/Kyoto/Animation/CAnimSourceReader.s
+++ b/asm/Kyoto/Animation/CAnimSourceReader.s
@ -57,6 +57,19 @@ lbl_803ECFE4:
 	.4byte 0
 	.4byte 0
 	.4byte sub_802ee0a0
+	
+.section .sdata
+
+.global lbl_805A8788
+lbl_805A8788:
+	# ROM: 0x3F6128
+	.4byte 0x00000002
+
+.global lbl_805A878C
+lbl_805A878C:
+	# ROM: 0x3F612C
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global VGetAdvancementResults__17CAnimSourceReaderCFRC13CCharAnimTimeRC13CCharAnimTime
--- a/asm/Kyoto/Animation/CAnimSourceReaderBase.s
+++ b/asm/Kyoto/Animation/CAnimSourceReaderBase.s
@ -30,6 +30,37 @@ lbl_803ED008:
 	.4byte VGetAdvancementResults__11IAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8790
+lbl_805A8790:
+	# ROM: 0x3F6130
+	.4byte 0
+
+.global lbl_805A8794
+lbl_805A8794:
+	# ROM: 0x3F6134
+	.4byte 0
+
+.global lbl_805A8798
+lbl_805A8798:
+	# ROM: 0x3F6138
+	.4byte 0
+
+.global lbl_805A879C
+lbl_805A879C:
+	# ROM: 0x3F613C
+	.4byte 0
+
+.global lbl_805A87A0
+lbl_805A87A0:
+	# ROM: 0x3F6140
+	.4byte 0
+
+.global lbl_805A87A4
+lbl_805A87A4:
+	# ROM: 0x3F6144
+	.4byte 0

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

--- a/asm/Kyoto/Animation/CAnimTreeDoubleChild.s
+++ b/asm/Kyoto/Animation/CAnimTreeDoubleChild.s
@ -36,6 +36,28 @@ lbl_803ED158:
 	.4byte 0
 	.4byte 0

+.section .sdata
+
+.global lbl_805A87A8
+lbl_805A87A8:
+	# ROM: 0x3F6148
+	.4byte 0x00000002
+
+.global lbl_805A87AC
+lbl_805A87AC:
+	# ROM: 0x3F614C
+	.4byte 0
+
+.global lbl_805A87B0
+lbl_805A87B0:
+	# ROM: 0x3F6150
+	.4byte 0x00000004
+
+.global lbl_805A87B4
+lbl_805A87B4:
+	# ROM: 0x3F6154
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global "VGetWeightedReaders__20CAnimTreeDoubleChildFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>"
--- a/asm/Kyoto/Animation/CAnimTreeSequence.s
+++ b/asm/Kyoto/Animation/CAnimTreeSequence.s
@ -36,6 +36,18 @@ lbl_803ECC58:
 	.4byte VSupportsReverseView__17CAnimTreeSequenceCFv
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8700
+lbl_805A8700:
+	# ROM: 0x3F60A0
+	.4byte 0x00000002
+
+.global lbl_805A8704
+lbl_805A8704:
+	# ROM: 0x3F60A4
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__17CAnimTreeSequenceFv
--- a/asm/Kyoto/Animation/CAnimTreeTimeScale.s
+++ b/asm/Kyoto/Animation/CAnimTreeTimeScale.s
@ -34,6 +34,28 @@ lbl_803ED2B0:
 	.4byte VGetBestUnblendedChild__18CAnimTreeTimeScaleCFv
 	.4byte "VGetWeightedReaders__20CAnimTreeSingleChildFfRQ24rstl48reserved_vector<Q24rstl22pair<f,P11IAnimReader>>"

+.section .sdata
+
+.global lbl_805A87B8
+lbl_805A87B8:
+	# ROM: 0x3F6158
+	.4byte 0x00000002
+
+.global lbl_805A87BC
+lbl_805A87BC:
+	# ROM: 0x3F615C
+	.4byte 0
+
+.global lbl_805A87C0
+lbl_805A87C0:
+	# ROM: 0x3F6160
+	.4byte 0x00000004
+
+.global lbl_805A87C4
+lbl_805A87C4:
+	# ROM: 0x3F6164
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global "CreatePrimitiveName__18CAnimTreeTimeScaleFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>fRC13CCharAnimTimef"
--- a/asm/Kyoto/Animation/CAnimTreeTransition.s
+++ b/asm/Kyoto/Animation/CAnimTreeTransition.s
@ -38,6 +38,18 @@ lbl_803ED320:
 	.4byte VReverseSimplified__19CAnimTreeTransitionFv
 	.4byte VGetBlendingWeight__19CAnimTreeTransitionCFv

+.section .sdata
+
+.global lbl_805A87C8
+lbl_805A87C8:
+	# ROM: 0x3F6168
+	.4byte 0x00000002
+
+.global lbl_805A87CC
+lbl_805A87CC:
+	# ROM: 0x3F616C
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global VGetBestUnblendedChild__19CAnimTreeTransitionCFv
--- a/asm/Kyoto/Animation/CCharAnimTime.s
+++ b/asm/Kyoto/Animation/CCharAnimTime.s
@ -1,5 +1,47 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8938
+lbl_805A8938:
+	# ROM: 0x3F62D8
+	.4byte 0
+
+.global lbl_805A893C
+lbl_805A893C:
+	# ROM: 0x3F62DC
+	.4byte 0x00000002
+
+.global lbl_805A8940
+lbl_805A8940:
+	# ROM: 0x3F62E0
+	.4byte 0
+
+.global lbl_805A8944
+lbl_805A8944:
+	# ROM: 0x3F62E4
+	.4byte 0x00000004
+
+.global lbl_805A8948
+lbl_805A8948:
+	# ROM: 0x3F62E8
+	.4byte 0
+
+.global lbl_805A894C
+lbl_805A894C:
+	# ROM: 0x3F62EC
+	.4byte 0x00000001
+
+.global lbl_805A8950
+lbl_805A8950:
+	# ROM: 0x3F62F0
+	.4byte 0xFFFFFFFF
+
+.global lbl_805A8954
+lbl_805A8954:
+	# ROM: 0x3F62F4
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global PutTo__13CCharAnimTimeCFR13COutputStream
--- a/asm/Kyoto/Animation/CCharLayoutInfo.s
+++ b/asm/Kyoto/Animation/CCharLayoutInfo.s
@ -10,6 +10,33 @@ lbl_803ED420:
 	.4byte sub_802f8294
 	.4byte 0

+.section .sdata
+
+.global lbl_805A87D0
+lbl_805A87D0:
+	# ROM: 0x3F6170
+	.byte 0xFF
+
+.global lbl_805A87D1
+lbl_805A87D1:
+	# ROM: 0x3F6171
+	.byte 0xFF
+
+.global lbl_805A87D2
+lbl_805A87D2:
+	# ROM: 0x3F6172
+	.byte 0x01
+
+.global lbl_805A87D3
+lbl_805A87D3:
+	# ROM: 0x3F6173
+	.byte 0x00
+
+.global lbl_805A87D4
+lbl_805A87D4:
+	# ROM: 0x3F6174
+	.4byte 0x01000000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global "GetSegIdFromString__15CCharLayoutInfoCFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
--- a/asm/Kyoto/Animation/CCharacterInfo.s
+++ b/asm/Kyoto/Animation/CCharacterInfo.s
@ -1,5 +1,23 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8708
+lbl_805A8708:
+	# ROM: 0x3F60A8
+	.byte 0x01
+
+.global lbl_805A8709
+lbl_805A8709:
+	# ROM: 0x3F60A9
+	.byte 0x00
+
+.global lbl_805A870A
+lbl_805A870A:
+	# ROM: 0x3F60AA
+	.byte 0x01, 0x00
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_802dd89c
--- a/asm/Kyoto/Animation/CFBStreamedAnimReader.s
+++ b/asm/Kyoto/Animation/CFBStreamedAnimReader.s
@ -45,6 +45,34 @@ lbl_803ED494:
 	.4byte "GetAnimationDuration__41TAnimSourceInfo<22CFBStreamedCompression>CFv"
 	.4byte "__dt__41TAnimSourceInfo<22CFBStreamedCompression>Fv"

+.section .sdata
+
+.global lbl_805A87D8
+lbl_805A87D8:
+	# ROM: 0x3F6178
+	.4byte 0x00000002
+
+.global lbl_805A87DC
+lbl_805A87DC:
+	# ROM: 0x3F617C
+	.4byte 0
+
+.global lbl_805A87E0
+lbl_805A87E0:
+	# ROM: 0x3F6180
+	.4byte 0
+
+.global lbl_805A87E4
+lbl_805A87E4:
+	# ROM: 0x3F6184
+	.4byte 0
+
+.global lbl_805A87E8
+lbl_805A87E8:
+	# ROM: 0x3F6188
+	.4byte 0x3F800000
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global VGetAdvancementResults__21CFBStreamedAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime
--- a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s
+++ b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s
@ -1,5 +1,28 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A87F0
+lbl_805A87F0:
+	# ROM: 0x3F6190
+	.byte 0xFF
+
+.global lbl_805A87F1
+lbl_805A87F1:
+	# ROM: 0x3F6191
+	.byte 0xFF
+
+.global lbl_805A87F2
+lbl_805A87F2:
+	# ROM: 0x3F6192
+	.byte 0xFF
+
+.global lbl_805A87F3
+lbl_805A87F3:
+	# ROM: 0x3F6193
+	.byte 0xFF
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_802fc358
--- a/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s
+++ b/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s
@ -26,6 +26,28 @@ lbl_803ECD10:
 	.4byte 0
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8710
+lbl_805A8710:
+	# ROM: 0x3F60B0
+	.4byte 0x00000002
+
+.global lbl_805A8714
+lbl_805A8714:
+	# ROM: 0x3F60B4
+	.4byte 0
+
+.global lbl_805A8718
+lbl_805A8718:
+	# ROM: 0x3F60B8
+	.4byte 0x00000004
+
+.global lbl_805A871C
+lbl_805A871C:
+	# ROM: 0x3F60BC
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__19CMetaAnimPhaseBlendFv
--- a/asm/Kyoto/Animation/CMetaAnimPlay.s
+++ b/asm/Kyoto/Animation/CMetaAnimPlay.s
@ -14,6 +14,24 @@ lbl_803ECD30:
 	.4byte WriteAnimData__13CMetaAnimPlayCFR13COutputStream
 	.4byte VGetAnimationTree__13CMetaAnimPlayCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders

+.section .sdata
+
+.global lbl_805A8720
+lbl_805A8720:
+	# ROM: 0x3F60C0
+	.byte 0x01
+
+.global lbl_805A8721
+lbl_805A8721:
+	# ROM: 0x3F60C1
+	.byte 0x00
+
+.global lbl_805A8722
+lbl_805A8722:
+	# ROM: 0x3F60C2
+	.byte 0x01, 0x00
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__13CMetaAnimPlayFv
--- a/asm/Kyoto/Animation/CMetaTransPhaseTrans.s
+++ b/asm/Kyoto/Animation/CMetaTransPhaseTrans.s
@ -12,6 +12,28 @@ lbl_803ECDA8:
 	.4byte GetType__20CMetaTransPhaseTransCFv
 	.4byte WriteTransData__20CMetaTransPhaseTransCFR13COutputStream

+.section .sdata
+
+.global lbl_805A8728
+lbl_805A8728:
+	# ROM: 0x3F60C8
+	.4byte 0x00000002
+
+.global lbl_805A872C
+lbl_805A872C:
+	# ROM: 0x3F60CC
+	.4byte 0
+
+.global lbl_805A8730
+lbl_805A8730:
+	# ROM: 0x3F60D0
+	.4byte 0
+
+.global lbl_805A8734
+lbl_805A8734:
+	# ROM: 0x3F60D4
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .sdata
+
+.global lbl_805A8738
+lbl_805A8738:
+	# ROM: 0x3F60D8
+	.4byte 0
+
+.global lbl_805A873C
+lbl_805A873C:
+	# ROM: 0x3F60DC
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global PickRandomAnimation__13CPASAnimStateCFR9CRandom16
--- a/asm/Kyoto/Animation/CPASDatabase.s
+++ b/asm/Kyoto/Animation/CPASDatabase.s
@ -1,5 +1,27 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8740
+lbl_805A8740:
+	# ROM: 0x3F60E0
+	.4byte 0
+
+.global lbl_805A8744
+lbl_805A8744:
+	# ROM: 0x3F60E4
+	.4byte 0xFFFFFFFF
+
+.global lbl_805A8748
+lbl_805A8748:
+	# ROM: 0x3F60E8
+	.4byte 0
+
+.global lbl_805A874C
+lbl_805A874C:
+	# ROM: 0x3F60EC
+	.4byte 0xFFFFFFFF
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AddAnimState__12CPASDatabaseFRC13CPASAnimState
--- a/asm/Kyoto/Animation/CPoseAsTransforms.s
+++ b/asm/Kyoto/Animation/CPoseAsTransforms.s
@ -1,5 +1,37 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8A58
+lbl_805A8A58:
+	# ROM: 0x3F63F8
+	.byte 0xFF
+
+.global lbl_805A8A59
+lbl_805A8A59:
+	# ROM: 0x3F63F9
+	.byte 0xFF
+
+.global lbl_805A8A5A
+lbl_805A8A5A:
+	# ROM: 0x3F63FA
+	.byte 0xFF
+
+.global lbl_805A8A5B
+lbl_805A8A5B:
+	# ROM: 0x3F63FB
+	.byte 0xFF
+
+.global lbl_805A8A5C
+lbl_805A8A5C:
+	# ROM: 0x3F63FC
+	.byte 0xFF
+
+.global lbl_805A8A5D
+lbl_805A8A5D:
+	# ROM: 0x3F63FD
+	.byte 0xFF, 0x00, 0x00
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global Clear__17CPoseAsTransformsFv
--- a/asm/Kyoto/Animation/CSegStatementSet.s
+++ b/asm/Kyoto/Animation/CSegStatementSet.s
@ -16,6 +16,14 @@ lbl_803ED4C4:
 	.4byte 0
 	.4byte 0

+.section .sdata
+
+.global lbl_805A87F8
+lbl_805A87F8:
+	# ROM: 0x3F6198
+	.4byte 0x0000001F
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__21CStackSegStatementSetFv
--- a/asm/Kyoto/Animation/CSequenceHelper.s
+++ b/asm/Kyoto/Animation/CSequenceHelper.s
@ -1,5 +1,27 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8750
+lbl_805A8750:
+	# ROM: 0x3F60F0
+	.4byte 0x00000002
+
+.global lbl_805A8754
+lbl_805A8754:
+	# ROM: 0x3F60F4
+	.4byte 0
+
+.global lbl_805A8758
+lbl_805A8758:
+	# ROM: 0x3F60F8
+	.4byte 0x00000004
+
+.global lbl_805A875C
+lbl_805A875C:
+	# ROM: 0x3F60FC
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global ComputeSequenceFundamentals__15CSequenceHelperCFv
--- a/asm/Kyoto/Animation/DolphinCSkinRules.s
+++ b/asm/Kyoto/Animation/DolphinCSkinRules.s
@ -1,5 +1,27 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A89C0
+lbl_805A89C0:
+	# ROM: 0x3F6360
+	.4byte 0x000000C0
+
+.global lbl_805A89C4
+lbl_805A89C4:
+	# ROM: 0x3F6364
+	.4byte 0x01000000
+
+.global lbl_805A89C8
+lbl_805A89C8:
+	# ROM: 0x3F6368
+	.4byte 0x00000150
+
+.global lbl_805A89CC
+lbl_805A89CC:
+	# ROM: 0x3F636C
+	.4byte 0x00000150
+
 .section .data

 .global lbl_803EF728
--- a/asm/Kyoto/Animation/IMetaAnim.s
+++ b/asm/Kyoto/Animation/IMetaAnim.s
@ -14,6 +14,18 @@ lbl_803ECDF0:
 	.4byte 0
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8760
+lbl_805A8760:
+	# ROM: 0x3F6100
+	.4byte 0x00000002
+
+.global lbl_805A8764
+lbl_805A8764:
+	# ROM: 0x3F6104
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AdvanceAnim__9IMetaAnimFR11IAnimReaderRC13CCharAnimTime
--- a/asm/Kyoto/Audio/CSfxManager.s
+++ b/asm/Kyoto/Audio/CSfxManager.s
@ -97,6 +97,38 @@ lbl_803ECEE4:
 	.4byte 0
 	

+.section .sdata
+
+.global lbl_805A8768
+lbl_805A8768:
+	# ROM: 0x3F6108
+	.4byte 0x3F800000
+
+.global lbl_805A876C
+lbl_805A876C:
+	# ROM: 0x3F610C
+	.4byte 0x3DCCCCCD
+
+.global lbl_805A8770
+lbl_805A8770:
+	# ROM: 0x3F6110
+	.4byte 0xFFFFFFFF
+
+.global lbl_805A8774
+lbl_805A8774:
+	# ROM: 0x3F6114
+	.4byte 0xFFFFFFFF
+
+.global lbl_805A8778
+lbl_805A8778:
+	# ROM: 0x3F6118
+	.4byte 0x3F800000
+
+.global lbl_805A877C
+lbl_805A877C:
+	# ROM: 0x3F611C
+	.4byte 0
+
 .section .bss

 .global lbl_80479BA0
--- a/asm/Kyoto/Audio/CStreamAudioManager.s
+++ b/asm/Kyoto/Audio/CStreamAudioManager.s
@ -1,5 +1,38 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8A30
+lbl_805A8A30:
+	# ROM: 0x3F63D0
+	.4byte 0x00000001
+
+.global lbl_805A8A34
+lbl_805A8A34:
+	# ROM: 0x3F63D4
+	.4byte 0xBF800000
+
+.global lbl_805A8A38
+lbl_805A8A38:
+	# ROM: 0x3F63D8
+	.4byte 0x0000007F
+
+.global lbl_805A8A3C
+lbl_805A8A3C:
+	# ROM: 0x3F63DC
+	.4byte 0x0000007F
+
+.global lbl_805A8A40
+lbl_805A8A40:
+	# ROM: 0x3F63E0
+	.byte 0x01
+
+.global lbl_805A8A41
+lbl_805A8A41:
+	# ROM: 0x3F63E1
+	.byte 0x01, 0x00, 0x00
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .sdata
+
+.global lbl_805A8998
+lbl_805A8998:
+	# ROM: 0x3F6338
+	.2byte 0x00000100
+
+.global lbl_805A899A
+lbl_805A899A:
+	# ROM: 0x3F633A
+	.2byte 0x0000007F
+
+.global lbl_805A899C
+lbl_805A899C:
+	# ROM: 0x3F633C
+	.2byte 0x0000007F
+
+.global lbl_805A899E
+lbl_805A899E:
+	# ROM: 0x3F633E
+	.byte 0x01
+
+.global lbl_805A899F
+lbl_805A899F:
+	# ROM: 0x3F633F
+	.byte 0x01
+
+.global lbl_805A89A0
+lbl_805A89A0:
+	# ROM: 0x3F6340
+	.byte 0x00
+
+.global lbl_805A89A1
+lbl_805A89A1:
+	# ROM: 0x3F6341
+	.byte 0x01
+
+.global lbl_805A89A2
+lbl_805A89A2:
+	# ROM: 0x3F6342
+	.byte 0x01
+
+.global lbl_805A89A3
+lbl_805A89A3:
+	# ROM: 0x3F6343
+	.byte 0x00
+
+.global lbl_805A89A4
+lbl_805A89A4:
+	# ROM: 0x3F6344
+	.byte 0x01
+
+.global lbl_805A89A5
+lbl_805A89A5:
+	# ROM: 0x3F6345
+	.byte 0x01
+
+.global lbl_805A89A6
+lbl_805A89A6:
+	# ROM: 0x3F6346
+	.byte 0x00
+
+.global lbl_805A89A7
+lbl_805A89A7:
+	# ROM: 0x3F6347
+	.byte 0x01
+
 .section .bss

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

+.section .sdata
+
+.global lbl_805A8920
+lbl_805A8920:
+	# ROM: 0x3F62C0
+	.4byte 0x00004000
+	.4byte 0
+
 .section .bss

 .global lbl_804BFF40
--- a/asm/Kyoto/CFactoryMgr.s
+++ b/asm/Kyoto/CFactoryMgr.s
@ -1,5 +1,42 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8900
+lbl_805A8900:
+	# ROM: 0x3F62A0
+	.byte 0x01
+
+.global lbl_805A8901
+lbl_805A8901:
+	# ROM: 0x3F62A1
+	.byte 0x00
+
+.global lbl_805A8902
+lbl_805A8902:
+	# ROM: 0x3F62A2
+	.byte 0x01
+
+.global lbl_805A8903
+lbl_805A8903:
+	# ROM: 0x3F62A3
+	.byte 0x01
+
+.global lbl_805A8904
+lbl_805A8904:
+	# ROM: 0x3F62A4
+	.byte 0x00
+
+.global lbl_805A8905
+lbl_805A8905:
+	# ROM: 0x3F62A5
+	.byte 0x01, 0x00, 0x00
+
+.global lbl_805A8908
+lbl_805A8908:
+	# ROM: 0x3F62A8
+	.4byte 0x00000002
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global FourCCToTypeIdx__11CFactoryMgrFUi
--- a/asm/Kyoto/CFinalInput.s
+++ b/asm/Kyoto/CFinalInput.s
@ -10,6 +10,88 @@ lbl_803EF660:
 	.4byte 0
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8958
+lbl_805A8958:
+	# ROM: 0x3F62F8
+	.4byte 0xBF800000
+
+.global lbl_805A895C
+lbl_805A895C:
+	# ROM: 0x3F62FC
+	.4byte 0x3F800000
+
+.global lbl_805A8960
+lbl_805A8960:
+	# ROM: 0x3F6300
+	.4byte 0xBF800000
+
+.global lbl_805A8964
+lbl_805A8964:
+	# ROM: 0x3F6304
+	.4byte 0x3F800000
+
+.global lbl_805A8968
+lbl_805A8968:
+	# ROM: 0x3F6308
+	.4byte 0xBF800000
+
+.global lbl_805A896C
+lbl_805A896C:
+	# ROM: 0x3F630C
+	.4byte 0x3F800000
+
+.global lbl_805A8970
+lbl_805A8970:
+	# ROM: 0x3F6310
+	.4byte 0xBF800000
+
+.global lbl_805A8974
+lbl_805A8974:
+	# ROM: 0x3F6314
+	.4byte 0x3F800000
+
+.global lbl_805A8978
+lbl_805A8978:
+	# ROM: 0x3F6318
+	.4byte 0xBF800000
+
+.global lbl_805A897C
+lbl_805A897C:
+	# ROM: 0x3F631C
+	.4byte 0x3F800000
+
+.global lbl_805A8980
+lbl_805A8980:
+	# ROM: 0x3F6320
+	.4byte 0xBF800000
+
+.global lbl_805A8984
+lbl_805A8984:
+	# ROM: 0x3F6324
+	.4byte 0x3F800000
+
+.global lbl_805A8988
+lbl_805A8988:
+	# ROM: 0x3F6328
+	.4byte 0xBF800000
+
+.global lbl_805A898C
+lbl_805A898C:
+	# ROM: 0x3F632C
+	.4byte 0x3F800000
+
+.global lbl_805A8990
+lbl_805A8990:
+	# ROM: 0x3F6330
+	.4byte 0xBF800000
+
+.global lbl_805A8994
+lbl_805A8994:
+	# ROM: 0x3F6334
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global ScaleAnalogueSticks__11CFinalInputCFff
--- a/asm/Kyoto/CPakFile.s
+++ b/asm/Kyoto/CPakFile.s
@ -1,5 +1,32 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8A48
+lbl_805A8A48:
+	# ROM: 0x3F63E8
+	.4byte 0x00002000
+
+.global lbl_805A8A4C
+lbl_805A8A4C:
+	# ROM: 0x3F63EC
+	.byte 0x00
+
+.global lbl_805A8A4D
+lbl_805A8A4D:
+	# ROM: 0x3F63ED
+	.balign 4
+
+.global lbl_805A8A50
+lbl_805A8A50:
+	# ROM: 0x3F63F0
+	.4byte 0x00000040
+
+.global lbl_805A8A54
+lbl_805A8A54:
+	# ROM: 0x3F63F4
+	.4byte 0x00000040
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global EnsureWorldPakReady__8CPakFileFv
--- a/asm/Kyoto/CResFactory.s
+++ b/asm/Kyoto/CResFactory.s
@ -14,6 +14,23 @@ lbl_803EE368:
 	.4byte CanBuild__11CResFactoryFRC10SObjectTag
 	.4byte GetResourceIdByName__11CResFactoryCFPCc

+.section .sdata
+
+.global lbl_805A890C
+lbl_805A890C:
+	# ROM: 0x3F62AC
+	.byte 0x01
+
+.global lbl_805A890D
+lbl_805A890D:
+	# ROM: 0x3F62AD
+	.byte 0x00
+
+.global lbl_805A890E
+lbl_805A890E:
+	# ROM: 0x3F62AE
+	.2byte 0x00000100
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_803394a8
--- a/asm/Kyoto/CSimplePool.s
+++ b/asm/Kyoto/CSimplePool.s
@ -33,6 +33,24 @@ lbl_803EE410:
 	.4byte ObjectUnreferenced__11CSimplePoolFRC10SObjectTag
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8910
+lbl_805A8910:
+	# ROM: 0x3F62B0
+	.byte 0x01
+
+.global lbl_805A8911
+lbl_805A8911:
+	# ROM: 0x3F62B1
+	.byte 0x00
+
+.global lbl_805A8912
+lbl_805A8912:
+	# ROM: 0x3F62B2
+	.byte 0x01, 0x00
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetFactory__11CSimplePoolCFv
--- a/asm/Kyoto/DolphinCDvdFile.s
+++ b/asm/Kyoto/DolphinCDvdFile.s
@ -1,5 +1,23 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A89B0
+lbl_805A89B0:
+	# ROM: 0x3F6350
+	.4byte 0x00010000
+
+.global lbl_805A89B4
+lbl_805A89B4:
+	# ROM: 0x3F6354
+	.4byte 0x00010000
+
+.global lbl_805A89B8
+lbl_805A89B8:
+	# ROM: 0x3F6358
+	.4byte 0x00010000
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .sdata
+
+.global lbl_805A89A8
+lbl_805A89A8:
+	# ROM: 0x3F6348
+	.byte 0x00
+
+.global lbl_805A89A9
+lbl_805A89A9:
+	# ROM: 0x3F6349
+	.byte 0x00
+
+.global lbl_805A89AA
+lbl_805A89AA:
+	# ROM: 0x3F634A
+	.byte 0x00
+
+.global lbl_805A89AB
+lbl_805A89AB:
+	# ROM: 0x3F634B
+	.balign 4
+	.4byte 0
+
 .section .bss

 .global lbl_804BFFA0
--- a/asm/Kyoto/Graphics/CCubeMaterial.s
+++ b/asm/Kyoto/Graphics/CCubeMaterial.s
@ -30,6 +30,28 @@ lbl_803EF640:
 	.4byte lbl_80347D0C
 	.4byte lbl_80347E5C

+.section .sdata
+
+.global lbl_805A8928
+lbl_805A8928:
+	# ROM: 0x3F62C8
+	.4byte 0xFFFFFFFF
+
+.global lbl_805A892C
+lbl_805A892C:
+	# ROM: 0x3F62CC
+	.4byte 0x3F800000
+
+.global lbl_805A8930
+lbl_805A8930:
+	# ROM: 0x3F62D0
+	.4byte 0x3F800000
+
+.global lbl_805A8934
+lbl_805A8934:
+	# ROM: 0x3F62D4
+	.4byte 0xFFFFFFFF
+
 .section .bss

 .global lbl_804BFF50
--- a/asm/Kyoto/Graphics/CCubeMoviePlayer.s
+++ b/asm/Kyoto/Graphics/CCubeMoviePlayer.s
@ -1,5 +1,28 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A89E8
+lbl_805A89E8:
+	# ROM: 0x3F6388
+	.byte 0x01
+
+.global lbl_805A89E9
+lbl_805A89E9:
+	# ROM: 0x3F6389
+	.byte 0x7F, 0x00, 0x00
+
+.global lbl_805A89EC
+lbl_805A89EC:
+	# ROM: 0x3F638C
+	.4byte 0x0000007F
+
+.global lbl_805A89F0
+lbl_805A89F0:
+	# ROM: 0x3F6390
+	.4byte 0x7F000000
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global SetSfxVolume__12CMoviePlayerFUc
--- a/asm/Kyoto/Graphics/CLight.s
+++ b/asm/Kyoto/Graphics/CLight.s
@ -1,5 +1,27 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8810
+lbl_805A8810:
+	# ROM: 0x3F61B0
+	.4byte 0x3D70F0F1
+
+.global lbl_805A8814
+lbl_805A8814:
+	# ROM: 0x3F61B4
+	.4byte 0x3E4CCCCD
+
+.global lbl_805A8818
+lbl_805A8818:
+	# ROM: 0x3F61B8
+	.4byte 0x3D70F0F1
+
+.global lbl_805A881C
+lbl_805A881C:
+	# ROM: 0x3F61BC
+	.4byte 0x3E4CCCCD
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetNormalIndependentLightingAtPoint__6CLightCFRC9CVector3f
--- a/asm/Kyoto/Graphics/CTevCombiners.s
+++ b/asm/Kyoto/Graphics/CTevCombiners.s
@ -1,5 +1,22 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8820
+lbl_805A8820:
+	# ROM: 0x3F61C0
+	.4byte 0
+
+.global lbl_805A8824
+lbl_805A8824:
+	# ROM: 0x3F61C4
+	.4byte 0xFFFFFFFF
+
+.global lbl_805A8828
+lbl_805A8828:
+	# ROM: 0x3F61C8
+	.4byte 0x805A564C
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global ResetStates__13CTevCombinersFv
--- a/asm/Kyoto/Graphics/DolphinCColor.s
+++ b/asm/Kyoto/Graphics/DolphinCColor.s
@ -1,5 +1,27 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8A20
+lbl_805A8A20:
+	# ROM: 0x3F63C0
+	.4byte 0x000000FF
+
+.global lbl_805A8A24
+lbl_805A8A24:
+	# ROM: 0x3F63C4
+	.4byte 0x000000FF
+
+.global lbl_805A8A28
+lbl_805A8A28:
+	# ROM: 0x3F63C8
+	.4byte 0x000000FF
+
+.global lbl_805A8A2C
+lbl_805A8A2C:
+	# ROM: 0x3F63CC
+	.4byte 0x000000FF
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global ToRGB5A3__6CColorCFv
--- a/asm/Kyoto/Graphics/DolphinCGraphics.s
+++ b/asm/Kyoto/Graphics/DolphinCGraphics.s
@ -37,6 +37,63 @@ lbl_803ED948:
 	.4byte lbl_8030AD80


+.section .sdata
+
+.global lbl_805A882C
+lbl_805A882C:
+	# ROM: 0x3F61CC
+	.4byte 0x01000000
+
+.global lbl_805A8830
+lbl_805A8830:
+	# ROM: 0x3F61D0
+	.4byte 0x00000003
+
+.global lbl_805A8834
+lbl_805A8834:
+	# ROM: 0x3F61D4
+	.4byte 0x000000B8
+
+.global lbl_805A8838
+lbl_805A8838:
+	# ROM: 0x3F61D8
+	.4byte 0x3F800000
+
+.global lbl_805A883C
+lbl_805A883C:
+	# ROM: 0x3F61DC
+	.4byte 0x00FFFFFF
+
+.global lbl_805A8840
+lbl_805A8840:
+	# ROM: 0x3F61E0
+	.byte 0x01
+
+.global lbl_805A8841
+lbl_805A8841:
+	# ROM: 0x3F61E1
+	.byte 0x01
+
+.global lbl_805A8842
+lbl_805A8842:
+	# ROM: 0x3F61E2
+	.2byte 0x00000100
+
+.global lbl_805A8844
+lbl_805A8844:
+	# ROM: 0x3F61E4
+	.4byte 0x3F800000
+
+.global lbl_805A8848
+lbl_805A8848:
+	# ROM: 0x3F61E8
+	.4byte 0
+
+.global lbl_805A884C
+lbl_805A884C:
+	# ROM: 0x3F61EC
+	.4byte 0x40000000
+
 .section .bss

 .global lbl_80479CC0
--- a/asm/Kyoto/Graphics/DolphinCModel.s
+++ b/asm/Kyoto/Graphics/DolphinCModel.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A89D0
+lbl_805A89D0:
+	# ROM: 0x3F6370
+	.4byte 0x01000000
+	.4byte 0
+
 .section .data

 .global lbl_803EF738
--- a/asm/Kyoto/Input/CRumbleVoice.s
+++ b/asm/Kyoto/Input/CRumbleVoice.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8A60
+lbl_805A8A60:
+	# ROM: 0x3F6400
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global CreateRumbleHandle__12CRumbleVoiceFs
--- a/asm/Kyoto/Math/CQuaternion.s
+++ b/asm/Kyoto/Math/CQuaternion.s
@ -11,7 +11,39 @@ lbl_804BFD3C:
 .global lbl_804BFD48
 lbl_804BFD48:
 	.skip 0x10
-	
+
+.section .sdata
+
+.global lbl_805A8850
+lbl_805A8850:
+	# ROM: 0x3F61F0
+	.4byte 0xBF800000
+
+.global lbl_805A8854
+lbl_805A8854:
+	# ROM: 0x3F61F4
+	.4byte 0x3F800000
+
+.global lbl_805A8858
+lbl_805A8858:
+	# ROM: 0x3F61F8
+	.4byte 0xBF800000
+
+.global lbl_805A885C
+lbl_805A885C:
+	# ROM: 0x3F61FC
+	.4byte 0x3F800000
+
+.global lbl_805A8860
+lbl_805A8860:
+	# ROM: 0x3F6200
+	.4byte 0x3F800000
+
+.global lbl_805A8864
+lbl_805A8864:
+	# ROM: 0x3F6204
+	.4byte 0xBF800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global FromNUQuaternion__11CQuaternionFRC13CNUQuaternion
--- a/asm/Kyoto/Particles/CColorElement.s
+++ b/asm/Kyoto/Particles/CColorElement.s
@ -66,6 +66,88 @@ lbl_803EDA70:
 	.4byte __dt__11CCEConstantFv
 	.4byte GetValue__11CCEConstantCFiR6CColor

+.section .sdata
+
+.global lbl_805A8870
+lbl_805A8870:
+	# ROM: 0x3F6210
+	.4byte 0
+
+.global lbl_805A8874
+lbl_805A8874:
+	# ROM: 0x3F6214
+	.4byte 0x3F800000
+
+.global lbl_805A8878
+lbl_805A8878:
+	# ROM: 0x3F6218
+	.4byte 0
+
+.global lbl_805A887C
+lbl_805A887C:
+	# ROM: 0x3F621C
+	.4byte 0x3F800000
+
+.global lbl_805A8880
+lbl_805A8880:
+	# ROM: 0x3F6220
+	.4byte 0
+
+.global lbl_805A8884
+lbl_805A8884:
+	# ROM: 0x3F6224
+	.4byte 0x3F800000
+
+.global lbl_805A8888
+lbl_805A8888:
+	# ROM: 0x3F6228
+	.4byte 0
+
+.global lbl_805A888C
+lbl_805A888C:
+	# ROM: 0x3F622C
+	.4byte 0x3F800000
+
+.global lbl_805A8890
+lbl_805A8890:
+	# ROM: 0x3F6230
+	.4byte 0
+
+.global lbl_805A8894
+lbl_805A8894:
+	# ROM: 0x3F6234
+	.4byte 0x3F800000
+
+.global lbl_805A8898
+lbl_805A8898:
+	# ROM: 0x3F6238
+	.4byte 0
+
+.global lbl_805A889C
+lbl_805A889C:
+	# ROM: 0x3F623C
+	.4byte 0x3F800000
+
+.global lbl_805A88A0
+lbl_805A88A0:
+	# ROM: 0x3F6240
+	.4byte 0
+
+.global lbl_805A88A4
+lbl_805A88A4:
+	# ROM: 0x3F6244
+	.4byte 0x3F800000
+
+.global lbl_805A88A8
+lbl_805A88A8:
+	# ROM: 0x3F6248
+	.4byte 0
+
+.global lbl_805A88AC
+lbl_805A88AC:
+	# ROM: 0x3F624C
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__16CCEParticleColor
--- a/asm/Kyoto/Particles/CElementGen.s
+++ b/asm/Kyoto/Particles/CElementGen.s
@ -336,6 +336,42 @@ lbl_803EDD08:
 	.4byte AddModifier__12CParticleGenFP5CWarp
 	.4byte 0

+.section .sdata
+
+.global lbl_805A88B0
+lbl_805A88B0:
+	# ROM: 0x3F6250
+	.4byte 0x3F911111
+	.4byte 0x11111111
+
+.global lbl_805A88B8
+lbl_805A88B8:
+	# ROM: 0x3F6258
+	.4byte 0x00630000
+	.4byte 0
+
+.global lbl_805A88C0
+lbl_805A88C0:
+	# ROM: 0x3F6260
+	.4byte 0
+	.4byte 0
+
+.global lbl_805A88C8
+lbl_805A88C8:
+	# ROM: 0x3F6268
+	.4byte 0
+
+.global lbl_805A88CC
+lbl_805A88CC:
+	# ROM: 0x3F626C
+	.4byte 0x00000001
+
+.global lbl_805A88D0
+lbl_805A88D0:
+	# ROM: 0x3F6270
+	.4byte 0
+	.4byte 0
+
 .section .bss

 .global lbl_804BFE28
--- a/asm/Kyoto/Particles/CParticleElectric.s
+++ b/asm/Kyoto/Particles/CParticleElectric.s
@ -36,6 +36,29 @@ lbl_803EF7B8:
 	.4byte AddModifier__12CParticleGenFP5CWarp
 	.4byte Get4CharId__17CParticleElectricFv

+.section .sdata
+
+.global lbl_805A8A10
+lbl_805A8A10:
+	# ROM: 0x3F63B0
+	.2byte 0x00000063
+
+.global lbl_805A8A12
+lbl_805A8A12:
+	# ROM: 0x3F63B2
+	.2byte 0x00000000
+
+.global lbl_805A8A14
+lbl_805A8A14:
+	# ROM: 0x3F63B4
+	.4byte 0
+
+.global lbl_805A8A18
+lbl_805A8A18:
+	# ROM: 0x3F63B8
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetTranslation__17CParticleElectricCFv
--- a/asm/Kyoto/Particles/CParticleSwoosh.s
+++ b/asm/Kyoto/Particles/CParticleSwoosh.s
@ -36,6 +36,18 @@ lbl_803EDD80:
 	.4byte AddModifier__12CParticleGenFP5CWarp
 	.4byte Get4CharId__15CParticleSwooshCF

+.section .sdata
+
+.global lbl_805A88D8
+lbl_805A88D8:
+	# ROM: 0x3F6278
+	.4byte 0x3C888889
+
+.global lbl_805A88DC
+lbl_805A88DC:
+	# ROM: 0x3F627C
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetTranslation__15CParticleSwooshCFv
--- a/asm/Kyoto/Particles/CRealElement.s
+++ b/asm/Kyoto/Particles/CRealElement.s
@ -354,6 +354,14 @@ lbl_803EE100:
 	.4byte IsConstant__11CREConstantCFv
 	.4byte 0

+.section .sdata
+
+.global lbl_805A88E0
+lbl_805A88E0:
+	# ROM: 0x3F6280
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetValue__15CREIntTimesRealCFiRf
--- a/asm/Kyoto/Particles/CUVElement.s
+++ b/asm/Kyoto/Particles/CUVElement.s
@ -24,6 +24,24 @@ lbl_803EE134:
 	.4byte HasConstantTexture__12CUVEConstantFv
 	.4byte HasConstantUV__12CUVEConstantFv

+.section .sdata
+
+.global lbl_805A88E8
+lbl_805A88E8:
+	# ROM: 0x3F6288
+	.4byte 0x00000001
+
+.global lbl_805A88EC
+lbl_805A88EC:
+	# ROM: 0x3F628C
+	.4byte 0x00000001
+
+.global lbl_805A88F0
+lbl_805A88F0:
+	# ROM: 0x3F6290
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global HasConstantTexture__15CUVEAnimTextureFv
--- a/asm/Kyoto/Particles/CVectorElement.s
+++ b/asm/Kyoto/Particles/CVectorElement.s
@ -192,6 +192,14 @@ lbl_803EE2E0:
 	.4byte IsFastConstant__14CVectorElementCFv
 	.4byte 0

+.section .sdata
+
+.global lbl_805A88F8
+lbl_805A88F8:
+	# ROM: 0x3F6298
+	.4byte 0x3F800000
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetValue__7CVECVTCCFiR9CVector3f
--- a/asm/Kyoto/Text/CDrawStringOptions.s
+++ b/asm/Kyoto/Text/CDrawStringOptions.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8800
+lbl_805A8800:
+	# ROM: 0x3F61A0
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __ct__18CDrawStringOptionsFv
--- a/asm/Kyoto/Text/CSavableState.s
+++ b/asm/Kyoto/Text/CSavableState.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8808
+lbl_805A8808:
+	# ROM: 0x3F61A8
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global IsFinishedLoading__14CSaveableStateFv
--- a/asm/Kyoto/Text/CStringTable.s
+++ b/asm/Kyoto/Text/CStringTable.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A89D8
+lbl_805A89D8:
+	# ROM: 0x3F6378
+	.asciz "ENGL"
+	.balign 4
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global FStringTableFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
--- a/asm/Kyoto/Text/CTextRenderBuffer.s
+++ b/asm/Kyoto/Text/CTextRenderBuffer.s
@ -1,5 +1,13 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A89E0
+lbl_805A89E0:
+	# ROM: 0x3F6380
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AccumulateTextBounds__17CTextRenderBufferFv
--- a/asm/Kyoto/zlib/inftrees.s
+++ b/asm/Kyoto/zlib/inftrees.s
@ -1098,6 +1098,18 @@ lbl_803EF4C8:
 	.4byte 0xC0050000
 	.4byte 0x00006001

+.section .sdata
+
+.global lbl_805A8918
+lbl_805A8918:
+	# ROM: 0x3F62B8
+	.4byte 0x00000009
+
+.global lbl_805A891C
+lbl_805A891C:
+	# ROM: 0x3F62BC
+	.4byte 0x00000005
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global inflate_trees_fixed
--- a/asm/MetaRender/CCubeRenderer.s
+++ b/asm/MetaRender/CCubeRenderer.s
@ -77,7 +77,119 @@ lbl_803EC5D8:
 	.4byte "@4@__dt__13CCubeRendererFv"
 	.4byte "@4@AddParticleGen__13CCubeRendererFRC12CParticleGen"
 	.4byte 0
-	
+
+.section .sdata
+
+.global lbl_805A8658
+lbl_805A8658:
+	# ROM: 0x3F5FF8
+	.4byte 0x47C34F80
+
+.global lbl_805A865C
+lbl_805A865C:
+	# ROM: 0x3F5FFC
+	.4byte 0xC7C34F80
+
+.global lbl_805A8660
+lbl_805A8660:
+	# ROM: 0x3F6000
+	.4byte 0x3F800000
+
+.global lbl_805A8664
+lbl_805A8664:
+	# ROM: 0x3F6004
+	.4byte 0x00000031
+
+.global lbl_805A8668
+lbl_805A8668:
+	# ROM: 0x3F6008
+	.4byte 0x00000001
+
+.global lbl_805A866C
+lbl_805A866C:
+	# ROM: 0x3F600C
+	.4byte 0
+
+.global lbl_805A8670
+lbl_805A8670:
+	# ROM: 0x3F6010
+	.4byte 0
+
+.global lbl_805A8674
+lbl_805A8674:
+	# ROM: 0x3F6014
+	.4byte 0x437F0000
+
+.global lbl_805A8678
+lbl_805A8678:
+	# ROM: 0x3F6018
+	.4byte 0
+
+.global lbl_805A867C
+lbl_805A867C:
+	# ROM: 0x3F601C
+	.4byte 0x437F0000
+
+.global lbl_805A8680
+lbl_805A8680:
+	# ROM: 0x3F6020
+	.4byte 0
+
+.global lbl_805A8684
+lbl_805A8684:
+	# ROM: 0x3F6024
+	.4byte 0x3F800000
+
+.global lbl_805A8688
+lbl_805A8688:
+	# ROM: 0x3F6028
+	.4byte 0
+
+.global lbl_805A868C
+lbl_805A868C:
+	# ROM: 0x3F602C
+	.4byte 0x3F800000
+
+.global lbl_805A8690
+lbl_805A8690:
+	# ROM: 0x3F6030
+	.4byte 0
+
+.global lbl_805A8694
+lbl_805A8694:
+	# ROM: 0x3F6034
+	.4byte 0x3F000000
+
+.global lbl_805A8698
+lbl_805A8698:
+	# ROM: 0x3F6038
+	.4byte 0
+
+.global lbl_805A869C
+lbl_805A869C:
+	# ROM: 0x3F603C
+	.4byte 0
+
+.global lbl_805A86A0
+lbl_805A86A0:
+	# ROM: 0x3F6040
+	.4byte 0
+
+.global lbl_805A86A4
+lbl_805A86A4:
+	# ROM: 0x3F6044
+	.4byte 0x3F800000
+
+.global lbl_805A86A8
+lbl_805A86A8:
+	# ROM: 0x3F6048
+	.4byte 0
+
+.global lbl_805A86AC
+lbl_805A86AC:
+	# ROM: 0x3F604C
+	.4byte 0
+
 .section .sbss2, "", @nobits

 # CCubeRenderer
@ -7909,7 +8021,7 @@ lbl_802BCE54:
 /* 802BCE5C 002B9DBC  41 82 00 08 */	beq lbl_802BCE64
 /* 802BCE60 002B9DC0  38 04 00 04 */	addi r0, r4, 4
 lbl_802BCE64:
-/* 802BCE64 002B9DC4  90 0D 9A 90 */	stw r0, lbl_805A8650@sda21(r13)
+/* 802BCE64 002B9DC4  90 0D 9A 90 */	stw r0, sWeaponRenderer__15IWeaponRenderer@sda21(r13)
 /* 802BCE68 002B9DC8  7C 83 23 78 */	mr r3, r4
 /* 802BCE6C 002B9DCC  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 802BCE70 002B9DD0  83 E1 00 1C */	lwz r31, 0x1c(r1)
--- a/asm/MetroidPrime/BodyState/CABSAim.s
+++ b/asm/MetroidPrime/BodyState/CABSAim.s
@ -14,6 +14,29 @@ lbl_803E5CA0:
 	.4byte UpdateBody__7CABSAimFfR15CBodyControllerR13CStateManager
 	.4byte Shutdown__7CABSAimFR15CBodyController

+.section .sdata
+
+
+.global lbl_805A7D98
+lbl_805A7D98:
+	# ROM: 0x3F5738
+	.4byte 0xC0400000
+
+.global lbl_805A7D9C
+lbl_805A7D9C:
+	# ROM: 0x3F573C
+	.4byte 0xC1200000
+
+.global lbl_805A7DA0
+lbl_805A7DA0:
+	# ROM: 0x3F5740
+	.4byte 0xC0400000
+
+.global lbl_805A7DA4
+lbl_805A7DA4:
+	# ROM: 0x3F5744
+	.4byte 0xC1200000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__7CABSAimFv
--- a/asm/MetroidPrime/CActorParticles.s
+++ b/asm/MetroidPrime/CActorParticles.s
@ -1,5 +1,27 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A7DE8
+lbl_805A7DE8:
+	# ROM: 0x3F5788
+	.4byte 0
+
+.global lbl_805A7DEC
+lbl_805A7DEC:
+	# ROM: 0x3F578C
+	.4byte 0x00000010
+
+.global lbl_805A7DF0
+lbl_805A7DF0:
+	# ROM: 0x3F5790
+	.4byte 0x00000001
+
+.global lbl_805A7DF4
+lbl_805A7DF4:
+	# ROM: 0x3F5794
+	.4byte 0x00000004
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetAshyTexture__20CActorModelParticlesFR5CActor
--- a/asm/MetroidPrime/CArtifactDoll.s
+++ b/asm/MetroidPrime/CArtifactDoll.s
@ -1,5 +1,27 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A85D0
+lbl_805A85D0:
+	# ROM: 0x3F5F70
+	.4byte 0x3F800000
+
+.global lbl_805A85D4
+lbl_805A85D4:
+	# ROM: 0x3F5F74
+	.4byte 0x3F800000
+
+.global lbl_805A85D8
+lbl_805A85D8:
+	# ROM: 0x3F5F78
+	.4byte 0
+
+.global lbl_805A85DC
+lbl_805A85DC:
+	# ROM: 0x3F5F7C
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .sdata
+
+.global lbl_805A8078
+lbl_805A8078:
+	# ROM: 0x3F5A18
+	.4byte 0
+
+.global lbl_805A807C
+lbl_805A807C:
+	# ROM: 0x3F5A1C
+	.4byte 0x3F800000
+
+.global lbl_805A8080
+lbl_805A8080:
+	# ROM: 0x3F5A20
+	.4byte 0x01000000
+
+.global lbl_805A8084
+lbl_805A8084:
+	# ROM: 0x3F5A24
+	.4byte 0x00000013
+
+.global lbl_805A8088
+lbl_805A8088:
+	# ROM: 0x3F5A28
+	.4byte 0x00000022
+
+.global lbl_805A808C
+lbl_805A808C:
+	# ROM: 0x3F5A2C
+	.4byte 0x00000012
+
+.global lbl_805A8090
+lbl_805A8090:
+	# ROM: 0x3F5A30
+	.4byte 0x0000001A
+
+.global lbl_805A8094
+lbl_805A8094:
+	# ROM: 0x3F5A34
+	.4byte 0x00000022
+
+.global lbl_805A8098
+lbl_805A8098:
+	# ROM: 0x3F5A38
+	.4byte 0
+
+.global lbl_805A809C
+lbl_805A809C:
+	# ROM: 0x3F5A3C
+	.4byte 0x3F800000
+
 .section .bss

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

+.section .sdata
+
+.global lbl_805A8408
+lbl_805A8408:
+	# ROM: 0x3F5DA8
+	.4byte 0
+
+.global lbl_805A840C
+lbl_805A840C:
+	# ROM: 0x3F5DAC
+	.4byte 0
+
 .section .bss

 .global lbl_8046DCC0
--- a/asm/MetroidPrime/CGBASupport.s
+++ b/asm/MetroidPrime/CGBASupport.s
@ -16,6 +16,17 @@ lbl_803E8C18:
 	.4byte lbl_80248B54
 	.4byte 0

+.section .sdata
+
+.global lbl_805A82B8
+lbl_805A82B8:
+	# ROM: 0x3F5C58
+	.4byte 0
+
+.global lbl_805A82BC
+lbl_805A82BC:
+	# ROM: 0x3F5C5C
+	.4byte 0

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

--- a/asm/MetroidPrime/CIkChain.s
+++ b/asm/MetroidPrime/CIkChain.s
@ -1,5 +1,47 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8100
+lbl_805A8100:
+	# ROM: 0x3F5AA0
+	.4byte 0xBF800000
+
+.global lbl_805A8104
+lbl_805A8104:
+	# ROM: 0x3F5AA4
+	.4byte 0x3F800000
+
+.global lbl_805A8108
+lbl_805A8108:
+	# ROM: 0x3F5AA8
+	.4byte 0xBF800000
+
+.global lbl_805A810C
+lbl_805A810C:
+	# ROM: 0x3F5AAC
+	.4byte 0x3F800000
+
+.global lbl_805A8110
+lbl_805A8110:
+	# ROM: 0x3F5AB0
+	.4byte 0x3F800000
+
+.global lbl_805A8114
+lbl_805A8114:
+	# ROM: 0x3F5AB4
+	.4byte 0x3F800000
+
+.global lbl_805A8118
+lbl_805A8118:
+	# ROM: 0x3F5AB8
+	.4byte 0x3F800000
+
+.global lbl_805A811C
+lbl_805A811C:
+	# ROM: 0x3F5ABC
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global Update__8CIkChainFf
--- a/asm/MetroidPrime/CInventoryScreen.s
+++ b/asm/MetroidPrime/CInventoryScreen.s
@ -86,12 +86,28 @@ lbl_803E6F64:
 .global lbl_803E6FC4
 lbl_803E6FC4:
 	# ROM: 0x3E3FC4
-	.4byte 0x003F003F
-	.4byte 0x003F003F
-	.4byte 0x003F003F
+	.string16 "??????"
+	.4byte 0
+
+.section .sdata
+
+.global lbl_805A7F40
+lbl_805A7F40:
+	# ROM: 0x3F58E0
+	.4byte 0
+
+.global lbl_805A7F44
+lbl_805A7F44:
+	# ROM: 0x3F58E4
+	.4byte 0x3F800000
+
+.global lbl_805A7F48
+lbl_805A7F48:
+	# ROM: 0x3F58E8
 	.4byte 0
 	.4byte 0

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

 .global IsRightLogDynamic__16CInventoryScreenCFv
--- a/asm/MetroidPrime/CLogBookScreen.s
+++ b/asm/MetroidPrime/CLogBookScreen.s
@ -50,6 +50,28 @@ lbl_803E8BCC:
 	.4byte 0x000A000A
 	.4byte 0

+.section .sdata
+
+.global lbl_805A82A8
+lbl_805A82A8:
+	# ROM: 0x3F5C48
+	.4byte 0x3F800000
+
+.global lbl_805A82AC
+lbl_805A82AC:
+	# ROM: 0x3F5C4C
+	.4byte 0
+
+.global lbl_805A82B0
+lbl_805A82B0:
+	# ROM: 0x3F5C50
+	.4byte 0
+
+.global lbl_805A82B4
+lbl_805A82B4:
+	# ROM: 0x3F5C54
+	.4byte 0x00000005
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global IsScanComplete__14CLogBookScreenF13EScanCategoryUiRC12CPlayerState
--- a/asm/MetroidPrime/CMapUniverse.s
+++ b/asm/MetroidPrime/CMapUniverse.s
@ -10,6 +10,14 @@ lbl_803E6BD0:
 	.4byte "__dt__40TObjOwnerDerivedFromIObj<12CMapUniverse>Fv"
 	.4byte 0

+.section .sdata
+
+.global lbl_805A7F08
+lbl_805A7F08:
+	# ROM: 0x3F58A8
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global FMapUniverseFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer
--- a/asm/MetroidPrime/CMemoryCardDriver.s
+++ b/asm/MetroidPrime/CMemoryCardDriver.s
@ -36,6 +36,29 @@ lbl_803E8D6C:
 	.4byte lbl_8024E7A0
 	.4byte lbl_8024E7B0

+.section .sdata
+
+.global lbl_805A82D0
+lbl_805A82D0:
+	# ROM: 0x3F5C70
+	.byte 0x00
+
+.global lbl_805A82D1
+lbl_805A82D1:
+	# ROM: 0x3F5C71
+	.byte 0x00
+
+.global lbl_805A82D2
+lbl_805A82D2:
+	# ROM: 0x3F5C72
+	.byte 0x00
+
+.global lbl_805A82D3
+lbl_805A82D3:
+	# ROM: 0x3F5C73
+	.balign 4
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetCardFreeBytes__17CMemoryCardDriverFv
--- a/asm/MetroidPrime/CMessageScreen.s
+++ b/asm/MetroidPrime/CMessageScreen.s
@ -1,5 +1,28 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A7E30
+lbl_805A7E30:
+	# ROM: 0x3F57D0
+	.4byte 0
+
+.global lbl_805A7E34
+lbl_805A7E34:
+	# ROM: 0x3F57D4
+	.4byte 0
+
+.global lbl_805A7E38
+lbl_805A7E38:
+	# ROM: 0x3F57D8
+	.4byte 0
+
+.global lbl_805A7E3C
+lbl_805A7E3C:
+	# ROM: 0x3F57DC
+	.4byte 0x3F800000
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global Draw__14CMessageScreenCFv
--- a/asm/MetroidPrime/CPauseScreenBlur.s
+++ b/asm/MetroidPrime/CPauseScreenBlur.s
@ -10,6 +10,18 @@ lbl_803E9A00:
 	.4byte __dt__16CPauseScreenBlurFv
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8398
+lbl_805A8398:
+	# ROM: 0x3F5D38
+	.4byte 0
+
+.global lbl_805A839C
+lbl_805A839C:
+	# ROM: 0x3F5D3C
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetBlurAmt__16CPauseScreenBlurCFv
--- a/asm/MetroidPrime/CPauseScreenFrame.s
+++ b/asm/MetroidPrime/CPauseScreenFrame.s
@ -129,7 +129,29 @@ lbl_803E8864:
 	.4byte 0
 	.4byte 0
 	.4byte 0
-	
+
+.section .sdata
+
+.global lbl_805A8290
+lbl_805A8290:
+	# ROM: 0x3F5C30
+	.4byte 0x3F800000
+
+.global lbl_805A8294
+lbl_805A8294:
+	# ROM: 0x3F5C34
+	.4byte 0
+
+.global lbl_805A8298
+lbl_805A8298:
+	# ROM: 0x3F5C38
+	.4byte 0x3F800000
+
+.global lbl_805A829C
+lbl_805A829C:
+	# ROM: 0x3F5C3C
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

+.section .sdata
+
+.global lbl_805A85E0
+lbl_805A85E0:
+	# ROM: 0x3F5F80
+	.4byte 0x3F800000
+	.4byte 0
+
 .section .sbss2, "", @nobits
 # CProjectedShadow
 .global lbl_805AF480
--- a/asm/MetroidPrime/CRagDoll.s
+++ b/asm/MetroidPrime/CRagDoll.s
@ -12,6 +12,54 @@ lbl_803E70D0:
 	.4byte PreRender__8CRagDollFRC9CVector3fR10CModelData
 	.4byte 0

+.section .sdata
+
+.global lbl_805A7FB8
+lbl_805A7FB8:
+	# ROM: 0x3F5958
+	.4byte 0x00000013
+
+.global lbl_805A7FBC
+lbl_805A7FBC:
+	# ROM: 0x3F595C
+	.4byte 0x00000013
+
+.global lbl_805A7FC0
+lbl_805A7FC0:
+	# ROM: 0x3F5960
+	.4byte 0x00000030
+
+.global lbl_805A7FC4
+lbl_805A7FC4:
+	# ROM: 0x3F5964
+	.4byte 0x00000021
+
+.global lbl_805A7FC8
+lbl_805A7FC8:
+	# ROM: 0x3F5968
+	.4byte 0x00000020
+
+.global lbl_805A7FCC
+lbl_805A7FCC:
+	# ROM: 0x3F596C
+	.4byte 0x00000030
+
+.global lbl_805A7FD0
+lbl_805A7FD0:
+	# ROM: 0x3F5970
+	.4byte 0x0000002A
+
+.global lbl_805A7FD4
+lbl_805A7FD4:
+	# ROM: 0x3F5974
+	.4byte 0x00000021
+
+.global lbl_805A7FD8
+lbl_805A7FD8:
+	# ROM: 0x3F5978
+	.4byte 0x00000020
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global PreRender__8CRagDollFRC9CVector3fR10CModelData
--- a/asm/MetroidPrime/CSaveGameScreen.s
+++ b/asm/MetroidPrime/CSaveGameScreen.s
@ -65,6 +65,14 @@ lbl_803E8E40:
 	.4byte 0x803D4B5B
 	.4byte 0x803D4B66

+.section .sdata
+
+.global lbl_805A82D8
+lbl_805A82D8:
+	# ROM: 0x3F5C78
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global SetInGame__15CSaveGameScreenb
--- a/asm/MetroidPrime/CSlideShow.s
+++ b/asm/MetroidPrime/CSlideShow.s
@ -37,6 +37,84 @@ lbl_805AF478:
 lbl_805AF47C:
 	.skip 0x4

+.section .sdata
+
+.global lbl_805A8590
+lbl_805A8590:
+	# ROM: 0x3F5F30
+	.4byte 0
+
+.global lbl_805A8594
+lbl_805A8594:
+	# ROM: 0x3F5F34
+	.4byte 0
+
+.global lbl_805A8598
+lbl_805A8598:
+	# ROM: 0x3F5F38
+	.4byte 0x3F800000
+
+.global lbl_805A859C
+lbl_805A859C:
+	# ROM: 0x3F5F3C
+	.4byte 0
+
+.global lbl_805A85A0
+lbl_805A85A0:
+	# ROM: 0x3F5F40
+	.4byte 0
+
+.global lbl_805A85A4
+lbl_805A85A4:
+	# ROM: 0x3F5F44
+	.4byte 0
+
+.global lbl_805A85A8
+lbl_805A85A8:
+	# ROM: 0x3F5F48
+	.4byte 0x00000001
+
+.global lbl_805A85AC
+lbl_805A85AC:
+	# ROM: 0x3F5F4C
+	.4byte 0
+
+.global lbl_805A85B0
+lbl_805A85B0:
+	# ROM: 0x3F5F50
+	.4byte 0
+
+.global lbl_805A85B4
+lbl_805A85B4:
+	# ROM: 0x3F5F54
+	.4byte 0
+
+.global lbl_805A85B8
+lbl_805A85B8:
+	# ROM: 0x3F5F58
+	.4byte 0x3F800000
+
+.global lbl_805A85BC
+lbl_805A85BC:
+	# ROM: 0x3F5F5C
+	.4byte 0
+
+.global lbl_805A85C0
+lbl_805A85C0:
+	# ROM: 0x3F5F60
+	.4byte 0x3F800000
+
+.global lbl_805A85C4
+lbl_805A85C4:
+	# ROM: 0x3F5F64
+	.4byte 0
+
+.global lbl_805A85C8
+lbl_805A85C8:
+	# ROM: 0x3F5F68
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetIsContinueDraw__10CSlideShowFv
--- a/asm/MetroidPrime/CVisorFlare.s
+++ b/asm/MetroidPrime/CVisorFlare.s
@ -1,5 +1,37 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A7F50
+lbl_805A7F50:
+	# ROM: 0x3F58F0
+	.4byte 0x38D1B717
+
+.global lbl_805A7F54
+lbl_805A7F54:
+	# ROM: 0x3F58F4
+	.4byte 0x0000002A
+
+.global lbl_805A7F58
+lbl_805A7F58:
+	# ROM: 0x3F58F8
+	.4byte 0x00000013
+
+.global lbl_805A7F5C
+lbl_805A7F5C:
+	# ROM: 0x3F58FC
+	.4byte 0x0000001A
+
+.global lbl_805A7F60
+lbl_805A7F60:
+	# ROM: 0x3F5900
+	.4byte 0
+
+.global lbl_805A7F64
+lbl_805A7F64:
+	# ROM: 0x3F5904
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_802075fc
--- a/asm/MetroidPrime/CWorldTransManager.s
+++ b/asm/MetroidPrime/CWorldTransManager.s
@ -1,5 +1,63 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A7F88
+lbl_805A7F88:
+	# ROM: 0x3F5928
+	.4byte 0
+
+.global lbl_805A7F8C
+lbl_805A7F8C:
+	# ROM: 0x3F592C
+	.4byte 0x42C80000
+
+.global lbl_805A7F90
+lbl_805A7F90:
+	# ROM: 0x3F5930
+	.4byte 0
+
+.global lbl_805A7F94
+lbl_805A7F94:
+	# ROM: 0x3F5934
+	.4byte 0x3F800000
+
+.global lbl_805A7F98
+lbl_805A7F98:
+	# ROM: 0x3F5938
+	.4byte 0
+
+.global lbl_805A7F9C
+lbl_805A7F9C:
+	# ROM: 0x3F593C
+	.4byte 0x3F800000
+
+.global lbl_805A7FA0
+lbl_805A7FA0:
+	# ROM: 0x3F5940
+	.4byte 0
+
+.global lbl_805A7FA4
+lbl_805A7FA4:
+	# ROM: 0x3F5944
+	.4byte 0x3F800000
+
+.global lbl_805A7FA8
+lbl_805A7FA8:
+	# ROM: 0x3F5948
+	.4byte 0x3F800000
+
+.global lbl_805A7FAC
+lbl_805A7FAC:
+	# ROM: 0x3F594C
+	.4byte 0x3F800000
+
+.global lbl_805A7FB0
+lbl_805A7FB0:
+	# ROM: 0x3F5950
+	.4byte 0
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global WaitForModelsAndTextures__18CWorldTransManagerFv
--- a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s
+++ b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s
@ -1,5 +1,58 @@
 .include "macros.inc"

+.section .sdata
+
+.global lbl_805A8248
+lbl_805A8248:
+	# ROM: 0x3F5BE8
+	.4byte 0
+
+.global lbl_805A824C
+lbl_805A824C:
+	# ROM: 0x3F5BEC
+	.4byte 0x3F800000
+
+.global lbl_805A8250
+lbl_805A8250:
+	# ROM: 0x3F5BF0
+	.4byte 0x00000013
+
+.global lbl_805A8254
+lbl_805A8254:
+	# ROM: 0x3F5BF4
+	.4byte 0x00000013
+
+.global lbl_805A8258
+lbl_805A8258:
+	# ROM: 0x3F5BF8
+	.4byte 0x00000012
+
+.global lbl_805A825C
+lbl_805A825C:
+	# ROM: 0x3F5BFC
+	.4byte 0x00000020
+
+.global lbl_805A8260
+lbl_805A8260:
+	# ROM: 0x3F5C00
+	.4byte 0x00000021
+
+.global lbl_805A8264
+lbl_805A8264:
+	# ROM: 0x3F5C04
+	.4byte 0x00000015
+
+.global lbl_805A8268
+lbl_805A8268:
+	# ROM: 0x3F5C08
+	.4byte 0
+
+.global lbl_805A826C
+lbl_805A826C:
+	# ROM: 0x3F5C0C
+	.4byte 0x3F800000
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global nullsub_19
--- a/asm/MetroidPrime/Enemies/CAtomicAlpha.s
+++ b/asm/MetroidPrime/Enemies/CAtomicAlpha.s
@ -186,6 +186,18 @@ lbl_803E88A8:
 	.4byte GetDeathExplosionParticle__10CPatternedCFv
 	.4byte 0

+.section .sdata
+
+.global lbl_805A82A0
+lbl_805A82A0:
+	# ROM: 0x3F5C40
+	.4byte 0
+
+.global lbl_805A82A4
+lbl_805A82A4:
+	# ROM: 0x3F5C44
+	.4byte 0x3F800000
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__12CAtomicAlphaFv
--- a/asm/MetroidPrime/Enemies/CAtomicBeta.s
+++ b/asm/MetroidPrime/Enemies/CAtomicBeta.s
@ -184,7 +184,16 @@ lbl_803E8E4C:
 	.4byte GetProjectileInfo__10CPatternedFv
 	.4byte PhazeOut__10CPatternedFR13CStateManager
 	.4byte GetDeathExplosionParticle__10CPatternedCFv
-	
+
+.section .sdata
+
+.global lbl_805A82E0
+lbl_805A82E0:
+	# ROM: 0x3F5C80
+	.4byte 0
+	.4byte 0
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetDamageVulnerability__11CAtomicBetaFv
--- a/asm/MetroidPrime/Enemies/CBabygoth.s
+++ b/asm/MetroidPrime/Enemies/CBabygoth.s
@ -267,6 +267,44 @@ lbl_803E767C:
 	.4byte lbl_80223280
 	.4byte lbl_80223268

+.section .sdata
+
+.global lbl_805A80D8
+lbl_805A80D8:
+	# ROM: 0x3F5A78
+	.4byte 0x00000013
+
+.global lbl_805A80DC
+lbl_805A80DC:
+	# ROM: 0x3F5A7C
+	.4byte 0x00000013
+
+.global lbl_805A80E0
+lbl_805A80E0:
+	# ROM: 0x3F5A80
+	.4byte 0x0000002F
+
+.global lbl_805A80E4
+lbl_805A80E4:
+	# ROM: 0x3F5A84
+	.4byte 0x0000001C
+
+.global lbl_805A80E8
+lbl_805A80E8:
+	# ROM: 0x3F5A88
+	.4byte 0x00000020
+
+.global lbl_805A80EC
+lbl_805A80EC:
+	# ROM: 0x3F5A8C
+	.4byte 0x00000035
+
+.global lbl_805A80F0
+lbl_805A80F0:
+	# ROM: 0x3F5A90
+	.4byte 0x00000015
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_8021d43c
--- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s
+++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s
@ -40,6 +40,63 @@ lbl_803E7ED0:
 	.4byte GetWeight__13CPhysicsActorCFv
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8178
+lbl_805A8178:
+	# ROM: 0x3F5B18
+	.4byte 0x00000013
+
+.global lbl_805A817C
+lbl_805A817C:
+	# ROM: 0x3F5B1C
+	.4byte 0x00000013
+
+.global lbl_805A8180
+lbl_805A8180:
+	# ROM: 0x3F5B20
+	.4byte 0x00000023
+
+.global lbl_805A8184
+lbl_805A8184:
+	# ROM: 0x3F5B24
+	.4byte 0x00000021
+
+.global lbl_805A8188
+lbl_805A8188:
+	# ROM: 0x3F5B28
+	.4byte 0x00000013
+
+.global lbl_805A818C
+lbl_805A818C:
+	# ROM: 0x3F5B2C
+	.4byte 0x0000001D
+
+.global lbl_805A8190
+lbl_805A8190:
+	# ROM: 0x3F5B30
+	.4byte 0x0000001E
+
+.global lbl_805A8194
+lbl_805A8194:
+	# ROM: 0x3F5B34
+	.4byte 0x0000001F
+
+.global lbl_805A8198
+lbl_805A8198:
+	# ROM: 0x3F5B38
+	.4byte 0x00000021
+
+.global lbl_805A819C
+lbl_805A819C:
+	# ROM: 0x3F5B3C
+	.4byte 0x00000021
+
+.global lbl_805A81A0
+lbl_805A81A0:
+	# ROM: 0x3F5B40
+	.4byte 0x00000020
+	.4byte 0

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

--- a/asm/MetroidPrime/Enemies/CElitePirate.s
+++ b/asm/MetroidPrime/Enemies/CElitePirate.s
@ -267,6 +267,109 @@ lbl_803E7E20:
 	.4byte lbl_8022D2F4
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8128
+lbl_805A8128:
+	# ROM: 0x3F5AC8
+	.4byte 0x00000013
+
+.global lbl_805A812C
+lbl_805A812C:
+	# ROM: 0x3F5ACC
+	.4byte 0x0000001E
+
+.global lbl_805A8130
+lbl_805A8130:
+	# ROM: 0x3F5AD0
+	.4byte 0x0000001D
+
+.global lbl_805A8134
+lbl_805A8134:
+	# ROM: 0x3F5AD4
+	.4byte 0x00000030
+
+.global lbl_805A8138
+lbl_805A8138:
+	# ROM: 0x3F5AD8
+	.4byte 0x00000021
+
+.global lbl_805A813C
+lbl_805A813C:
+	# ROM: 0x3F5ADC
+	.4byte 0x0000001E
+
+.global lbl_805A8140
+lbl_805A8140:
+	# ROM: 0x3F5AE0
+	.4byte 0x0000001D
+
+.global lbl_805A8144
+lbl_805A8144:
+	# ROM: 0x3F5AE4
+	.4byte 0x00000030
+
+.global lbl_805A8148
+lbl_805A8148:
+	# ROM: 0x3F5AE8
+	.4byte 0x00000021
+
+.global lbl_805A814C
+lbl_805A814C:
+	# ROM: 0x3F5AEC
+	.4byte 0x0000002F
+
+.global lbl_805A8150
+lbl_805A8150:
+	# ROM: 0x3F5AF0
+	.4byte 0x0000001C
+
+.global lbl_805A8154
+lbl_805A8154:
+	# ROM: 0x3F5AF4
+	.4byte 0x00000020
+
+.global lbl_805A8158
+lbl_805A8158:
+	# ROM: 0x3F5AF8
+	.4byte 0x00000013
+
+.global lbl_805A815C
+lbl_805A815C:
+	# ROM: 0x3F5AFC
+	.4byte 0x00000035
+
+.global lbl_805A8160
+lbl_805A8160:
+	# ROM: 0x3F5B00
+	.4byte 0x00000015
+
+.global lbl_805A8164
+lbl_805A8164:
+	# ROM: 0x3F5B04
+	.4byte 0x0000002B
+
+.global lbl_805A8168
+lbl_805A8168:
+	# ROM: 0x3F5B08
+	.4byte 0x00000035
+
+.global lbl_805A816C
+lbl_805A816C:
+	# ROM: 0x3F5B0C
+	.4byte 0x00000015
+
+.global lbl_805A8170
+lbl_805A8170:
+	# ROM: 0x3F5B10
+	.4byte 0x00000023
+
+.global lbl_805A8174
+lbl_805A8174:
+	# ROM: 0x3F5B14
+	.4byte 0x00000021
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global GetSearchPath__12CElitePirateFv
--- a/asm/MetroidPrime/Enemies/CEyeBall.s
+++ b/asm/MetroidPrime/Enemies/CEyeBall.s
@ -218,6 +218,14 @@ lbl_803E7A18:
 	.4byte lbl_802252D8
 	.4byte lbl_80225358

+.section .sdata
+
+.global lbl_805A80F8
+lbl_805A80F8:
+	# ROM: 0x3F5A98
+	.4byte 0x803D3248
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__8CEyeBallFv
--- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s
+++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s
@ -34,6 +34,44 @@ lbl_803E6FD8:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0

+.section .sdata
+
+.global lbl_805A7F68
+lbl_805A7F68:
+	# ROM: 0x3F5908
+	.4byte 0x00000023
+
+.global lbl_805A7F6C
+lbl_805A7F6C:
+	# ROM: 0x3F590C
+	.4byte 0x00000013
+
+.global lbl_805A7F70
+lbl_805A7F70:
+	# ROM: 0x3F5910
+	.4byte 0x00000020
+
+.global lbl_805A7F74
+lbl_805A7F74:
+	# ROM: 0x3F5914
+	.4byte 0x00000022
+
+.global lbl_805A7F78
+lbl_805A7F78:
+	# ROM: 0x3F5918
+	.4byte 0x0000002F
+
+.global lbl_805A7F7C
+lbl_805A7F7C:
+	# ROM: 0x3F591C
+	.4byte 0x00000026
+
+.global lbl_805A7F80
+lbl_805A7F80:
+	# ROM: 0x3F5920
+	.4byte 0x00000021
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AcceptScriptMsg__15CFlaahgraPlantsF20EScriptObjectMessage9TUniqueIdR13CStateManager
--- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s
+++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s
@ -222,6 +222,43 @@ lbl_803E66D4:
 	.4byte lbl_801F0CB0
 	.4byte lbl_801F0E38

+.section .sdata
+
+.global lbl_805A7E40
+lbl_805A7E40:
+	# ROM: 0x3F57E0
+	.4byte 0x00000013
+
+.global lbl_805A7E44
+lbl_805A7E44:
+	# ROM: 0x3F57E4
+	.4byte 0x00000020
+
+.global lbl_805A7E48
+lbl_805A7E48:
+	# ROM: 0x3F57E8
+	.4byte 0x00000021
+
+.global lbl_805A7E4C
+lbl_805A7E4C:
+	# ROM: 0x3F57EC
+	.4byte 0x0000002F
+
+.global lbl_805A7E50
+lbl_805A7E50:
+	# ROM: 0x3F57F0
+	.4byte 0x00000026
+
+.global lbl_805A7E54
+lbl_805A7E54:
+	# ROM: 0x3F57F4
+	.4byte 0x00000014
+
+.global lbl_805A7E58
+lbl_805A7E58:
+	# ROM: 0x3F57F8
+	.4byte 0x00000013
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global SaveBombSlotInfo__17CFlaahgraTentacleFR13CStateManager
--- a/asm/MetroidPrime/Enemies/CFlyingPirate.s
+++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s
@ -292,6 +292,161 @@ lbl_803E6B98:
 	.4byte PreRender__20CFlyingPirateRagDollFRC9CVector3fR10CModelData
 	.4byte 0

+.section .sdata
+
+
+.global lbl_805A7E80
+lbl_805A7E80:
+	# ROM: 0x3F5820
+	.4byte 0x00000013
+
+.global lbl_805A7E84
+lbl_805A7E84:
+	# ROM: 0x3F5824
+	.4byte 0x00000021
+
+.global lbl_805A7E88
+lbl_805A7E88:
+	# ROM: 0x3F5828
+	.4byte 0x00000013
+	.4byte 0
+
+.global lbl_805A7E90
+lbl_805A7E90:
+	# ROM: 0x3F5830
+	.4byte 0x00000013
+
+.global lbl_805A7E94
+lbl_805A7E94:
+	# ROM: 0x3F5834
+	.4byte 0x447A0000
+
+.global lbl_805A7E98
+lbl_805A7E98:
+	# ROM: 0x3F5838
+	.4byte 0x42FE0000
+
+.global lbl_805A7E9C
+lbl_805A7E9C:
+	# ROM: 0x3F583C
+	.4byte 0x00000013
+
+.global lbl_805A7EA0
+lbl_805A7EA0:
+	# ROM: 0x3F5840
+	.4byte 0x00000023
+
+.global lbl_805A7EA4
+lbl_805A7EA4:
+	# ROM: 0x3F5844
+	.4byte 0x00000013
+
+.global lbl_805A7EA8
+lbl_805A7EA8:
+	# ROM: 0x3F5848
+	.4byte 0x00000020
+
+.global lbl_805A7EAC
+lbl_805A7EAC:
+	# ROM: 0x3F584C
+	.4byte 0x00000012
+
+.global lbl_805A7EB0
+lbl_805A7EB0:
+	# ROM: 0x3F5850
+	.4byte 0x00000020
+
+.global lbl_805A7EB4
+lbl_805A7EB4:
+	# ROM: 0x3F5854
+	.4byte 0x00000012
+
+.global lbl_805A7EB8
+lbl_805A7EB8:
+	# ROM: 0x3F5858
+	.4byte 0x00000021
+
+.global lbl_805A7EBC
+lbl_805A7EBC:
+	# ROM: 0x3F585C
+	.4byte 0x00000020
+
+.global lbl_805A7EC0
+lbl_805A7EC0:
+	# ROM: 0x3F5860
+	.4byte 0x00000012
+
+.global lbl_805A7EC4
+lbl_805A7EC4:
+	# ROM: 0x3F5864
+	.4byte 0x00000020
+
+.global lbl_805A7EC8
+lbl_805A7EC8:
+	# ROM: 0x3F5868
+	.4byte 0x00000012
+
+.global lbl_805A7ECC
+lbl_805A7ECC:
+	# ROM: 0x3F586C
+	.4byte 0x3F800000
+
+.global lbl_805A7ED0
+lbl_805A7ED0:
+	# ROM: 0x3F5870
+	.4byte 0x00000020
+
+.global lbl_805A7ED4
+lbl_805A7ED4:
+	# ROM: 0x3F5874
+	.4byte 0x00000012
+
+.global lbl_805A7ED8
+lbl_805A7ED8:
+	# ROM: 0x3F5878
+	.4byte 0x00000030
+
+.global lbl_805A7EDC
+lbl_805A7EDC:
+	# ROM: 0x3F587C
+	.4byte 0
+
+.global lbl_805A7EE0
+lbl_805A7EE0:
+	# ROM: 0x3F5880
+	.4byte 0
+
+.global lbl_805A7EE4
+lbl_805A7EE4:
+	# ROM: 0x3F5884
+	.4byte 0
+
+.global lbl_805A7EE8
+lbl_805A7EE8:
+	# ROM: 0x3F5888
+	.4byte 0
+
+.global lbl_805A7EEC
+lbl_805A7EEC:
+	# ROM: 0x3F588C
+	.4byte 0x3F800000
+
+.global lbl_805A7EF0
+lbl_805A7EF0:
+	# ROM: 0x3F5890
+	.4byte 0x3FFFDF3B
+
+.global lbl_805A7EF4
+lbl_805A7EF4:
+	# ROM: 0x3F5894
+	.4byte 0x3EAA7EFA
+
+.global lbl_805A7EF8
+lbl_805A7EF8:
+	# ROM: 0x3F5898
+	.4byte 0x3DCCCCCD
+	.4byte 0
+
 .section .bss

 .global lbl_8046C950
--- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s
+++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s
@ -71,6 +71,85 @@ lbl_803E7FDC:
 	.4byte lbl_80230CD0
 	.4byte 0

+.section .sdata
+
+.global lbl_805A81A8
+lbl_805A81A8:
+	# ROM: 0x3F5B48
+	.4byte 0x00000021
+
+.global lbl_805A81AC
+lbl_805A81AC:
+	# ROM: 0x3F5B4C
+	.4byte 0x00000013
+
+.global lbl_805A81B0
+lbl_805A81B0:
+	# ROM: 0x3F5B50
+	.4byte 0x3C23D70A
+
+.global lbl_805A81B4
+lbl_805A81B4:
+	# ROM: 0x3F5B54
+	.4byte 0xBF490FDB
+
+.global lbl_805A81B8
+lbl_805A81B8:
+	# ROM: 0x3F5B58
+	.4byte 0xC0400000
+
+.global lbl_805A81BC
+lbl_805A81BC:
+	# ROM: 0x3F5B5C
+	.4byte 0xC1200000
+
+.global lbl_805A81C0
+lbl_805A81C0:
+	# ROM: 0x3F5B60
+	.4byte 0xBF490FDB
+
+.global lbl_805A81C4
+lbl_805A81C4:
+	# ROM: 0x3F5B64
+	.4byte 0xC0400000
+
+.global lbl_805A81C8
+lbl_805A81C8:
+	# ROM: 0x3F5B68
+	.4byte 0xC1200000
+
+.global lbl_805A81CC
+lbl_805A81CC:
+	# ROM: 0x3F5B6C
+	.4byte 0xBF000000
+
+.global lbl_805A81D0
+lbl_805A81D0:
+	# ROM: 0x3F5B70
+	.4byte 0xBF000000
+
+.global lbl_805A81D4
+lbl_805A81D4:
+	# ROM: 0x3F5B74
+	.4byte 0
+
+.global lbl_805A81D8
+lbl_805A81D8:
+	# ROM: 0x3F5B78
+	.4byte 0
+
+.global lbl_805A81DC
+lbl_805A81DC:
+	# ROM: 0x3F5B7C
+	.4byte 0
+
+.global lbl_805A81E0
+lbl_805A81E0:
+	# ROM: 0x3F5B80
+	.4byte 0x3F800000
+	.4byte 0
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

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

 .section .data

-
 .global lbl_803E5930
 lbl_803E5930:
 	# ROM: 0x3E2930
@ -207,6 +206,24 @@ lbl_803E5954:
 	.4byte PhazeOut__10CPatternedFR13CStateManager
 	.4byte GetDeathExplosionParticle__10CPatternedCFv

+.section .sdata
+
+.global lbl_805A7D88
+lbl_805A7D88:
+	# ROM: 0x3F5728
+	.4byte 0
+
+.global lbl_805A7D8C
+lbl_805A7D8C:
+	# ROM: 0x3F572C
+	.4byte 0x3F800000
+
+.global lbl_805A7D90
+lbl_805A7D90:
+	# ROM: 0x3F5730
+	.4byte 0x00000020
+	.4byte 0
+
 .section .bss

 .global lbl_8046C920
--- a/asm/MetroidPrime/Enemies/CKnockBackController.s
+++ b/asm/MetroidPrime/Enemies/CKnockBackController.s
@ -30,6 +30,19 @@ lbl_803E8178:
 	.4byte lbl_80233A78
 	.4byte 0

+.section .sdata
+
+.global lbl_805A81F8
+lbl_805A81F8:
+	# ROM: 0x3F5B98
+	.4byte 0
+
+.global lbl_805A81FC
+lbl_805A81FC:
+	# ROM: 0x3F5B9C
+	.4byte 0
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global DoKnockBackAnimation__20CKnockBackControllerFRC9CVector3fR13CStateManagerR10CPatternedf
--- a/asm/MetroidPrime/Enemies/CMagdolite.s
+++ b/asm/MetroidPrime/Enemies/CMagdolite.s
@ -292,6 +292,58 @@ lbl_803E850C:
 	.4byte lbl_80236D40
 	.4byte lbl_80236D28

+.section .sdata
+
+.global lbl_805A8208
+lbl_805A8208:
+	# ROM: 0x3F5BA8
+	.4byte 0x00000013
+
+.global lbl_805A820C
+lbl_805A820C:
+	# ROM: 0x3F5BAC
+	.4byte 0x803D4310
+
+.global lbl_805A8210
+lbl_805A8210:
+	# ROM: 0x3F5BB0
+	.4byte 0x803D431E
+
+.global lbl_805A8214
+lbl_805A8214:
+	# ROM: 0x3F5BB4
+	.4byte 0x803D431E
+
+.global lbl_805A8218
+lbl_805A8218:
+	# ROM: 0x3F5BB8
+	.4byte 0x803D4323
+
+.global lbl_805A821C
+lbl_805A821C:
+	# ROM: 0x3F5BBC
+	.4byte 0x803D432C
+
+.global lbl_805A8220
+lbl_805A8220:
+	# ROM: 0x3F5BC0
+	.4byte 0x00000013
+
+.global lbl_805A8224
+lbl_805A8224:
+	# ROM: 0x3F5BC4
+	.4byte 0x00000021
+
+.global lbl_805A8228
+lbl_805A8228:
+	# ROM: 0x3F5BC8
+	.4byte 0x00000020
+
+.global lbl_805A822C
+lbl_805A822C:
+	# ROM: 0x3F5BCC
+	.4byte 0x00000012
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__10CMagdoliteFv
--- a/Show More
+++ b/Show More