From b1efa7e9c46c6e32e6f5ad4981a2281918e46b58 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 24 Apr 2022 10:43:04 -0700 Subject: [PATCH] Start splitting sbss.s --- Makefile | 4 +- asm/MetroidPrime/BodyState/CBSLocomotion.s | 7 + asm/MetroidPrime/CActorLights.s | 10 + asm/MetroidPrime/CAnimData.s | 12 +- asm/MetroidPrime/CConsoleOutputWindow.s | 7 + asm/MetroidPrime/CDecalManager.s | 19 + asm/MetroidPrime/CMFGame.s | 17 +- asm/MetroidPrime/CRipple.s | 10 + asm/MetroidPrime/CStateManager.s | 54 ++ asm/MetroidPrime/CTransitionDatabaseGame.s | 18 +- asm/MetroidPrime/CWorld.s | 16 + asm/MetroidPrime/CWorldShadow.s | 16 + asm/MetroidPrime/Cameras/CBallCamera.s | 18 +- asm/MetroidPrime/Cameras/CCameraFilter.s | 7 + asm/MetroidPrime/Cameras/CCinematicCamera.s | 15 + asm/MetroidPrime/Cameras/CPathCamera.s | 18 +- asm/MetroidPrime/Enemies/CAi.s | 18 + asm/MetroidPrime/Enemies/CBeetle.s | 13 + asm/MetroidPrime/Enemies/CBloodFlower.s | 10 + asm/MetroidPrime/Enemies/CDrone.s | 17 + asm/MetroidPrime/Enemies/CFireFlea.s | 16 + asm/MetroidPrime/Enemies/CMetroid.s | 15 + asm/MetroidPrime/Enemies/CParasite.s | 40 ++ asm/MetroidPrime/Enemies/CPatterned.s | 33 + asm/MetroidPrime/Enemies/CPuddleToadGamma.s | 9 +- asm/MetroidPrime/HUD/CSamusHud.s | 9 +- asm/MetroidPrime/Player/CMorphBall.s | 22 + asm/MetroidPrime/Player/CPlayerCameraBob.s | 13 + asm/MetroidPrime/Player/CPlayerGun.s | 27 +- .../ScriptObjects/CHUDBillboardEffect.s | 15 +- asm/MetroidPrime/ScriptObjects/CScriptDoor.s | 10 + .../ScriptObjects/CScriptEffect.s | 10 + asm/MetroidPrime/ScriptObjects/CScriptSound.s | 24 +- .../ScriptObjects/CScriptTrigger.s | 10 + asm/MetroidPrime/ScriptObjects/CScriptWater.s | 9 +- asm/MetroidPrime/TGameTypes.s | 16 + asm/MetroidPrime/Tweaks/CTweakAutoMapper.s | 7 + asm/MetroidPrime/Tweaks/CTweakPlayer.s | 12 +- asm/MetroidPrime/Tweaks/CTweakTargeting.s | 10 + asm/MetroidPrime/Tweaks/CTweaks.s | 139 +++- asm/MetroidPrime/Weapons/CBomb.s | 9 +- asm/MetroidPrime/Weapons/CPlasmaProjectile.s | 6 + asm/MetroidPrime/Weapons/CPowerBomb.s | 7 + .../Weapons/CTargetableProjectile.s | 10 + asm/MetroidPrime/Weapons/CWaveBeam.s | 7 + asm/sbss.s | 673 ------------------ obj_files.mk | 2 +- src/musyx/snd3d.c | 2 +- 48 files changed, 778 insertions(+), 690 deletions(-) diff --git a/Makefile b/Makefile index b88c8daf..f169c081 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ NAME := mp1 VERSION ?= 0 # Overkill epilogue fixup strategy. Set to 1 if necessary. -EPILOGUE_PROCESS := 0 +EPILOGUE_PROCESS := 1 BUILD_DIR := build/$(NAME).$(VERSION) ifeq ($(EPILOGUE_PROCESS),1) @@ -127,6 +127,8 @@ $(BUILD_DIR)/src/os/__start.o: MWCC_VERSION := 1.2.5 $(BUILD_DIR)/src/os/__start.o: CFLAGS := $(CFLAGS_1.2) $(BUILD_DIR)/src/Dolphin/PPCArch.o: MWCC_VERSION := 1.2.5 $(BUILD_DIR)/src/Dolphin/PPCArch.o: CFLAGS := $(CFLAGS_1.2) +$(BUILD_DIR)/src/Dolphin/os/OSAudioSystem.o: MWCC_VERSION := 1.2.5 +$(BUILD_DIR)/src/Dolphin/os/OSAudioSystem.o: CFLAGS := $(CFLAGS_1.2) #------------------------------------------------------------------------------- # Recipes diff --git a/asm/MetroidPrime/BodyState/CBSLocomotion.s b/asm/MetroidPrime/BodyState/CBSLocomotion.s index 9878285e..3c7dbe0f 100644 --- a/asm/MetroidPrime/BodyState/CBSLocomotion.s +++ b/asm/MetroidPrime/BodyState/CBSLocomotion.s @@ -236,6 +236,13 @@ lbl_805A7738: .4byte 0x3F800000 .4byte 0 +.section .sbss + +# CBSFlyerLocomotion +.global lbl_805A8F80 +lbl_805A8F80: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __dt__28CBSRestrictedFlyerLocomotionFv diff --git a/asm/MetroidPrime/CActorLights.s b/asm/MetroidPrime/CActorLights.s index a5bd2347..78507ab1 100644 --- a/asm/MetroidPrime/CActorLights.s +++ b/asm/MetroidPrime/CActorLights.s @@ -28,6 +28,16 @@ lbl_805A7570: .4byte 0x0000001A .4byte 0 +.section .sbss + +# CActorLights +.global lbl_805A8F10 +lbl_805A8F10: + .skip 0x4 +.global lbl_805A8F14 +lbl_805A8F14: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global BuildConstantAmbientLighting__12CActorLightsFv diff --git a/asm/MetroidPrime/CAnimData.s b/asm/MetroidPrime/CAnimData.s index 7a3f2c8d..1048ec28 100644 --- a/asm/MetroidPrime/CAnimData.s +++ b/asm/MetroidPrime/CAnimData.s @@ -83,7 +83,17 @@ lbl_805A6DB0: .global lbl_8045B140 lbl_8045B140: .skip 0x40 - + +.section .sbss + +# CAnimData +.global lbl_805A8CC8 +lbl_805A8CC8: + .skip 0x4 +.global lbl_805A8CCC +lbl_805A8CCC: + .skip 0x4 + .section .text, "ax" .global GetEventResourceIdForAnimResourceId__9CAnimDataCFi diff --git a/asm/MetroidPrime/CConsoleOutputWindow.s b/asm/MetroidPrime/CConsoleOutputWindow.s index 4c40bb15..7b1a7cc4 100644 --- a/asm/MetroidPrime/CConsoleOutputWindow.s +++ b/asm/MetroidPrime/CConsoleOutputWindow.s @@ -26,6 +26,13 @@ lbl_805A7544: # ROM: 0x3F4EE4 .4byte 0 +.section .sbss + +# CConsoleOutputWindow +.global lbl_805A8F00 +lbl_805A8F00: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global Draw__20CConsoleOutputWindowCFv diff --git a/asm/MetroidPrime/CDecalManager.s b/asm/MetroidPrime/CDecalManager.s index 9059942d..afd641a5 100644 --- a/asm/MetroidPrime/CDecalManager.s +++ b/asm/MetroidPrime/CDecalManager.s @@ -9,6 +9,25 @@ lbl_8046C558: lbl_8046C564: .skip 0xC +.section .sbss + +# CDecalManager +.global lbl_805A8F28 +lbl_805A8F28: + .skip 0x4 +.global lbl_805A8F2C +lbl_805A8F2C: + .skip 0x4 +.global lbl_805A8F30 +lbl_805A8F30: + .skip 0x4 +.global lbl_805A8F34 +lbl_805A8F34: + .skip 0x4 +.global lbl_805A8F38 +lbl_805A8F38: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global AddToRenderer__13CDecalManagerFRC14CFrustumPlanesRC13CStateManager diff --git a/asm/MetroidPrime/CMFGame.s b/asm/MetroidPrime/CMFGame.s index 6685f076..057ef082 100644 --- a/asm/MetroidPrime/CMFGame.s +++ b/asm/MetroidPrime/CMFGame.s @@ -80,7 +80,22 @@ lbl_803CCAD4: .asciz "STRG_IntroLevelLoad" .asciz "CMFGame" .4byte 0 - + +.section .sbss + +# CMFGame +.global lbl_805A8CB8 +lbl_805A8CB8: + .skip 0x8 + +# TOneStatic +.global lbl_805A8CC0 +lbl_805A8CC0: + .skip 0x4 +.global lbl_805A8CC4 +lbl_805A8CC4: + .skip 0x4 + .section .text, "ax" .global Draw__13CMFGameLoaderCFv diff --git a/asm/MetroidPrime/CRipple.s b/asm/MetroidPrime/CRipple.s index 402059d2..6ae928b7 100644 --- a/asm/MetroidPrime/CRipple.s +++ b/asm/MetroidPrime/CRipple.s @@ -1,5 +1,15 @@ .include "macros.inc" +.section .sbss + +# CRipple +.global lbl_805A8F58 +lbl_805A8F58: + .skip 0x4 +.global lbl_805A8F5C +lbl_805A8F5C: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __ct__7CRippleF9TUniqueIdRC9CVector3ff diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index d5205185..add4d2da 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -128,6 +128,60 @@ lbl_805A6E64: # ROM: 0x3F4804 .4byte 0 +.section .sbss + +# CStateManager +.global lbl_805A8D98 +lbl_805A8D98: + .skip 0x4 +.global lbl_805A8D9C +lbl_805A8D9C: + .skip 0x4 +.global lbl_805A8DA0 +lbl_805A8DA0: + .skip 0x1 +.global lbl_805A8DA1 +lbl_805A8DA1: + .skip 0x7 +.global lbl_805A8DA8 +lbl_805A8DA8: + .skip 0x4 +.global lbl_805A8DAC +lbl_805A8DAC: + .skip 0x4 +.global lbl_805A8DB0 +lbl_805A8DB0: + .skip 0x8 +.global lbl_805A8DB8 +lbl_805A8DB8: + .skip 0x4 +.global lbl_805A8DBC +lbl_805A8DBC: + .skip 0x4 +.global lbl_805A8DC0 +lbl_805A8DC0: + .skip 0x4 +.global lbl_805A8DC4 +lbl_805A8DC4: + .skip 0x1 +.global lbl_805A8DC5 +lbl_805A8DC5: + .skip 0x3 +.global lbl_805A8DC8 +lbl_805A8DC8: + .skip 0x4 +.global lbl_805A8DCC +lbl_805A8DCC: + .skip 0x4 + +# TOneStatic +.global lbl_805A8DD0 +lbl_805A8DD0: + .skip 0x4 +.global lbl_805A8DD4 +lbl_805A8DD4: + .skip 0x4 + .section .text, "ax" .global IntegrateVisorFog__13CStateManagerFf diff --git a/asm/MetroidPrime/CTransitionDatabaseGame.s b/asm/MetroidPrime/CTransitionDatabaseGame.s index 0d20ea21..3b824bd0 100644 --- a/asm/MetroidPrime/CTransitionDatabaseGame.s +++ b/asm/MetroidPrime/CTransitionDatabaseGame.s @@ -9,7 +9,23 @@ lbl_803DA340: .4byte 0 .4byte GetMetaTrans__23CTransitionDatabaseGameCFUiUi .4byte 0 - + +.section .sbss + +# CTransitionDatabaseGame +.global lbl_805A8DF0 +lbl_805A8DF0: + .skip 0x4 +.global lbl_805A8DF4 +lbl_805A8DF4: + .skip 0x4 +.global lbl_805A8DF8 +lbl_805A8DF8: + .skip 0x4 +.global lbl_805A8DFC +lbl_805A8DFC: + .skip 0x4 + .section .text, "ax" .global GetMetaTrans__23CTransitionDatabaseGameCFUiUi diff --git a/asm/MetroidPrime/CWorld.s b/asm/MetroidPrime/CWorld.s index 3b8bc479..cca6b7e0 100644 --- a/asm/MetroidPrime/CWorld.s +++ b/asm/MetroidPrime/CWorld.s @@ -68,6 +68,22 @@ lbl_803DA04C: .4byte 0 .4byte 0 +.section .sbss + +# CWorld +.global lbl_805A8DD8 +lbl_805A8DD8: + .skip 0x4 +.global lbl_805A8DDC +lbl_805A8DDC: + .skip 0x4 +.global lbl_805A8DE0 +lbl_805A8DE0: + .skip 0x4 +.global lbl_805A8DE4 +lbl_805A8DE4: + .skip 0x4 + .section .text, "ax" .global CyclePauseState__6CWorldFv diff --git a/asm/MetroidPrime/CWorldShadow.s b/asm/MetroidPrime/CWorldShadow.s index 46582d06..4e2da343 100644 --- a/asm/MetroidPrime/CWorldShadow.s +++ b/asm/MetroidPrime/CWorldShadow.s @@ -1,5 +1,21 @@ .include "macros.inc" +.section .sbss + +# CWorldShadow +.global lbl_805A8F18 +lbl_805A8F18: + .skip 0x4 +.global lbl_805A8F1C +lbl_805A8F1C: + .skip 0x4 +.global lbl_805A8F20 +lbl_805A8F20: + .skip 0x4 +.global lbl_805A8F24 +lbl_805A8F24: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global ResetBlur__12CWorldShadowFv diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index d9f3df99..311bc36a 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -373,7 +373,23 @@ lbl_805A710C: .global lbl_8046C408 lbl_8046C408: .skip 0x18 - + +.section .sbss + +# CBallCamera +.global lbl_805A8E48 +lbl_805A8E48: + .skip 0x4 +.global lbl_805A8E4C +lbl_805A8E4C: + .skip 0x4 +.global lbl_805A8E50 +lbl_805A8E50: + .skip 0x4 +.global lbl_805A8E54 +lbl_805A8E54: + .skip 0x4 + .section .text, "ax" .global SplineIntersectTest__11CBallCameraCFR13CMaterialListR13CStateManager diff --git a/asm/MetroidPrime/Cameras/CCameraFilter.s b/asm/MetroidPrime/Cameras/CCameraFilter.s index 6e6ef245..fc219cad 100644 --- a/asm/MetroidPrime/Cameras/CCameraFilter.s +++ b/asm/MetroidPrime/Cameras/CCameraFilter.s @@ -46,6 +46,13 @@ lbl_805A73E0: .4byte 0x3F800000 .4byte 0 +.section .sbss + +# CCameraFilter +.global lbl_805A8EE0 +lbl_805A8EE0: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global FreePersistentFbTexture__15CCameraBlurPassFv diff --git a/asm/MetroidPrime/Cameras/CCinematicCamera.s b/asm/MetroidPrime/Cameras/CCinematicCamera.s index e39d3d84..b8ef7166 100644 --- a/asm/MetroidPrime/Cameras/CCinematicCamera.s +++ b/asm/MetroidPrime/Cameras/CCinematicCamera.s @@ -48,6 +48,21 @@ lbl_805A7164: # ROM: 0x3F4B04 .4byte 0 +.section .sbss + +# CCinematicCamera +.global lbl_805A8E68 +lbl_805A8E68: + .skip 0x4 +.global lbl_805A8E6C +lbl_805A8E6C: + .skip 0x4 +.global lbl_805A8E70 +lbl_805A8E70: + .skip 0x4 +.global lbl_805A8E74 +lbl_805A8E74: + .skip 0x4 .section .text, "ax" diff --git a/asm/MetroidPrime/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s index 856be130..17375a37 100644 --- a/asm/MetroidPrime/Cameras/CPathCamera.s +++ b/asm/MetroidPrime/Cameras/CPathCamera.s @@ -69,7 +69,23 @@ lbl_805A76C0: .global lbl_8046C720 lbl_8046C720: .skip 0x18 - + +.section .sbss + +# CPathCamera +.global lbl_805A8F60 +lbl_805A8F60: + .skip 0x4 +.global lbl_805A8F64 +lbl_805A8F64: + .skip 0x4 +.global lbl_805A8F68 +lbl_805A8F68: + .skip 0x4 +.global lbl_805A8F6C +lbl_805A8F6C: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global AcceptScriptMsg__11CPathCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index 00ddcfb8..c0763b2f 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -1054,6 +1054,24 @@ lbl_805A71D8: .4byte 0x00000030 .4byte 0 +.section .sbss + +# CAi + CAiFuncMap +.global lbl_805A8E78 +lbl_805A8E78: + .skip 0x4 +.global lbl_805A8E7C +lbl_805A8E7C: + .skip 0x4 +.global lbl_805A8E80 +lbl_805A8E80: + .skip 0x4 +.global lbl_805A8E84 +lbl_805A8E84: + .skip 0x4 +.global lbl_805A8E88 +lbl_805A8E88: + .skip 0x8 .section .text, "ax" diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index e32d8ba7..edfc3ea4 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -274,6 +274,19 @@ lbl_805A7358: .4byte 0x0000001E .4byte 0 +.section .sbss + +# CBeetleFR +.global lbl_805A8EC0 +lbl_805A8EC0: + .skip 0x8 +.global lbl_805A8EC8 +lbl_805A8EC8: + .skip 0x4 +.global lbl_805A8ECC +lbl_805A8ECC: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global GetSearchPath__7CBeetleFv diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index 248f2b37..8fc92a35 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -214,6 +214,16 @@ lbl_805A7628: .4byte 0x00000013 .4byte 0 +.section .sbss + +# CBloodFlower +.global lbl_805A8F40 +lbl_805A8F40: + .skip 0x4 +.global lbl_805A8F44 +lbl_805A8F44: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __dt__12CBloodFlowerFv diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index daeff11e..711075de 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -493,6 +493,23 @@ lbl_8046C890: lbl_8046C8A8: .skip 0x18 +.section .sbss +# CDrone +.global lbl_805A8FE0 +lbl_805A8FE0: + .skip 0x1 +.global lbl_805A8FE1 +lbl_805A8FE1: + .skip 0x1 +.global lbl_805A8FE2 +lbl_805A8FE2: + .skip 0x1 +.global lbl_805A8FE3 +lbl_805A8FE3: + .skip 0x1 +.global lbl_805A8FE4 +lbl_805A8FE4: + .skip 0x4 .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __dt__6CDroneFv diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index b28d26b1..f44d3a3c 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -236,6 +236,22 @@ lbl_805A7798: .4byte 0x00000013 .4byte 0 +.section .sbss + +# CFireFlea +.global lbl_805A8F90 +lbl_805A8F90: + .skip 0x4 +.global lbl_805A8F94 +lbl_805A8F94: + .skip 0x4 +.global lbl_805A8F98 +lbl_805A8F98: + .skip 0x4 +.global lbl_805A8F9C +lbl_805A8F9C: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __dt__9CFireFleaFv diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index 6779bd1a..17bfca32 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -369,6 +369,21 @@ lbl_805A79D8: .4byte 0x3F800000 .4byte 0 +.section .sbss + +.global lbl_805A8FE8 +lbl_805A8FE8: + .skip 0x4 +.global lbl_805A8FEC +lbl_805A8FEC: + .skip 0x4 +.global lbl_805A8FF0 +lbl_805A8FF0: + .skip 0x4 +.global lbl_805A8FF4 +lbl_805A8FF4: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global GetSearchPath__8CMetroidFv diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 1863f93c..114c13e7 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -194,6 +194,46 @@ lbl_803E3004: .4byte UpdateWalkerAnimation__9CParasiteFR13CStateManagerf .4byte 0 +.section .sbss + +# CParasite +.global lbl_805A8FB0 +lbl_805A8FB0: + .skip 0x4 +.global lbl_805A8FB4 +lbl_805A8FB4: + .skip 0x4 +.global lbl_805A8FB8 +lbl_805A8FB8: + .skip 0x4 +.global lbl_805A8FBC +lbl_805A8FBC: + .skip 0x4 +.global lbl_805A8FC0 +lbl_805A8FC0: + .skip 0x4 +.global lbl_805A8FC4 +lbl_805A8FC4: + .skip 0x4 +.global lbl_805A8FC8 +lbl_805A8FC8: + .skip 0x1 +.global lbl_805A8FC9 +lbl_805A8FC9: + .skip 0x1 +.global lbl_805A8FCA +lbl_805A8FCA: + .skip 0x6 +.global lbl_805A8FD0 +lbl_805A8FD0: + .skip 0x4 +.global lbl_805A8FD4 +lbl_805A8FD4: + .skip 0x4 +.global lbl_805A8FD8 +lbl_805A8FD8: + .skip 0x8 + .section .sdata .global lbl_805A7850 diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index bc7bd39a..b768862c 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -476,6 +476,39 @@ lbl_805A6FEC: # ROM: 0x3F498C .4byte 0x00000021 +.section .sbss +# CPatterned +.global lbl_805A8E10 +lbl_805A8E10: + .skip 0x4 +.global lbl_805A8E14 +lbl_805A8E14: + .skip 0x4 +.global lbl_805A8E18 +lbl_805A8E18: + .skip 0x8 +.global lbl_805A8E20 +lbl_805A8E20: + .skip 0x4 +.global lbl_805A8E24 +lbl_805A8E24: + .skip 0x4 +.global lbl_805A8E28 +lbl_805A8E28: + .skip 0x4 +.global lbl_805A8E2C +lbl_805A8E2C: + .skip 0x4 +.global lbl_805A8E30 +lbl_805A8E30: + .skip 0x8 +.global lbl_805A8E38 +lbl_805A8E38: + .skip 0x4 +.global lbl_805A8E3C +lbl_805A8E3C: + .skip 0x4 + .section .text, "ax" .global __dt__10CPatternedFv diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index 1ab67dd1..ad558cfa 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -233,7 +233,14 @@ lbl_805A77D4: .global lbl_8046C758 lbl_8046C758: .skip 0x18 - + +.section .sbss + +# CPuddleToadGamma +.global lbl_805A8FA0 +lbl_805A8FA0: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __dt__16CPuddleToadGammaFv diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index 53a65553..38196a04 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -260,7 +260,14 @@ lbl_805A6F50: .global lbl_8046C3C8 lbl_8046C3C8: .skip 0x18 - + +.section .sbss + +# CSamusHud +.global lbl_805A8DE8 +lbl_805A8DE8: + .skip 0x8 + .section .text, "ax" .global "SetMessage__9CSamusHudFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC13CHUDMemoParms" diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index 634c4cdb..16faad0f 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -257,6 +257,28 @@ lbl_8046C4F8: lbl_8046C504: .skip 0x1C +.section .sbss + +# CMorphBall +.global lbl_805A8EE8 +lbl_805A8EE8: + .skip 0x4 +.global lbl_805A8EEC +lbl_805A8EEC: + .skip 0x4 +.global lbl_805A8EF0 +lbl_805A8EF0: + .skip 0x4 +.global lbl_805A8EF4 +lbl_805A8EF4: + .skip 0x4 +.global lbl_805A8EF8 +lbl_805A8EF8: + .skip 0x4 +.global lbl_805A8EFC +lbl_805A8EFC: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global DeleteBallShadow__10CMorphBallFv diff --git a/asm/MetroidPrime/Player/CPlayerCameraBob.s b/asm/MetroidPrime/Player/CPlayerCameraBob.s index 9a66ee61..6cdbecf1 100644 --- a/asm/MetroidPrime/Player/CPlayerCameraBob.s +++ b/asm/MetroidPrime/Player/CPlayerCameraBob.s @@ -122,6 +122,19 @@ lbl_805A73D4: # ROM: 0x3F4D74 .4byte 0x3F800000 +.section .sbss + +# CPlayerCameraBob +.global lbl_805A8ED0 +lbl_805A8ED0: + .skip 0x4 +.global lbl_805A8ED4 +lbl_805A8ED4: + .skip 0x4 +.global lbl_805A8ED8 +lbl_805A8ED8: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global GetViewWanderTransform__16CPlayerCameraBobCFv diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index 222260d6..63313a4d 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -147,7 +147,32 @@ lbl_8045C518: .global lbl_8045C530 lbl_8045C530: .skip 0x20 - + +.section .sbss + +# CPlayerGun +.global lbl_805A8D70 +lbl_805A8D70: + .skip 0x4 +.global lbl_805A8D74 +lbl_805A8D74: + .skip 0x4 +.global lbl_805A8D78 +lbl_805A8D78: + .skip 0x4 +.global lbl_805A8D7C +lbl_805A8D7C: + .skip 0x4 +.global lbl_805A8D80 +lbl_805A8D80: + .skip 0x4 +.global lbl_805A8D84 +lbl_805A8D84: + .skip 0x8 +.global lbl_805A8D8C +lbl_805A8D8C: + .skip 0xC + .section .text, "ax" .global CModelDataNull__10CModelDataFv diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index c6912af4..daccd1de 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -47,7 +47,20 @@ lbl_805A76E8: .global lbl_8046C738 lbl_8046C738: .skip 0x10 - + +.section .sbss + +# CHudBillboardEffect +.global lbl_805A8F70 +lbl_805A8F70: + .skip 0x4 +.global lbl_805A8F74 +lbl_805A8F74: + .skip 0x4 +.global lbl_805A8F78 +lbl_805A8F78: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global Accept__19CHUDBillboardEffectFR8IVisitor diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s index 71276af0..3e02a7c9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s @@ -115,6 +115,16 @@ lbl_805A7008: .4byte 0x00000029 .4byte 0 +.section .sbss + +# CScriptDoor +.global lbl_805A8E40 +lbl_805A8E40: + .skip 0x4 +.global lbl_805A8E44 +lbl_805A8E44: + .skip 0x4 + .section .text, "ax" .global __dt__11CScriptDoorFv diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 470acd60..380ba281 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -66,6 +66,16 @@ lbl_805A7118: .4byte 0x3F800000 .4byte 0 +.section .sbss + +# CScriptEffect +.global lbl_805A8E58 +lbl_805A8E58: + .skip 0x4 +.global lbl_805A8E5C +lbl_805A8E5C: + .skip 0x4 + .section .text, "ax" .global __dt__13CScriptEffectFv diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index c962a68b..1f1b36c4 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -95,7 +95,29 @@ lbl_805A71E8: .global lbl_8046C438 lbl_8046C438: .skip 0x18 - + +.section .sbss + +# CScriptSound +.global lbl_805A8E90 +lbl_805A8E90: + .skip 0x4 +.global lbl_805A8E94 +lbl_805A8E94: + .skip 0x4 +.global lbl_805A8E98 +lbl_805A8E98: + .skip 0x4 +.global lbl_805A8E9C +lbl_805A8E9C: + .skip 0x4 +.global lbl_805A8EA0 +lbl_805A8EA0: + .skip 0x1 +.global lbl_805A8EA1 +lbl_805A8EA1: + .skip 0x7 + .section .text, "ax" .global GetOccludedVolumeAmount__12CScriptSoundFRC9CVector3fRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index f256fcba..36e47f71 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -50,6 +50,16 @@ lbl_805A6F94: # ROM: 0x3F4934 .4byte 0x00000022 +.section .sbss + +# CScriptTrigger +.global lbl_805A8E00 +lbl_805A8E00: + .skip 0x4 +.global lbl_805A8E04 +lbl_805A8E04: + .skip 0xC + .section .text, "ax" .global InhabitantRejected__14CScriptTriggerFR6CActorR13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s index 7afaac65..9b43ba83 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s @@ -65,7 +65,14 @@ lbl_805A7554: .global lbl_8046C520 lbl_8046C520: .skip 0x18 - + +.section .sbss + +# CScriptWater +.global lbl_805A8F08 +lbl_805A8F08: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global GetPatchRenderFlags__12CScriptWaterCFii diff --git a/asm/MetroidPrime/TGameTypes.s b/asm/MetroidPrime/TGameTypes.s index 88661368..2a69bd0e 100644 --- a/asm/MetroidPrime/TGameTypes.s +++ b/asm/MetroidPrime/TGameTypes.s @@ -1,5 +1,21 @@ .include "macros.inc" +.section .sbss + +# TGameTypes +.global kInvalidEditorId +kInvalidEditorId: + .skip 0x4 +.global kInvalidUniqueId +kInvalidUniqueId: + .skip 0x4 +.global kInvalidAreaId +kInvalidAreaId: + .skip 0x4 +.global lbl_805A8F54 +lbl_805A8F54: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __ct__9TEditorIdFR12CInputStream diff --git a/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s b/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s index b6a4f7a3..2075b584 100644 --- a/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s +++ b/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s @@ -10,6 +10,13 @@ lbl_803DF438: .4byte __dt__16CTweakAutoMapperFv .4byte 0 +.section .sbss + +# CGameArea or CMApWorld +.global lbl_805A8EB0 +lbl_805A8EB0: + .skip 0x8 + .section .text, "ax" .global __ct__16CTweakAutoMapperFR12CInputStream diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayer.s b/asm/MetroidPrime/Tweaks/CTweakPlayer.s index 93a12f4c..8b23d424 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayer.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayer.s @@ -16,7 +16,17 @@ lbl_803D9CC4: .4byte 0 .4byte 0 .4byte 0 - + +.section .sbss + +# TOneStatic +.global lbl_805A8CD0 +lbl_805A8CD0: + .skip 0x4 +.global lbl_805A8CD4 +lbl_805A8CD4: + .skip 0x4 + .section .text, "ax" .global __ct__12CTweakPlayerFR12CInputStream diff --git a/asm/MetroidPrime/Tweaks/CTweakTargeting.s b/asm/MetroidPrime/Tweaks/CTweakTargeting.s index 75f7e358..c85955f3 100644 --- a/asm/MetroidPrime/Tweaks/CTweakTargeting.s +++ b/asm/MetroidPrime/Tweaks/CTweakTargeting.s @@ -10,6 +10,16 @@ lbl_803DF428: .4byte __dt__15CTweakTargetingFv .4byte 0 +.section .sbss + +# CTweakTargeting +.global lbl_805A8EA8 +lbl_805A8EA8: + .skip 0x4 +.global lbl_805A8EAC +lbl_805A8EAC: + .skip 0x4 + .section .text, "ax" .global __ct__15CTweakTargetingFR12CInputStream diff --git a/asm/MetroidPrime/Tweaks/CTweaks.s b/asm/MetroidPrime/Tweaks/CTweaks.s index 78f99806..916b7be2 100644 --- a/asm/MetroidPrime/Tweaks/CTweaks.s +++ b/asm/MetroidPrime/Tweaks/CTweaks.s @@ -38,7 +38,144 @@ lbl_8045BFD0: .global lbl_8045C208 lbl_8045C208: .skip 0x310 - + +.section .sbss + +# CTweaks +.global gpTweakPlayer +gpTweakPlayer: + .skip 0x4 +.global gpTweakBall +gpTweakBall: + .skip 0x4 +.global gpTweakGame +gpTweakGame: + .skip 0x4 +.global gpTweakParticle +gpTweakParticle: + .skip 0x4 +.global gpTweakPlayerControlCurrent +gpTweakPlayerControlCurrent: + .skip 0x4 +.global gpTweakPlayerControl1 +gpTweakPlayerControl1: + .skip 0x4 +.global gpTweakPlayerControl2 +gpTweakPlayerControl2: + .skip 0x4 +.global gpTweakPlayerGun +gpTweakPlayerGun: + .skip 0x4 +.global gpTweakGui +gpTweakGui: + .skip 0x4 +.global gpTweakGuiColors +gpTweakGuiColors: + .skip 0x4 +.global gpTweakTargeting +gpTweakTargeting: + .skip 0x4 +.global gpTweakAutoMapper +gpTweakAutoMapper: + .skip 0x4 +.global gpTweakGunRes +gpTweakGunRes: + .skip 0x4 +.global gpTweakPlayerRes +gpTweakPlayerRes: + .skip 0x4 +.global gpTweakSlideShow +gpTweakSlideShow: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D14 +lbl_805A8D14: + .skip 0x4 +.global lbl_805A8D18 +lbl_805A8D18: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D1C +lbl_805A8D1C: + .skip 0x4 +.global lbl_805A8D20 +lbl_805A8D20: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D24 +lbl_805A8D24: + .skip 0x4 +.global lbl_805A8D28 +lbl_805A8D28: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D2C +lbl_805A8D2C: + .skip 0x4 +.global lbl_805A8D30 +lbl_805A8D30: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D34 +lbl_805A8D34: + .skip 0x4 +.global lbl_805A8D38 +lbl_805A8D38: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D3C +lbl_805A8D3C: + .skip 0x4 +.global lbl_805A8D40 +lbl_805A8D40: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D44 +lbl_805A8D44: + .skip 0x4 +.global lbl_805A8D48 +lbl_805A8D48: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D4C +lbl_805A8D4C: + .skip 0x4 +.global lbl_805A8D50 +lbl_805A8D50: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D54 +lbl_805A8D54: + .skip 0x4 +.global lbl_805A8D58 +lbl_805A8D58: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D5C +lbl_805A8D5C: + .skip 0x4 +.global lbl_805A8D60 +lbl_805A8D60: + .skip 0x4 + +# TOneStatic +.global lbl_805A8D64 +lbl_805A8D64: + .skip 0x4 +.global lbl_805A8D68 +lbl_805A8D68: + .skip 0x8 + .section .text, "ax" .global RegisterResourceTweaks__7CTweaksFv diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index 4dd31ed8..7af9f5e9 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -101,7 +101,14 @@ lbl_805A714C: .global lbl_8046C420 lbl_8046C420: .skip 0x18 - + +.section .sbss + +# CBomb +.global lbl_805A8E60 +lbl_805A8E60: + .skip 0x8 + .section .text, "ax" .global sub_8008faf0 diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index b7237d42..a8c0f5c1 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -38,6 +38,12 @@ lbl_803E3F00: .4byte Fire__17CPlasmaProjectileFRC12CTransform4fR13CStateManagerb .4byte 0 +.section .sbss + +.global lbl_805A8FF8 +lbl_805A8FF8: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __dt__17CPlasmaProjectileFv diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s index 67cf5d1d..459caab5 100644 --- a/asm/MetroidPrime/Weapons/CPowerBomb.s +++ b/asm/MetroidPrime/Weapons/CPowerBomb.s @@ -72,6 +72,13 @@ lbl_805A77F0: .4byte 0x0000002D .4byte 0 +.section .sbss + +# CPowerBomb +.global lbl_805A8FA8 +lbl_805A8FA8: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global AcceptScriptMsg__10CPowerBombF20EScriptObjectMessage9TUniqueIdR13CStateManager diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index 4854e876..d1cc104f 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -37,6 +37,16 @@ lbl_803E1800: .4byte Think__21CTargetableProjectileFfR13CStateManager .4byte 0 +.section .sbss + +# CTargetableProjectile +.global lbl_805A8F88 +lbl_805A8F88: + .skip 0x4 +.global lbl_805A8F8C +lbl_805A8F8C: + .skip 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global __dt__21CTargetableProjectileFv diff --git a/asm/MetroidPrime/Weapons/CWaveBeam.s b/asm/MetroidPrime/Weapons/CWaveBeam.s index 25c8ae3d..85aa9747 100644 --- a/asm/MetroidPrime/Weapons/CWaveBeam.s +++ b/asm/MetroidPrime/Weapons/CWaveBeam.s @@ -24,6 +24,13 @@ lbl_803DF7A0: .4byte IsLoaded__9CWaveBeamCFv .4byte 0 +.section .sbss + +# CWaveBeam +.global lbl_805A8EB8 +lbl_805A8EB8: + .skip 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global EnableSecondaryFx__9CWaveBeamFQ210CGunWeapon16ESecondaryFxType diff --git a/asm/sbss.s b/asm/sbss.s index c1f5b208..02299d04 100644 --- a/asm/sbss.s +++ b/asm/sbss.s @@ -2,679 +2,6 @@ .section .sbss, "wa" # 0x805A8C20 - 0x805A9D1F -# CMFGame -.global lbl_805A8CB8 -lbl_805A8CB8: - .skip 0x8 - -# TOneStatic -.global lbl_805A8CC0 -lbl_805A8CC0: - .skip 0x4 -.global lbl_805A8CC4 -lbl_805A8CC4: - .skip 0x4 - -# CAnimData -.global lbl_805A8CC8 -lbl_805A8CC8: - .skip 0x4 -.global lbl_805A8CCC -lbl_805A8CCC: - .skip 0x4 - -# TOneStatic -.global lbl_805A8CD0 -lbl_805A8CD0: - .skip 0x4 -.global lbl_805A8CD4 -lbl_805A8CD4: - .skip 0x4 - -# CTweaks -.global gpTweakPlayer -gpTweakPlayer: - .skip 0x4 -.global gpTweakBall -gpTweakBall: - .skip 0x4 -.global gpTweakGame -gpTweakGame: - .skip 0x4 -.global gpTweakParticle -gpTweakParticle: - .skip 0x4 -.global gpTweakPlayerControlCurrent -gpTweakPlayerControlCurrent: - .skip 0x4 -.global gpTweakPlayerControl1 -gpTweakPlayerControl1: - .skip 0x4 -.global gpTweakPlayerControl2 -gpTweakPlayerControl2: - .skip 0x4 -.global gpTweakPlayerGun -gpTweakPlayerGun: - .skip 0x4 -.global gpTweakGui -gpTweakGui: - .skip 0x4 -.global gpTweakGuiColors -gpTweakGuiColors: - .skip 0x4 -.global gpTweakTargeting -gpTweakTargeting: - .skip 0x4 -.global gpTweakAutoMapper -gpTweakAutoMapper: - .skip 0x4 -.global gpTweakGunRes -gpTweakGunRes: - .skip 0x4 -.global gpTweakPlayerRes -gpTweakPlayerRes: - .skip 0x4 -.global gpTweakSlideShow -gpTweakSlideShow: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D14 -lbl_805A8D14: - .skip 0x4 -.global lbl_805A8D18 -lbl_805A8D18: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D1C -lbl_805A8D1C: - .skip 0x4 -.global lbl_805A8D20 -lbl_805A8D20: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D24 -lbl_805A8D24: - .skip 0x4 -.global lbl_805A8D28 -lbl_805A8D28: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D2C -lbl_805A8D2C: - .skip 0x4 -.global lbl_805A8D30 -lbl_805A8D30: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D34 -lbl_805A8D34: - .skip 0x4 -.global lbl_805A8D38 -lbl_805A8D38: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D3C -lbl_805A8D3C: - .skip 0x4 -.global lbl_805A8D40 -lbl_805A8D40: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D44 -lbl_805A8D44: - .skip 0x4 -.global lbl_805A8D48 -lbl_805A8D48: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D4C -lbl_805A8D4C: - .skip 0x4 -.global lbl_805A8D50 -lbl_805A8D50: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D54 -lbl_805A8D54: - .skip 0x4 -.global lbl_805A8D58 -lbl_805A8D58: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D5C -lbl_805A8D5C: - .skip 0x4 -.global lbl_805A8D60 -lbl_805A8D60: - .skip 0x4 - -# TOneStatic -.global lbl_805A8D64 -lbl_805A8D64: - .skip 0x4 -.global lbl_805A8D68 -lbl_805A8D68: - .skip 0x8 - -# CPlayerGun -.global lbl_805A8D70 -lbl_805A8D70: - .skip 0x4 -.global lbl_805A8D74 -lbl_805A8D74: - .skip 0x4 -.global lbl_805A8D78 -lbl_805A8D78: - .skip 0x4 -.global lbl_805A8D7C -lbl_805A8D7C: - .skip 0x4 -.global lbl_805A8D80 -lbl_805A8D80: - .skip 0x4 -.global lbl_805A8D84 -lbl_805A8D84: - .skip 0x8 -.global lbl_805A8D8C -lbl_805A8D8C: - .skip 0xC - -# CStateManager -.global lbl_805A8D98 -lbl_805A8D98: - .skip 0x4 -.global lbl_805A8D9C -lbl_805A8D9C: - .skip 0x4 -.global lbl_805A8DA0 -lbl_805A8DA0: - .skip 0x1 -.global lbl_805A8DA1 -lbl_805A8DA1: - .skip 0x7 -.global lbl_805A8DA8 -lbl_805A8DA8: - .skip 0x4 -.global lbl_805A8DAC -lbl_805A8DAC: - .skip 0x4 -.global lbl_805A8DB0 -lbl_805A8DB0: - .skip 0x8 -.global lbl_805A8DB8 -lbl_805A8DB8: - .skip 0x4 -.global lbl_805A8DBC -lbl_805A8DBC: - .skip 0x4 -.global lbl_805A8DC0 -lbl_805A8DC0: - .skip 0x4 -.global lbl_805A8DC4 -lbl_805A8DC4: - .skip 0x1 -.global lbl_805A8DC5 -lbl_805A8DC5: - .skip 0x3 -.global lbl_805A8DC8 -lbl_805A8DC8: - .skip 0x4 -.global lbl_805A8DCC -lbl_805A8DCC: - .skip 0x4 - -# TOneStatic -.global lbl_805A8DD0 -lbl_805A8DD0: - .skip 0x4 -.global lbl_805A8DD4 -lbl_805A8DD4: - .skip 0x4 - -# CWorld -.global lbl_805A8DD8 -lbl_805A8DD8: - .skip 0x4 -.global lbl_805A8DDC -lbl_805A8DDC: - .skip 0x4 -.global lbl_805A8DE0 -lbl_805A8DE0: - .skip 0x4 -.global lbl_805A8DE4 -lbl_805A8DE4: - .skip 0x4 - -# CSamusHud -.global lbl_805A8DE8 -lbl_805A8DE8: - .skip 0x8 - -# CTransitionDatabaseGame -.global lbl_805A8DF0 -lbl_805A8DF0: - .skip 0x4 -.global lbl_805A8DF4 -lbl_805A8DF4: - .skip 0x4 -.global lbl_805A8DF8 -lbl_805A8DF8: - .skip 0x4 -.global lbl_805A8DFC -lbl_805A8DFC: - .skip 0x4 - -# CScriptTrigger -.global lbl_805A8E00 -lbl_805A8E00: - .skip 0x4 -.global lbl_805A8E04 -lbl_805A8E04: - .skip 0xC - -# CPatterned -.global lbl_805A8E10 -lbl_805A8E10: - .skip 0x4 -.global lbl_805A8E14 -lbl_805A8E14: - .skip 0x4 -.global lbl_805A8E18 -lbl_805A8E18: - .skip 0x8 -.global lbl_805A8E20 -lbl_805A8E20: - .skip 0x4 -.global lbl_805A8E24 -lbl_805A8E24: - .skip 0x4 -.global lbl_805A8E28 -lbl_805A8E28: - .skip 0x4 -.global lbl_805A8E2C -lbl_805A8E2C: - .skip 0x4 -.global lbl_805A8E30 -lbl_805A8E30: - .skip 0x8 -.global lbl_805A8E38 -lbl_805A8E38: - .skip 0x4 -.global lbl_805A8E3C -lbl_805A8E3C: - .skip 0x4 - -# CScriptDoor -.global lbl_805A8E40 -lbl_805A8E40: - .skip 0x4 -.global lbl_805A8E44 -lbl_805A8E44: - .skip 0x4 - -# CBallCamera -.global lbl_805A8E48 -lbl_805A8E48: - .skip 0x4 -.global lbl_805A8E4C -lbl_805A8E4C: - .skip 0x4 -.global lbl_805A8E50 -lbl_805A8E50: - .skip 0x4 -.global lbl_805A8E54 -lbl_805A8E54: - .skip 0x4 - -# CScriptEffect -.global lbl_805A8E58 -lbl_805A8E58: - .skip 0x4 -.global lbl_805A8E5C -lbl_805A8E5C: - .skip 0x4 - -# CBomb -.global lbl_805A8E60 -lbl_805A8E60: - .skip 0x8 - -# CCinematicCamera -.global lbl_805A8E68 -lbl_805A8E68: - .skip 0x4 -.global lbl_805A8E6C -lbl_805A8E6C: - .skip 0x4 -.global lbl_805A8E70 -lbl_805A8E70: - .skip 0x4 -.global lbl_805A8E74 -lbl_805A8E74: - .skip 0x4 - -# CAi + CAiFuncMap -.global lbl_805A8E78 -lbl_805A8E78: - .skip 0x4 -.global lbl_805A8E7C -lbl_805A8E7C: - .skip 0x4 -.global lbl_805A8E80 -lbl_805A8E80: - .skip 0x4 -.global lbl_805A8E84 -lbl_805A8E84: - .skip 0x4 -.global lbl_805A8E88 -lbl_805A8E88: - .skip 0x8 - -# CScriptSound -.global lbl_805A8E90 -lbl_805A8E90: - .skip 0x4 -.global lbl_805A8E94 -lbl_805A8E94: - .skip 0x4 -.global lbl_805A8E98 -lbl_805A8E98: - .skip 0x4 -.global lbl_805A8E9C -lbl_805A8E9C: - .skip 0x4 -.global lbl_805A8EA0 -lbl_805A8EA0: - .skip 0x1 -.global lbl_805A8EA1 -lbl_805A8EA1: - .skip 0x7 - -# CTweakTargeting -.global lbl_805A8EA8 -lbl_805A8EA8: - .skip 0x4 -.global lbl_805A8EAC -lbl_805A8EAC: - .skip 0x4 - -# CGameArea or CMApWorld -.global lbl_805A8EB0 -lbl_805A8EB0: - .skip 0x8 - -# CWaveBeam -.global lbl_805A8EB8 -lbl_805A8EB8: - .skip 0x8 - -# CBeetleFR -.global lbl_805A8EC0 -lbl_805A8EC0: - .skip 0x8 -.global lbl_805A8EC8 -lbl_805A8EC8: - .skip 0x4 -.global lbl_805A8ECC -lbl_805A8ECC: - .skip 0x4 - -# CPlayerCameraBob -.global lbl_805A8ED0 -lbl_805A8ED0: - .skip 0x4 -.global lbl_805A8ED4 -lbl_805A8ED4: - .skip 0x4 -.global lbl_805A8ED8 -lbl_805A8ED8: - .skip 0x8 - -# CCameraFilter -.global lbl_805A8EE0 -lbl_805A8EE0: - .skip 0x8 - -# CMorphBall -.global lbl_805A8EE8 -lbl_805A8EE8: - .skip 0x4 -.global lbl_805A8EEC -lbl_805A8EEC: - .skip 0x4 -.global lbl_805A8EF0 -lbl_805A8EF0: - .skip 0x4 -.global lbl_805A8EF4 -lbl_805A8EF4: - .skip 0x4 -.global lbl_805A8EF8 -lbl_805A8EF8: - .skip 0x4 -.global lbl_805A8EFC -lbl_805A8EFC: - .skip 0x4 - -# CConsoleOutputWindow -.global lbl_805A8F00 -lbl_805A8F00: - .skip 0x8 - -# CScriptWater -.global lbl_805A8F08 -lbl_805A8F08: - .skip 0x8 - -# CActorLights -.global lbl_805A8F10 -lbl_805A8F10: - .skip 0x4 -.global lbl_805A8F14 -lbl_805A8F14: - .skip 0x4 - -# CWorldShadow -.global lbl_805A8F18 -lbl_805A8F18: - .skip 0x4 -.global lbl_805A8F1C -lbl_805A8F1C: - .skip 0x4 -.global lbl_805A8F20 -lbl_805A8F20: - .skip 0x4 -.global lbl_805A8F24 -lbl_805A8F24: - .skip 0x4 - -# CDecalManager -.global lbl_805A8F28 -lbl_805A8F28: - .skip 0x4 -.global lbl_805A8F2C -lbl_805A8F2C: - .skip 0x4 -.global lbl_805A8F30 -lbl_805A8F30: - .skip 0x4 -.global lbl_805A8F34 -lbl_805A8F34: - .skip 0x4 -.global lbl_805A8F38 -lbl_805A8F38: - .skip 0x8 - -# CBloodFlower -.global lbl_805A8F40 -lbl_805A8F40: - .skip 0x4 -.global lbl_805A8F44 -lbl_805A8F44: - .skip 0x4 - -# TGameTypes -.global kInvalidEditorId -kInvalidEditorId: - .skip 0x4 -.global kInvalidUniqueId -kInvalidUniqueId: - .skip 0x4 -.global kInvalidAreaId -kInvalidAreaId: - .skip 0x4 -.global lbl_805A8F54 -lbl_805A8F54: - .skip 0x4 - -# CRipple -.global lbl_805A8F58 -lbl_805A8F58: - .skip 0x4 -.global lbl_805A8F5C -lbl_805A8F5C: - .skip 0x4 - -# CPathCamera -.global lbl_805A8F60 -lbl_805A8F60: - .skip 0x4 -.global lbl_805A8F64 -lbl_805A8F64: - .skip 0x4 -.global lbl_805A8F68 -lbl_805A8F68: - .skip 0x4 -.global lbl_805A8F6C -lbl_805A8F6C: - .skip 0x4 - -# CHudBillboardEffect -.global lbl_805A8F70 -lbl_805A8F70: - .skip 0x4 -.global lbl_805A8F74 -lbl_805A8F74: - .skip 0x4 -.global lbl_805A8F78 -lbl_805A8F78: - .skip 0x8 - -# CBSFlyerLocomotion -.global lbl_805A8F80 -lbl_805A8F80: - .skip 0x8 - -# CTargetableProjectile -.global lbl_805A8F88 -lbl_805A8F88: - .skip 0x4 -.global lbl_805A8F8C -lbl_805A8F8C: - .skip 0x4 - -# CFireFlea -.global lbl_805A8F90 -lbl_805A8F90: - .skip 0x4 -.global lbl_805A8F94 -lbl_805A8F94: - .skip 0x4 -.global lbl_805A8F98 -lbl_805A8F98: - .skip 0x4 -.global lbl_805A8F9C -lbl_805A8F9C: - .skip 0x4 - -# CPuddleToadGamma -.global lbl_805A8FA0 -lbl_805A8FA0: - .skip 0x8 - -# CPowerBomb -.global lbl_805A8FA8 -lbl_805A8FA8: - .skip 0x8 - -# CParasite -.global lbl_805A8FB0 -lbl_805A8FB0: - .skip 0x4 -.global lbl_805A8FB4 -lbl_805A8FB4: - .skip 0x4 -.global lbl_805A8FB8 -lbl_805A8FB8: - .skip 0x4 -.global lbl_805A8FBC -lbl_805A8FBC: - .skip 0x4 -.global lbl_805A8FC0 -lbl_805A8FC0: - .skip 0x4 -.global lbl_805A8FC4 -lbl_805A8FC4: - .skip 0x4 -.global lbl_805A8FC8 -lbl_805A8FC8: - .skip 0x1 -.global lbl_805A8FC9 -lbl_805A8FC9: - .skip 0x1 -.global lbl_805A8FCA -lbl_805A8FCA: - .skip 0x6 -.global lbl_805A8FD0 -lbl_805A8FD0: - .skip 0x4 -.global lbl_805A8FD4 -lbl_805A8FD4: - .skip 0x4 -.global lbl_805A8FD8 -lbl_805A8FD8: - .skip 0x8 - -# CDrone -.global lbl_805A8FE0 -lbl_805A8FE0: - .skip 0x1 -.global lbl_805A8FE1 -lbl_805A8FE1: - .skip 0x1 -.global lbl_805A8FE2 -lbl_805A8FE2: - .skip 0x1 -.global lbl_805A8FE3 -lbl_805A8FE3: - .skip 0x1 -.global lbl_805A8FE4 -lbl_805A8FE4: - .skip 0x4 -.global lbl_805A8FE8 -lbl_805A8FE8: - .skip 0x4 -.global lbl_805A8FEC -lbl_805A8FEC: - .skip 0x4 -.global lbl_805A8FF0 -lbl_805A8FF0: - .skip 0x4 -.global lbl_805A8FF4 -lbl_805A8FF4: - .skip 0x4 -.global lbl_805A8FF8 -lbl_805A8FF8: - .skip 0x8 .global lbl_805A9000 lbl_805A9000: .skip 0x4 diff --git a/obj_files.mk b/obj_files.mk index a2a822c4..471c5c57 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -691,7 +691,7 @@ OS_FILES :=\ $(BUILD_DIR)/asm/Dolphin/os/OS.o\ $(BUILD_DIR)/asm/Dolphin/os/OSAlarm.o\ $(BUILD_DIR)/asm/Dolphin/os/OSArena.o\ - $(BUILD_DIR)/asm/Dolphin/os/OSAudioSystem.o\ + $(BUILD_DIR)/src/Dolphin/os/OSAudioSystem.o\ $(BUILD_DIR)/asm/Dolphin/os/OSCache.o\ $(BUILD_DIR)/asm/Dolphin/os/OSContext.o\ $(BUILD_DIR)/asm/Dolphin/os/OSError.o\ diff --git a/src/musyx/snd3d.c b/src/musyx/snd3d.c index 1d0ca034..f6e18675 100644 --- a/src/musyx/snd3d.c +++ b/src/musyx/snd3d.c @@ -29,5 +29,5 @@ void s3dInit(s32 flags) { void s3dExit() {} #ifdef __cplusplus -extern "C" { +} #endif