diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index 0e63b8d9..bcead302 100644 --- a/config/GM8E01_00/symbols.txt +++ b/config/GM8E01_00/symbols.txt @@ -19488,8 +19488,8 @@ sMazeSeeds__15CScriptMazeNode = .bss:0x805726FC; // type:object size:0x4B0 scope sDupVertexList__20CMetroidAreaCollider = .bss:0x80572BAC; // type:object size:0x5000 scope:global sDupEdgeList__20CMetroidAreaCollider = .bss:0x8058BBAC; // type:object size:0xC000 scope:global sDupTriangleList__20CMetroidAreaCollider = .bss:0x80597BAC; // type:object size:0x8000 scope:global -lbl_8059FBAC = .bss:0x8059FBAC; // type:object size:0xC data:float -lbl_8059FBC4 = .bss:0x8059FBC4; // type:object size:0xC data:float +kDefaultPosition__11CWorldLight = .bss:0x8059FBAC; // type:object size:0xC data:float +kDefaultDirection__11CWorldLight = .bss:0x8059FBC4; // type:object size:0xC data:float lbl_8059FBD0 = .bss:0x8059FBD0; // type:object size:0x18 data:4byte lbl_8059FC78 = .bss:0x8059FC78; // type:object size:0x18 data:4byte lbl_8059FC90 = .bss:0x8059FC90; // type:object size:0x18 data:4byte @@ -19511,7 +19511,7 @@ lbl_805A4F98 = .bss:0x805A4F98; // type:object size:0x1E0 data:4byte lbl_805A5178 = .bss:0x805A5178; // type:object size:0x9C data:4byte lbl_805A5214 = .bss:0x805A5214; // type:object size:0x154 data:4byte lbl_805A5368 = .bss:0x805A5368; // type:object size:0x60 data:4byte -kDefaultPosition__6CLight = .bss:0x805A53C8; // type:object size:0x18 scope:global data:float +kDefaultPosition__6CLight = .bss:0x805A53C8; // type:object size:0xC scope:global data:float kDefaultDirection__6CLight = .bss:0x805A53E0; // type:object size:0xC scope:global data:float sGXState__3CGX = .bss:0x805A53EC; // type:object size:0x260 scope:global data:4byte kEnvPassthru__13CTevCombiners = .bss:0x805A564C; // type:object size:0x4C scope:global @@ -19544,7 +19544,7 @@ sIdentity__9CMatrix3f = .bss:0x805A65FC; // type:object size:0x24 scope:global lbl_805A6620 = .bss:0x805A6620; // type:object size:0x40 data:float sNoRotation__11CQuaternion = .bss:0x805A6660; // type:object size:0x10 scope:global data:float sIdentity__12CTransform4f = .bss:0x805A6670; // type:object size:0x30 scope:global data:float -sZeroVector__9CVector3f = .bss:0x805A66A0; // type:object size:0x54 scope:global data:float +sZeroVector__9CVector3f = .bss:0x805A66A0; // type:object size:0xC scope:global data:float sUpVector__9CVector3f = .bss:0x805A66F4; // type:object size:0xC scope:global data:float sDownVector__9CVector3f = .bss:0x805A6700; // type:object size:0xC scope:global data:float sLeftVector__9CVector3f = .bss:0x805A670C; // type:object size:0xC scope:global data:float diff --git a/config/GM8E01_01/splits.txt b/config/GM8E01_01/splits.txt index 8951ea62..dff8fa6e 100644 --- a/config/GM8E01_01/splits.txt +++ b/config/GM8E01_01/splits.txt @@ -38,6 +38,7 @@ MetroidPrime/CControlMapper.cpp: .rodata start:0x803CC210 end:0x803CC600 .data start:0x803D9098 end:0x803D9840 .bss start:0x80457AD8 end:0x80457AE8 + .bss start:0x8056A780 end:0x8056A7C8 align:4 common .sdata start:0x805A6DD0 end:0x805A6DD8 .sdata2 start:0x805A9FA8 end:0x805A9FB0 @@ -65,10 +66,12 @@ MetroidPrime/Player/CPlayer.cpp: MetroidPrime/CAxisAngle.cpp: .text start:0x8001B4A0 end:0x8001B640 .ctors start:0x803CB3AC end:0x803CB3B0 + .bss start:0x8056A7C8 end:0x8056A7D4 align:4 common MetroidPrime/CEulerAngles.cpp: .text start:0x8001B640 end:0x8001BA60 .ctors start:0x803CB3B0 end:0x803CB3B4 + .bss start:0x8056A7D4 end:0x8056A7E0 align:4 common .sdata2 start:0x805AA158 end:0x805AA188 MetroidPrime/CArchMsgParmUserInput.cpp: @@ -124,6 +127,7 @@ MetroidPrime/CAnimData.cpp: .rodata start:0x803CCF00 end:0x803CCF58 .data start:0x803D9D48 end:0x803D9D88 .bss start:0x8045B320 end:0x8045B360 + .bss start:0x8056A7E0 end:0x8056D5E4 align:4 common .sdata start:0x805A6F78 end:0x805A6F98 .sbss start:0x805A8EA8 end:0x805A8EB0 .sdata2 start:0x805AA2D0 end:0x805AA2F8 @@ -167,6 +171,7 @@ MetroidPrime/Player/CPlayerGun.cpp: .rodata start:0x803CD018 end:0x803CD0C0 .data start:0x803D9F30 end:0x803DA010 .bss start:0x8045C6F8 end:0x8045C730 + .bss start:0x8056D5E4 end:0x8056D5F0 align:4 common .sdata start:0x805A6FC0 end:0x805A7000 .sbss start:0x805A8F50 end:0x805A8F78 .sdata2 start:0x805AA348 end:0x805AA440 @@ -185,6 +190,7 @@ MetroidPrime/CEntity.cpp: .rodata start:0x803CD0F8 end:0x803CD100 .data start:0x803DA010 end:0x803DA030 .bss start:0x8046C598 end:0x8046C5A8 + .bss start:0x8056D5F0 end:0x8056D600 align:4 common MetroidPrime/CArchMsgParmInt32.cpp: .text start:0x80051644 end:0x800516C0 @@ -576,6 +582,7 @@ MetroidPrime/Weapons/CPlasmaBeam.cpp: .rodata start:0x803CE710 end:0x803CE728 .data start:0x803DF8F0 end:0x803DF938 .bss start:0x8046C668 end:0x8046C678 + .bss start:0x8056D600 end:0x8056D6D4 align:4 common .sdata start:0x805A7500 end:0x805A7508 .sdata2 start:0x805AAE30 end:0x805AAE68 @@ -674,6 +681,7 @@ MetroidPrime/Player/CMorphBall.cpp: .ctors start:0x803CB3FC end:0x803CB400 .rodata start:0x803CEAF0 end:0x803CEFD8 .bss start:0x8046C6D8 end:0x8046C700 + .bss start:0x8056D6D4 end:0x8056D758 align:4 common .sdata start:0x805A75C8 end:0x805A7690 .sbss start:0x805A90C8 end:0x805A90E0 .sdata2 start:0x805AB050 end:0x805AB238 @@ -726,6 +734,7 @@ MetroidPrime/Weapons/CWeapon.cpp: MetroidPrime/CDamageVulnerability.cpp: .text start:0x8010250C end:0x80103100 .ctors start:0x803CB400 end:0x803CB404 + .bss start:0x8056D758 end:0x8056DA30 align:4 common MetroidPrime/CActorLights.cpp: .text start:0x80103100 end:0x801058A4 @@ -789,6 +798,7 @@ MetroidPrime/CDecalManager.cpp: .text start:0x80116F40 end:0x80117CEC .ctors start:0x803CB408 end:0x803CB40C .bss start:0x8046C738 end:0x8046C750 + .bss start:0x8056DA30 end:0x8056FA3C align:4 common .sbss start:0x805A9108 end:0x805A9120 .sdata2 start:0x805AB558 end:0x805AB568 @@ -847,6 +857,7 @@ MetroidPrime/Enemies/CSpacePirate.cpp: .rodata start:0x803CF618 end:0x803D0218 .data start:0x803E08E0 end:0x803E0DD8 .bss start:0x8046C750 end:0x8046C900 + .bss start:0x8056FA3C end:0x8056FA94 align:4 common .sdata start:0x805A7830 end:0x805A7888 .sdata2 start:0x805AB6B0 end:0x805AB798 @@ -868,6 +879,7 @@ MetroidPrime/Cameras/CPathCamera.cpp: MetroidPrime/CFluidPlane.cpp: .text start:0x8012E988 end:0x8012F11C .data start:0x803E0EC0 end:0x803E0EE0 + .bss start:0x8056FA94 end:0x80571BAC align:4 common .sdata start:0x805A78A8 end:0x805A78B8 .sdata2 start:0x805AB7C8 end:0x805AB7F0 @@ -999,6 +1011,7 @@ MetroidPrime/Enemies/CChozoGhost.cpp: .rodata start:0x803D0258 end:0x803D0278 .data start:0x803E1AC8 end:0x803E1E68 .bss start:0x8046C928 end:0x8046C938 + .bss start:0x80571BAC end:0x80571BC8 align:4 common .sdata start:0x805A7938 end:0x805A7960 .sdata2 start:0x805ABA58 end:0x805ABAC0 @@ -1161,6 +1174,7 @@ MetroidPrime/Cameras/CCameraShakeData.cpp: .text start:0x8015C95C end:0x8015DF04 .ctors start:0x803CB434 end:0x803CB438 .bss start:0x8046C9B0 end:0x8046CA28 + .bss start:0x80571BC8 end:0x80571E44 align:4 common .sdata start:0x805A7A68 end:0x805A7A80 .sdata2 start:0x805ABDE0 end:0x805ABE28 @@ -1202,6 +1216,7 @@ MetroidPrime/Enemies/CMetroid.cpp: .ctors start:0x803CB438 end:0x803CB43C .rodata start:0x803D06B8 end:0x803D0800 .data start:0x803E3CB8 end:0x803E3F88 + .bss start:0x80571E44 end:0x805721EC align:4 common .sdata start:0x805A7B30 end:0x805A7BC0 .sbss start:0x805A91C8 end:0x805A91D8 .sdata2 start:0x805ABF70 end:0x805AC010 @@ -1319,6 +1334,7 @@ MetroidPrime/Weapons/CFlameThrower.cpp: .ctors start:0x803CB444 end:0x803CB448 .rodata start:0x803D13F0 end:0x803D1410 .data start:0x803E47B8 end:0x803E4828 + .bss start:0x805721EC end:0x805721F8 align:4 common .sdata2 start:0x805AC5A0 end:0x805AC5C8 MetroidPrime/Weapons/CBeamProjectile.cpp: @@ -1354,6 +1370,7 @@ MetroidPrime/Enemies/CIceSheegoth.cpp: .ctors start:0x803CB44C end:0x803CB450 .rodata start:0x803D1540 end:0x803D1678 .data start:0x803E4908 end:0x803E4CF8 + .bss start:0x805721F8 end:0x80572204 align:4 common .sdata start:0x805A7D98 end:0x805A7DD0 .sdata2 start:0x805AC638 end:0x805AC6F8 @@ -1392,6 +1409,7 @@ MetroidPrime/Enemies/CFlaahgra.cpp: .ctors start:0x803CB454 end:0x803CB458 .rodata start:0x803D16C0 end:0x803D1810 .data start:0x803E4EE8 end:0x803E53A8 + .bss start:0x80572204 end:0x80572228 align:4 common .sdata start:0x805A7E20 end:0x805A7E70 .sbss start:0x805A9238 end:0x805A9240 .sdata2 start:0x805AC798 end:0x805AC840 @@ -1453,6 +1471,7 @@ MetroidPrime/Enemies/CMetroidBeta.cpp: .ctors start:0x803CB45C end:0x803CB460 .rodata start:0x803D1C60 end:0x803D1C80 .data start:0x803E5568 end:0x803E58F8 + .bss start:0x80572228 end:0x8057224C align:4 common .sdata start:0x805A7EC8 end:0x805A7F28 .sbss start:0x805A9240 end:0x805A9250 .sdata2 start:0x805AC980 end:0x805ACA28 @@ -1573,6 +1592,7 @@ MetroidPrime/Enemies/CThardus.cpp: .ctors start:0x803CB460 end:0x803CB464 .rodata start:0x803D1D80 end:0x803D2078 .data start:0x803E5EC0 end:0x803E64E8 + .bss start:0x8057224C end:0x80572258 align:4 common .sdata start:0x805A7F88 end:0x805A7FC8 .sbss start:0x805A9258 end:0x805A9260 .sdata2 start:0x805ACBC8 end:0x805ACC80 @@ -1635,6 +1655,7 @@ MetroidPrime/Enemies/CFlyingPirate.cpp: .rodata start:0x803D2250 end:0x803D2760 .data start:0x803E69C8 end:0x803E6D90 .bss start:0x8046CB30 end:0x8046CD20 + .bss start:0x80572258 end:0x80572308 align:4 common .sdata start:0x805A8060 end:0x805A80E0 .sdata2 start:0x805ACE20 end:0x805ACF30 @@ -1751,6 +1772,7 @@ MetroidPrime/Enemies/CBabygoth.cpp: .ctors start:0x803CB470 end:0x803CB474 .rodata start:0x803D3388 end:0x803D3428 .data start:0x803E7530 end:0x803E7920 + .bss start:0x80572308 end:0x80572314 align:4 common .sdata start:0x805A82B8 end:0x805A82D8 .sdata2 start:0x805AD2F0 end:0x805AD370 @@ -1771,12 +1793,14 @@ MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.cpp: .text start:0x80226550 end:0x80226A38 .ctors start:0x803CB474 end:0x803CB478 .data start:0x803E7C50 end:0x803E7CC0 + .bss start:0x80572314 end:0x80572320 align:4 common .sdata start:0x805A8300 end:0x805A8308 .sdata2 start:0x805AD3B8 end:0x805AD3C0 MetroidPrime/RumbleFxTable.cpp: .text start:0x80226A38 end:0x80227414 .ctors start:0x803CB478 end:0x803CB47C + .bss start:0x80572320 end:0x805725C0 align:4 common .sdata2 start:0x805AD3C0 end:0x805AD4A0 MetroidPrime/Enemies/CElitePirate.cpp: @@ -1784,6 +1808,7 @@ MetroidPrime/Enemies/CElitePirate.cpp: .ctors start:0x803CB47C end:0x803CB480 .rodata start:0x803D3458 end:0x803D35E8 .data start:0x803E7CC0 end:0x803E80B0 + .bss start:0x805725C0 end:0x805725E4 align:4 common .sdata start:0x805A8308 end:0x805A8358 .sdata2 start:0x805AD4A0 end:0x805AD528 @@ -1962,6 +1987,7 @@ MetroidPrime/Enemies/CRidley.cpp: .rodata start:0x803D4D78 end:0x803D52E0 .data start:0x803E9378 end:0x803E9830 .bss start:0x8046D588 end:0x8046DE70 + .bss start:0x805725E4 end:0x805727F4 align:4 common .sdata start:0x805A84D0 end:0x805A8560 .sdata2 start:0x805AD808 end:0x805AD8E8 @@ -1992,6 +2018,7 @@ MetroidPrime/Enemies/CTryclops.cpp: .rodata start:0x803D5438 end:0x803D5458 .data start:0x803E9BF0 end:0x803E9EF0 .bss start:0x8046DE70 end:0x8046DE88 + .bss start:0x805727F4 end:0x80572874 align:4 common .sdata start:0x805A8580 end:0x805A85A8 .sbss start:0x805A9300 end:0x805A9308 .sdata2 start:0x805AD928 end:0x805AD968 @@ -2059,6 +2086,7 @@ MetroidPrime/Enemies/CBurrower.cpp: .ctors start:0x803CB49C end:0x803CB4A0 .rodata start:0x803D5600 end:0x803D5608 .data start:0x803EA970 end:0x803EAC70 + .bss start:0x80572874 end:0x805728DC align:4 common .sdata2 start:0x805ADAB8 end:0x805ADAD0 MetroidPrime/Enemies/CMetroidPrimeExo.cpp: @@ -2102,6 +2130,7 @@ MetroidPrime/ScriptObjects/CScriptMazeNode.cpp: .text start:0x80288844 end:0x8028AA48 .rodata start:0x803D5B60 end:0x803D5B78 .data start:0x803EB838 end:0x803EB8A8 + .bss start:0x805728DC end:0x80572D8C align:4 common .sdata2 start:0x805ADD60 end:0x805ADD68 MetroidPrime/Weapons/WeaponTypes.cpp: @@ -2236,6 +2265,7 @@ WorldFormat/CMetroidAreaCollider.cpp: .text start:0x802A3148 end:0x802A76A8 .rodata start:0x803D6208 end:0x803D6218 .data start:0x803EC608 end:0x803EC618 + .bss start:0x80572D8C end:0x8059FD8C align:4 common .sbss start:0x805A9360 end:0x805A9378 .sdata2 start:0x805AE048 end:0x805AE080 .sbss2 start:0x805AF668 end:0x805AF670 @@ -2243,6 +2273,7 @@ WorldFormat/CMetroidAreaCollider.cpp: WorldFormat/CWorldLight.cpp: .text start:0x802A76A8 end:0x802A7A20 .ctors start:0x803CB4B4 end:0x803CB4B8 + .bss start:0x8059FD8C end:0x8059FDB0 align:4 common .sdata start:0x805A87F0 end:0x805A8800 .sdata2 start:0x805AE080 end:0x805AE0A0 @@ -2348,6 +2379,7 @@ GuiSys/CGuiGroup.cpp: .ctors start:0x803CB4C4 end:0x803CB4C8 .rodata start:0x803D6A60 end:0x803D6A80 .data start:0x803EC918 end:0x803EC9E8 + .bss start:0x8059FDB0 end:0x8059FEE8 align:4 common .sbss start:0x805A93D8 end:0x805A93E0 .sdata2 start:0x805AE270 end:0x805AE280 @@ -2422,6 +2454,7 @@ GuiSys/CGuiWidgetIdDB.cpp: GuiSys/CGuiWidgetDrawParms.cpp: .text start:0x802CB25C end:0x802CB27C .ctors start:0x803CB4C8 end:0x803CB4CC + .bss start:0x8059FEE8 end:0x8059FEF8 align:4 common .sdata2 start:0x805AE318 end:0x805AE320 GuiSys/CAuiEnergyBarT01.cpp: @@ -2496,6 +2529,7 @@ Collision/CCollidableSphere.cpp: Collision/CMaterialFilter.cpp: .text start:0x802D53F8 end:0x802D5540 .ctors start:0x803CB4DC end:0x803CB4E0 + .bss start:0x8059FEF8 end:0x8059FF10 align:4 common Collision/COBBox.cpp: .text start:0x802D5540 end:0x802D6094 @@ -2512,6 +2546,7 @@ Kyoto/Basics/CBasics.cpp: Kyoto/Basics/CStopwatch.cpp: .text start:0x802D6310 end:0x802D6400 .ctors start:0x803CB4E0 end:0x803CB4E4 + .bss start:0x8059FF10 end:0x8059FF28 align:4 common .sbss start:0x805A9418 end:0x805A9420 .sdata2 start:0x805AE458 end:0x805AE468 @@ -2689,6 +2724,7 @@ Kyoto/Audio/CSfxManager.cpp: .rodata start:0x803D6FA8 end:0x803D6FB0 .data start:0x803ECFF0 end:0x803ED128 .bss start:0x80479D80 end:0x80479DB0 + .bss start:0x8059FF28 end:0x805A55A8 align:4 common .sdata start:0x805A8948 end:0x805A8960 .sbss start:0x805A94A0 end:0x805A94C0 .sdata2 start:0x805AE4F8 end:0x805AE528 @@ -2939,6 +2975,7 @@ Kyoto/Text/CFont.cpp: Kyoto/Graphics/CLight.cpp: .text start:0x80306104 end:0x80306710 .ctors start:0x803CB4E8 end:0x803CB4EC + .bss start:0x805A55A8 end:0x805A55CC align:4 common .sdata start:0x805A89F0 end:0x805A8A00 .sdata2 start:0x805AE678 end:0x805AE698 @@ -2952,12 +2989,14 @@ Kyoto/Graphics/CGX.cpp: .ctors start:0x803CB4EC end:0x803CB4F0 .rodata start:0x803D7580 end:0x803D75A8 .bss start:0x80479DB0 end:0x80479EA0 + .bss start:0x805A55CC end:0x805A582C align:4 common .sdata2 start:0x805AE698 end:0x805AE6A8 .sbss2 start:0x805AF680 end:0x805AF688 Kyoto/Graphics/CTevCombiners.cpp: .text start:0x80308F88 end:0x803093D8 .ctors start:0x803CB4F0 end:0x803CB4F4 + .bss start:0x805A582C end:0x805A5878 align:4 common .sdata start:0x805A8A00 end:0x805A8A08 .sbss start:0x805A9538 end:0x805A9548 @@ -2967,6 +3006,7 @@ Kyoto/Graphics/DolphinCGraphics.cpp: .rodata start:0x803D75A8 end:0x803D75C8 .data start:0x803EDAF0 end:0x803EDB48 .bss start:0x80479EA0 end:0x804BFEF0 + .bss start:0x805A5878 end:0x805A67DC align:4 common .sdata start:0x805A8A08 end:0x805A8A30 .sbss start:0x805A9548 end:0x805A9608 .sdata2 start:0x805AE6A8 end:0x805AE738 @@ -2993,17 +3033,20 @@ Kyoto/Math/CloseEnough.cpp: Kyoto/Math/CMatrix3f.cpp: .text start:0x803100D8 end:0x80310800 .ctors start:0x803CB4FC end:0x803CB500 + .bss start:0x805A67DC end:0x805A6800 align:4 common .sdata2 start:0x805AE750 end:0x805AE758 Kyoto/Math/CMatrix4f.cpp: .text start:0x80310800 end:0x80310AC8 .ctors start:0x803CB500 end:0x803CB504 + .bss start:0x805A6800 end:0x805A6840 align:4 common .sdata2 start:0x805AE758 end:0x805AE760 Kyoto/Math/CQuaternion.cpp: .text start:0x80310AC8 end:0x803125BC .ctors start:0x803CB504 end:0x803CB508 .bss start:0x804BFF10 end:0x804BFF38 + .bss start:0x805A6840 end:0x805A6850 align:4 common .sdata start:0x805A8A30 end:0x805A8A48 .sbss start:0x805A9628 end:0x805A9630 .sdata2 start:0x805AE760 end:0x805AE7C0 @@ -3016,6 +3059,7 @@ Kyoto/CRandom16.cpp: Kyoto/Math/CTransform4f.cpp: .text start:0x803127C0 end:0x80313EB0 .ctors start:0x803CB508 end:0x803CB50C + .bss start:0x805A6850 end:0x805A6880 align:4 common .sdata2 start:0x805AE7D0 end:0x805AE7F0 Kyoto/Math/CUnitVector3f.cpp: @@ -3038,6 +3082,7 @@ Kyoto/Math/CVector3d.cpp: Kyoto/Math/CVector3f.cpp: .text start:0x80314690 end:0x80314D28 .ctors start:0x803CB510 end:0x803CB514 + .bss start:0x805A6880 end:0x805A691C align:4 common .sdata2 start:0x805AE810 end:0x805AE828 Kyoto/Math/CVector3i.cpp: @@ -3106,6 +3151,7 @@ Kyoto/Particles/CParticleDataFactory.cpp: .rodata start:0x803D7AF8 end:0x803D7B00 .data start:0x803EDEE8 end:0x803EDF60 .bss start:0x804C00E0 end:0x804C00F0 + .bss start:0x805A691C end:0x805A6934 align:4 common .sbss start:0x805A9668 end:0x805A9670 Kyoto/Particles/CParticleGen.cpp: @@ -3170,6 +3216,7 @@ Kyoto/Math/CAABox.cpp: .text start:0x803372BC end:0x803386AC .ctors start:0x803CB51C end:0x803CB520 .data start:0x803EE4F8 end:0x803EE548 + .bss start:0x805A6934 end:0x805A697C align:4 common .sdata2 start:0x805AEA88 end:0x805AEAA0 .sbss2 start:0x805AF688 end:0x805AF690 @@ -3296,6 +3343,7 @@ Kyoto/CARAMManager.cpp: .ctors start:0x803CB52C end:0x803CB530 .rodata start:0x803D8130 end:0x803D8138 .bss start:0x804C0120 end:0x804C0130 + .bss start:0x805A697C end:0x805A6994 align:4 common .sdata start:0x805A8B00 end:0x805A8B08 .sbss start:0x805A9700 end:0x805A9720 .sdata2 start:0x805AEAA8 end:0x805AEAB0 @@ -3310,6 +3358,7 @@ Kyoto/Graphics/CCubeMaterial.cpp: .rodata start:0x803D8138 end:0x803D82E8 .data start:0x803EF7F0 end:0x803EF840 .bss start:0x804C0130 end:0x804C0170 + .bss start:0x805A6994 end:0x805A69A0 align:4 common .sdata start:0x805A8B08 end:0x805A8B18 .sbss start:0x805A9720 end:0x805A9748 .sdata2 start:0x805AEAB8 end:0x805AEB18 @@ -3317,6 +3366,7 @@ Kyoto/Graphics/CCubeMaterial.cpp: Kyoto/Graphics/CCubeSurface.cpp: .text start:0x80348390 end:0x80348414 .ctors start:0x803CB534 end:0x803CB538 + .bss start:0x805A69A0 end:0x805A69AC align:4 common .sdata2 start:0x805AEB18 end:0x805AEB20 Kyoto/Animation/CCharAnimTime.cpp: @@ -3348,6 +3398,7 @@ Kyoto/Audio/DolphinCAudioSys.cpp: .ctors start:0x803CB53C end:0x803CB540 .rodata start:0x803D83F0 end:0x803D8400 .bss start:0x804C0170 end:0x804C0180 + .bss start:0x805A69AC end:0x805A69BC align:4 common .sdata start:0x805A8B78 end:0x805A8B88 .sbss start:0x805A9770 end:0x805A97A0 .sdata2 start:0x805AEB40 end:0x805AEB50 @@ -3357,6 +3408,7 @@ Kyoto/DolphinCMemoryCardSys.cpp: .ctors start:0x803CB540 end:0x803CB544 .rodata start:0x803D8400 end:0x803D8408 .bss start:0x804C0180 end:0x804C01A0 + .bss start:0x805A69BC end:0x805A69EC align:4 common .sdata start:0x805A8B88 end:0x805A8B90 .sbss start:0x805A97A0 end:0x805A97A8 @@ -3453,6 +3505,7 @@ Kyoto/CTimeProvider.cpp: Kyoto/CARAMToken.cpp: .text start:0x80358438 end:0x80358C68 .rodata start:0x803D8518 end:0x803D8520 + .bss start:0x805A69EC end:0x805A6A08 align:4 common Kyoto/Audio/CMidiManager.cpp: .text start:0x80358C68 end:0x80359540 @@ -3460,6 +3513,7 @@ Kyoto/Audio/CMidiManager.cpp: .rodata start:0x803D8520 end:0x803D8528 .data start:0x803EF968 end:0x803EF978 .bss start:0x805401F0 end:0x80540200 + .bss start:0x805A6A08 end:0x805A6A40 align:4 common Kyoto/Text/CFontImageDef.cpp: .text start:0x80359540 end:0x8035981C @@ -3511,6 +3565,7 @@ Kyoto/Audio/CDSPStreamManager.cpp: .ctors start:0x803CB54C end:0x803CB550 .rodata start:0x803D85E0 end:0x803D85E8 .bss start:0x80540700 end:0x80540730 + .bss start:0x805A6A40 end:0x805A6D40 align:4 common .sbss start:0x805A9858 end:0x805A9860 Kyoto/CDependencyGroup.cpp: @@ -3523,6 +3578,7 @@ Kyoto/Audio/CStreamAudioManager.cpp: .ctors start:0x803CB550 end:0x803CB554 .rodata start:0x803D85F0 end:0x803D85F8 .bss start:0x80540730 end:0x80540820 + .bss start:0x805A6D40 end:0x805A6D90 align:4 common .sdata start:0x805A8C10 end:0x805A8C28 .sbss start:0x805A9860 end:0x805A9870 .sdata2 start:0x805AECB0 end:0x805AECD8 diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt index 1b5bf2ef..582d3c4a 100644 --- a/config/GM8E01_01/symbols.txt +++ b/config/GM8E01_01/symbols.txt @@ -19169,8 +19169,8 @@ D54 = .data:0x803F7350; // type:object size:0x2D scope:local data:byte D35 = .data:0x803F7380; // type:object size:0x380 scope:local @12 = .data:0x803F7700; // type:object size:0x9 scope:local data:string @13 = .data:0x803F770C; // type:object size:0x1A scope:local data:string -lbl_803F7740 = .bss:0x803F7740; // type:object size:0x60000 -lbl_80457740 = .bss:0x80457740; // type:object size:0x168 +sGraphicsFifo = .bss:0x803F7740; // type:object size:0x60000 align:32 +sMainSpace = .bss:0x80457740; // type:object size:0x168 scope:local lbl_804578A8 = .bss:0x804578A8; // type:object size:0xD0 lbl_80457978 = .bss:0x80457978; // type:object size:0x160 @27 = .bss:0x80457AD8; // type:object size:0xC scope:local @@ -19300,11 +19300,11 @@ lbl_804C013C = .bss:0x804C013C; // type:object size:0x34 data:float lbl_804C0170 = .bss:0x804C0170; // type:object size:0x10 lbl_804C0180 = .bss:0x804C0180; // type:object size:0xC lbl_804C018C = .bss:0x804C018C; // type:object size:0x14 -lbl_804C01A0 = .bss:0x804C01A0; // type:object size:0x8000C -lbl_805401AC = .bss:0x805401AC; // type:object size:0x28 data:byte -lbl_805401D4 = .bss:0x805401D4; // type:object size:0x1C +sStaticSkinningData__8Skinning = .bss:0x804C01A0; // type:object size:0x8000C scope:local align:32 +sSkinningBuffer__8Skinning = .bss:0x805401AC; // type:object size:0x28 scope:local data:byte +sAllocations__8Skinning = .bss:0x805401D4; // type:object size:0x1C scope:local @148 = .bss:0x805401F0; // type:object size:0xC scope:local -lbl_80540200 = .bss:0x80540200; // type:object size:0x500 +lbl_80540200 = .bss:0x80540200; // type:object size:0x500 align:32 lbl_80540700 = .bss:0x80540700; // type:object size:0x30 lbl_80540730 = .bss:0x80540730; // type:object size:0x30 lbl_80540760 = .bss:0x80540760; // type:object size:0x64 @@ -19321,9 +19321,9 @@ AlarmForTimeout = .bss:0x80540CC8; // type:object size:0x28 scope:local AlarmForBreak = .bss:0x80540CF0; // type:object size:0x28 scope:local Prev = .bss:0x80540D18; // type:object size:0xC scope:local Curr = .bss:0x80540D24; // type:object size:0xC scope:local -BB2 = .bss:0x80540D40; // type:object size:0x20 scope:local +BB2 = .bss:0x80540D40; // type:object size:0x20 scope:local align:32 ...bss.0 = .bss:0x80540D40; // type:label scope:local -CurrDiskID = .bss:0x80540D60; // type:object size:0x20 scope:local +CurrDiskID = .bss:0x80540D60; // type:object size:0x20 scope:local align:32 DummyCommandBlock = .bss:0x80540D80; // type:object size:0x30 scope:local ResetAlarm = .bss:0x80540DB0; // type:object size:0x28 scope:local WaitingQueue = .bss:0x80540DD8; // type:object size:0x20 scope:local data:4byte @@ -19331,7 +19331,7 @@ WaitingQueue = .bss:0x80540DD8; // type:object size:0x20 scope:local data:4byte bb2Buf = .bss:0x80540DF8; // type:object size:0x3F scope:local block$16 = .bss:0x80540E38; // type:object size:0x30 scope:local gxData = .bss:0x80540E68; // type:object size:0x4F8 scope:local -DriveInfo = .bss:0x805413E0; // type:object size:0x20 scope:local +DriveInfo = .bss:0x805413E0; // type:object size:0x20 scope:local align:32 ...bss.0 = .bss:0x805413E0; // type:label scope:local DriveBlock = .bss:0x80541400; // type:object size:0x30 scope:local __OSErrorTable = .bss:0x80541430; // type:object size:0x44 scope:global data:4byte @@ -19499,22 +19499,22 @@ skScaleFactor__24CScriptCameraPitchVolume = .bss:0x80572314; // type:object size skRumbleFxTable = .bss:0x80572320; // type:object size:0x2A0 data:float skExtendedClawBounds__12CElitePirate = .bss:0x805725C0; // type:object size:0xC data:float skLocalShieldBounds__12CElitePirate = .bss:0x805725D8; // type:object size:0xC data:float -lbl_805725E4 = .bss:0x805725E4; // type:object size:0x110 +lbl_805725E4 = .bss:0x805725E4; // type:object size:0x10 lbl_805726F4 = .bss:0x805726F4; // type:object size:0x10 lbl_80572704 = .bss:0x80572704; // type:object size:0x10 lbl_80572714 = .bss:0x80572714; // type:object size:0x10 lbl_80572724 = .bss:0x80572724; // type:object size:0x68 data:4byte lbl_8057278C = .bss:0x8057278C; // type:object size:0x68 data:4byte -lbl_805727F4 = .bss:0x805727F4; // type:object size:0x74 data:4byte +lbl_805727F4 = .bss:0x805727F4; // type:object size:0x68 data:4byte lbl_80572868 = .bss:0x80572868; // type:object size:0xC data:float lbl_80572874 = .bss:0x80572874; // type:object size:0x68 data:4byte sMazeSeeds__15CScriptMazeNode = .bss:0x805728DC; // type:object size:0x4B0 data:4byte -lbl_80572D8C = .bss:0x80572D8C; // type:object size:0x19000 -lbl_8058BD8C = .bss:0x8058BD8C; // type:object size:0xC000 -lbl_80597D8C = .bss:0x80597D8C; // type:object size:0x8000 -lbl_8059FD8C = .bss:0x8059FD8C; // type:object size:0x18 data:float -lbl_8059FDA4 = .bss:0x8059FDA4; // type:object size:0xC data:float -lbl_8059FDB0 = .bss:0x8059FDB0; // type:object size:0xA8 data:4byte +sDupVertexList__20CMetroidAreaCollider = .bss:0x80572D8C; // type:object size:0x5000 +sDupEdgeList__20CMetroidAreaCollider = .bss:0x8058BD8C; // type:object size:0xC000 +sDupTriangleList__20CMetroidAreaCollider = .bss:0x80597D8C; // type:object size:0x8000 +kDefaultPosition__11CWorldLight = .bss:0x8059FD8C; // type:object size:0xC data:float +kDefaultDirection__11CWorldLight = .bss:0x8059FDA4; // type:object size:0xC data:float +lbl_8059FDB0 = .bss:0x8059FDB0; // type:object size:0x18 data:4byte lbl_8059FE58 = .bss:0x8059FE58; // type:object size:0x18 data:4byte lbl_8059FE70 = .bss:0x8059FE70; // type:object size:0x18 data:4byte lbl_8059FE88 = .bss:0x8059FE88; // type:object size:0x18 data:4byte @@ -19524,9 +19524,9 @@ lbl_8059FED0 = .bss:0x8059FED0; // type:object size:0x18 data:4byte sDefaultDrawParms__19CGuiWidgetDrawParms = .bss:0x8059FEE8; // type:object size:0x10 data:float skPassEverything__15CMaterialFilter = .bss:0x8059FEF8; // type:object size:0x18 data:4byte mData__10CStopwatch = .bss:0x8059FF10; // type:object size:0x18 data:4byte -lbl_8059FF28 = .bss:0x8059FF28; // type:object size:0x2E18 -lbl_805A2D40 = .bss:0x805A2D40; // type:object size:0x1604 data:4byte -lbl_805A4344 = .bss:0x805A4344; // type:object size:0xA04 data:4byte +mChannels__11CSfxManager = .bss:0x8059FF28; // type:object size:0x5B0 +mEmitterWrapperPool__11CSfxManager = .bss:0x805A2D40; // type:object size:0x1604 data:4byte +mWrapperPool__11CSfxManager = .bss:0x805A4344; // type:object size:0xA04 data:4byte lbl_805A4D48 = .bss:0x805A4D48; // type:object size:0x1E0 data:4byte lbl_805A4F28 = .bss:0x805A4F28; // type:object size:0x9C data:4byte lbl_805A4FC4 = .bss:0x805A4FC4; // type:object size:0x154 data:4byte @@ -19535,59 +19535,59 @@ lbl_805A5178 = .bss:0x805A5178; // type:object size:0x1E0 data:4byte lbl_805A5358 = .bss:0x805A5358; // type:object size:0x9C data:4byte lbl_805A53F4 = .bss:0x805A53F4; // type:object size:0x154 data:4byte lbl_805A5548 = .bss:0x805A5548; // type:object size:0x60 data:4byte -kDefaultPosition__6CLight = .bss:0x805A55A8; // type:object size:0x18 data:float +kDefaultPosition__6CLight = .bss:0x805A55A8; // type:object size:0xC data:float kDefaultDirection__6CLight = .bss:0x805A55C0; // type:object size:0xC data:float sGXState__3CGX = .bss:0x805A55CC; // type:object size:0x260 data:4byte -lbl_805A582C = .bss:0x805A582C; // type:object size:0x4C -lbl_805A5878 = .bss:0x805A5878; // type:object size:0x7D8 -lbl_805A6050 = .bss:0x805A6050; // type:object size:0x4C +kEnvPassthru__13CTevCombiners = .bss:0x805A582C; // type:object size:0x4C +kEnvModulateConstColor__9CGraphics = .bss:0x805A5878; // type:object size:0x4C +kEnvConstColor__9CGraphics = .bss:0x805A6050; // type:object size:0x4C kEnvModulate__9CGraphics = .bss:0x805A609C; // type:object size:0x4C -lbl_805A60E8 = .bss:0x805A60E8; // type:object size:0x4C -lbl_805A6134 = .bss:0x805A6134; // type:object size:0x4C -lbl_805A6180 = .bss:0x805A6180; // type:object size:0x4C -lbl_805A61CC = .bss:0x805A61CC; // type:object size:0x4C -lbl_805A6218 = .bss:0x805A6218; // type:object size:0x4C -lbl_805A6264 = .bss:0x805A6264; // type:object size:0x4C -lbl_805A62B0 = .bss:0x805A62B0; // type:object size:0xA0 -lbl_805A6350 = .bss:0x805A6350; // type:object size:0x30 data:float -lbl_805A6380 = .bss:0x805A6380; // type:object size:0xC data:float -lbl_805A638C = .bss:0x805A638C; // type:object size:0xC data:float -lbl_805A6398 = .bss:0x805A6398; // type:object size:0x1C data:float +kEnvDecal__9CGraphics = .bss:0x805A60E8; // type:object size:0x4C +kEnvBlend__9CGraphics = .bss:0x805A6134; // type:object size:0x4C +kEnvReplace__9CGraphics = .bss:0x805A6180; // type:object size:0x4C +kEnvModulateAlpha__9CGraphics = .bss:0x805A61CC; // type:object size:0x4C +kEnvModulateColor__9CGraphics = .bss:0x805A6218; // type:object size:0x4C +kEnvModulateColorByAlpha__9CGraphics = .bss:0x805A6264; // type:object size:0x4C +mLightParams = .bss:0x805A62B0; // type:object size:0xA0 +vtxDescr = .bss:0x805A6350; // type:object size:0x30 data:float +kDefaultPositionVector__9CGraphics = .bss:0x805A6380; // type:object size:0xC data:float +kDefaultDirectionVector__9CGraphics = .bss:0x805A638C; // type:object size:0xC data:float +mProj__9CGraphics = .bss:0x805A6398; // type:object size:0x1C data:float mViewMatrix__9CGraphics = .bss:0x805A63B4; // type:object size:0x30 data:float mModelMatrix__9CGraphics = .bss:0x805A63E4; // type:object size:0x30 data:float -lbl_805A6414 = .bss:0x805A6414; // type:object size:0xC data:float -lbl_805A6420 = .bss:0x805A6420; // type:object size:0x200 -lbl_805A6620 = .bss:0x805A6620; // type:object size:0x80 -lbl_805A66A0 = .bss:0x805A66A0; // type:object size:0x40 -lbl_805A66E0 = .bss:0x805A66E0; // type:object size:0x3C data:4byte -lbl_805A671C = .bss:0x805A671C; // type:object size:0x30 data:float -lbl_805A674C = .bss:0x805A674C; // type:object size:0x30 data:float -lbl_805A677C = .bss:0x805A677C; // type:object size:0x30 -lbl_805A67AC = .bss:0x805A67AC; // type:object size:0x30 +mViewPoint__9CGraphics = .bss:0x805A6414; // type:object size:0xC data:float +mLightObj__9CGraphics = .bss:0x805A6420; // type:object size:0x200 +mTexRegions__9CGraphics = .bss:0x805A6620; // type:object size:0x80 +mTexRegionsCI__9CGraphics = .bss:0x805A66A0; // type:object size:0x40 +mRenderModeObj__9CGraphics = .bss:0x805A66E0; // type:object size:0x3C data:4byte +mGXViewPointMatrix__9CGraphics = .bss:0x805A671C; // type:object size:0x30 data:float +mGXModelMatrix__9CGraphics = .bss:0x805A674C; // type:object size:0x30 data:float +mGxModelView__9CGraphics = .bss:0x805A677C; // type:object size:0x30 +mCameraMtx__9CGraphics = .bss:0x805A67AC; // type:object size:0x30 sIdentity__9CMatrix3f = .bss:0x805A67DC; // type:object size:0x24 sIdentity__9CMatrix4f = .bss:0x805A6800; // type:object size:0x40 data:float sNoRotation__11CQuaternion = .bss:0x805A6840; // type:object size:0x10 data:float sIdentity__12CTransform4f = .bss:0x805A6850; // type:object size:0x30 data:float -sZeroVector__9CVector3f = .bss:0x805A6880; // type:object size:0x54 data:float +sZeroVector__9CVector3f = .bss:0x805A6880; // type:object size:0xC data:float sUpVector__9CVector3f = .bss:0x805A68D4; // type:object size:0xC data:float sDownVector__9CVector3f = .bss:0x805A68E0; // type:object size:0xC data:float -lbl_805A68EC = .bss:0x805A68EC; // type:object size:0xC data:float +sLeftVector__9CVector3f = .bss:0x805A68EC; // type:object size:0xC data:float sRightVector__9CVector3f = .bss:0x805A68F8; // type:object size:0xC data:float sForwardVector__9CVector3f = .bss:0x805A6904; // type:object size:0xC data:float -lbl_805A6910 = .bss:0x805A6910; // type:object size:0xC data:float +sBackVector__9CVector3f = .bss:0x805A6910; // type:object size:0xC data:float lbl_805A691C = .bss:0x805A691C; // type:object size:0x18 -lbl_805A6934 = .bss:0x805A6934; // type:object size:0x30 data:float -lbl_805A6964 = .bss:0x805A6964; // type:object size:0x18 data:float +mskInvertedBox__6CAABox = .bss:0x805A6934; // type:object size:0x18 data:float +mskNullBox__6CAABox = .bss:0x805A6964; // type:object size:0x18 data:float mActiveDMAs__12CARAMManager = .bss:0x805A697C; // type:object size:0x18 lbl_805A6994 = .bss:0x805A6994; // type:object size:0xC data:float skDefaultNormal__12CCubeSurface = .bss:0x805A69A0; // type:object size:0xC data:float -lbl_805A69AC = .bss:0x805A69AC; // type:object size:0x10 -lbl_805A69BC = .bss:0x805A69BC; // type:object size:0x20 +mpDefaultInvalidString__9CAudioSys = .bss:0x805A69AC; // type:object size:0x10 +lbl_805A69BC = .bss:0x805A69BC; // type:object size:0x10 lbl_805A69DC = .bss:0x805A69DC; // type:object size:0x10 sLists__10CARAMToken = .bss:0x805A69EC; // type:object size:0x1C -mMidiWrappers__12CMidiManager = .bss:0x805A6A08; // type:object size:0x38 data:4byte -lbl_805A6A40 = .bss:0x805A6A40; // type:object size:0x300 data:4byte -lbl_805A6D40 = .bss:0x805A6D40; // type:object size:0x30 data:4byte +mMidiWrappers__12CMidiManager = .bss:0x805A6A08; // type:object size:0x28 data:4byte +lbl_805A6A40 = .bss:0x805A6A40; // type:object size:0x300 align:32 data:4byte +lbl_805A6D40 = .bss:0x805A6D40; // type:object size:0x10 data:4byte lbl_805A6D70 = .bss:0x805A6D70; // type:object size:0x10 data:4byte lbl_805A6D80 = .bss:0x805A6D80; // type:object size:0x10 data:4byte lbl_805A6DA0 = .sdata:0x805A6DA0; // type:object size:0x1 data:byte