Split .comm declarations

Former-commit-id: 11f69fcb5d

Makefile

@@ -49,7 +49,7 @@ O_FILES := $(INIT_O_FILES) $(METROTRK_FILES) \
 	   $(AR_FILES) $(BASE_FILES) $(DB_FILES) $(DSP_FILES) $(DVD_FILES) $(GX_FILES) $(MTX_FILES) \
 	   $(OS_FILES) $(PAD_FILES) $(VI_FILES) $(MSL_PPCEABI_BARE_H) $(MUSYX_FILES) \
 	   $(DTK_FILES) $(CARD_FILES) $(SI_FILES) $(EXI_FILES) $(THP_FILES) \
-	   $(GBA_FILES) $(DTORS_O_FILES)
+	   $(GBA_FILES)
 DEPENDS := $(O_FILES:.o=.d)
 # If a specific .o file is passed as a target, also process its deps
 DEPENDS += $(MAKECMDGOALS:.o=.d)
@@ -59,7 +59,7 @@ DEPENDS += $(MAKECMDGOALS:.o=.d)
 #-------------------------------------------------------------------------------
 
 MWCC_VERSION := 1.3.2
-MWLD_VERSION := 2.6
+MWLD_VERSION := 1.3.2
 
 # Programs
 export WINEDEBUG ?= -all

asm/Collision/CMaterialFilter.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_8059FD18, 0x18, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CMaterialFilter_cpp

asm/GuiSys/CGuiGroup.s

@@ -2,6 +2,14 @@
 
 #TODO: Split this up properly (need to split CGuiCamera and CGuiCompoundWidget)
 
+.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
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CGuiFeeHelper_cpp

asm/GuiSys/CGuiWidgetDrawParms.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_8059FD08, 0x10, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CGuiWidgetDrawParms_cpp

asm/Kyoto/Audio/CDSPStreamManager.s

@@ -7,6 +7,7 @@ lbl_ctor:
 .section .bss
 .balign 8
 
+.comm lbl_805A6860, 0x300, 4
 .lcomm lbl_80540520, 0x30, 4
 
 .section .sbss, "wa"

asm/Kyoto/Audio/CMidiManager.s

@@ -7,6 +7,7 @@ lbl_ctor:
 .section .bss
 .balign 8
 
+.comm lbl_805A6828, 0x38, 4
 .lcomm lbl_80540010, 0x10, 4
 
 .section .data

asm/Kyoto/Audio/CSfxManager.s

@@ -138,6 +138,18 @@ lbl_805A877C:
 .balign 8
 
 .lcomm lbl_80479BA0, 0x30, 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
 
 .section .sbss, "wa"
 .balign 8

asm/Kyoto/Audio/CStreamAudioManager.s

@@ -41,6 +41,11 @@ lbl_805A8A41:
 .section .bss
 .balign 8
 
+.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
 .lcomm lbl_80540550, 0x30, 4
 .lcomm lbl_80540580, 0x64, 4
 .lcomm lbl_805405E4, 0x5C, 4

asm/Kyoto/Audio/DolphinCAudioSys.s

@@ -1,5 +1,8 @@
 .include "macros.inc"
 
+# TODO: currently in CCubeSurface, linker alignment bug
+# .comm lbl_805A67CC, 0x10, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_DolphinCAudioSys_cpp

asm/Kyoto/Basics/CStopwatch.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm mData__10CStopwatch, 0x18, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CStopwatch_cpp

asm/Kyoto/CARAMManager.s

@@ -16,6 +16,7 @@ lbl_805A8920:
 .section .bss
 .balign 8
 
+.comm lbl_805A679C, 0x18, 4
 .lcomm lbl_804BFF40, 0x10, 4
 
 .section .sbss, "wa"

asm/Kyoto/CARAMToken.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_805A680C, 0x1C, 4
+
 .section .text, "ax"
 
 .global GetMRAMSafe__10CARAMTokenFv

asm/Kyoto/DolphinCMemoryCardSys.s

@@ -31,6 +31,8 @@ lbl_805A89AB:
 .section .bss
 .balign 8
 
+.comm lbl_805A67DC, 0x20, 4
+.comm lbl_805A67FC, 0x10, 4
 .lcomm lbl_804BFFA0, 0xC, 4
 .lcomm lbl_804BFFAC, 0x14, 4
 

asm/Kyoto/Graphics/CCubeMaterial.s

@@ -61,6 +61,7 @@ lbl_805A8934:
 .section .bss
 .balign 8
 
