diff --git a/include/MetroidPrime/CEntityInfo.hpp b/include/MetroidPrime/CEntityInfo.hpp index 9a5c317..20c218a 100644 --- a/include/MetroidPrime/CEntityInfo.hpp +++ b/include/MetroidPrime/CEntityInfo.hpp @@ -135,4 +135,7 @@ public: EScriptObjectState m_state; }; +struct SLdrEditorProperties; +const CEntityInfo& LdrToEntityInfo(const CEntityInfo&, const SLdrEditorProperties&); + #endif // _CENTITYINFO diff --git a/include/MetroidPrime/ScriptLoader/SLdrEditorProperties.hpp b/include/MetroidPrime/ScriptLoader/SLdrEditorProperties.hpp index bfae62e..4619fee 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrEditorProperties.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrEditorProperties.hpp @@ -15,7 +15,6 @@ struct SLdrEditorProperties { int unknown; }; -const CEntityInfo& LdrToEntityInfo(const CEntityInfo&, const SLdrEditorProperties&); void LoadTypedefSLdrEditorProperties(SLdrEditorProperties&, CInputStream&); #endif // _SLDREDITORPROPERTIES diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIMannedTurret.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIMannedTurret.hpp index a1f2d94..168f9d5 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIMannedTurret.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIMannedTurret.hpp @@ -1,6 +1,7 @@ #ifndef _SLDRAIMANNEDTURRET #define _SLDRAIMANNEDTURRET +#include "Kyoto/Math/CMayaSpline.hpp" #include "Kyoto/Streams/CInputStream.hpp" #include "MetroidPrime/ScriptLoader/SLdrEditorProperties.hpp" #include "MetroidPrime/ScriptLoader/SLdrUnknownStruct3.hpp" @@ -11,8 +12,8 @@ struct SLdrAIMannedTurret { SLdrEditorProperties editorProperties; SLdrUnknownStruct3 unknownStruct3; - spline patrolHorizSpline; - spline patrolVerticalSpline; + SLdrSpline patrolHorizSpline; + SLdrSpline patrolVerticalSpline; }; void LoadTypedefSLdrAIMannedTurret(SLdrAIMannedTurret&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPickup.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPickup.hpp index f1c2daa..a9163a2 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPickup.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPickup.hpp @@ -12,6 +12,7 @@ struct SLdrPickup { SLdrPickup(); + ~SLdrPickup(); SLdrEditorProperties editorProperties; CVector3f collisionSize; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZoneCrystal.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZoneCrystal.hpp index 1012996..388c29d 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZoneCrystal.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZoneCrystal.hpp @@ -1,6 +1,7 @@ #ifndef _SLDRSAFEZONECRYSTAL #define _SLDRSAFEZONECRYSTAL +#include "Kyoto/Math/CMayaSpline.hpp" #include "Kyoto/Math/CVector3f.hpp" #include "Kyoto/SObjectTag.hpp" #include "Kyoto/Streams/CInputStream.hpp" @@ -39,7 +40,7 @@ struct SLdrSafeZoneCrystal { CVector3f hitRadius; CVector3f hitOffset; CVector3f effectOffset; - spline unknown_0xbbbee60b; + SLdrSpline unknown_0xbbbee60b; }; void LoadTypedefSLdrSafeZoneCrystal(SLdrSafeZoneCrystal&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakAutoMapper.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakAutoMapper.hpp index ce74e74..6ff9917 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakAutoMapper.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakAutoMapper.hpp @@ -17,27 +17,4 @@ struct SLdrTweakAutoMapper { void LoadTypedefSLdrTweakAutoMapper(SLdrTweakAutoMapper&, CInputStream&); -/* { - SLdrTweakAutoMapper sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0x18b2f423: - LoadTypedefSLdrTweakAutoMapper_Base(sldrThis.base, input); - break; - case 0xc5368863: - LoadTypedefSLdrTweakAutoMapper_DoorColors(sldrThis.doorColors, input); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKAUTOMAPPER diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakBall.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakBall.hpp index ec1e6a3..812a335 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakBall.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakBall.hpp @@ -27,42 +27,4 @@ struct SLdrTweakBall { void LoadTypedefSLdrTweakBall(SLdrTweakBall&, CInputStream&); -/* { - SLdrTweakBall sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0x0def1ffb: - LoadTypedefSLdrTweakBall_Movement(sldrThis.movement, input); - break; - case 0x7aac09b9: - LoadTypedefSLdrTweakBall_Camera(sldrThis.camera, input); - break; - case 0x0c67b730: - LoadTypedefSLdrTweakBall_Misc(sldrThis.misc, input); - break; - case 0xcb4ea3bf: - LoadTypedefSLdrTweakBall_BoostBall(sldrThis.boostBall, input); - break; - case 0x5fb9e808: - LoadTypedefSLdrTweakBall_CannonBall(sldrThis.cannonBall, input); - break; - case 0x4b1c7b7d: - LoadTypedefSLdrTweakBall_ScrewAttack(sldrThis.screwAttack, input); - break; - case 0xbb5fc8a4: - LoadTypedefSLdrTweakBall_DeathBall(sldrThis.deathBall, input); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKBALL diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakCameraBob.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakCameraBob.hpp index d5ced3e..75b79be 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakCameraBob.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakCameraBob.hpp @@ -27,63 +27,4 @@ struct SLdrTweakCameraBob { void LoadTypedefSLdrTweakCameraBob(SLdrTweakCameraBob&, CInputStream&); -/* { - SLdrTweakCameraBob sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0xe2a0b6f1: - sldrThis.cameraBobExtentX = input.ReadFloat(); - break; - case 0x29fc6554: - sldrThis.cameraBobExtentY = input.ReadFloat(); - break; - case 0x149d7339: - sldrThis.cameraBobPeriod = input.ReadFloat(); - break; - case 0xa27bb5a7: - sldrThis.unknown_0xa27bb5a7 = input.ReadFloat(); - break; - case 0xe3580b2b: - sldrThis.unknown_0xe3580b2b = input.ReadFloat(); - break; - case 0xb05dade7: - sldrThis.slowSpeedPeriodScale = input.ReadFloat(); - break; - case 0x6dc5d440: - sldrThis.targetMagnitudeTrackingRate = input.ReadFloat(); - break; - case 0xd16539a7: - sldrThis.landingBobSpringConstant = input.ReadFloat(); - break; - case 0xadbb0a42: - sldrThis.viewWanderRadius = input.ReadFloat(); - break; - case 0xe7f8f11b: - sldrThis.viewWanderSpeedMin = input.ReadFloat(); - break; - case 0x01985efa: - sldrThis.viewWanderSpeedMax = input.ReadFloat(); - break; - case 0xef19ba33: - sldrThis.viewWanderRollVariation = input.ReadFloat(); - break; - case 0x7f59be96: - sldrThis.gunBobMagnitude = input.ReadFloat(); - break; - case 0x38a82ac1: - sldrThis.helmetBobMagnitude = input.ReadFloat(); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKCAMERABOB diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGame.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGame.hpp index 4c84a7a..2bb0b23 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGame.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGame.hpp @@ -40,90 +40,4 @@ struct SLdrTweakGame { void LoadTypedefSLdrTweakGame(SLdrTweakGame&, CInputStream&); -/* { - SLdrTweakGame sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0x2bd13ab3: - // sldrThis.pakFile = TODO - break; - case 0xf8be005a: - // sldrThis.asset = TODO - break; - case 0xfc93ceb8: - sldrThis.fieldofView = input.ReadFloat(); - break; - case 0x9fb2faa6: - sldrThis.fieldofView2Player = input.ReadFloat(); - break; - case 0xa9096914: - sldrThis.disableDebugMenu = input.ReadBool(); - break; - case 0x7262d27b: - sldrThis.unknown_0x7262d27b = input.ReadBool(); - break; - case 0xe943ba12: - sldrThis.developmentMode = input.ReadBool(); - break; - case 0xa3dcf42a: - sldrThis.unknown_0xa3dcf42a = input.ReadFloat(); - break; - case 0xb35c72be: - sldrThis.unknown_0xb35c72be = input.ReadFloat(); - break; - case 0x4a02103c: - sldrThis.unknown_0x4a02103c = input.ReadFloat(); - break; - case 0xe1fca71b: - sldrThis.unknown_0xe1fca71b = input.ReadFloat(); - break; - case 0xfbce966a: - sldrThis.unknown_0xfbce966a = input.ReadFloat(); - break; - case 0x09c6ca10: - sldrThis.unknown_0x09c6ca10 = input.ReadFloat(); - break; - case 0x4dfcd432: - sldrThis.hardModeDamageMultiplier = input.ReadFloat(); - break; - case 0xae1831d9: - sldrThis.hardModeWeaponMultiplier = input.ReadFloat(); - break; - case 0x5ab5812c: - sldrThis.unknown_0x5ab5812c = input.ReadFloat(); - break; - case 0x53401390: - sldrThis.unknown_0x53401390 = input.ReadFloat(); - break; - case 0xd09f373b: - sldrThis.totalPercentage = input.ReadInt32(); - break; - case 0x1d627808: - LoadTypedefSLdrTweakGame_FragLimitChoices(sldrThis.unknown_0x1d627808, input); - break; - case 0xb2e8828d: - LoadTypedefSLdrTweakGame_TimeLimitChoices(sldrThis.unknown_0xb2e8828d, input); - break; - case 0x06af87bd: - LoadTypedefSLdrTweakGame_CoinLimitChoices(sldrThis.unknown_0x06af87bd, input); - break; - case 0x1533ea4e: - LoadTypedefSLdrTweakGame_TimeLimitChoices(sldrThis.unknown_0x1533ea4e, input); - break; - case 0x40818220: - // sldrThis.unknown_0x40818220 = TODO - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKGAME diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGui.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGui.hpp index bf73316..12f661c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGui.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGui.hpp @@ -31,48 +31,4 @@ struct SLdrTweakGui { void LoadTypedefSLdrTweakGui(SLdrTweakGui&, CInputStream&); -/* { - SLdrTweakGui sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0xd45f7663: - LoadTypedefSLdrTweakGui_Misc(sldrThis.misc, input); - break; - case 0x80b13e60: - LoadTypedefSLdrTweakGui_ScannableObjectDownloadTimes(sldrThis.scannableObjectDownloadTimes, input); - break; - case 0x102aa38d: - LoadTypedefSLdrTweakGui_DarkVisor(sldrThis.unknown, input); - break; - case 0x2b698e45: - LoadTypedefSLdrTweakGui_EchoVisor(sldrThis.echoVisor, input); - break; - case 0x40ffb3c4: - LoadTypedefSLdrTweakGui_ScanVisor(sldrThis.scanVisor, input); - break; - case 0x97b8a76a: - LoadTypedefSLdrTweakGui_LogBook(sldrThis.logBook, input); - break; - case 0x77393416: - LoadTypedefSLdrTweakGui_Credits(sldrThis.credits, input); - break; - case 0x02149892: - LoadTypedefSLdrTweakGui_Completion(sldrThis.completion, input); - break; - case 0xa4f61e92: - LoadTypedefSLdrTweakGui_MovieVolumes(sldrThis.movieVolumes, input); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKGUI diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGuiColors.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGuiColors.hpp index 8b48f39..64ef18e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGuiColors.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakGuiColors.hpp @@ -33,63 +33,4 @@ struct SLdrTweakGuiColors { void LoadTypedefSLdrTweakGuiColors(SLdrTweakGuiColors&, CInputStream&); -/* { - SLdrTweakGuiColors sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0xcb737724: - LoadTypedefSLdrTweakGuiColors_HUDColorsTypedef(sldrThis.hudColors, input); - break; - case 0x6756d4de: - LoadTypedefSLdrTweakGuiColors_Misc(sldrThis.misc, input); - break; - case 0x697613e9: - LoadTypedefSLdrTweakGuiColors_Multiplayer(sldrThis.multiplayer, input); - break; - case 0x67c70055: - LoadTypedefSLdrTweakGui_VisorColorSchemeTypedef(sldrThis.combatHudColorScheme, input); - break; - case 0x62e0a08f: - LoadTypedefSLdrTweakGui_VisorColorSchemeTypedef(sldrThis.echoHudColorScheme, input); - break; - case 0x80becd6e: - LoadTypedefSLdrTweakGui_VisorColorSchemeTypedef(sldrThis.scanHudColorScheme, input); - break; - case 0x7de4b297: - LoadTypedefSLdrTweakGui_VisorColorSchemeTypedef(sldrThis.darkHudColorScheme, input); - break; - case 0xc0181762: - LoadTypedefSLdrTweakGui_VisorColorSchemeTypedef(sldrThis.ballHudColorScheme, input); - break; - case 0x45d7a40f: - LoadTypedefSLdrTweakGui_HudColorTypedef(sldrThis.combatHud, input); - break; - case 0x594b44cf: - LoadTypedefSLdrTweakGui_HudColorTypedef(sldrThis.scanHud, input); - break; - case 0x8f5ebeb9: - LoadTypedefSLdrTweakGui_HudColorTypedef(sldrThis.xRayHud, input); - break; - case 0xf12b1e59: - LoadTypedefSLdrTweakGui_HudColorTypedef(sldrThis.thermalHud, input); - break; - case 0x58cd6373: - LoadTypedefSLdrTweakGui_HudColorTypedef(sldrThis.ballHud, input); - break; - case 0xde139081: - LoadTypedefSLdrTweakGuiColors_TurretHudTypedef(sldrThis.turretHud, input); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKGUICOLORS diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakParticle.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakParticle.hpp index f4e60ba..feb788b 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakParticle.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakParticle.hpp @@ -16,30 +16,4 @@ struct SLdrTweakParticle { void LoadTypedefSLdrTweakParticle(SLdrTweakParticle&, CInputStream&); -/* { - SLdrTweakParticle sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0x2bd13ab3: - // sldrThis.pakFile = TODO - break; - case 0x5e15868a: - // sldrThis.primaryWeapon = TODO - break; - case 0xbc401445: - // sldrThis.secondaryWeapon = TODO - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKPARTICLE diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayer.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayer.hpp index fccf5f4..402a740 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayer.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayer.hpp @@ -39,60 +39,4 @@ struct SLdrTweakPlayer { void LoadTypedefSLdrTweakPlayer(SLdrTweakPlayer&, CInputStream&); -/* { - SLdrTweakPlayer sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0xdfd08eba: - LoadTypedefSLdrTweakPlayer_DarkWorld(sldrThis.darkWorld, input); - break; - case 0x45171a96: - LoadTypedefSLdrTweakPlayer_GrappleBeam(sldrThis.grappleBeam, input); - break; - case 0x82cf4cf1: - LoadTypedefSLdrTweakPlayer_Motion(sldrThis.motion, input); - break; - case 0x56a720c8: - LoadTypedefSLdrTweakPlayer_Misc(sldrThis.misc, input); - break; - case 0x42a17438: - LoadTypedefSLdrTweakPlayer_AimStuff(sldrThis.aimStuff, input); - break; - case 0x243ae038: - LoadTypedefSLdrTweakPlayer_Orbit(sldrThis.orbit, input); - break; - case 0x20124c3d: - LoadTypedefSLdrTweakPlayer_ScanVisor(sldrThis.scanVisor, input); - break; - case 0x30412440: - LoadTypedefSLdrTweakPlayer_Grapple(sldrThis.grapple, input); - break; - case 0xc4d32ae5: - LoadTypedefSLdrTweakPlayer_Collision(sldrThis.collision, input); - break; - case 0xd6155d4b: - LoadTypedefSLdrTweakPlayer_FirstPersonCamera(sldrThis.firstPersonCamera, input); - break; - case 0xbcca767e: - LoadTypedefSLdrTweakPlayer_Shield(sldrThis.shield, input); - break; - case 0x4d3b20b7: - LoadTypedefSLdrTweakPlayer_Frozen(sldrThis.frozen, input); - break; - case 0xaeaff210: - LoadTypedefSLdrTweakPlayer_SuitDamageReduction(sldrThis.suitDamageReduction, input); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKPLAYER diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerControls.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerControls.hpp index 3ffdc54..4d31da5 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerControls.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerControls.hpp @@ -17,27 +17,4 @@ struct SLdrTweakPlayerControls { void LoadTypedefSLdrTweakPlayerControls(SLdrTweakPlayerControls&, CInputStream&); -/* { - SLdrTweakPlayerControls sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0x3c34dfed: - LoadTypedefSLdrTweakPlayerControls_UnknownStruct1(sldrThis.unknown_0x3c34dfed, input); - break; - case 0x168a79f1: - LoadTypedefSLdrTweakPlayerControls_UnknownStruct2(sldrThis.unknown_0x168a79f1, input); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKPLAYERCONTROLS diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerGun.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerGun.hpp index 7237b97..867537c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerGun.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerGun.hpp @@ -36,63 +36,4 @@ struct SLdrTweakPlayerGun { void LoadTypedefSLdrTweakPlayerGun(SLdrTweakPlayerGun&, CInputStream&); -/* { - SLdrTweakPlayerGun sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0xb82ed424: - LoadTypedefSLdrTweakPlayerGun_Misc(sldrThis.misc, input); - break; - case 0x6b6bdc47: - LoadTypedefSLdrTweakPlayerGun_Holstering(sldrThis.holstering, input); - break; - case 0x87882cb0: - LoadTypedefSLdrTweakPlayerGun_Position(sldrThis.position, input); - break; - case 0x255007ad: - LoadTypedefSLdrTweakPlayerGun_Arm_Position(sldrThis.armPosition, input); - break; - case 0x83d758ab: - LoadTypedefSLdrTweakPlayerGun_Weapons(sldrThis.weapons, input); - break; - case 0x888c8775: - LoadTypedefSLdrTweakPlayerGun_UnknownStruct1(sldrThis.combos, input); - break; - case 0xaaebb73e: - LoadTypedefSLdrTweakPlayerGun_Beam_Misc(sldrThis.beamMisc, input); - break; - case 0x8da058fe: - LoadTypedefSLdrTweakPlayerGun_RicochetDamage_Factor(sldrThis.ricochetDamageFactor, input); - break; - case 0xffdb4bb7: - LoadTypedefSLdrCameraShakerData(sldrThis.recoil, input); - break; - case 0x937a35bd: - LoadTypedefSLdrCameraShakerData(sldrThis.comboRecoil, input); - break; - case 0x26196738: - LoadTypedefSLdrCameraShakerData(sldrThis.projectileRecoil, input); - break; - case 0xf40808c9: - LoadTypedefSLdrCameraShakerData(sldrThis.flameThrower, input); - break; - case 0x9a6d7a31: - LoadTypedefSLdrCameraShakerData(sldrThis.waveBuster, input); - break; - case 0x12f14c5a: - LoadTypedefSLdrCameraShakerData(sldrThis.projectileImpact, input); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKPLAYERGUN diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerRes.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerRes.hpp index 6817dda..931a29d 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerRes.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakPlayerRes.hpp @@ -22,36 +22,4 @@ struct SLdrTweakPlayerRes { void LoadTypedefSLdrTweakPlayerRes(SLdrTweakPlayerRes&, CInputStream&); -/* { - SLdrTweakPlayerRes sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0x357741e0: - LoadTypedefSLdrTweakPlayerRes_AutoMapperIcons(sldrThis.autoMapperIcons, input); - break; - case 0x0d5e02a0: - LoadTypedefSLdrTweakPlayerRes_MapScreenIcons(sldrThis.mapScreenIcons, input); - break; - case 0x279852ba: - LoadTypedefSLdrTBallTransitionResources(sldrThis.ballTransitionResources, input); - break; - case 0x5e630608: - LoadTypedefSLdrTGunResources(sldrThis.cinematicResources, input); - break; - case 0x36ad9d19: - sldrThis.unknown = input.ReadFloat(); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKPLAYERRES diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakSlideShow.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakSlideShow.hpp index be2e2ca..73de973 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakSlideShow.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakSlideShow.hpp @@ -31,72 +31,4 @@ struct SLdrTweakSlideShow { void LoadTypedefSLdrTweakSlideShow(SLdrTweakSlideShow&, CInputStream&); -/* { - SLdrTweakSlideShow sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0x2bd13ab3: - // sldrThis.pakFile = TODO - break; - case 0xfe31fba0: - // sldrThis.font = TODO - break; - case 0x1a96ec67: - // sldrThis.fontColor = TODO - break; - case 0x844ab6b0: - // sldrThis.fontOutlineColor = TODO - break; - case 0xd398dac2: - sldrThis.unknown_0xd398dac2 = input.ReadFloat(); - break; - case 0x03757d08: - sldrThis.unknown_0x03757d08 = input.ReadFloat(); - break; - case 0x59276e14: - sldrThis.translationMultiplier = input.ReadFloat(); - break; - case 0x3ce7a013: - sldrThis.scaleMultiplier = input.ReadFloat(); - break; - case 0x278c0893: - sldrThis.slideShowDelay = input.ReadFloat(); - break; - case 0xd75d29f8: - // sldrThis.helpFrameColor = TODO - break; - case 0x27515c7b: - sldrThis.helpTransitionTime = input.ReadFloat(); - break; - case 0xae47dc81: - sldrThis.slideBlendTime = input.ReadFloat(); - break; - case 0x029d2082: - sldrThis.unknown_0x029d2082 = input.ReadFloat(); - break; - case 0xb187cd9b: - sldrThis.unknown_0xb187cd9b = input.ReadFloat(); - break; - case 0x90aa341f: - sldrThis.fadeInTime = input.ReadFloat(); - break; - case 0x7c269ebc: - sldrThis.fadeOutTime = input.ReadFloat(); - break; - case 0xc0544bc1: - // sldrThis.unknown_0xc0544bc1 = TODO - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKSLIDESHOW diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakTargeting.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakTargeting.hpp index d3c0beb..d705f19 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakTargeting.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrTweakTargeting.hpp @@ -137,369 +137,4 @@ struct SLdrTweakTargeting { void LoadTypedefSLdrTweakTargeting(SLdrTweakTargeting&, CInputStream&); -/* { - SLdrTweakTargeting sldrThis; - int propertyCount = input.ReadUint16(); - for (int i = 0; i < propertyCount; ++i) { - uint propertyId = (uint)input.ReadInt32(); - u16 propertySize = input.ReadUint16(); - - switch (propertyId) { - case 0x7fda1466: - // sldrThis.instanceName = TODO - break; - case 0x5173932f: - LoadTypedefSLdrTweakTargeting_OuterBeamIcon(sldrThis.unknown_0x5173932f, input); - break; - case 0x23ff4be4: - LoadTypedefSLdrTIcon_Configurations(sldrThis.unknown_0x23ff4be4, input); - break; - case 0x92e98613: - LoadTypedefSLdrTIcon_Configurations(sldrThis.unknown_0x92e98613, input); - break; - case 0x64833842: - LoadTypedefSLdrTIcon_Configurations(sldrThis.unknown_0x64833842, input); - break; - case 0x8dfd6e3c: - LoadTypedefSLdrTIcon_Configurations(sldrThis.unknown_0x8dfd6e3c, input); - break; - case 0xbc5a41b2: - LoadTypedefSLdrTweakTargeting_Charge_Gauge(sldrThis.chargeGauge, input); - break; - case 0x00183589: - LoadTypedefSLdrTweakTargeting_LockFire(sldrThis.lockFire, input); - break; - case 0xd20ecc07: - LoadTypedefSLdrTweakTargeting_LockDagger(sldrThis.lockDagger, input); - break; - case 0x65ef9f2a: - LoadTypedefSLdrTweakTargeting_Scan(sldrThis.scan, input); - break; - case 0xc3410560: - sldrThis.unknown_0xc3410560 = input.ReadInt32(); - break; - case 0x3eb13041: - sldrThis.unknown_0x3eb13041 = input.ReadFloat(); - break; - case 0x5e67cab0: - sldrThis.unknown_0x5e67cab0 = input.ReadFloat(); - break; - case 0xe0ca98ac: - sldrThis.unknown_0xe0ca98ac = input.ReadFloat(); - break; - case 0xc1e35abb: - sldrThis.lockOnConfirmReticleScale = input.ReadFloat(); - break; - case 0x9f8d62c1: - sldrThis.unknown_0x9f8d62c1 = input.ReadFloat(); - break; - case 0xff5eeeb9: - sldrThis.unknown_0xff5eeeb9 = input.ReadFloat(); - break; - case 0x0d0b660d: - sldrThis.unknown_0x0d0b660d = input.ReadFloat(); - break; - case 0x132dd09e: - sldrThis.seekerTargetReticleScale = input.ReadFloat(); - break; - case 0x03efc783: - sldrThis.unknown_0x03efc783 = input.ReadFloat(); - break; - case 0xdcbd7bf8: - sldrThis.unknown_0xdcbd7bf8 = input.ReadFloat(); - break; - case 0x2acd6b4b: - sldrThis.unknown_0x2acd6b4b = input.ReadFloat(); - break; - case 0xb4c6c331: - sldrThis.unknown_0xb4c6c331 = input.ReadFloat(); - break; - case 0x27d02089: - sldrThis.unknown_0x27d02089 = input.ReadFloat(); - break; - case 0xae89310e: - sldrThis.unknown_0xae89310e = input.ReadFloat(); - break; - case 0xb27644df: - sldrThis.unknown_0xb27644df = input.ReadFloat(); - break; - case 0x21e2d1cc: - sldrThis.unknown_0x21e2d1cc = input.ReadFloat(); - break; - case 0x8e3afef8: - sldrThis.orbitPointOccludedOpacity = input.ReadFloat(); - break; - case 0x5c489cb5: - sldrThis.unknown_0x5c489cb5 = input.ReadFloat(); - break; - case 0xef2c842e: - sldrThis.orbitPointZOffset = input.ReadFloat(); - break; - case 0x61a6a38e: - sldrThis.unknown_0x61a6a38e = input.ReadFloat(); - break; - case 0xfbdf31f9: - sldrThis.unknown_0xfbdf31f9 = input.ReadFloat(); - break; - case 0xf76f7d0b: - sldrThis.unknown_0xf76f7d0b = input.ReadFloat(); - break; - case 0x810b3a08: - sldrThis.unknown_0x810b3a08 = input.ReadFloat(); - break; - case 0x73fe1553: - sldrThis.unknown_0x73fe1553 = input.ReadFloat(); - break; - case 0xc8aef6f2: - sldrThis.unknown_0xc8aef6f2 = input.ReadFloat(); - break; - case 0x69b1e76c: - sldrThis.unknown_0x69b1e76c = input.ReadFloat(); - break; - case 0x8a0dfd23: - sldrThis.unknown_0x8a0dfd23 = input.ReadFloat(); - break; - case 0x8299e96e: - sldrThis.unknown_0x8299e96e = input.ReadFloat(); - break; - case 0xa18a3f25: - sldrThis.unknown_0xa18a3f25 = input.ReadFloat(); - break; - case 0x23be9bb2: - sldrThis.unknown_0x23be9bb2 = input.ReadFloat(); - break; - case 0x8d512b82: - sldrThis.unknown_0x8d512b82 = input.ReadFloat(); - break; - case 0x39f1698d: - sldrThis.unknown_0x39f1698d = input.ReadFloat(); - break; - case 0xc768c1e9: - sldrThis.unknown_0xc768c1e9 = input.ReadFloat(); - break; - case 0x55c47b0e: - sldrThis.unknown_0x55c47b0e = input.ReadFloat(); - break; - case 0xa009aea2: - sldrThis.unknown_0xa009aea2 = input.ReadFloat(); - break; - case 0x38080bbf: - sldrThis.unknown_0x38080bbf = input.ReadFloat(); - break; - case 0x71017dbe: - sldrThis.unknown_0x71017dbe = input.ReadFloat(); - break; - case 0x4a996997: - sldrThis.unknown_0x4a996997 = input.ReadFloat(); - break; - case 0x9f9fa6f3: - sldrThis.unknown_0x9f9fa6f3 = input.ReadFloat(); - break; - case 0x932fea01: - sldrThis.unknown_0x932fea01 = input.ReadFloat(); - break; - case 0x165f0fa8: - sldrThis.unknown_0x165f0fa8 = input.ReadFloat(); - break; - case 0x6bd6b11f: - sldrThis.unknown_0x6bd6b11f = input.ReadFloat(); - break; - case 0x42420f6e: - // sldrThis.unknown_0x42420f6e = TODO - break; - case 0xa63229f1: - sldrThis.flowerReticleScale = input.ReadFloat(); - break; - case 0xbda45f1a: - // sldrThis.flowerReticleColor = TODO - break; - case 0xb090e147: - sldrThis.unknown_0xb090e147 = input.ReadFloat(); - break; - case 0x4c73a43d: - sldrThis.unknown_0x4c73a43d = input.ReadFloat(); - break; - case 0x6543d31b: - sldrThis.unknown_0x6543d31b = input.ReadFloat(); - break; - case 0x8cd2d1ce: - sldrThis.unknown_0x8cd2d1ce = input.ReadFloat(); - break; - case 0xe42f6be0: - // sldrThis.missileBracketColor = TODO - break; - case 0x45910e5d: - sldrThis.unknown_0x45910e5d = input.ReadFloat(); - break; - case 0x07b30fa0: - sldrThis.unknown_0x07b30fa0 = input.ReadFloat(); - break; - case 0x13ce8500: - // sldrThis.unknown_0x13ce8500 = TODO - break; - case 0x9829f256: - // sldrThis.unknown_0x9829f256 = TODO - break; - case 0x77a613b9: - // sldrThis.unknown_0x77a613b9 = TODO - break; - case 0xdfa81287: - // sldrThis.unknown_0xdfa81287 = TODO - break; - case 0xda752c50: - // sldrThis.lockOnConfirmReticleColor = TODO - break; - case 0x7b544e14: - // sldrThis.seekerReticleColor = TODO - break; - case 0x618d150a: - sldrThis.unknown_0x618d150a = input.ReadFloat(); - break; - case 0x209a2a8c: - sldrThis.unknown_0x209a2a8c = input.ReadFloat(); - break; - case 0xacb3f8f7: - sldrThis.unknown_0xacb3f8f7 = input.ReadFloat(); - break; - case 0xeda4c771: - sldrThis.unknown_0xeda4c771 = input.ReadFloat(); - break; - case 0xd3427574: - sldrThis.unknown_0xd3427574 = input.ReadFloat(); - break; - case 0x92554af2: - sldrThis.unknown_0x92554af2 = input.ReadFloat(); - break; - case 0x1e134e75: - sldrThis.unknown_0x1e134e75 = input.ReadFloat(); - break; - case 0x5f0471f3: - sldrThis.unknown_0x5f0471f3 = input.ReadFloat(); - break; - case 0xe90548ac: - sldrThis.unknown_0xe90548ac = input.ReadFloat(); - break; - case 0xa812772a: - sldrThis.unknown_0xa812772a = input.ReadFloat(); - break; - case 0x2d75c7be: - sldrThis.unknown_0x2d75c7be = input.ReadFloat(); - break; - case 0x6c62f838: - sldrThis.unknown_0x6c62f838 = input.ReadFloat(); - break; - case 0xf98e6242: - sldrThis.unknown_0xf98e6242 = input.ReadFloat(); - break; - case 0xb8995dc4: - sldrThis.unknown_0xb8995dc4 = input.ReadFloat(); - break; - case 0x5009c614: - sldrThis.unknown_0x5009c614 = input.ReadFloat(); - break; - case 0x111ef992: - sldrThis.unknown_0x111ef992 = input.ReadFloat(); - break; - case 0xec0ff888: - sldrThis.grappleIconScale = input.ReadFloat(); - break; - case 0xf229e05e: - sldrThis.grappleIconScaleInactive = input.ReadFloat(); - break; - case 0x498d794a: - sldrThis.unknown_0x498d794a = input.ReadFloat(); - break; - case 0x089a46cc: - sldrThis.unknown_0x089a46cc = input.ReadFloat(); - break; - case 0xf7998e63: - // sldrThis.grappleIconColor = TODO - break; - case 0x3ce853e3: - // sldrThis.grappleIconColorInactive = TODO - break; - case 0x083b1cc8: - // sldrThis.unknown_0x083b1cc8 = TODO - break; - case 0x966982b1: - sldrThis.unknown_0x966982b1 = input.ReadFloat(); - break; - case 0xf9799f5f: - // sldrThis.unknown_0xf9799f5f = TODO - break; - case 0x9b980788: - sldrThis.unknown_0x9b980788 = input.ReadFloat(); - break; - case 0x3523a47f: - // sldrThis.orbitPointModelColor = TODO - break; - case 0x27358b4d: - // sldrThis.crosshairsColor = TODO - break; - case 0x2ff52290: - sldrThis.unknown_0x2ff52290 = input.ReadFloat(); - break; - case 0x8a548cc9: - sldrThis.unknown_0x8a548cc9 = input.ReadBool(); - break; - case 0x65d449e1: - // sldrThis.unknown_0x65d449e1 = TODO - break; - case 0x42c7fbe4: - sldrThis.unknown_0x42c7fbe4 = input.ReadFloat(); - break; - case 0x13820c03: - sldrThis.unknown_0x13820c03 = input.ReadFloat(); - break; - case 0x52953385: - sldrThis.unknown_0x52953385 = input.ReadFloat(); - break; - case 0x0cd8fe5d: - // sldrThis.xRaySeekerReticleColor = TODO - break; - case 0xdd8cf478: - sldrThis.unknown_0xdd8cf478 = input.ReadFloat(); - break; - case 0xcbac6d52: - sldrThis.unknown_0xcbac6d52 = input.ReadFloat(); - break; - case 0x980a75b6: - sldrThis.unknown_0x980a75b6 = input.ReadFloat(); - break; - case 0xcd1e0e91: - sldrThis.unknown_0xcd1e0e91 = input.ReadFloat(); - break; - case 0xce9cf241: - sldrThis.unknown_0xce9cf241 = input.ReadFloat(); - break; - case 0xb6531e99: - sldrThis.unknown_0xb6531e99 = input.ReadFloat(); - break; - case 0x77e5c6b5: - sldrThis.unknown_0x77e5c6b5 = input.ReadFloat(); - break; - case 0xfef5668b: - sldrThis.unknown_0xfef5668b = input.ReadFloat(); - break; - case 0x5ce2a16f: - // sldrThis.healthColor = TODO - break; - case 0x1e179603: - LoadTypedefSLdrTweakTargeting_VulnerabilityIndicator(sldrThis.powerVulnerabilityIndicator, input); - break; - case 0x2b70cef8: - LoadTypedefSLdrTweakTargeting_VulnerabilityIndicator(sldrThis.lightVulnerabilityIndicator, input); - break; - case 0x946cefde: - LoadTypedefSLdrTweakTargeting_VulnerabilityIndicator(sldrThis.darkVulnerabilityIndicator, input); - break; - case 0x921c86e1: - LoadTypedefSLdrTweakTargeting_VulnerabilityIndicator(sldrThis.annihilatorVulnerabilityIndicator, input); - break; - default: - input.ReadBytes(nullptr, propertySize); - break; - } - } -} */ #endif // _SLDRTWEAKTARGETING