From 0f326e1ce39b7500ecb674c3f4b166ee510c5adb Mon Sep 17 00:00:00 2001 From: Luke Street Date: Wed, 10 Aug 2022 21:17:58 -0400 Subject: [PATCH] Migrate to -common on; use .comm/.lcomm --- Makefile | 2 +- asm/Collision/CCollidableAABox.s | 4 +- asm/Collision/CCollidableSphere.s | 4 +- asm/Collision/CCollisionPrimitive.s | 4 +- asm/Collision/CollisionUtil.s | 4 +- asm/Kyoto/Alloc/CMemory.s | 8 +- asm/Kyoto/Animation/DolphinCSkinnedModel.s | 16 +- asm/Kyoto/Audio/CDSPStreamManager.s | 30 +- asm/Kyoto/Audio/CMidiManager.s | 5 + asm/Kyoto/Audio/CSfxManager.s | 4 +- asm/Kyoto/Audio/CStaticAudioPlayer.s | 17 +- asm/Kyoto/Audio/CStreamAudioManager.s | 7 + asm/Kyoto/Audio/DolphinCAudioSys.s | 4 +- asm/Kyoto/Audio/SDSPStream.s | 5 + asm/Kyoto/Basics/CBasics.s | 4 +- asm/Kyoto/Basics/RAssertDolphin.s | 4 +- asm/Kyoto/CARAMManager.s | 4 +- asm/Kyoto/CFrameDelayedKiller.s | 8 +- asm/Kyoto/DolphinCMemoryCardSys.s | 8 +- asm/Kyoto/Graphics/CCubeMaterial.s | 8 +- asm/Kyoto/Graphics/CCubeMoviePlayer.s | 5 + asm/Kyoto/Graphics/CGX.s | 4 +- asm/Kyoto/Graphics/DolphinCGraphics.s | 8 +- asm/Kyoto/Graphics/DolphinCTexture.s | 4 +- asm/Kyoto/Math/CQuaternion.s | 12 +- asm/Kyoto/Particles/CElementGen.s | 20 +- .../Particles/CSpawnSystemKeyframeData.s | 8 +- asm/Kyoto/rstl/RstlExtras.s | 4 +- asm/MetaRender/CCubeRenderer.s | 20 +- asm/MetroidPrime/CAnimData.s | 4 +- asm/MetroidPrime/CControlMapper.s | 4 +- asm/MetroidPrime/CDecalManager.s | 8 +- asm/MetroidPrime/CEntity.s | 4 +- asm/MetroidPrime/CEnvFxManager.s | 4 +- asm/MetroidPrime/CFluidPlaneRender.s | 4 +- asm/MetroidPrime/CMFGame.s | 4 +- asm/MetroidPrime/CMapArea.s | 4 +- asm/MetroidPrime/CMappableObject.s | 4 +- asm/MetroidPrime/CModelData.s | 4 +- asm/MetroidPrime/CSamusDoll.s | 8 +- asm/MetroidPrime/CStateManager.s | 24 +- asm/MetroidPrime/CTargetReticles.s | 4 +- asm/MetroidPrime/Cameras/CBallCamera.s | 4 +- asm/MetroidPrime/Cameras/CCameraShakeData.s | 4 +- asm/MetroidPrime/Cameras/CPathCamera.s | 4 +- asm/MetroidPrime/Enemies/CChozoGhost.s | 4 +- asm/MetroidPrime/Enemies/CDrone.s | 20 +- asm/MetroidPrime/Enemies/CFlyingPirate.s | 8 +- asm/MetroidPrime/Enemies/CJellyZap.s | 4 +- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 4 +- asm/MetroidPrime/Enemies/CParasite.s | 8 +- asm/MetroidPrime/Enemies/CPuddleToadGamma.s | 4 +- asm/MetroidPrime/Enemies/CRidley.s | 16 +- asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s | 8 +- asm/MetroidPrime/Enemies/CSpacePirate.s | 8 +- asm/MetroidPrime/Enemies/CTryclops.s | 4 +- asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s | 4 +- asm/MetroidPrime/HUD/CSamusHud.s | 13 +- asm/MetroidPrime/Player/CMorphBall.s | 8 +- asm/MetroidPrime/Player/CPlayer.s | 28 +- asm/MetroidPrime/Player/CPlayerDynamics.s | 4 +- asm/MetroidPrime/Player/CPlayerGun.s | 8 +- asm/MetroidPrime/Player/CPlayerOrbit.s | 12 +- .../Player/CSamusFaceReflection.s | 4 +- asm/MetroidPrime/Player/CWorldLayerState.s | 8 +- .../ScriptObjects/CHUDBillboardEffect.s | 4 +- asm/MetroidPrime/ScriptObjects/CScriptSound.s | 4 +- .../ScriptObjects/CScriptSpindleCamera.s | 4 +- asm/MetroidPrime/ScriptObjects/CScriptWater.s | 4 +- asm/MetroidPrime/Tweaks/CTweaks.s | 48 +- asm/MetroidPrime/Weapons/CBomb.s | 4 +- asm/MetroidPrime/Weapons/CNewFlameThrower.s | 4 +- asm/MetroidPrime/Weapons/CPlasmaBeam.s | 4 +- asm/MetroidPrime/Weapons/CWaveBuster.s | 8 +- asm/MetroidPrime/main.s | 16 +- asm/Runtime/Gecko_ExceptionPPC.s | 3 +- asm/Runtime/abort_exit.s | 3 +- asm/Runtime/alloc.s | 3 +- asm/Weapons/IWeaponRenderer.s | 4 +- asm/WorldFormat/CAreaOctTree_Tests.s | 4 +- asm/dtors.s | 590 +++++------------- 81 files changed, 324 insertions(+), 887 deletions(-) diff --git a/Makefile b/Makefile index 40a81fdb..cd3ee50b 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ LDFLAGS := $(MAPGEN) -fp fmadd -nodefaults -w off endif CFLAGS_1.2 = -proc gekko -nodefaults -Cpp_exceptions off -RTTI off -fp fmadd -fp_contract on -O4,p -maxerrors 1 -enum int -inline auto -MMD $(INCLUDES) CFLAGS_MUSYX = -proc gekko -nodefaults -Cpp_exceptions off -RTTI off -fp fmadd -str reuse,pool,readonly -O4,p -maxerrors 1 -enum int -inline auto -MMD $(INCLUDES) -CFLAGS = $(CFLAGS_1.2) -use_lmw_stmw on -str reuse,pool,readonly -gccinc -inline deferred,noauto +CFLAGS = $(CFLAGS_1.2) -use_lmw_stmw on -str reuse,pool,readonly -gccinc -inline deferred,noauto -common on CFLAGS_ZLIB = $(CFLAGS_1.2) -use_lmw_stmw on -str reuse,pool,readonly -gccinc -inline deferred,auto CFLAGS_1.2 += -str reuse diff --git a/asm/Collision/CCollidableAABox.s b/asm/Collision/CCollidableAABox.s index b39a7e08..ed292585 100644 --- a/asm/Collision/CCollidableAABox.s +++ b/asm/Collision/CCollidableAABox.s @@ -33,9 +33,7 @@ sTableIndex__16CCollidableAABox: .section .bss .balign 8 -.global lbl_80479498 -lbl_80479498: - .skip 0x48 +.lcomm lbl_80479498, 0x48, 4 .section .text, "ax" diff --git a/asm/Collision/CCollidableSphere.s b/asm/Collision/CCollidableSphere.s index 0e9b42e5..661fcb6d 100644 --- a/asm/Collision/CCollidableSphere.s +++ b/asm/Collision/CCollidableSphere.s @@ -82,9 +82,7 @@ lbl_805A86F8: .section .bss .balign 8 -.global lbl_80479558 -lbl_80479558: - .skip 0x48 +.lcomm lbl_80479558, 0x48, 4 .section .text, "ax" diff --git a/asm/Collision/CCollisionPrimitive.s b/asm/Collision/CCollisionPrimitive.s index 13c1361b..47692e73 100644 --- a/asm/Collision/CCollisionPrimitive.s +++ b/asm/Collision/CCollisionPrimitive.s @@ -7,9 +7,7 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_804794E0 -lbl_804794E0: - .skip 0x30 +.lcomm lbl_804794E0, 0x30, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Collision/CollisionUtil.s b/asm/Collision/CollisionUtil.s index 91c4657b..df37ecca 100644 --- a/asm/Collision/CollisionUtil.s +++ b/asm/Collision/CollisionUtil.s @@ -7,9 +7,7 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_80479510 -lbl_80479510: - .skip 0x48 +.lcomm lbl_80479510, 0x48, 4 .section .text, "ax" diff --git a/asm/Kyoto/Alloc/CMemory.s b/asm/Kyoto/Alloc/CMemory.s index 38edccf7..5629e67a 100644 --- a/asm/Kyoto/Alloc/CMemory.s +++ b/asm/Kyoto/Alloc/CMemory.s @@ -7,12 +7,8 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_804BFD58 -lbl_804BFD58: - .skip 0xC -.global lbl_804BFD64 -lbl_804BFD64: - .skip 0xC4 +.lcomm lbl_804BFD58, 0xC, 4 +.lcomm lbl_804BFD64, 0xC4, 4 .section .sdata .balign 8 diff --git a/asm/Kyoto/Animation/DolphinCSkinnedModel.s b/asm/Kyoto/Animation/DolphinCSkinnedModel.s index 71bae3d8..e5e162ed 100644 --- a/asm/Kyoto/Animation/DolphinCSkinnedModel.s +++ b/asm/Kyoto/Animation/DolphinCSkinnedModel.s @@ -18,18 +18,10 @@ lbl_803EF718: .section .bss .balign 8 -.global lbl_804BFFC0 -lbl_804BFFC0: - .skip 0x8000C -.global lbl_8053FFCC -lbl_8053FFCC: - .skip 0x28 -.global lbl_8053FFF4 -lbl_8053FFF4: - .skip 0x10 -.global lbl_80540004 -lbl_80540004: - .skip 0xC +.lcomm lbl_804BFFC0, 0x8000C, 4 +.lcomm lbl_8053FFCC, 0x28, 4 +.lcomm lbl_8053FFF4, 0x10, 4 +.lcomm lbl_80540004, 0xC, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Audio/CDSPStreamManager.s b/asm/Kyoto/Audio/CDSPStreamManager.s index ff3f0124..b0b4e8a6 100644 --- a/asm/Kyoto/Audio/CDSPStreamManager.s +++ b/asm/Kyoto/Audio/CDSPStreamManager.s @@ -7,35 +7,7 @@ lbl_ctor: .section .bss .balign 8 -#TODO: Figure out what's going on with these, they're referenced in various locations - -.global lbl_80540010 -lbl_80540010: - .skip 0x10 -.global lbl_80540020 -lbl_80540020: - .skip 0x500 -.global lbl_80540520 -lbl_80540520: - .skip 0x30 -.global lbl_80540550 -lbl_80540550: - .skip 0x30 -.global lbl_80540580 -lbl_80540580: - .skip 0x64 -.global lbl_805405E4 -lbl_805405E4: - .skip 0x5C -.global lbl_80540640 -lbl_80540640: - .skip 0x3E0 -.global lbl_80540A20 -lbl_80540A20: - .skip 0xC -.global lbl_80540A2C -lbl_80540A2C: - .skip 0x14 +.lcomm lbl_80540520, 0x30, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Audio/CMidiManager.s b/asm/Kyoto/Audio/CMidiManager.s index e3ea1b57..60dae478 100644 --- a/asm/Kyoto/Audio/CMidiManager.s +++ b/asm/Kyoto/Audio/CMidiManager.s @@ -4,6 +4,11 @@ lbl_ctor: .4byte __sinit_CMidiManager_cpp +.section .bss +.balign 8 + +.lcomm lbl_80540010, 0x10, 4 + .section .data .balign 8 diff --git a/asm/Kyoto/Audio/CSfxManager.s b/asm/Kyoto/Audio/CSfxManager.s index 3ae4ae28..4a0f61e3 100644 --- a/asm/Kyoto/Audio/CSfxManager.s +++ b/asm/Kyoto/Audio/CSfxManager.s @@ -137,9 +137,7 @@ lbl_805A877C: .section .bss .balign 8 -.global lbl_80479BA0 -lbl_80479BA0: - .skip 0x30 +.lcomm lbl_80479BA0, 0x30, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Audio/CStaticAudioPlayer.s b/asm/Kyoto/Audio/CStaticAudioPlayer.s index b01f9a2e..10c296d4 100644 --- a/asm/Kyoto/Audio/CStaticAudioPlayer.s +++ b/asm/Kyoto/Audio/CStaticAudioPlayer.s @@ -4,6 +4,11 @@ lbl_ctor: .4byte __sinit_CStaticAudioPlayer_cpp +.section .bss +.balign 8 +.lcomm lbl_80540A20, 0xC, 4 +.lcomm lbl_80540A2C, 0x14, 4 + .section .sbss, "wa" .balign 8 @@ -812,11 +817,11 @@ sub_8036c704: /* 8036C714 00369674 7C 7F 1B 78 */ mr r31, r3 /* 8036C718 00369678 48 01 4F 49 */ bl OSDisableInterrupts /* 8036C71C 0036967C 7C 03 00 D0 */ neg r0, r3 -/* 8036C720 00369680 3C 80 80 54 */ lis r4, lbl_80540004@ha +/* 8036C720 00369680 3C 80 80 54 */ lis r4, lbl_80540A2C@ha /* 8036C724 00369684 7C 03 1B 78 */ or r3, r0, r3 -/* 8036C728 00369688 84 04 0A 2C */ lwzu r0, 0xa2c(r4) +/* 8036C728 00369688 84 04 0A 2C */ lwzu r0, lbl_80540A2C@l(r4) /* 8036C72C 0036968C 54 63 0F FE */ srwi r3, r3, 0x1f -/* 8036C730 00369690 38 C4 00 04 */ addi r6, r4, lbl_80540004@l +/* 8036C730 00369690 38 C4 00 04 */ addi r6, r4, 0x4 /* 8036C734 00369694 54 00 10 3A */ slwi r0, r0, 2 /* 8036C738 00369698 98 61 00 08 */ stb r3, 8(r1) /* 8036C73C 0036969C 7C C5 33 78 */ mr r5, r6 @@ -875,11 +880,11 @@ RunDMACallback__18CStaticAudioPlayerFv: /* 8036C7EC 0036974C 7C 7F 1B 78 */ mr r31, r3 /* 8036C7F0 00369750 48 01 4E 71 */ bl OSDisableInterrupts /* 8036C7F4 00369754 7C 03 00 D0 */ neg r0, r3 -/* 8036C7F8 00369758 3C 80 80 54 */ lis r4, lbl_80540004@ha +/* 8036C7F8 00369758 3C 80 80 54 */ lis r4, lbl_80540A2C@ha /* 8036C7FC 0036975C 7C 03 1B 78 */ or r3, r0, r3 -/* 8036C800 00369760 84 04 0A 2C */ lwzu r0, 0xa2c(r4) +/* 8036C800 00369760 84 04 0A 2C */ lwzu r0, lbl_80540A2C@l(r4) /* 8036C804 00369764 54 63 0F FE */ srwi r3, r3, 0x1f -/* 8036C808 00369768 38 84 00 04 */ addi r4, r4, lbl_80540004@l +/* 8036C808 00369768 38 84 00 04 */ addi r4, r4, 0x4 /* 8036C80C 0036976C 54 00 10 3A */ slwi r0, r0, 2 /* 8036C810 00369770 98 61 00 08 */ stb r3, 8(r1) /* 8036C814 00369774 7C 64 02 14 */ add r3, r4, r0 diff --git a/asm/Kyoto/Audio/CStreamAudioManager.s b/asm/Kyoto/Audio/CStreamAudioManager.s index dbf311c5..1773c833 100644 --- a/asm/Kyoto/Audio/CStreamAudioManager.s +++ b/asm/Kyoto/Audio/CStreamAudioManager.s @@ -38,6 +38,13 @@ lbl_805A8A41: .byte 0x01, 0x00, 0x00 .4byte 0 +.section .bss +.balign 8 + +.lcomm lbl_80540550, 0x30, 4 +.lcomm lbl_80540580, 0x64, 4 +.lcomm lbl_805405E4, 0x5C, 4 + .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Audio/DolphinCAudioSys.s b/asm/Kyoto/Audio/DolphinCAudioSys.s index 98af14d0..76beb951 100644 --- a/asm/Kyoto/Audio/DolphinCAudioSys.s +++ b/asm/Kyoto/Audio/DolphinCAudioSys.s @@ -75,9 +75,7 @@ lbl_805A89A7: .section .bss .balign 8 -.global lbl_804BFF90 -lbl_804BFF90: - .skip 0x10 +.lcomm lbl_804BFF90, 0x10, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Audio/SDSPStream.s b/asm/Kyoto/Audio/SDSPStream.s index 9d8a9ca4..0188c365 100644 --- a/asm/Kyoto/Audio/SDSPStream.s +++ b/asm/Kyoto/Audio/SDSPStream.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .bss +.balign 8 + +.lcomm lbl_80540640, 0x3E0, 4 + .section .text, "ax" .global ReadCompleted__10SDSPStreamFiP11DVDFileInfo diff --git a/asm/Kyoto/Basics/CBasics.s b/asm/Kyoto/Basics/CBasics.s index 5a7b59b0..f92f1fc2 100644 --- a/asm/Kyoto/Basics/CBasics.s +++ b/asm/Kyoto/Basics/CBasics.s @@ -3,9 +3,7 @@ .section .bss .balign 8 -.global lbl_804795A0 -lbl_804795A0: - .skip 0x200 +.lcomm lbl_804795A0, 0x200, 4 .section .text, "ax" diff --git a/asm/Kyoto/Basics/RAssertDolphin.s b/asm/Kyoto/Basics/RAssertDolphin.s index 1225cd21..597c1bef 100644 --- a/asm/Kyoto/Basics/RAssertDolphin.s +++ b/asm/Kyoto/Basics/RAssertDolphin.s @@ -3,9 +3,7 @@ .section .bss .balign 8 -.global lbl_804797A0 -lbl_804797A0: - .skip 0x400 +.lcomm lbl_804797A0, 0x400, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/CARAMManager.s b/asm/Kyoto/CARAMManager.s index ec186e85..66027890 100644 --- a/asm/Kyoto/CARAMManager.s +++ b/asm/Kyoto/CARAMManager.s @@ -16,9 +16,7 @@ lbl_805A8920: .section .bss .balign 8 -.global lbl_804BFF40 -lbl_804BFF40: - .skip 0x10 +.lcomm lbl_804BFF40, 0x10, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/CFrameDelayedKiller.s b/asm/Kyoto/CFrameDelayedKiller.s index de0b8352..07e2bf42 100644 --- a/asm/Kyoto/CFrameDelayedKiller.s +++ b/asm/Kyoto/CFrameDelayedKiller.s @@ -7,12 +7,8 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_80540A40 -lbl_80540A40: - .skip 0xC -.global lbl_80540A4C -lbl_80540A4C: - .skip 0x34 +.lcomm lbl_80540A40, 0xC, 4 +.lcomm lbl_80540A4C, 0x34, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/DolphinCMemoryCardSys.s b/asm/Kyoto/DolphinCMemoryCardSys.s index 1e958daf..4438468a 100644 --- a/asm/Kyoto/DolphinCMemoryCardSys.s +++ b/asm/Kyoto/DolphinCMemoryCardSys.s @@ -31,12 +31,8 @@ lbl_805A89AB: .section .bss .balign 8 -.global lbl_804BFFA0 -lbl_804BFFA0: - .skip 0xC -.global lbl_804BFFAC -lbl_804BFFAC: - .skip 0x14 +.lcomm lbl_804BFFA0, 0xC, 4 +.lcomm lbl_804BFFAC, 0x14, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Graphics/CCubeMaterial.s b/asm/Kyoto/Graphics/CCubeMaterial.s index d10d88ca..8e37e957 100644 --- a/asm/Kyoto/Graphics/CCubeMaterial.s +++ b/asm/Kyoto/Graphics/CCubeMaterial.s @@ -61,12 +61,8 @@ lbl_805A8934: .section .bss .balign 8 -.global lbl_804BFF50 -lbl_804BFF50: - .skip 0xC -.global lbl_804BFF5C -lbl_804BFF5C: - .skip 0x34 +.lcomm lbl_804BFF50, 0xC, 4 +.lcomm lbl_804BFF5C, 0x34, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Graphics/CCubeMoviePlayer.s b/asm/Kyoto/Graphics/CCubeMoviePlayer.s index 8585772b..11cb05c6 100644 --- a/asm/Kyoto/Graphics/CCubeMoviePlayer.s +++ b/asm/Kyoto/Graphics/CCubeMoviePlayer.s @@ -24,6 +24,11 @@ lbl_805A89F0: .4byte 0x7F000000 .4byte 0 +.section .bss +.balign 8 + +.lcomm lbl_80540020, 0x500, 4 + .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Graphics/CGX.s b/asm/Kyoto/Graphics/CGX.s index ba5ed772..db2bae76 100644 --- a/asm/Kyoto/Graphics/CGX.s +++ b/asm/Kyoto/Graphics/CGX.s @@ -7,9 +7,7 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_80479BD0 -lbl_80479BD0: - .skip 0xF0 +.lcomm lbl_80479BD0, 0xF0, 4 .section .sbss2, "", @nobits .balign 8 diff --git a/asm/Kyoto/Graphics/DolphinCGraphics.s b/asm/Kyoto/Graphics/DolphinCGraphics.s index 772e4a19..f130e50d 100644 --- a/asm/Kyoto/Graphics/DolphinCGraphics.s +++ b/asm/Kyoto/Graphics/DolphinCGraphics.s @@ -107,12 +107,8 @@ lbl_805A884C: .section .bss .balign 8 -.global lbl_80479CC0 -lbl_80479CC0: - .skip 0x46000 -.global lbl_804BFCC0 -lbl_804BFCC0: - .skip 0x50 +.lcomm lbl_80479CC0, 0x46000, 4 +.lcomm lbl_804BFCC0, 0x50, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Graphics/DolphinCTexture.s b/asm/Kyoto/Graphics/DolphinCTexture.s index 04939a10..9cc89a1c 100644 --- a/asm/Kyoto/Graphics/DolphinCTexture.s +++ b/asm/Kyoto/Graphics/DolphinCTexture.s @@ -37,9 +37,7 @@ lbl_803ED994: .section .bss .balign 8 -.global lbl_804BFD10 -lbl_804BFD10: - .skip 0x20 +.lcomm lbl_804BFD10, 0x20, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Math/CQuaternion.s b/asm/Kyoto/Math/CQuaternion.s index 498bd7f2..858227ab 100644 --- a/asm/Kyoto/Math/CQuaternion.s +++ b/asm/Kyoto/Math/CQuaternion.s @@ -7,15 +7,9 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_804BFD30 -lbl_804BFD30: - .skip 0xC -.global lbl_804BFD3C -lbl_804BFD3C: - .skip 0xC -.global lbl_804BFD48 -lbl_804BFD48: - .skip 0x10 +.lcomm lbl_804BFD30, 0xC, 4 +.lcomm lbl_804BFD3C, 0xC, 4 +.lcomm lbl_804BFD48, 0x10, 4 .section .sdata .balign 8 diff --git a/asm/Kyoto/Particles/CElementGen.s b/asm/Kyoto/Particles/CElementGen.s index 66dda2c7..f33b3143 100644 --- a/asm/Kyoto/Particles/CElementGen.s +++ b/asm/Kyoto/Particles/CElementGen.s @@ -381,21 +381,11 @@ lbl_805A88D0: .section .bss .balign 8 -.global lbl_804BFE28 -lbl_804BFE28: - .skip 0x20 -.global lbl_804BFE48 -lbl_804BFE48: - .skip 0x20 -.global lbl_804BFE68 -lbl_804BFE68: - .skip 0x4C -.global lbl_804BFEB4 -lbl_804BFEB4: - .skip 0x4C -.global lbl_804BFF00 -lbl_804BFF00: - .skip 0x10 +.lcomm lbl_804BFE28, 0x20, 4 +.lcomm lbl_804BFE48, 0x20, 4 +.lcomm lbl_804BFE68, 0x4C, 4 +.lcomm lbl_804BFEB4, 0x4C, 4 +.lcomm lbl_804BFF00, 0x10, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s index b66795f5..13c5f1aa 100644 --- a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s +++ b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s @@ -3,12 +3,8 @@ .section .bss .balign 8 -.global lbl_804BFF10 -lbl_804BFF10: - .skip 0xC -.global lbl_804BFF1C -lbl_804BFF1C: - .skip 0x14 +.lcomm lbl_804BFF10, 0xC, 4 +.lcomm lbl_804BFF1C, 0x14, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/Kyoto/rstl/RstlExtras.s b/asm/Kyoto/rstl/RstlExtras.s index 67835be0..0b993f56 100644 --- a/asm/Kyoto/rstl/RstlExtras.s +++ b/asm/Kyoto/rstl/RstlExtras.s @@ -7,9 +7,7 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_804BFF30 -lbl_804BFF30: - .skip 0x10 +.lcomm lbl_804BFF30, 0x10, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetaRender/CCubeRenderer.s b/asm/MetaRender/CCubeRenderer.s index d3bbf365..2a777c5f 100644 --- a/asm/MetaRender/CCubeRenderer.s +++ b/asm/MetaRender/CCubeRenderer.s @@ -262,21 +262,11 @@ lbl_805AF498: .section .bss .balign 8 -.global lbl_8046E200 -lbl_8046E200: - .skip 0xC -.global lbl_8046E20C -lbl_8046E20C: - .skip 0x1DF8 -.global lbl_80470004 -lbl_80470004: - .skip 0x9168 -.global lbl_8047916C -lbl_8047916C: - .skip 0xC -.global lbl_80479178 -lbl_80479178: - .skip 0x320 +.lcomm lbl_8046E200, 0xC, 4 +.lcomm lbl_8046E20C, 0x1DF8, 4 +.lcomm lbl_80470004, 0x9168, 4 +.lcomm lbl_8047916C, 0xC, 4 +.lcomm lbl_80479178, 0x320, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/CAnimData.s b/asm/MetroidPrime/CAnimData.s index dee64ed5..d2f86d95 100644 --- a/asm/MetroidPrime/CAnimData.s +++ b/asm/MetroidPrime/CAnimData.s @@ -87,9 +87,7 @@ lbl_805A6DB0: .section .bss .balign 8 -.global lbl_8045B140 -lbl_8045B140: - .skip 0x40 +.lcomm lbl_8045B140, 0x40, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/CControlMapper.s b/asm/MetroidPrime/CControlMapper.s index 70b63e81..778d43b5 100644 --- a/asm/MetroidPrime/CControlMapper.s +++ b/asm/MetroidPrime/CControlMapper.s @@ -523,9 +523,7 @@ lbl_803D9600: .section .bss .balign 8 -.global lbl_804578F8 -lbl_804578F8: - .skip 0x10 +.lcomm lbl_804578F8, 0x10, 4 .section .rodata .balign 8 diff --git a/asm/MetroidPrime/CDecalManager.s b/asm/MetroidPrime/CDecalManager.s index 0ef06328..e68a85a9 100644 --- a/asm/MetroidPrime/CDecalManager.s +++ b/asm/MetroidPrime/CDecalManager.s @@ -7,12 +7,8 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_8046C558 -lbl_8046C558: - .skip 0xC -.global lbl_8046C564 -lbl_8046C564: - .skip 0xC +.lcomm lbl_8046C558, 0xC, 4 +.lcomm lbl_8046C564, 0xC, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/CEntity.s b/asm/MetroidPrime/CEntity.s index d0486f52..1a1d3a47 100644 --- a/asm/MetroidPrime/CEntity.s +++ b/asm/MetroidPrime/CEntity.s @@ -22,9 +22,7 @@ __vt__7CEntity: .section .bss .balign 8 -.global lbl_8046C3B8 -lbl_8046C3B8: - .skip 0x10 +.lcomm lbl_8046C3B8, 0x10, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s index 51d9b6a6..d0b1f0d1 100644 --- a/asm/MetroidPrime/CEnvFxManager.s +++ b/asm/MetroidPrime/CEnvFxManager.s @@ -56,9 +56,7 @@ lbl_805A809C: .section .bss .balign 8 -.global lbl_8046CB40 -lbl_8046CB40: - .skip 0x800 +.lcomm lbl_8046CB40, 0x800, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/CFluidPlaneRender.s b/asm/MetroidPrime/CFluidPlaneRender.s index b5d5e300..77c51cba 100644 --- a/asm/MetroidPrime/CFluidPlaneRender.s +++ b/asm/MetroidPrime/CFluidPlaneRender.s @@ -16,9 +16,7 @@ lbl_805A840C: .section .bss .balign 8 -.global lbl_8046DCC0 -lbl_8046DCC0: - .skip 0x400 +.lcomm lbl_8046DCC0, 0x400, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/CMFGame.s b/asm/MetroidPrime/CMFGame.s index 86a495ea..0c9e2969 100644 --- a/asm/MetroidPrime/CMFGame.s +++ b/asm/MetroidPrime/CMFGame.s @@ -7,9 +7,7 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_8045A1A8 -lbl_8045A1A8: - .skip 0xF98 +.lcomm lbl_8045A1A8, 0xF98, 4 .section .data .balign 8 diff --git a/asm/MetroidPrime/CMapArea.s b/asm/MetroidPrime/CMapArea.s index 620f9e27..2b52cf64 100644 --- a/asm/MetroidPrime/CMapArea.s +++ b/asm/MetroidPrime/CMapArea.s @@ -27,9 +27,7 @@ lbl_805A7010: .section .bss .balign 8 -.global lbl_8046C3E0 -lbl_8046C3E0: - .skip 0x28 +.lcomm lbl_8046C3E0, 0x28, 4 .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/CMappableObject.s b/asm/MetroidPrime/CMappableObject.s index a714019b..cfbf3015 100644 --- a/asm/MetroidPrime/CMappableObject.s +++ b/asm/MetroidPrime/CMappableObject.s @@ -69,9 +69,7 @@ lbl_805A7374: .section .bss .balign 8 -.global lbl_8046C498 -lbl_8046C498: - .skip 0x60 +.lcomm lbl_8046C498, 0x60, 4 .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/CModelData.s b/asm/MetroidPrime/CModelData.s index 3b806367..4103bf39 100644 --- a/asm/MetroidPrime/CModelData.s +++ b/asm/MetroidPrime/CModelData.s @@ -7,9 +7,7 @@ lbl_ctor: .section .bss .balign 8 -.global lbl_8046C538 -lbl_8046C538: - .skip 0x20 +.lcomm lbl_8046C538, 0x20, 4 .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s index 601e406d..5bf8fdd5 100644 --- a/asm/MetroidPrime/CSamusDoll.s +++ b/asm/MetroidPrime/CSamusDoll.s @@ -120,12 +120,8 @@ lbl_805A731C: .section .bss .balign 8 -.global lbl_8046C470 -lbl_8046C470: - .skip 0xC -.global lbl_8046C47C -lbl_8046C47C: - .skip 0xC +.lcomm lbl_8046C470, 0xC, 4 +.lcomm lbl_8046C47C, 0xC, 4 .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index 614ddd15..0f4d1f35 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -3,24 +3,12 @@ .section .bss .balign 8 -.global lbl_8045C550 -lbl_8045C550: - .skip 0x30 -.global lbl_8045C580 -lbl_8045C580: - .skip 0x18 -.global lbl_8045C598 -lbl_8045C598: - .skip 0xC -.global lbl_8045C5A4 -lbl_8045C5A4: - .skip 0x10 -.global lbl_8045C5B4 -lbl_8045C5B4: - .skip 0xF3C8 -.global lbl_8046B97C -lbl_8046B97C: - .skip 0xA3C +.lcomm lbl_8045C550, 0x30, 4 +.lcomm lbl_8045C580, 0x18, 4 +.lcomm lbl_8045C598, 0xC, 4 +.lcomm lbl_8045C5A4, 0x10, 4 +.lcomm lbl_8045C5B4, 0xF3C8, 4 +.lcomm lbl_8046B97C, 0xA3C, 4 .section .sdata .balign 8 diff --git a/asm/MetroidPrime/CTargetReticles.s b/asm/MetroidPrime/CTargetReticles.s index 4453e024..c39c4089 100644 --- a/asm/MetroidPrime/CTargetReticles.s +++ b/asm/MetroidPrime/CTargetReticles.s @@ -100,9 +100,7 @@ lbl_805A7274: .section .bss .balign 8 -.global lbl_8046C450 -lbl_8046C450: - .skip 0x20 +.lcomm lbl_8046C450, 0x20, 4 .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index 02568769..6f46648d 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -377,9 +377,7 @@ lbl_805A710C: .section .bss .balign 8 -.global lbl_8046C408 -lbl_8046C408: - .skip 0x18 +.lcomm lbl_8046C408, 0x18, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Cameras/CCameraShakeData.s b/asm/MetroidPrime/Cameras/CCameraShakeData.s index 9f62a58a..61d86335 100644 --- a/asm/MetroidPrime/Cameras/CCameraShakeData.s +++ b/asm/MetroidPrime/Cameras/CCameraShakeData.s @@ -39,9 +39,7 @@ lbl_805A789C: .section .bss .balign 8 -.global lbl_8046C7D0 -lbl_8046C7D0: - .skip 0x78 +.lcomm lbl_8046C7D0, 0x78, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s index 8c9837be..9b7905bd 100644 --- a/asm/MetroidPrime/Cameras/CPathCamera.s +++ b/asm/MetroidPrime/Cameras/CPathCamera.s @@ -73,9 +73,7 @@ lbl_805A76C0: .section .bss .balign 8 -.global lbl_8046C720 -lbl_8046C720: - .skip 0x18 +.lcomm lbl_8046C720, 0x18, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index 2143c96d..22ab4b7a 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -317,9 +317,7 @@ lbl_805A7778: .section .bss .balign 8 -.global lbl_8046C748 -lbl_8046C748: - .skip 0x10 +.lcomm lbl_8046C748, 0x10, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 68b14fcc..01bf1415 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -480,21 +480,11 @@ lbl_805A7944: .section .bss .balign 8 -.global lbl_8046C848 -lbl_8046C848: - .skip 0x18 -.global lbl_8046C860 -lbl_8046C860: - .skip 0x18 -.global lbl_8046C878 -lbl_8046C878: - .skip 0x18 -.global lbl_8046C890 -lbl_8046C890: - .skip 0x18 -.global lbl_8046C8A8 -lbl_8046C8A8: - .skip 0x18 +.lcomm lbl_8046C848, 0x18, 4 +.lcomm lbl_8046C860, 0x18, 4 +.lcomm lbl_8046C878, 0x18, 4 +.lcomm lbl_8046C890, 0x18, 4 +.lcomm lbl_8046C8A8, 0x18, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index f852377c..a9d37190 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -456,12 +456,8 @@ lbl_805A7EF8: .section .bss .balign 8 -.global lbl_8046C950 -lbl_8046C950: - .skip 0xFC -.global lbl_8046CA4C -lbl_8046CA4C: - .skip 0xF4 +.lcomm lbl_8046C950, 0xFC, 4 +.lcomm lbl_8046CA4C, 0xF4, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s index 846d0864..badcf966 100644 --- a/asm/MetroidPrime/Enemies/CJellyZap.s +++ b/asm/MetroidPrime/Enemies/CJellyZap.s @@ -229,9 +229,7 @@ lbl_805A7D90: .section .bss .balign 8 -.global lbl_8046C920 -lbl_8046C920: - .skip 0x18 +.lcomm lbl_8046C920, 0x18, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 201adb81..36001e15 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -709,9 +709,7 @@ lbl_805A849C: .section .bss .balign 8 -.global lbl_8046E0C0 -lbl_8046E0C0: - .skip 0x18 +.lcomm lbl_8046E0C0, 0x18, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 93de0ba7..c42aac9b 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -271,12 +271,8 @@ lbl_805A7860: .section .bss .balign 8 -.global lbl_8046C770 -lbl_8046C770: - .skip 0x18 -.global lbl_8046C788 -lbl_8046C788: - .skip 0x18 +.lcomm lbl_8046C770, 0x18, 4 +.lcomm lbl_8046C788, 0x18, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index a3f2a836..28a9df4f 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -237,9 +237,7 @@ lbl_805A77D4: .section .bss .balign 8 -.global lbl_8046C758 -lbl_8046C758: - .skip 0x18 +.lcomm lbl_8046C758, 0x18, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index c97951a6..63fac8b0 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -604,18 +604,10 @@ lbl_805A8378: .section .bss .balign 8 -.global lbl_8046D3A8 -lbl_8046D3A8: - .skip 0x150 -.global lbl_8046D4F8 -lbl_8046D4F8: - .skip 0x2E8 -.global lbl_8046D7E0 -lbl_8046D7E0: - .skip 0x1E0 -.global lbl_8046D9C0 -lbl_8046D9C0: - .skip 0x2D0 +.lcomm lbl_8046D3A8, 0x150, 4 +.lcomm lbl_8046D4F8, 0x2E8, 4 +.lcomm lbl_8046D7E0, 0x1E0, 4 +.lcomm lbl_8046D9C0, 0x2D0, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s index 4587f2aa..f9cf11a2 100644 --- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s +++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s @@ -71,12 +71,8 @@ lbl_805A8244: .section .bss .balign 8 -.global lbl_8046D360 -lbl_8046D360: - .skip 0x18 -.global lbl_8046D378 -lbl_8046D378: - .skip 0x18 +.lcomm lbl_8046D360, 0x18, 4 +.lcomm lbl_8046D378, 0x18, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index 30fc5857..65c56155 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -526,12 +526,8 @@ lbl_805A76A0: .section .bss .balign 8 -.global lbl_8046C570 -lbl_8046C570: - .skip 0xA8 -.global lbl_8046C618 -lbl_8046C618: - .skip 0x108 +.lcomm lbl_8046C570, 0xA8, 4 +.lcomm lbl_8046C618, 0x108, 4 .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index 585e46f5..8eb08f8b 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -275,9 +275,7 @@ lbl_805A83C4: .section .bss .balign 8 -.global lbl_8046DC90 -lbl_8046DC90: - .skip 0x18 +.lcomm lbl_8046DC90, 0x18, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index 087d439f..359b4910 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -150,9 +150,7 @@ lbl_805AF46C: .section .bss .balign 8 -.global lbl_8046C938 -lbl_8046C938: - .skip 0x18 +.lcomm lbl_8046C938, 0x18, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index d782b9fb..e773dae8 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -269,9 +269,8 @@ lbl_805A6F50: .section .bss .balign 8 -.global lbl_8046C3C8 -lbl_8046C3C8: - .skip 0x18 +.lcomm lbl_8046C3C8, 0xC, 4 +.lcomm lbl_8046C3D4, 0xC, 4 .section .sbss .balign 8 @@ -7749,7 +7748,7 @@ lbl_8006AD90: /* 8006ADD0 00067D30 C0 42 87 34 */ lfs f2, lbl_805AA454@sda21(r2) /* 8006ADD4 00067D34 38 80 00 00 */ li r4, 0 /* 8006ADD8 00067D38 C0 02 87 28 */ lfs f0, lbl_805AA448@sda21(r2) -/* 8006ADDC 00067D3C 3C 60 80 47 */ lis r3, lbl_80470004@ha +/* 8006ADDC 00067D3C 3C 60 80 47 */ lis r3, lbl_8046C3D4@ha /* 8006ADE0 00067D40 D0 5F 05 48 */ stfs f2, 0x548(r31) /* 8006ADE4 00067D44 34 DF 05 A8 */ addic. r6, r31, 0x5a8 /* 8006ADE8 00067D48 38 00 00 04 */ li r0, 4 @@ -7775,9 +7774,9 @@ lbl_8006AD90: /* 8006AE38 00067D98 D0 5F 05 7C */ stfs f2, 0x57c(r31) /* 8006AE3C 00067D9C D0 5F 05 80 */ stfs f2, 0x580(r31) /* 8006AE40 00067DA0 D0 5F 05 84 */ stfs f2, 0x584(r31) -/* 8006AE44 00067DA4 84 A3 C3 D4 */ lwzu r5, -0x3c2c(r3) -/* 8006AE48 00067DA8 80 83 00 04 */ lwz r4, lbl_80470004@l(r3) -/* 8006AE4C 00067DAC 80 63 00 08 */ lwz r3, 8(r3) +/* 8006AE44 00067DA4 84 A3 C3 D4 */ lwzu r5, lbl_8046C3D4@l(r3) +/* 8006AE48 00067DA8 80 83 00 04 */ lwz r4, 0x4(r3) +/* 8006AE4C 00067DAC 80 63 00 08 */ lwz r3, 0x8(r3) /* 8006AE50 00067DB0 90 A1 00 28 */ stw r5, 0x28(r1) /* 8006AE54 00067DB4 90 81 00 2C */ stw r4, 0x2c(r1) /* 8006AE58 00067DB8 90 61 00 30 */ stw r3, 0x30(r1) diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index 43eb6c62..f7cb9835 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -256,12 +256,8 @@ lbl_805A74A8: .section .bss .balign 8 -.global lbl_8046C4F8 -lbl_8046C4F8: - .skip 0xC -.global lbl_8046C504 -lbl_8046C504: - .skip 0x1C +.lcomm lbl_8046C4F8, 0xC, 4 +.lcomm lbl_8046C504, 0x1C, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 8fc45bc3..1bede048 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -98,27 +98,13 @@ lbl_803D97E4: .section .bss .balign 8 -.global lbl_80457908 -lbl_80457908: - .skip 0xC0 -.global lbl_804579C8 -lbl_804579C8: - .skip 0x20 -.global lbl_804579E8 -lbl_804579E8: - .skip 0x10 -.global lbl_804579F8 -lbl_804579F8: - .skip 0x18 -.global lbl_80457A10 -lbl_80457A10: - .skip 0x838 -.global lbl_80458248 -lbl_80458248: - .skip 0x108 -.global lbl_80458350 -lbl_80458350: - .skip 0x1E58 +.lcomm lbl_80457908, 0xC0, 4 +.lcomm lbl_804579C8, 0x20, 4 +.lcomm lbl_804579E8, 0x10, 4 +.lcomm lbl_804579F8, 0x18, 4 +.lcomm lbl_80457A10, 0x838, 4 +.lcomm lbl_80458248, 0x108, 4 +.lcomm lbl_80458350, 0x1E58, 4 .section .rodata .balign 8 diff --git a/asm/MetroidPrime/Player/CPlayerDynamics.s b/asm/MetroidPrime/Player/CPlayerDynamics.s index 0fdcef4f..5d17bc05 100644 --- a/asm/MetroidPrime/Player/CPlayerDynamics.s +++ b/asm/MetroidPrime/Player/CPlayerDynamics.s @@ -106,9 +106,7 @@ lbl_805A8530: .section .bss .balign 8 -.global lbl_8046E0D8 -lbl_8046E0D8: - .skip 0x18 +.lcomm lbl_8046E0D8, 0x18, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index 0d9bfecb..1c9a5db9 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -148,12 +148,8 @@ lbl_805A6E18: .section .bss .balign 8 -.global lbl_8045C518 -lbl_8045C518: - .skip 0x18 -.global lbl_8045C530 -lbl_8045C530: - .skip 0x20 +.lcomm lbl_8045C518, 0x18, 4 +.lcomm lbl_8045C530, 0x20, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Player/CPlayerOrbit.s b/asm/MetroidPrime/Player/CPlayerOrbit.s index d83bafb5..8a84c103 100644 --- a/asm/MetroidPrime/Player/CPlayerOrbit.s +++ b/asm/MetroidPrime/Player/CPlayerOrbit.s @@ -80,15 +80,9 @@ lbl_805A7A3C: .section .bss .balign 8 -.global lbl_8046C8C0 -lbl_8046C8C0: - .skip 0x18 -.global lbl_8046C8D8 -lbl_8046C8D8: - .skip 0x18 -.global lbl_8046C8F0 -lbl_8046C8F0: - .skip 0x18 +.lcomm lbl_8046C8C0, 0x18, 4 +.lcomm lbl_8046C8D8, 0x18, 4 +.lcomm lbl_8046C8F0, 0x18, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s index 29c8ef10..805e3570 100644 --- a/asm/MetroidPrime/Player/CSamusFaceReflection.s +++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s @@ -20,9 +20,7 @@ lbl_805A786C: .section .bss .balign 8 -.global lbl_8046C7A0 -lbl_8046C7A0: - .skip 0x30 +.lcomm lbl_8046C7A0, 0x30, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/Player/CWorldLayerState.s b/asm/MetroidPrime/Player/CWorldLayerState.s index baf2f297..a01c1feb 100644 --- a/asm/MetroidPrime/Player/CWorldLayerState.s +++ b/asm/MetroidPrime/Player/CWorldLayerState.s @@ -17,12 +17,8 @@ lbl_805A8200: .section .bss .balign 8 -.global lbl_8046D340 -lbl_8046D340: - .skip 0xC -.global lbl_8046D34C -lbl_8046D34C: - .skip 0x14 +.lcomm lbl_8046D340, 0xC, 4 +.lcomm lbl_8046D34C, 0x14, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index 6096d302..c5c907d8 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -47,9 +47,7 @@ lbl_805A76E8: .section .bss .balign 8 -.global lbl_8046C738 -lbl_8046C738: - .skip 0x10 +.lcomm lbl_8046C738, 0x10, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index da5cc8f2..6457b8c0 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -95,9 +95,7 @@ lbl_805A71E8: .section .bss .balign 8 -.global lbl_8046C438 -lbl_8046C438: - .skip 0x18 +.lcomm lbl_8046C438, 0x18, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s index cb1bad58..2371772f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s @@ -87,9 +87,7 @@ lbl_805A828C: .section .bss .balign 8 -.global lbl_8046D390 -lbl_8046D390: - .skip 0x18 +.lcomm lbl_8046D390, 0x18, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s index 67ac4cd7..75ca7b22 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s @@ -65,9 +65,7 @@ lbl_805A7554: .section .bss .balign 8 -.global lbl_8046C520 -lbl_8046C520: - .skip 0x18 +.lcomm lbl_8046C520, 0x18, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Tweaks/CTweaks.s b/asm/MetroidPrime/Tweaks/CTweaks.s index 5f642df1..9fae70e6 100644 --- a/asm/MetroidPrime/Tweaks/CTweaks.s +++ b/asm/MetroidPrime/Tweaks/CTweaks.s @@ -3,42 +3,18 @@ .section .bss .balign 8 -.global lbl_8045B180 -lbl_8045B180: - .skip 0x5C -.global lbl_8045B1DC -lbl_8045B1DC: - .skip 0xF4 -.global lbl_8045B2D0 -lbl_8045B2D0: - .skip 0xC8 -.global lbl_8045B398 -lbl_8045B398: - .skip 0x120 -.global lbl_8045B4B8 -lbl_8045B4B8: - .skip 0x228 -.global lbl_8045B6E0 -lbl_8045B6E0: - .skip 0x254 -.global lbl_8045B934 -lbl_8045B934: - .skip 0x368 -.global lbl_8045BC9C -lbl_8045BC9C: - .skip 0x298 -.global lbl_8045BF34 -lbl_8045BF34: - .skip 0x34 -.global lbl_8045BF68 -lbl_8045BF68: - .skip 0x68 -.global lbl_8045BFD0 -lbl_8045BFD0: - .skip 0x238 -.global lbl_8045C208 -lbl_8045C208: - .skip 0x310 +.lcomm lbl_8045B180, 0x5C, 4 +.lcomm lbl_8045B1DC, 0xF4, 4 +.lcomm lbl_8045B2D0, 0xC8, 4 +.lcomm lbl_8045B398, 0x120, 4 +.lcomm lbl_8045B4B8, 0x228, 4 +.lcomm lbl_8045B6E0, 0x254, 4 +.lcomm lbl_8045B934, 0x368, 4 +.lcomm lbl_8045BC9C, 0x298, 4 +.lcomm lbl_8045BF34, 0x34, 4 +.lcomm lbl_8045BF68, 0x68, 4 +.lcomm lbl_8045BFD0, 0x238, 4 +.lcomm lbl_8045C208, 0x310, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index 0f90a37d..5a9b6158 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -101,9 +101,7 @@ lbl_805A714C: .section .bss .balign 8 -.global lbl_8046C420 -lbl_8046C420: - .skip 0x18 +.lcomm lbl_8046C420, 0x18, 4 .section .sbss .balign 8 diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index 3392bdef..a00e1c3b 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -101,9 +101,7 @@ lbl_805A83F0: .section .bss .balign 8 -.global lbl_8046DCA8 -lbl_8046DCA8: - .skip 0x18 +.lcomm lbl_8046DCA8, 0x18, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/Weapons/CPlasmaBeam.s b/asm/MetroidPrime/Weapons/CPlasmaBeam.s index bd7a47ee..121be0ff 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaBeam.s +++ b/asm/MetroidPrime/Weapons/CPlasmaBeam.s @@ -42,9 +42,7 @@ lbl_805A7320: .section .bss .balign 8 -.global lbl_8046C488 -lbl_8046C488: - .skip 0x10 +.lcomm lbl_8046C488, 0x10, 4 .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index e41e1ae6..f3a420d7 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -70,12 +70,8 @@ lbl_805A7CD0: .section .bss .balign 8 -.global lbl_8046C908 -lbl_8046C908: - .skip 0xC -.global lbl_8046C914 -lbl_8046C914: - .skip 0xC +.lcomm lbl_8046C908, 0xC, 4 +.lcomm lbl_8046C914, 0xC, 4 .section .text, "ax" diff --git a/asm/MetroidPrime/main.s b/asm/MetroidPrime/main.s index bd21773b..a40f0126 100644 --- a/asm/MetroidPrime/main.s +++ b/asm/MetroidPrime/main.s @@ -3,20 +3,12 @@ .section .bss .balign 8 -.global sGraphicsFifo -sGraphicsFifo: - .skip 0x60000 +.lcomm sGraphicsFifo, 0x60000, 4 -.global sMainSpace -sMainSpace: - .skip 0x168 +.lcomm sMainSpace, 0x168, 4 -.global lbl_804576C8 -lbl_804576C8: - .skip 0xD0 -.global lbl_80457798 -lbl_80457798: - .skip 0x160 +.lcomm lbl_804576C8, 0xD0, 4 +.lcomm lbl_80457798, 0x160, 4 .section .data, "wa" .balign 8 diff --git a/asm/Runtime/Gecko_ExceptionPPC.s b/asm/Runtime/Gecko_ExceptionPPC.s index 91763681..91e2205a 100644 --- a/asm/Runtime/Gecko_ExceptionPPC.s +++ b/asm/Runtime/Gecko_ExceptionPPC.s @@ -2,8 +2,7 @@ .section .bss .balign 8 -lbl_80542188: - .skip 0x10 +.lcomm lbl_80542188, 0x10, 4 .section .text, "ax" diff --git a/asm/Runtime/abort_exit.s b/asm/Runtime/abort_exit.s index 85f2691a..20cc41ca 100644 --- a/asm/Runtime/abort_exit.s +++ b/asm/Runtime/abort_exit.s @@ -2,8 +2,7 @@ .section .bss .balign 8 -lbl_80542198: - .skip 0x100 +.lcomm lbl_80542198, 0x100, 4 .section .sbss .balign 8 diff --git a/asm/Runtime/alloc.s b/asm/Runtime/alloc.s index ba82f614..543575b2 100644 --- a/asm/Runtime/alloc.s +++ b/asm/Runtime/alloc.s @@ -2,8 +2,7 @@ .section .bss .balign 8 -"protopool$192": - .skip 0x338 +.lcomm "protopool$192", 0x338, 4 .section .rodata .balign 8 diff --git a/asm/Weapons/IWeaponRenderer.s b/asm/Weapons/IWeaponRenderer.s index da997c0b..cf024e8b 100644 --- a/asm/Weapons/IWeaponRenderer.s +++ b/asm/Weapons/IWeaponRenderer.s @@ -36,9 +36,7 @@ sWeaponRenderer__15IWeaponRenderer: .section .bss .balign 8 -.global lbl_8046E1F0 -lbl_8046E1F0: - .skip 0x10 +.lcomm lbl_8046E1F0, 0x10, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/WorldFormat/CAreaOctTree_Tests.s b/asm/WorldFormat/CAreaOctTree_Tests.s index 93d3cc50..08ab24a8 100644 --- a/asm/WorldFormat/CAreaOctTree_Tests.s +++ b/asm/WorldFormat/CAreaOctTree_Tests.s @@ -3,9 +3,7 @@ .section .bss .balign 8 -.global lbl_8046E0F0 -lbl_8046E0F0: - .skip 0x100 +.lcomm lbl_8046E0F0, 0x100, 4 .section .sbss, "wa" .balign 8 diff --git a/asm/dtors.s b/asm/dtors.s index 069cf5c0..ab8f22a1 100644 --- a/asm/dtors.s +++ b/asm/dtors.s @@ -3,445 +3,151 @@ .section .bss, "wa" .balign 8 -.global lbl_8056A5A0 -lbl_8056A5A0: - .skip 0x48 -.global lbl_8056A5E8 -lbl_8056A5E8: - .skip 0xC -.global lbl_8056A5F4 -lbl_8056A5F4: - .skip 0xC -.global lbl_8056A600 -lbl_8056A600: - .skip 0x17F4 -.global lbl_8056BDF4 -lbl_8056BDF4: - .skip 0x4C4 -.global lbl_8056C2B8 -lbl_8056C2B8: - .skip 0x734 -.global lbl_8056C9EC -lbl_8056C9EC: - .skip 0x554 -.global lbl_8056CF40 -lbl_8056CF40: - .skip 0x4C4 -.global lbl_8056D404 -lbl_8056D404: - .skip 0xC -.global lbl_8056D410 -lbl_8056D410: - .skip 0x10 -.global lbl_8056D420 -lbl_8056D420: - .skip 0xD4 -.global lbl_8056D4F4 -lbl_8056D4F4: - .skip 0x84 -.global lbl_8056D578 -lbl_8056D578: - .skip 0x1A0 -.global lbl_8056D718 -lbl_8056D718: - .skip 0x68 -.global lbl_8056D780 -lbl_8056D780: - .skip 0x68 -.global lbl_8056D7E8 -lbl_8056D7E8: - .skip 0x68 -.global lbl_8056D850 -lbl_8056D850: - .skip 0x1F08 -.global lbl_8056F758 -lbl_8056F758: - .skip 0x104 -.global lbl_8056F85C -lbl_8056F85C: - .skip 0x38 -.global lbl_8056F894 -lbl_8056F894: - .skip 0x10 -.global lbl_8056F8A4 -lbl_8056F8A4: - .skip 0x10 -.global lbl_8056F8B4 -lbl_8056F8B4: - .skip 0x750 -.global lbl_80570004 -lbl_80570004: - .skip 0x948 -.global lbl_8057094C -lbl_8057094C: - .skip 0x1000 -.global lbl_8057194C -lbl_8057194C: - .skip 0x40 -.global lbl_8057198C -lbl_8057198C: - .skip 0x40 -.global lbl_805719CC -lbl_805719CC: - .skip 0x10 -.global lbl_805719DC -lbl_805719DC: - .skip 0xC -.global lbl_805719E8 -lbl_805719E8: - .skip 0x1A8 -.global lbl_80571B90 -lbl_80571B90: - .skip 0xD4 -.global lbl_80571C64 -lbl_80571C64: - .skip 0x208 -.global lbl_80571E6C -lbl_80571E6C: - .skip 0x68 -.global lbl_80571ED4 -lbl_80571ED4: - .skip 0x68 -.global lbl_80571F3C -lbl_80571F3C: - .skip 0x68 -.global lbl_80571FA4 -lbl_80571FA4: - .skip 0x68 -.global lbl_8057200C -lbl_8057200C: - .skip 0xC -.global lbl_80572018 -lbl_80572018: - .skip 0xC -.global lbl_80572024 -lbl_80572024: - .skip 0x18 -.global lbl_8057203C -lbl_8057203C: - .skip 0xC -.global lbl_80572048 -lbl_80572048: - .skip 0x18 -.global lbl_80572060 -lbl_80572060: - .skip 0xC -.global lbl_8057206C -lbl_8057206C: - .skip 0xC -.global lbl_80572078 -lbl_80572078: - .skip 0x60 -.global lbl_805720D8 -lbl_805720D8: - .skip 0x10 -.global lbl_805720E8 -lbl_805720E8: - .skip 0x10 -.global lbl_805720F8 -lbl_805720F8: - .skip 0x10 -.global lbl_80572108 -lbl_80572108: - .skip 0x10 -.global lbl_80572118 -lbl_80572118: - .skip 0x10 -.global lbl_80572128 -lbl_80572128: - .skip 0xC -.global lbl_80572134 -lbl_80572134: - .skip 0xC -.global lbl_80572140 -lbl_80572140: - .skip 0x2A0 -.global lbl_805723E0 -lbl_805723E0: - .skip 0x18 -.global lbl_805723F8 -lbl_805723F8: - .skip 0xC -.global lbl_80572404 -lbl_80572404: - .skip 0x110 -.global lbl_80572514 -lbl_80572514: - .skip 0x10 -.global lbl_80572524 -lbl_80572524: - .skip 0x10 -.global lbl_80572534 -lbl_80572534: - .skip 0x10 -.global lbl_80572544 -lbl_80572544: - .skip 0x68 -.global lbl_805725AC -lbl_805725AC: - .skip 0x68 -.global lbl_80572614 -lbl_80572614: - .skip 0x74 -.global lbl_80572688 -lbl_80572688: - .skip 0xC -.global lbl_80572694 -lbl_80572694: - .skip 0x68 -.global lbl_805726FC -lbl_805726FC: - .skip 0x4B0 -.global lbl_80572BAC -lbl_80572BAC: - .skip 0x19000 -.global lbl_8058BBAC -lbl_8058BBAC: - .skip 0xC000 -.global lbl_80597BAC -lbl_80597BAC: - .skip 0x8000 -.global lbl_8059FBAC -lbl_8059FBAC: - .skip 0x18 -.global lbl_8059FBC4 -lbl_8059FBC4: - .skip 0xC -.global lbl_8059FBD0 -lbl_8059FBD0: - .skip 0xA8 -.global lbl_8059FC78 -lbl_8059FC78: - .skip 0x18 -.global lbl_8059FC90 -lbl_8059FC90: - .skip 0x18 -.global lbl_8059FCA8 -lbl_8059FCA8: - .skip 0x18 -.global lbl_8059FCC0 -lbl_8059FCC0: - .skip 0x18 -.global lbl_8059FCD8 -lbl_8059FCD8: - .skip 0x18 -.global lbl_8059FCF0 -lbl_8059FCF0: - .skip 0x18 -.global lbl_8059FD08 -lbl_8059FD08: - .skip 0x10 -.global lbl_8059FD18 -lbl_8059FD18: - .skip 0x18 -.global mData__10CStopwatch -mData__10CStopwatch: - .skip 0x18 -.global lbl_8059FD48 -lbl_8059FD48: - .skip 0x2BC -.global lbl_805A0004 -lbl_805A0004: - .skip 0x2B5C -.global lbl_805A2B60 -lbl_805A2B60: - .skip 0x1604 -.global lbl_805A4164 -lbl_805A4164: - .skip 0xA04 -.global lbl_805A4B68 -lbl_805A4B68: - .skip 0x1E0 -.global lbl_805A4D48 -lbl_805A4D48: - .skip 0x9C -.global lbl_805A4DE4 -lbl_805A4DE4: - .skip 0x154 -.global lbl_805A4F38 -lbl_805A4F38: - .skip 0x60 -.global lbl_805A4F98 -lbl_805A4F98: - .skip 0x1E0 -.global lbl_805A5178 -lbl_805A5178: - .skip 0x9C -.global lbl_805A5214 -lbl_805A5214: - .skip 0x154 -.global lbl_805A5368 -lbl_805A5368: - .skip 0x60 -.global kDefaultPosition__6CLight -kDefaultPosition__6CLight: - .skip 0x18 -.global kDefaultDirection__6CLight -kDefaultDirection__6CLight: - .skip 0xC -.global lbl_805A53EC -lbl_805A53EC: - .skip 0x260 -.global lbl_805A564C -lbl_805A564C: - .skip 0x4C -.global lbl_805A5698 -lbl_805A5698: - .skip 0x7D8 -.global lbl_805A5E70 -lbl_805A5E70: - .skip 0x4C -.global lbl_805A5EBC -lbl_805A5EBC: - .skip 0x4C -.global lbl_805A5F08 -lbl_805A5F08: - .skip 0x4C -.global lbl_805A5F54 -lbl_805A5F54: - .skip 0x4C -.global lbl_805A5FA0 -lbl_805A5FA0: - .skip 0x4C -.global lbl_805A5FEC -lbl_805A5FEC: - .skip 0x4C -.global lbl_805A6038 -lbl_805A6038: - .skip 0x4C -.global lbl_805A6084 -lbl_805A6084: - .skip 0x4C -.global lbl_805A60D0 -lbl_805A60D0: - .skip 0xA0 -.global lbl_805A6170 -lbl_805A6170: - .skip 0x30 -.global lbl_805A61A0 -lbl_805A61A0: - .skip 0xC -.global lbl_805A61AC -lbl_805A61AC: - .skip 0xC -.global lbl_805A61B8 -lbl_805A61B8: - .skip 0x1C -.global lbl_805A61D4 -lbl_805A61D4: - .skip 0x30 -.global lbl_805A6204 -lbl_805A6204: - .skip 0x30 -.global lbl_805A6234 -lbl_805A6234: - .skip 0xC -.global lbl_805A6240 -lbl_805A6240: - .skip 0x200 -.global lbl_805A6440 -lbl_805A6440: - .skip 0x80 -.global lbl_805A64C0 -lbl_805A64C0: - .skip 0x40 -.global lbl_805A6500 -lbl_805A6500: - .skip 0x3C -.global lbl_805A653C -lbl_805A653C: - .skip 0x30 -.global lbl_805A656C -lbl_805A656C: - .skip 0x30 -.global lbl_805A659C -lbl_805A659C: - .skip 0x30 -.global lbl_805A65CC -lbl_805A65CC: - .skip 0x30 -.global lbl_805A65FC -lbl_805A65FC: - .skip 0x24 -.global lbl_805A6620 -lbl_805A6620: - .skip 0x40 -.global lbl_805A6660 -lbl_805A6660: - .skip 0x10 -.global skIdentity4f -skIdentity4f: - .skip 0x30 -.global skZero3f -skZero3f: - .skip 0xC -.skip 0x48 -.global lbl_805A66F4 -lbl_805A66F4: - .skip 0xC -.global lbl_805A6700 -lbl_805A6700: - .skip 0xC -.global lbl_805A670C -lbl_805A670C: - .skip 0xC -.global lbl_805A6718 -lbl_805A6718: - .skip 0xC -.global lbl_805A6724 -lbl_805A6724: - .skip 0xC -.global lbl_805A6730 -lbl_805A6730: - .skip 0xC -.global lbl_805A673C -lbl_805A673C: - .skip 0x18 -.global lbl_805A6754 -lbl_805A6754: - .skip 0x30 -.global lbl_805A6784 -lbl_805A6784: - .skip 0x18 -.global lbl_805A679C -lbl_805A679C: - .skip 0x18 -.global lbl_805A67B4 -lbl_805A67B4: - .skip 0xC -.global lbl_805A67C0 -lbl_805A67C0: - .skip 0xC -.global lbl_805A67CC -lbl_805A67CC: - .skip 0x10 -.global lbl_805A67DC -lbl_805A67DC: - .skip 0x20 -.global lbl_805A67FC -lbl_805A67FC: - .skip 0x10 -.global lbl_805A680C -lbl_805A680C: - .skip 0x1C -.global lbl_805A6828 -lbl_805A6828: - .skip 0x38 -.global lbl_805A6860 -lbl_805A6860: - .skip 0x300 -.global lbl_805A6B60 -lbl_805A6B60: - .skip 0x30 -.global lbl_805A6B90 -lbl_805A6B90: - .skip 0x10 -.global lbl_805A6BA0 -lbl_805A6BA0: - .skip 0x4 -.global lbl_805A6BA4 -lbl_805A6BA4: - .skip 0x4 -.global lbl_805A6BA8 -lbl_805A6BA8: - .skip 0x8 +.comm lbl_8056A5A0, 0x48, 4 +.comm lbl_8056A5E8, 0xC, 4 +.comm lbl_8056A5F4, 0xC, 4 +.comm lbl_8056A600, 0x17F4, 4 +.comm lbl_8056BDF4, 0x4C4, 4 +.comm lbl_8056C2B8, 0x734, 4 +.comm lbl_8056C9EC, 0x554, 4 +.comm lbl_8056CF40, 0x4C4, 4 +.comm lbl_8056D404, 0xC, 4 +.comm NullConnectionList__7CEntity, 0x10, 4 +.comm lbl_8056D420, 0xD4, 4 +.comm lbl_8056D4F4, 0x84, 4 +.comm lbl_8056D578, 0x1A0, 4 +.comm lbl_8056D718, 0x68, 4 +.comm lbl_8056D780, 0x68, 4 +.comm lbl_8056D7E8, 0x68, 4 +.comm lbl_8056D850, 0x1F08, 4 +.comm lbl_8056F758, 0x104, 4 +.comm lbl_8056F85C, 0x38, 4 +.comm lbl_8056F894, 0x10, 4 +.comm lbl_8056F8A4, 0x10, 4 +.comm lbl_8056F8B4, 0x750, 4 +.comm lbl_80570004, 0x948, 4 +.comm lbl_8057094C, 0x1000, 4 +.comm lbl_8057194C, 0x40, 4 +.comm lbl_8057198C, 0x40, 4 +.comm lbl_805719CC, 0x10, 4 +.comm lbl_805719DC, 0xC, 4 +.comm lbl_805719E8, 0x1A8, 4 +.comm lbl_80571B90, 0xD4, 4 +.comm lbl_80571C64, 0x208, 4 +.comm lbl_80571E6C, 0x68, 4 +.comm lbl_80571ED4, 0x68, 4 +.comm lbl_80571F3C, 0x68, 4 +.comm lbl_80571FA4, 0x68, 4 +.comm lbl_8057200C, 0xC, 4 +.comm lbl_80572018, 0xC, 4 +.comm lbl_80572024, 0x18, 4 +.comm lbl_8057203C, 0xC, 4 +.comm lbl_80572048, 0x18, 4 +.comm lbl_80572060, 0xC, 4 +.comm lbl_8057206C, 0xC, 4 +.comm lbl_80572078, 0x60, 4 +.comm lbl_805720D8, 0x10, 4 +.comm lbl_805720E8, 0x10, 4 +.comm lbl_805720F8, 0x10, 4 +.comm lbl_80572108, 0x10, 4 +.comm lbl_80572118, 0x10, 4 +.comm lbl_80572128, 0xC, 4 +.comm lbl_80572134, 0xC, 4 +.comm lbl_80572140, 0x2A0, 4 +.comm lbl_805723E0, 0x18, 4 +.comm lbl_805723F8, 0xC, 4 +.comm lbl_80572404, 0x110, 4 +.comm lbl_80572514, 0x10, 4 +.comm lbl_80572524, 0x10, 4 +.comm lbl_80572534, 0x10, 4 +.comm lbl_80572544, 0x68, 4 +.comm lbl_805725AC, 0x68, 4 +.comm lbl_80572614, 0x74, 4 +.comm lbl_80572688, 0xC, 4 +.comm lbl_80572694, 0x68, 4 +.comm lbl_805726FC, 0x4B0, 4 +.comm lbl_80572BAC, 0x19000, 4 +.comm lbl_8058BBAC, 0xC000, 4 +.comm lbl_80597BAC, 0x8000, 4 +.comm lbl_8059FBAC, 0x18, 4 +.comm lbl_8059FBC4, 0xC, 4 +.comm lbl_8059FBD0, 0xA8, 4 +.comm lbl_8059FC78, 0x18, 4 +.comm lbl_8059FC90, 0x18, 4 +.comm lbl_8059FCA8, 0x18, 4 +.comm lbl_8059FCC0, 0x18, 4 +.comm lbl_8059FCD8, 0x18, 4 +.comm lbl_8059FCF0, 0x18, 4 +.comm lbl_8059FD08, 0x10, 4 +.comm lbl_8059FD18, 0x18, 4 +.comm mData__10CStopwatch, 0x18, 4 +.comm lbl_8059FD48, 0x2BC, 4 +.comm lbl_805A0004, 0x2B5C, 4 +.comm lbl_805A2B60, 0x1604, 4 +.comm lbl_805A4164, 0xA04, 4 +.comm lbl_805A4B68, 0x1E0, 4 +.comm lbl_805A4D48, 0x9C, 4 +.comm lbl_805A4DE4, 0x154, 4 +.comm lbl_805A4F38, 0x60, 4 +.comm lbl_805A4F98, 0x1E0, 4 +.comm lbl_805A5178, 0x9C, 4 +.comm lbl_805A5214, 0x154, 4 +.comm lbl_805A5368, 0x60, 4 +.comm kDefaultPosition__6CLight, 0x18, 4 +.comm kDefaultDirection__6CLight, 0xC, 4 +.comm lbl_805A53EC, 0x260, 4 +.comm lbl_805A564C, 0x4C, 4 +.comm lbl_805A5698, 0x7D8, 4 +.comm lbl_805A5E70, 0x4C, 4 +.comm lbl_805A5EBC, 0x4C, 4 +.comm lbl_805A5F08, 0x4C, 4 +.comm lbl_805A5F54, 0x4C, 4 +.comm lbl_805A5FA0, 0x4C, 4 +.comm lbl_805A5FEC, 0x4C, 4 +.comm lbl_805A6038, 0x4C, 4 +.comm lbl_805A6084, 0x4C, 4 +.comm lbl_805A60D0, 0xA0, 4 +.comm lbl_805A6170, 0x30, 4 +.comm lbl_805A61A0, 0xC, 4 +.comm lbl_805A61AC, 0xC, 4 +.comm lbl_805A61B8, 0x1C, 4 +.comm lbl_805A61D4, 0x30, 4 +.comm lbl_805A6204, 0x30, 4 +.comm lbl_805A6234, 0xC, 4 +.comm lbl_805A6240, 0x200, 4 +.comm lbl_805A6440, 0x80, 4 +.comm lbl_805A64C0, 0x40, 4 +.comm lbl_805A6500, 0x3C, 4 +.comm lbl_805A653C, 0x30, 4 +.comm lbl_805A656C, 0x30, 4 +.comm lbl_805A659C, 0x30, 4 +.comm lbl_805A65CC, 0x30, 4 +.comm lbl_805A65FC, 0x24, 4 +.comm lbl_805A6620, 0x40, 4 +.comm lbl_805A6660, 0x10, 4 +.comm skIdentity4f, 0x30, 4 +.comm skZero3f, 0xC, 4 +.comm lbl_805A66AC, 0x48, 4 # unreferenced, what's this? +.comm lbl_805A66F4, 0xC, 4 +.comm lbl_805A6700, 0xC, 4 +.comm lbl_805A670C, 0xC, 4 +.comm lbl_805A6718, 0xC, 4 +.comm lbl_805A6724, 0xC, 4 +.comm lbl_805A6730, 0xC, 4 +.comm lbl_805A673C, 0x18, 4 +.comm lbl_805A6754, 0x30, 4 +.comm lbl_805A6784, 0x18, 4 +.comm lbl_805A679C, 0x18, 4 +.comm lbl_805A67B4, 0xC, 4 +.comm lbl_805A67C0, 0xC, 4 +.comm lbl_805A67CC, 0x10, 4 +.comm lbl_805A67DC, 0x20, 4 +.comm lbl_805A67FC, 0x10, 4 +.comm lbl_805A680C, 0x1C, 4 +.comm lbl_805A6828, 0x38, 4 +.comm lbl_805A6860, 0x300, 4 +.comm lbl_805A6B60, 0x30, 4 +.comm lbl_805A6B90, 0x10, 4 +.comm lbl_805A6BA0, 0x4, 4 +.comm lbl_805A6BA4, 0x4, 4 +.comm lbl_805A6BA8, 0x8, 4