+.comm lbl_805A67B4, 0xC, 4
 .lcomm lbl_804BFF50, 0xC, 4
 .lcomm lbl_804BFF5C, 0x34, 4
 

asm/Kyoto/Graphics/CCubeSurface.s

@@ -1,5 +1,9 @@
 .include "macros.inc"
 
+.comm lbl_805A67C0, 0xC, 4
+# TODO: DolphinCAudioSys, linker alignment bug
+.comm lbl_805A67CC, 0x10, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CCubeSurface_cpp

asm/Kyoto/Graphics/CGX.s

@@ -8,6 +8,7 @@ lbl_ctor:
 .balign 8
 
 .lcomm lbl_80479BD0, 0xF0, 4
+.comm lbl_805A53EC, 0x260, 4
 
 .section .sbss2, "", @nobits
 .balign 8

asm/Kyoto/Graphics/CLight.s

@@ -1,5 +1,8 @@
 .include "macros.inc"
 
+.comm kDefaultPosition__6CLight, 0x18, 4
+.comm kDefaultDirection__6CLight, 0xC, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CLight_cpp

asm/Kyoto/Graphics/CTevCombiners.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_805A564C, 0x4C, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CTevCombiners_cpp

asm/Kyoto/Graphics/DolphinCGraphics.s

@@ -109,6 +109,31 @@ lbl_805A884C:
 
 .lcomm lbl_80479CC0, 0x46000, 4
 .lcomm lbl_804BFCC0, 0x50, 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
 
 .section .sbss, "wa"
 .balign 8

asm/Kyoto/Math/CAABox.s

@@ -1,5 +1,8 @@
 .include "macros.inc"
 
+.comm lbl_805A6754, 0x30, 4
+.comm lbl_805A6784, 0x18, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CAABox_cpp

asm/Kyoto/Math/CMatrix3f.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_805A65FC, 0x24, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CMatrix3f_cpp

asm/Kyoto/Math/CMatrix4f.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_805A6620, 0x40, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CMatrix4f_cpp

asm/Kyoto/Math/CQuaternion.s

@@ -7,6 +7,7 @@ lbl_ctor:
 .section .bss
 .balign 8
 
+.comm lbl_805A6660, 0x10, 4
 .lcomm lbl_804BFD30, 0xC, 4
 .lcomm lbl_804BFD3C, 0xC, 4
 .lcomm lbl_804BFD48, 0x10, 4

asm/Kyoto/Math/CTransform4f.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm skIdentity4f, 0x30, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CTransform4f_cpp

asm/Kyoto/Math/CVector3f.s

@@ -1,5 +1,14 @@
 .include "macros.inc"
 
+.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
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CVector3f_cpp

asm/Kyoto/Particles/CElementGen.s

@@ -381,6 +381,7 @@ lbl_805A88D0:
 .section .bss
 .balign 8
 
+.comm lbl_805A673C, 0x18, 4
 .lcomm lbl_804BFE28, 0x20, 4
 .lcomm lbl_804BFE48, 0x20, 4
 .lcomm lbl_804BFE68, 0x4C, 4

asm/MetroidPrime/CAnimData.s

@@ -88,6 +88,11 @@ lbl_805A6DB0:
 .balign 8
 
 .lcomm lbl_8045B140, 0x40, 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
 
 .section .sbss
 .balign 8

asm/MetroidPrime/CAxisAngle.s

@@ -4,6 +4,11 @@
 lbl_ctor:
 .4byte __sinit_CAxisAngle_cpp
 
+.section .bss, "wa"
+.balign 8
+
+.comm lbl_8056A5E8, 0xC, 4
+
 .section .text, "ax"
 
 .global __pl__FRC10CAxisAngleRC10CAxisAngle

asm/MetroidPrime/CControlMapper.s

@@ -524,6 +524,7 @@ lbl_803D9600:
 .section .bss
 .balign 8
 .lcomm lbl_804578F8, 0x10, 4
+.comm lbl_8056A5A0, 0x48, 4
 
 .section .rodata
 .balign 8

asm/MetroidPrime/CDamageVulnerability.s

@@ -4,6 +4,14 @@
 lbl_ctor:
 .4byte __sinit_CDamageVulnerability_cpp
 
+.section .bss, "wa"
+.balign 8
+
+.comm lbl_8056D578, 0x1A0, 4
+.comm lbl_8056D718, 0x68, 4
+.comm lbl_8056D780, 0x68, 4
+.comm lbl_8056D7E8, 0x68, 4
+
 .section .text, "ax"
 
 .global GetDeflectionType__20CDamageVulnerabilityCFRC11CWeaponMode

