Finish splitting sdata.s

2025-12-09 22:27:40 +00:00 · 2022-04-23 00:19:32 -07:00
parent 813b9e6e01
commit 757e6d48f9
141 changed files with 4364 additions and 4086 deletions
--- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s
+++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s
@@ -199,6 +199,50 @@ lbl_803EC370:
 	.4byte SetActive__7CEntityFb
 	

+.section .sdata
+
+.global lbl_805A85E8
+lbl_805A85E8:
+	# ROM: 0x3F5F88
+	.4byte 0x3F800000
+	.4byte 0
+
+.global lbl_805A85F0
+lbl_805A85F0:
+	# ROM: 0x3F5F90
+	.4byte 0x00000013
+
+.global lbl_805A85F4
+lbl_805A85F4:
+	# ROM: 0x3F5F94
+	.4byte 0x00000020
+
+.global lbl_805A85F8
+lbl_805A85F8:
+	# ROM: 0x3F5F98
+	.4byte 0x3F800000
+
+.global lbl_805A85FC
+lbl_805A85FC:
+	# ROM: 0x3F5F9C
+	.4byte 0
+
+.global lbl_805A8600
+lbl_805A8600:
+	# ROM: 0x3F5FA0
+	.4byte 0x3F800000
+
+.global lbl_805A8604
+lbl_805A8604:
+	# ROM: 0x3F5FA4
+	.4byte 0
+
+.global lbl_805A8608
+lbl_805A8608:
+	# ROM: 0x3F5FA8
+	.4byte 0x00000013
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global sub_8029f318
--- a/asm/MetroidPrime/ScriptObjects/CFire.s
+++ b/asm/MetroidPrime/ScriptObjects/CFire.s
@@ -34,6 +34,18 @@ lbl_803E9990:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8390
+lbl_805A8390:
+	# ROM: 0x3F5D30
+	.4byte 0x00000013
+
+.global lbl_805A8394
+lbl_805A8394:
+	# ROM: 0x3F5D34
+	.4byte 0x00000023
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global AcceptScriptMsg__5CFireF20EScriptObjectMessage9TUniqueIdR13CStateManager
--- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s
+++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s
@@ -34,6 +34,15 @@ lbl_803E70E8:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0

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

 .global __dt__9CRepulsorFv
--- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s
@@ -34,6 +34,14 @@ lbl_803E6398:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0

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

 .global __dt__18CScriptAiJumpPointFv
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s
@@ -34,6 +34,14 @@ lbl_803E8C40:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0

+.section .sdata
+
+.global lbl_805A82C8
+lbl_805A82C8:
+	# ROM: 0x3F5C68
+	.4byte 0x00000022
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__24CScriptCameraHintTriggerFv
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s
@@ -34,6 +34,15 @@ lbl_803E7A70:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8120
+lbl_805A8120:
+	# ROM: 0x3F5AC0
+	.4byte 0x00000022
+	.4byte 0
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__24CScriptCameraPitchVolumeFv
--- a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s
@@ -13,6 +13,19 @@ lbl_803E6BB0:
 	.4byte AcceptScriptMsg__20CScriptColorModulateF20EScriptObjectMessage9TUniqueIdR13CStateManager
 	.4byte SetActive__7CEntityFb

+.section .sdata
+
+.global lbl_805A7F00
+lbl_805A7F00:
+	# ROM: 0x3F58A0
+	.4byte 0x3F800000
+
+.global lbl_805A7F04
+lbl_805A7F04:
+	# ROM: 0x3F58A4
+	.4byte 0x3F800000
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global __dt__20CScriptColorModulateFv
--- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s
@@ -114,6 +114,79 @@ lbl_803E72A4:
 	.4byte lbl_8021A6D0
 	.4byte 0

+.section .sdata
+
+.global lbl_805A80A0
+lbl_805A80A0:
+	# ROM: 0x3F5A40
+	.4byte 0x00000021
+
+.global lbl_805A80A4
+lbl_805A80A4:
+	# ROM: 0x3F5A44
+	.4byte 0x00000013
+
+.global lbl_805A80A8
+lbl_805A80A8:
+	# ROM: 0x3F5A48
+	.4byte 0x00000021
+
+.global lbl_805A80AC
+lbl_805A80AC:
+	# ROM: 0x3F5A4C
+	.4byte 0x00000029
+
+.global lbl_805A80B0
+lbl_805A80B0:
+	# ROM: 0x3F5A50
+	.4byte 0x00000028
+
+.global lbl_805A80B4
+lbl_805A80B4:
+	# ROM: 0x3F5A54
+	.4byte 0
+
+.global lbl_805A80B8
+lbl_805A80B8:
+	# ROM: 0x3F5A58
+	.4byte 0x3F800000
+
+.global lbl_805A80BC
+lbl_805A80BC:
+	# ROM: 0x3F5A5C
+	.4byte 0x00000013
+
+.global lbl_805A80C0
+lbl_805A80C0:
+	# ROM: 0x3F5A60
+	.4byte 0x00000020
+
+.global lbl_805A80C4
+lbl_805A80C4:
+	# ROM: 0x3F5A64
+	.4byte 0x0000002F
+
+.global lbl_805A80C8
+lbl_805A80C8:
+	# ROM: 0x3F5A68
+	.4byte 0x00000020
+
+.global lbl_805A80CC
+lbl_805A80CC:
+	# ROM: 0x3F5A6C
+	.4byte 0x00000021
+
+.global lbl_805A80D0
+lbl_805A80D0:
+	# ROM: 0x3F5A70
+	.4byte 0x00000026
+
+.global lbl_805A80D4
+lbl_805A80D4:
+	# ROM: 0x3F5A74
+	.4byte 0x00000014
+
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global HealthInfo__16CScriptGunTurretFR13CStateManager
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s
@@ -36,6 +36,48 @@ lbl_803E8670:
 	.4byte Reset__20CScriptSpindleCameraFRC12CTransform4fR13CStateManager
 	.4byte 0

+.section .sdata
+
+.global lbl_805A8270
+lbl_805A8270:
+	# ROM: 0x3F5C10
+	.4byte 0x00000013
+
+.global lbl_805A8274
+lbl_805A8274:
+	# ROM: 0x3F5C14
+	.4byte 0x00000012
+
+.global lbl_805A8278
+lbl_805A8278:
+	# ROM: 0x3F5C18
+	.4byte 0x00000020
+
+.global lbl_805A827C
+lbl_805A827C:
+	# ROM: 0x3F5C1C
+	.4byte 0x00000021
+
+.global lbl_805A8280
+lbl_805A8280:
+	# ROM: 0x3F5C20
+	.4byte 0x00000015
+
+.global lbl_805A8284
+lbl_805A8284:
+	# ROM: 0x3F5C24
+	.4byte 0
+
+.global lbl_805A8288
+lbl_805A8288:
+	# ROM: 0x3F5C28
+	.4byte 0
+
+.global lbl_805A828C
+lbl_805A828C:
+	# ROM: 0x3F5C2C
+	.4byte 0x3F800000
+
 .section .bss

 .global lbl_8046D390
--- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s
+++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s
@@ -34,6 +34,14 @@ lbl_803E58C0:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte 0

+.section .sdata
+
+.global lbl_805A7D80
+lbl_805A7D80:
+	# ROM: 0x3F5720
+	.4byte 0x42B40000
+	.4byte 0
+
 .section .text, "ax"  # 0x80003640 - 0x803CB1C0

 .global Accept__15CScriptVisorGooFR8IVisitor