asm/MetroidPrime/CDecalManager.s

@@ -9,6 +9,8 @@ lbl_ctor:
 
 .lcomm lbl_8046C558, 0xC, 4
 .lcomm lbl_8046C564, 0xC, 4
+.comm lbl_8056D850, 0x1F08, 4
+.comm lbl_8056F758, 0x104, 4
 
 .section .sbss
 .balign 8

asm/MetroidPrime/CEntity.s

@@ -23,6 +23,7 @@ __vt__7CEntity:
 .balign 8
 
 .lcomm lbl_8046C3B8, 0x10, 4
+.comm NullConnectionList__7CEntity, 0x10, 4
 
 .section .text, "ax"
 

asm/MetroidPrime/CEulerAngles.s

@@ -4,6 +4,11 @@
 lbl_ctor:
 .4byte __sinit_CEulerAngles_cpp
 
+.section .bss, "wa"
+.balign 8
+
+.comm lbl_8056A5F4, 0xC, 4
+
 .section .sdata2, "a"
 .balign 8
 

asm/MetroidPrime/CFluidPlaneManager.s

@@ -13,6 +13,16 @@ lbl_805A76DC:
 	# ROM: 0x3F507C
 	.4byte 0x000000FF
 
+# .section .bss, "wa"
+
+.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
+# TODO: actually CChozoGhost
+.comm lbl_805719CC, 0x10, 4
+
 .section .sdata2, "a"
 .balign 8
 

asm/MetroidPrime/Cameras/CCameraShakeData.s

@@ -40,6 +40,8 @@ lbl_805A789C:
 .section .bss
 .balign 8
 .lcomm lbl_8046C7D0, 0x78, 4
+.comm lbl_805719E8, 0x1A8, 4
+.comm lbl_80571B90, 0xD4, 4
 
 .section .text, "ax"
 

asm/MetroidPrime/Enemies/CBabygoth.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_80572128, 0xC, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CBabygoth_cpp

asm/MetroidPrime/Enemies/CBurrower.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_80572694, 0x68, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CBurrower_cpp

asm/MetroidPrime/Enemies/CChozoGhost.s

@@ -318,6 +318,8 @@ lbl_805A7778:
 .balign 8
 
 .lcomm lbl_8046C748, 0x10, 4
+# TODO: alignment bug, currently in CFluidPlaneManager
+.comm lbl_805719CC, 0x10, 4
 
 .section .text, "ax"
 

asm/MetroidPrime/Enemies/CElitePirate.s

@@ -1,5 +1,8 @@
 .include "macros.inc"
 
+.comm lbl_805723E0, 0x18, 4
+.comm lbl_805723F8, 0xC, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CElitePirate_cpp

asm/MetroidPrime/Enemies/CFlaahgra.s

@@ -1,5 +1,8 @@
 .include "macros.inc"
 
+.comm lbl_80572024, 0x18, 4
+.comm lbl_8057203C, 0xC, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CFlaahgra_cpp

asm/MetroidPrime/Enemies/CFlyingPirate.s

@@ -458,6 +458,12 @@ lbl_805A7EF8:
 
 .lcomm lbl_8046C950, 0xFC, 4
 .lcomm lbl_8046CA4C, 0xF4, 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
 
 .section .text, "ax"
 

asm/MetroidPrime/Enemies/CIceSheegoth.s

@@ -271,6 +271,11 @@ lbl_803E4A54:
 	.4byte lbl_801A570C
 	.4byte lbl_801A56F4
 
+.section .bss
+.balign 8
+
+.comm lbl_80572018, 0xC, 4
+
 .section .sdata
 .balign 8
 

asm/MetroidPrime/Enemies/CMetroid.s

@@ -375,6 +375,15 @@ lbl_805A79D8:
 	.float 1.0
 	.4byte 0
 
+.section .bss
+.balign 8
+
+.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
+
 .section .sbss
 .balign 8
 

asm/MetroidPrime/Enemies/CMetroidBeta.s

@@ -1,5 +1,8 @@
 .include "macros.inc"
 
+.comm lbl_80572048, 0x18, 4
+.comm lbl_80572060, 0xC, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CMetroidBeta_cpp

asm/MetroidPrime/Enemies/CPuddleToadGamma.s

@@ -238,6 +238,7 @@ lbl_805A77D4:
 .balign 8
 
 .lcomm lbl_8046C758, 0x18, 4
+.comm lbl_805719DC, 0xC, 4
 
 .section .sbss
 .balign 8

asm/MetroidPrime/Enemies/CRidley.s

@@ -608,6 +608,12 @@ lbl_805A8378:
 .lcomm lbl_8046D4F8, 0x2E8, 4
 .lcomm lbl_8046D7E0, 0x1E0, 4
 .lcomm lbl_8046D9C0, 0x2D0, 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
 
 .section .text, "ax"
 

asm/MetroidPrime/Enemies/CSpacePirate.s

@@ -528,6 +528,9 @@ lbl_805A76A0:
 
 .lcomm lbl_8046C570, 0xA8, 4
 .lcomm lbl_8046C618, 0x108, 4
+.comm lbl_8056F85C, 0x38, 4
+.comm lbl_8056F894, 0x10, 4
+.comm lbl_8056F8A4, 0x10, 4
 
 .section .sdata2, "a"
 .balign 8

asm/MetroidPrime/Enemies/CThardus.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_8057206C, 0xC, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CThardus_cpp

asm/MetroidPrime/Enemies/CTryclops.s

@@ -276,6 +276,8 @@ lbl_805A83C4:
 .balign 8
 
 .lcomm lbl_8046DC90, 0x18, 4
+.comm lbl_80572614, 0x74, 4
+.comm lbl_80572688, 0xC, 4
 
 .section .sbss, "wa"
 .balign 8

asm/MetroidPrime/Player/CMorphBall.s

@@ -258,6 +258,7 @@ lbl_805A74A8:
 
 .lcomm lbl_8046C4F8, 0xC, 4
 .lcomm lbl_8046C504, 0x1C, 4
+.comm lbl_8056D4F4, 0x84, 4
 
 .section .sbss
 .balign 8

asm/MetroidPrime/Player/CPlayerGun.s

@@ -150,6 +150,7 @@ lbl_805A6E18:
 
 .lcomm lbl_8045C518, 0x18, 4
 .lcomm lbl_8045C530, 0x20, 4
+.comm lbl_8056D404, 0xC, 4
 
 .section .sbss
 .balign 8

asm/MetroidPrime/RumbleFxTable.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_80572140, 0x2A0, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_RumbleFxTable_cpp

asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_80572134, 0xC, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CScriptCameraPitchVolume_cpp

asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s

@@ -1,5 +1,7 @@
 .include "macros.inc"
 
+.comm lbl_805726FC, 0x4B0, 4
+
 .section .data
 .balign 8
 

asm/MetroidPrime/Weapons/CFlameThrower.s

@@ -39,6 +39,11 @@ lbl_803E45D8:
 	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 
+.section .bss
+.balign 8
+
+.comm lbl_8057200C, 0xC, 4
+
 .section .text, "ax"
 
 .global __dt__13CFlameThrowerFv

asm/MetroidPrime/Weapons/CPlasmaBeam.s

@@ -43,6 +43,7 @@ lbl_805A7320:
 .balign 8
 
 .lcomm lbl_8046C488, 0x10, 4
+.comm lbl_8056D420, 0xD4, 4
 
 .section .sdata2, "a"
 .balign 8

asm/WorldFormat/CMetroidAreaCollider.s

@@ -1,5 +1,9 @@
 .include "macros.inc"
 
+.comm lbl_80572BAC, 0x19000, 4
+.comm lbl_8058BBAC, 0xC000, 4
+.comm lbl_80597BAC, 0x8000, 4
+
 .section .data
 .balign 8
 

asm/WorldFormat/CWorldLight.s

@@ -1,5 +1,8 @@
 .include "macros.inc"
 
+.comm lbl_8059FBAC, 0x18, 4
+.comm lbl_8059FBC4, 0xC, 4
+
 .section .ctors, "wa"
 lbl_ctor:
 .4byte __sinit_CWorldLight_cpp

asm/dtors.s

@@ -1,153 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "wa"
-.balign 8
-
-.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

obj_files.mk

@@ -847,6 +847,3 @@ GBA_FILES :=\
 	$(BUILD_DIR)/asm/Dolphin/GBA/GBAWrite.o\
 	$(BUILD_DIR)/asm/Dolphin/GBA/GBAXfer.o\
 	$(BUILD_DIR)/asm/Dolphin/GBA/GBAKey.o
-
-DTORS_O_FILES :=\
-	$(BUILD_DIR)/asm/dtors.o