diff --git a/include/MetroidPrime/ScriptLoader/SLdrActorParameters.hpp b/include/MetroidPrime/ScriptLoader/SLdrActorParameters.hpp index 497b9c3..b7a6df7 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrActorParameters.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrActorParameters.hpp @@ -13,21 +13,21 @@ struct SLdrActorParameters { SLdrLightParameters lighting; SLdrScannableParameters scannable; - CAssetId dark_model; - CAssetId dark_skin; - CAssetId echo_model; - CAssetId echo_skin; - bool use_global_render_time; - float fade_in_time; - float fade_out_time; + CAssetId darkModel; + CAssetId darkSkin; + CAssetId echoModel; + CAssetId echoSkin; + bool useGlobalRenderTime; + float fadeInTime; + float fadeOutTime; SLdrVisorParameters visor; bool unknown_0xcd4c81a1; - bool force_render_unsorted; - bool takes_projected_shadow; + bool forceRenderUnsorted; + bool takesProjectedShadow; bool unknown_0xf07981e8; bool unknown_0x6df33845; - int max_volume; - int max_echo_volume; + int maxVolume; + int maxEchoVolume; }; void LoadTypedefSLdrActorParameters(SLdrActorParameters&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrAudioPlaybackParms.hpp b/include/MetroidPrime/ScriptLoader/SLdrAudioPlaybackParms.hpp index 86343b6..4d4665b 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrAudioPlaybackParms.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrAudioPlaybackParms.hpp @@ -7,12 +7,12 @@ struct SLdrAudioPlaybackParms { SLdrAudioPlaybackParms(); ~SLdrAudioPlaybackParms(); - float maximum_distance; - float fall_off; - int sound_id; - int max_volume; - int min_volume; - bool use_room_acoustics; + float maximumDistance; + float fallOff; + int soundId; + int maxVolume; + int minVolume; + bool useRoomAcoustics; }; void LoadTypedefSLdrAudioPlaybackParms(SLdrAudioPlaybackParms&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrBasicSwarmProperties.hpp b/include/MetroidPrime/ScriptLoader/SLdrBasicSwarmProperties.hpp index c6e7c3e..9d55bf8 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrBasicSwarmProperties.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrBasicSwarmProperties.hpp @@ -11,43 +11,43 @@ struct SLdrBasicSwarmProperties { SLdrBasicSwarmProperties(); ~SLdrBasicSwarmProperties(); - SLdrDamageInfo contact_damage; - float damage_wait_time; - float collision_radius; - float touch_radius; - float damage_radius; + SLdrDamageInfo contactDamage; + float damageWaitTime; + float collisionRadius; + float touchRadius; + float damageRadius; float speed; int count; - int max_count; - float influence_radius; + int maxCount; + float influenceRadius; float unknown_0x61959f0d; - float alignment_priority; - float separation_priority; - float path_following_priority; - float player_attract_priority; - float player_attract_distance; - float spawn_speed; - int attacker_count; - float attack_proximity; - float attack_timer; + float alignmentPriority; + float separationPriority; + float pathFollowingPriority; + float playerAttractPriority; + float playerAttractDistance; + float spawnSpeed; + int attackerCount; + float attackProximity; + float attackTimer; SLdrHealthInfo health; - SLdrDamageVulnerability damage_vulnerability; - CAssetId death_particle_effect; + SLdrDamageVulnerability damageVulnerability; + CAssetId deathParticleEffect; int unknown_0x84f81f55; float unknown_0xe1bd61d8; - float turn_rate; + float turnRate; bool unknown_0xc2208b0f; bool unknown_0x7eb5d9e8; - bool is_orbitable; + bool isOrbitable; bool unknown_0xbc01a28e; - int locomotion_looped_sound; - int attack_looped_sound; + int locomotionLoopedSound; + int attackLoopedSound; float unknown_0xd2986c43; - float max_audible_distance; - int min_volume; - int max_volume; - float freeze_duration; - float life_time; + float maxAudibleDistance; + int minVolume; + int maxVolume; + float freezeDuration; + float lifeTime; }; void LoadTypedefSLdrBasicSwarmProperties(SLdrBasicSwarmProperties&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrBehaveChance.hpp b/include/MetroidPrime/ScriptLoader/SLdrBehaveChance.hpp index e839aa0..ad1219d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrBehaveChance.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrBehaveChance.hpp @@ -11,9 +11,9 @@ struct SLdrBehaveChance { float unknown; float attack; float move; - float lurk_time; - float charge_attack; - int num_bolts; + float lurkTime; + float chargeAttack; + int numBolts; }; void LoadTypedefSLdrBehaveChance(SLdrBehaveChance&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrCameraShakerData.hpp b/include/MetroidPrime/ScriptLoader/SLdrCameraShakerData.hpp index a2fd381..866793d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrCameraShakerData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrCameraShakerData.hpp @@ -7,13 +7,13 @@ struct SLdrCameraShakerData { SLdrCameraShakerData(); ~SLdrCameraShakerData(); - int flags_camera_shaker; - float attenuation_distance; - spline horizontal_motion; - spline vertical_motion; - spline forward_motion; + int flagsCameraShaker; + float attenuationDistance; + spline horizontalMotion; + spline verticalMotion; + spline forwardMotion; float duration; - int audio_effect; + int audioEffect; }; void LoadTypedefSLdrCameraShakerData(SLdrCameraShakerData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrConditionalTest.hpp b/include/MetroidPrime/ScriptLoader/SLdrConditionalTest.hpp index 82e9e57..2898391 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrConditionalTest.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrConditionalTest.hpp @@ -9,8 +9,8 @@ struct SLdrConditionalTest { ~SLdrConditionalTest(); int boolean; - SLdrPlayerItem player_item; - int amount_or_capacity; + SLdrPlayerItem playerItem; + int amountOrCapacity; int condition; int value; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrConnection.hpp b/include/MetroidPrime/ScriptLoader/SLdrConnection.hpp index f8562c6..6641e9a 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrConnection.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrConnection.hpp @@ -8,8 +8,8 @@ struct SLdrConnection { SLdrConnection(); ~SLdrConnection(); - short connection_index; - rstl::vector< float > activation_times; + short connectionIndex; + rstl::vector< float > activationTimes; bool unknown; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrDamageInfo.hpp b/include/MetroidPrime/ScriptLoader/SLdrDamageInfo.hpp index a218af5..843ea08 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDamageInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDamageInfo.hpp @@ -8,10 +8,10 @@ struct SLdrDamageInfo { SLdrDamageInfo(); ~SLdrDamageInfo(); - SLdrWeaponType di_weapon_type; - float di_damage; - float di_radius; - float di_knock_back_power; + SLdrWeaponType diWeaponType; + float diDamage; + float diRadius; + float diKnockBackPower; }; void LoadTypedefSLdrDamageInfo(SLdrDamageInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDamageVulnerability.hpp b/include/MetroidPrime/ScriptLoader/SLdrDamageVulnerability.hpp index 0a129dd..8148463 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDamageVulnerability.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDamageVulnerability.hpp @@ -12,31 +12,31 @@ struct SLdrDamageVulnerability { SLdrWeaponVulnerability dark; SLdrWeaponVulnerability light; SLdrWeaponVulnerability annihilator; - SLdrWeaponVulnerability boost_ball; - SLdrWeaponVulnerability cannon_ball; - SLdrWeaponVulnerability screw_attack; + SLdrWeaponVulnerability boostBall; + SLdrWeaponVulnerability cannonBall; + SLdrWeaponVulnerability screwAttack; SLdrWeaponVulnerability bomb; - SLdrWeaponVulnerability power_bomb; + SLdrWeaponVulnerability powerBomb; SLdrWeaponVulnerability missile; SLdrWeaponVulnerability phazon; SLdrWeaponVulnerability ai; - SLdrWeaponVulnerability poison_water; - SLdrWeaponVulnerability dark_water; + SLdrWeaponVulnerability poisonWater; + SLdrWeaponVulnerability darkWater; SLdrWeaponVulnerability lava; - SLdrWeaponVulnerability area_damage_hot; - SLdrWeaponVulnerability area_damage_cold; - SLdrWeaponVulnerability area_damage_dark; - SLdrWeaponVulnerability area_damage_light; - SLdrWeaponVulnerability power_charge; + SLdrWeaponVulnerability areaDamageHot; + SLdrWeaponVulnerability areaDamageCold; + SLdrWeaponVulnerability areaDamageDark; + SLdrWeaponVulnerability areaDamageLight; + SLdrWeaponVulnerability powerCharge; SLdrWeaponVulnerability entangler; - SLdrWeaponVulnerability light_blast; - SLdrWeaponVulnerability sonic_boom; - SLdrWeaponVulnerability super_missle; - SLdrWeaponVulnerability black_hole; + SLdrWeaponVulnerability lightBlast; + SLdrWeaponVulnerability sonicBoom; + SLdrWeaponVulnerability superMissle; + SLdrWeaponVulnerability blackHole; SLdrWeaponVulnerability sunburst; SLdrWeaponVulnerability imploder; - SLdrWeaponVulnerability weapon_vulnerability; - SLdrWeaponVulnerability normal_safe_zone; + SLdrWeaponVulnerability weaponVulnerability; + SLdrWeaponVulnerability normalSafeZone; }; void LoadTypedefSLdrDamageVulnerability(SLdrDamageVulnerability&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDarkCommandoData.hpp b/include/MetroidPrime/ScriptLoader/SLdrDarkCommandoData.hpp index 327fdfd..437c3cd 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDarkCommandoData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDarkCommandoData.hpp @@ -12,16 +12,16 @@ struct SLdrDarkCommandoData { SLdrDarkCommandoData(); ~SLdrDarkCommandoData(); - float lurk_chance; - float taunt_chance; + float lurkChance; + float tauntChance; float unknown; - float charge_beam_attack_chance; - SLdrDamageInfo blade_damage; - SLdrAudioPlaybackParms sound_impact_rag_doll; - SLdrAudioPlaybackParms sound_hurled_death; - SLdrUnknownStruct12 unknown_struct12; - SLdrUnknownStruct13 unknown_struct13; - SLdrUnknownStruct14 unknown_struct14; + float chargeBeamAttackChance; + SLdrDamageInfo bladeDamage; + SLdrAudioPlaybackParms soundImpactRagDoll; + SLdrAudioPlaybackParms soundHurledDeath; + SLdrUnknownStruct12 unknownStruct12; + SLdrUnknownStruct13 unknownStruct13; + SLdrUnknownStruct14 unknownStruct14; }; void LoadTypedefSLdrDarkCommandoData(SLdrDarkCommandoData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianData.hpp b/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianData.hpp index 1c000bf..ca33345 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianData.hpp @@ -13,58 +13,58 @@ struct SLdrDigitalGuardianData { SLdrDigitalGuardianData(); ~SLdrDigitalGuardianData(); - CAssetId scannable_info_crippled; + CAssetId scannableInfoCrippled; float unknown_0x0faf6a8e; float unknown_0xd3056808; float unknown_0x304b47ee; - SLdrDamageInfo leg_stab_damage; + SLdrDamageInfo legStabDamage; float unknown_0xb4561f28; - CAssetId toe_target_model; + CAssetId toeTargetModel; CAssetId part_0x783635a6; - SLdrAudioPlaybackParms sound_toe_target; - SLdrAudioPlaybackParms sound_toe_target_attack; - SLdrAudioPlaybackParms sound_toe_target_explosion; - SLdrAudioPlaybackParms sound_toe_target_hit; - SLdrAudioPlaybackParms sound_shock_wave; - SLdrShockWaveInfo shock_wave_info; - float vortex_attack_duration; - float vortex_attraction_force; + SLdrAudioPlaybackParms soundToeTarget; + SLdrAudioPlaybackParms soundToeTargetAttack; + SLdrAudioPlaybackParms soundToeTargetExplosion; + SLdrAudioPlaybackParms soundToeTargetHit; + SLdrAudioPlaybackParms soundShockWave; + SLdrShockWaveInfo shockWaveInfo; + float vortexAttackDuration; + float vortexAttractionForce; float unknown_0x348bff02; - float vortex_linear_velocity; - float vortex_linear_acceleration; - SLdrDamageInfo vortex_damage; + float vortexLinearVelocity; + float vortexLinearAcceleration; + SLdrDamageInfo vortexDamage; int unknown_0xfb5263e8; int unknown_0x6aaf33e3; float unknown_0x4f5d725c; - SLdrAudioPlaybackParms sound_vortex_flash; - CAssetId leg_model; - CAssetId shin_armor; + SLdrAudioPlaybackParms soundVortexFlash; + CAssetId legModel; + CAssetId shinArmor; float unknown_0xe3dd61e6; - SLdrAudioPlaybackParms sound_knee_armor_hit; - SLdrAudioPlaybackParms sound_knee_vulnerable; - CAssetId knee_armor; - SLdrEchoParameters echo_parameters_0x7b5b7312; + SLdrAudioPlaybackParms soundKneeArmorHit; + SLdrAudioPlaybackParms soundKneeVulnerable; + CAssetId kneeArmor; + SLdrEchoParameters echoParameters_0x7b5b7312; float unknown_0xa324e26c; float unknown_0x6a754ebd; - float jump_timer; + float jumpTimer; float unknown_0x8106cda9; float unknown_0x9e1b8105; float unknown_0xa08fcc70; float unknown_0x3254a16b; - CAssetId transmission_beacon; + CAssetId transmissionBeacon; CAssetId part_0x3fa7df1c; - SLdrEchoParameters echo_parameters_0x021b6f9d; - SLdrAudioPlaybackParms sound_transmission_beacon; - SLdrAudioPlaybackParms audio_playback_parms; - SLdrAudioPlaybackParms sound_beacon_retract; + SLdrEchoParameters echoParameters_0x021b6f9d; + SLdrAudioPlaybackParms soundTransmissionBeacon; + SLdrAudioPlaybackParms audioPlaybackParms; + SLdrAudioPlaybackParms soundBeaconRetract; float unknown_0x4f6d27d3; CAssetId part_0x71f0c674; CAssetId part_0xc8ec315b; - SLdrAudioPlaybackParms sound_beacon_explode; - SLdrAudioPlaybackParms sound_beacon_hit; - SLdrDamageVulnerability knee_vulnerability; - SLdrDamageVulnerability vortex_vulnerability; - SLdrDamageVulnerability toe_target_vulnerability; + SLdrAudioPlaybackParms soundBeaconExplode; + SLdrAudioPlaybackParms soundBeaconHit; + SLdrDamageVulnerability kneeVulnerability; + SLdrDamageVulnerability vortexVulnerability; + SLdrDamageVulnerability toeTargetVulnerability; }; void LoadTypedefSLdrDigitalGuardianData(SLdrDigitalGuardianData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianHeadData.hpp b/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianHeadData.hpp index 62ef310..113fc8e 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianHeadData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianHeadData.hpp @@ -14,64 +14,64 @@ struct SLdrDigitalGuardianHeadData { SLdrDigitalGuardianHeadData(); ~SLdrDigitalGuardianHeadData(); - CAssetId scannable_info_shield_head; - CAssetId scannable_info_stunned_head; - CAssetId scannable_info_final_head; - CAssetId head_armor; - float max_turn_speed; - float max_linear_velocity; + CAssetId scannableInfoShieldHead; + CAssetId scannableInfoStunnedHead; + CAssetId scannableInfoFinalHead; + CAssetId headArmor; + float maxTurnSpeed; + float maxLinearVelocity; float unknown_0xe7de8b82; float unknown_0x96e18283; float unknown_0xf77138d5; float unknown_0x8a83a097; float unknown_0xd919fb13; - SLdrAudioPlaybackParms audio_playback_parms_0x0a693a04; + SLdrAudioPlaybackParms audioPlaybackParms_0x0a693a04; float unknown_0x1cc6d870; CAssetId part_0x5ff0b26c; - SLdrAudioPlaybackParms audio_playback_parms_0x50baee63; - SLdrAudioPlaybackParms audio_playback_parms_0xa5e1ec03; - SLdrAudioPlaybackParms audio_playback_parms_0x8d6053cb; + SLdrAudioPlaybackParms audioPlaybackParms_0x50baee63; + SLdrAudioPlaybackParms audioPlaybackParms_0xa5e1ec03; + SLdrAudioPlaybackParms audioPlaybackParms_0x8d6053cb; CAssetId part_0xc91ef399; float unknown_0x7d3d44af; - CAssetId echo_targets; + CAssetId echoTargets; CAssetId part_0x342ae844; - CAssetId explode_energy_stuff; - SLdrAudioPlaybackParms audio_playback_parms_0x76eedd2a; - SLdrAudioPlaybackParms audio_playback_parms_0xa5ecbe17; - SLdrAudioPlaybackParms audio_playback_parms_0xb1fc705f; - SLdrAudioPlaybackParms audio_playback_parms_0x2bc2677a; - SLdrAudioPlaybackParms audio_playback_parms_0x7f5b82b2; - SLdrEchoParameters echo_parameters; + CAssetId explodeEnergyStuff; + SLdrAudioPlaybackParms audioPlaybackParms_0x76eedd2a; + SLdrAudioPlaybackParms audioPlaybackParms_0xa5ecbe17; + SLdrAudioPlaybackParms audioPlaybackParms_0xb1fc705f; + SLdrAudioPlaybackParms audioPlaybackParms_0x2bc2677a; + SLdrAudioPlaybackParms audioPlaybackParms_0x7f5b82b2; + SLdrEchoParameters echoParameters; float unknown_0x8317610f; CAssetId part_0x321c97a9; - SLdrAudioPlaybackParms audio_playback_parms_0xd5cc7e71; - SLdrAudioPlaybackParms audio_playback_parms_0xa62c0ea7; - SLdrAudioPlaybackParms audio_playback_parms_0xfd9f5486; - CAssetId annihilator_pulse; - SLdrDamageInfo annihilator_pulse_damage; - CAssetId annihilator_charge; - SLdrDamageInfo annihilator_charge_damage; + SLdrAudioPlaybackParms audioPlaybackParms_0xd5cc7e71; + SLdrAudioPlaybackParms audioPlaybackParms_0xa62c0ea7; + SLdrAudioPlaybackParms audioPlaybackParms_0xfd9f5486; + CAssetId annihilatorPulse; + SLdrDamageInfo annihilatorPulseDamage; + CAssetId annihilatorCharge; + SLdrDamageInfo annihilatorChargeDamage; float unknown_0xff7688bf; int unknown_0x12ebb390; CAssetId frme; - SLdrPlasmaBeamInfo plasma_beam_info; - CAssetId lock_on_missiles; - SLdrDamageInfo lock_on_missiles_damage; - CAssetId machine_gun; - SLdrDamageInfo machine_gun_damage; - SLdrAudioPlaybackParms sound_machine_gun; + SLdrPlasmaBeamInfo plasmaBeamInfo; + CAssetId lockOnMissiles; + SLdrDamageInfo lockOnMissilesDamage; + CAssetId machineGun; + SLdrDamageInfo machineGunDamage; + SLdrAudioPlaybackParms soundMachineGun; float unknown_0x4ab23ffe; float unknown_0x81a8474f; float unknown_0x71c406ac; float unknown_0xe5bc88b7; - SLdrDigitalGuardianHeadStruct digital_guardian_head_struct_0x8f6732ea; - SLdrDigitalGuardianHeadStruct digital_guardian_head_struct_0x8e128141; - SLdrDigitalGuardianHeadStruct digital_guardian_head_struct_0xea54b390; - SLdrDigitalGuardianHeadStruct digital_guardian_head_struct_0xbbd3e7a7; - SLdrDigitalGuardianHeadStruct digital_guardian_head_struct_0x2dd88764; - SLdrDigitalGuardianHeadStruct digital_guardian_head_struct_0x48b46e55; - SLdrDamageVulnerability bomb_pit_vulnerability; - SLdrDamageVulnerability echo_target_vulnerability; + SLdrDigitalGuardianHeadStruct digitalGuardianHeadStruct_0x8f6732ea; + SLdrDigitalGuardianHeadStruct digitalGuardianHeadStruct_0x8e128141; + SLdrDigitalGuardianHeadStruct digitalGuardianHeadStruct_0xea54b390; + SLdrDigitalGuardianHeadStruct digitalGuardianHeadStruct_0xbbd3e7a7; + SLdrDigitalGuardianHeadStruct digitalGuardianHeadStruct_0x2dd88764; + SLdrDigitalGuardianHeadStruct digitalGuardianHeadStruct_0x48b46e55; + SLdrDamageVulnerability bombPitVulnerability; + SLdrDamageVulnerability echoTargetVulnerability; }; void LoadTypedefSLdrDigitalGuardianHeadData(SLdrDigitalGuardianHeadData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianHeadStruct.hpp b/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianHeadStruct.hpp index 3596921..4b89092 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianHeadStruct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDigitalGuardianHeadStruct.hpp @@ -7,9 +7,9 @@ struct SLdrDigitalGuardianHeadStruct { SLdrDigitalGuardianHeadStruct(); ~SLdrDigitalGuardianHeadStruct(); - int first_shot_type; - float projectile_telegraph_time; - float projectile_attack_time; + int firstShotType; + float projectileTelegraphTime; + float projectileAttackTime; float unknown_0xfdfca535; float unknown_0xcd03632c; float unknown_0xf1548397; diff --git a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightFalloff.hpp b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightFalloff.hpp index 42a31d9..421562c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightFalloff.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightFalloff.hpp @@ -7,10 +7,10 @@ struct SLdrDynamicLightFalloff { SLdrDynamicLightFalloff(); ~SLdrDynamicLightFalloff(); - int falloff_type; - spline falloff_rate; - float falloff_rate_duration; - bool falloff_rate_loops; + int falloffType; + spline falloffRate; + float falloffRateDuration; + bool falloffRateLoops; }; void LoadTypedefSLdrDynamicLightFalloff(SLdrDynamicLightFalloff&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightIntensity.hpp b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightIntensity.hpp index 915b0bd..f9b26c2 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightIntensity.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightIntensity.hpp @@ -8,8 +8,8 @@ struct SLdrDynamicLightIntensity { ~SLdrDynamicLightIntensity(); spline intensity; - float intensity_duration; - bool intensity_loops; + float intensityDuration; + bool intensityLoops; }; void LoadTypedefSLdrDynamicLightIntensity(SLdrDynamicLightIntensity&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightMotionSpline.hpp b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightMotionSpline.hpp index 9087f23..045be4f 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightMotionSpline.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightMotionSpline.hpp @@ -8,10 +8,10 @@ struct SLdrDynamicLightMotionSpline { SLdrDynamicLightMotionSpline(); ~SLdrDynamicLightMotionSpline(); - bool motion_spline_path_loops; - SLdrSplineType motion_spline_type; - spline motion_control_spline; - float motion_spline_duration; + bool motionSplinePathLoops; + SLdrSplineType motionSplineType; + spline motionControlSpline; + float motionSplineDuration; }; void LoadTypedefSLdrDynamicLightMotionSpline(SLdrDynamicLightMotionSpline&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightParent.hpp b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightParent.hpp index 5f2b282..4dcc3fd 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightParent.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightParent.hpp @@ -11,8 +11,8 @@ struct SLdrDynamicLightParent { CVector3f unknown_0xddd74295; CVector3f unknown_0x88f018b3; - rstl::string locator_name; - bool use_parent_rotation; + rstl::string locatorName; + bool useParentRotation; }; void LoadTypedefSLdrDynamicLightParent(SLdrDynamicLightParent&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightSpotlight.hpp b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightSpotlight.hpp index 9e52bd9..67bf5b6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrDynamicLightSpotlight.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrDynamicLightSpotlight.hpp @@ -7,9 +7,9 @@ struct SLdrDynamicLightSpotlight { SLdrDynamicLightSpotlight(); ~SLdrDynamicLightSpotlight(); - spline spotlight_angle; - float spotlight_angle_duration; - bool spotlight_angle_loops; + spline spotlightAngle; + float spotlightAngleDuration; + bool spotlightAngleLoops; }; void LoadTypedefSLdrDynamicLightSpotlight(SLdrDynamicLightSpotlight&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrEchoParameters.hpp b/include/MetroidPrime/ScriptLoader/SLdrEchoParameters.hpp index d67ec9c..7b643b2 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrEchoParameters.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrEchoParameters.hpp @@ -7,12 +7,12 @@ struct SLdrEchoParameters { SLdrEchoParameters(); ~SLdrEchoParameters(); - bool is_echo_emitter; - bool only_emit_damage; - int num_sound_waves; - float space_between_waves; - float wave_line_size; - float forced_minimum_vis; + bool isEchoEmitter; + bool onlyEmitDamage; + int numSoundWaves; + float spaceBetweenWaves; + float waveLineSize; + float forcedMinimumVis; }; void LoadTypedefSLdrEchoParameters(SLdrEchoParameters&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage1Data.hpp b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage1Data.hpp index bc74a7a..0b4092d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage1Data.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage1Data.hpp @@ -15,23 +15,23 @@ struct SLdrEmperorIngStage1Data { ~SLdrEmperorIngStage1Data(); SLdrEmperorIngStage1TentacleData tentacle; - SLdrUnknownStruct20 unknown_struct20; - SLdrUnknownStruct21 unknown_struct21; - SLdrUnknownStruct22 unknown_struct22; - SLdrUnknownStruct23 unknown_struct23; - SLdrUnknownStruct24 unknown_struct24; - float heart_exposed_time; + SLdrUnknownStruct20 unknownStruct20; + SLdrUnknownStruct21 unknownStruct21; + SLdrUnknownStruct22 unknownStruct22; + SLdrUnknownStruct23 unknownStruct23; + SLdrUnknownStruct24 unknownStruct24; + float heartExposedTime; float unknown_0x905938b8; float unknown_0xb826317a; - SLdrAudioPlaybackParms heart_damage_sound; - float turn_speed_accel; - float max_turn_speed_normal; - float max_turn_speed_melee; + SLdrAudioPlaybackParms heartDamageSound; + float turnSpeedAccel; + float maxTurnSpeedNormal; + float maxTurnSpeedMelee; float unknown_0xe5a7c358; - int vulnerability_change_sound; - float taunt_frequency; - float attack_interval_min; - float attack_interval_max; + int vulnerabilityChangeSound; + float tauntFrequency; + float attackIntervalMin; + float attackIntervalMax; }; void LoadTypedefSLdrEmperorIngStage1Data(SLdrEmperorIngStage1Data&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage1TentacleData.hpp b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage1TentacleData.hpp index 6c21458..fff291c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage1TentacleData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage1TentacleData.hpp @@ -10,12 +10,12 @@ struct SLdrEmperorIngStage1TentacleData { ~SLdrEmperorIngStage1TentacleData(); SLdrHealthInfo health; - SLdrDamageVulnerability normal_vulnerability; - SLdrDamageVulnerability warp_attack_vulnerability; - SLdrDamageVulnerability melee_attack_vulnerability; - SLdrDamageVulnerability projectile_attack_vulnerability; - float stay_retracted_time; - int tentacle_damaged_sound; + SLdrDamageVulnerability normalVulnerability; + SLdrDamageVulnerability warpAttackVulnerability; + SLdrDamageVulnerability meleeAttackVulnerability; + SLdrDamageVulnerability projectileAttackVulnerability; + float stayRetractedTime; + int tentacleDamagedSound; }; void LoadTypedefSLdrEmperorIngStage1TentacleData(SLdrEmperorIngStage1TentacleData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage2TentacleData.hpp b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage2TentacleData.hpp index 3d16c5e..8096039 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage2TentacleData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage2TentacleData.hpp @@ -7,8 +7,8 @@ struct SLdrEmperorIngStage2TentacleData { SLdrEmperorIngStage2TentacleData(); ~SLdrEmperorIngStage2TentacleData(); - float detection_time; - float forget_time; + float detectionTime; + float forgetTime; }; void LoadTypedefSLdrEmperorIngStage2TentacleData(SLdrEmperorIngStage2TentacleData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3Data.hpp b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3Data.hpp index e9d0dbe..b7edf41 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3Data.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3Data.hpp @@ -17,31 +17,31 @@ struct SLdrEmperorIngStage3Data { SLdrEmperorIngStage3Data(); ~SLdrEmperorIngStage3Data(); - float taunt_frequency; - SLdrHealthInfo yellow_health; + float tauntFrequency; + SLdrHealthInfo yellowHealth; SLdrHealthInfo health; - float vulnerable_time; - float vulnerable_damage_threshold; - SLdrDamageVulnerability red_vulnerability; - SLdrDamageVulnerability light_vulnerability; - SLdrDamageVulnerability dark_vulnerability; - SLdrDamageInfo melee_damage; - SLdrDamageInfo damage_info; - SLdrDamageInfo jump_slide_damage; - SLdrDamageInfo ground_pound_damage; - SLdrEmperorIngStage3StructA emperor_ing_stage3_struct_a_0x98e311c1; - SLdrEmperorIngStage3StructA emperor_ing_stage3_struct_a_0x93dae216; - CAssetId light_swarm_effect; - SLdrBasicSwarmProperties light_swarm_properties; - SLdrAudioPlaybackParms light_swarm_death_sound; - SLdrAudioPlaybackParms audio_playback_parms; - SLdrUnknownStruct26 unknown_struct26; - SLdrShockWaveInfo jump_attack_shock_wave_info; + float vulnerableTime; + float vulnerableDamageThreshold; + SLdrDamageVulnerability redVulnerability; + SLdrDamageVulnerability lightVulnerability; + SLdrDamageVulnerability darkVulnerability; + SLdrDamageInfo meleeDamage; + SLdrDamageInfo damageInfo; + SLdrDamageInfo jumpSlideDamage; + SLdrDamageInfo groundPoundDamage; + SLdrEmperorIngStage3StructA emperorIngStage3StructA_0x98e311c1; + SLdrEmperorIngStage3StructA emperorIngStage3StructA_0x93dae216; + CAssetId lightSwarmEffect; + SLdrBasicSwarmProperties lightSwarmProperties; + SLdrAudioPlaybackParms lightSwarmDeathSound; + SLdrAudioPlaybackParms audioPlaybackParms; + SLdrUnknownStruct26 unknownStruct26; + SLdrShockWaveInfo jumpAttackShockWaveInfo; int sound; - SLdrEmperorIngStage3StructB emperor_ing_stage3_struct_b_0xe843417f; - SLdrEmperorIngStage3StructB emperor_ing_stage3_struct_b_0xd13bec3f; - SLdrEmperorIngStage3StructB emperor_ing_stage3_struct_b_0xc61388ff; - SLdrEmperorIngStage3StructB emperor_ing_stage3_struct_b_0xa3cab6bf; + SLdrEmperorIngStage3StructB emperorIngStage3StructB_0xe843417f; + SLdrEmperorIngStage3StructB emperorIngStage3StructB_0xd13bec3f; + SLdrEmperorIngStage3StructB emperorIngStage3StructB_0xc61388ff; + SLdrEmperorIngStage3StructB emperorIngStage3StructB_0xa3cab6bf; }; void LoadTypedefSLdrEmperorIngStage3Data(SLdrEmperorIngStage3Data&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3StructA.hpp b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3StructA.hpp index 3409c9f..9e18a32 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3StructA.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3StructA.hpp @@ -9,9 +9,9 @@ struct SLdrEmperorIngStage3StructA { SLdrEmperorIngStage3StructA(); ~SLdrEmperorIngStage3StructA(); - SLdrPlasmaBeamInfo beam_info; + SLdrPlasmaBeamInfo beamInfo; SLdrDamageInfo damage; - int beam_sound; + int beamSound; }; void LoadTypedefSLdrEmperorIngStage3StructA(SLdrEmperorIngStage3StructA&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3StructB.hpp b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3StructB.hpp index 1b6919c..7844c1f 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3StructB.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrEmperorIngStage3StructB.hpp @@ -8,17 +8,17 @@ struct SLdrEmperorIngStage3StructB { SLdrEmperorIngStage3StructB(); ~SLdrEmperorIngStage3StructB(); - float min_health_percentage; + float minHealthPercentage; float unknown_0x95e7a2c2; float unknown_0x76ba1c18; - SLdrUnknownStruct2 unknown_struct2_0x3826ec75; - SLdrUnknownStruct2 unknown_struct2_0x93bf1106; - SLdrUnknownStruct2 unknown_struct2_0xc4b88b80; - SLdrUnknownStruct2 unknown_struct2_0x32c6dc77; - SLdrUnknownStruct2 unknown_struct2_0xc6e7b293; - SLdrUnknownStruct2 unknown_struct2_0x20746b56; - SLdrUnknownStruct2 unknown_struct2_0x2ab44adb; - SLdrUnknownStruct2 unknown_struct2_0xe2e78a78; + SLdrUnknownStruct2 unknownStruct2_0x3826ec75; + SLdrUnknownStruct2 unknownStruct2_0x93bf1106; + SLdrUnknownStruct2 unknownStruct2_0xc4b88b80; + SLdrUnknownStruct2 unknownStruct2_0x32c6dc77; + SLdrUnknownStruct2 unknownStruct2_0xc6e7b293; + SLdrUnknownStruct2 unknownStruct2_0x20746b56; + SLdrUnknownStruct2 unknownStruct2_0x2ab44adb; + SLdrUnknownStruct2 unknownStruct2_0xe2e78a78; }; void LoadTypedefSLdrEmperorIngStage3StructB(SLdrEmperorIngStage3StructB&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrGrappleParameters.hpp b/include/MetroidPrime/ScriptLoader/SLdrGrappleParameters.hpp index 77ad317..f274be6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrGrappleParameters.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrGrappleParameters.hpp @@ -7,16 +7,16 @@ struct SLdrGrappleParameters { SLdrGrappleParameters(); ~SLdrGrappleParameters(); - float grapple_length; - float grapple_attach_length; - float grapple_spring_constant; - float grapple_spring_length; + float grappleLength; + float grappleAttachLength; + float grappleSpringConstant; + float grappleSpringLength; float unknown_0x987f68c7; - float swing_force; - float swing_max_force; - float swing_arc_angle; - float swing_turn_angle; - float swing_camera_pitch; + float swingForce; + float swingMaxForce; + float swingArcAngle; + float swingTurnAngle; + float swingCameraPitch; float unknown_0xf9e45827; bool unknown_0x11b6a17a; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrGuiWidgetProperties.hpp b/include/MetroidPrime/ScriptLoader/SLdrGuiWidgetProperties.hpp index cc5e762..65ffdca 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrGuiWidgetProperties.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrGuiWidgetProperties.hpp @@ -8,9 +8,9 @@ struct SLdrGuiWidgetProperties { SLdrGuiWidgetProperties(); ~SLdrGuiWidgetProperties(); - rstl::string gui_label; - int controller_number; - bool is_locked; + rstl::string guiLabel; + int controllerNumber; + bool isLocked; }; void LoadTypedefSLdrGuiWidgetProperties(SLdrGuiWidgetProperties&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrHealthInfo.hpp b/include/MetroidPrime/ScriptLoader/SLdrHealthInfo.hpp index ea35f8e..4f83be2 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrHealthInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrHealthInfo.hpp @@ -8,7 +8,7 @@ struct SLdrHealthInfo { ~SLdrHealthInfo(); float health; - float hi_knock_back_resistance; + float hiKnockBackResistance; }; void LoadTypedefSLdrHealthInfo(SLdrHealthInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrIngBoostBallGuardianStruct.hpp b/include/MetroidPrime/ScriptLoader/SLdrIngBoostBallGuardianStruct.hpp index c0cc263..3f1fa2c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrIngBoostBallGuardianStruct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrIngBoostBallGuardianStruct.hpp @@ -19,8 +19,8 @@ struct SLdrIngBoostBallGuardianStruct { int unknown_0xa6fd6d54; int unknown_0xecb314b6; int unknown_0xa9b15734; - float locomotion_speed_scale; - float ing_spot_speed_scale; + float locomotionSpeedScale; + float ingSpotSpeedScale; }; void LoadTypedefSLdrIngBoostBallGuardianStruct(SLdrIngBoostBallGuardianStruct&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrIngPossessionData.hpp b/include/MetroidPrime/ScriptLoader/SLdrIngPossessionData.hpp index c160be3..1cd53ef 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrIngPossessionData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrIngPossessionData.hpp @@ -10,15 +10,15 @@ struct SLdrIngPossessionData { SLdrIngPossessionData(); ~SLdrIngPossessionData(); - bool is_an_encounter; + bool isAnEncounter; bool unknown_0xb68c0aa3; - CAssetId ing_possessed_model; - CAssetId ing_possessed_skin_rules; - CAssetId dark_scan_info; - SLdrHealthInfo ing_possessed_health; - float ing_possessed_damage_multiplier; + CAssetId ingPossessedModel; + CAssetId ingPossessedSkinRules; + CAssetId darkScanInfo; + SLdrHealthInfo ingPossessedHealth; + float ingPossessedDamageMultiplier; int unknown_0x2befc1bf; - SLdrDamageVulnerability ing_vulnerability; + SLdrDamageVulnerability ingVulnerability; }; void LoadTypedefSLdrIngPossessionData(SLdrIngPossessionData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrIngSpaceJumpGuardianStruct.hpp b/include/MetroidPrime/ScriptLoader/SLdrIngSpaceJumpGuardianStruct.hpp index 0d3436a..7dc3846 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrIngSpaceJumpGuardianStruct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrIngSpaceJumpGuardianStruct.hpp @@ -7,10 +7,10 @@ struct SLdrIngSpaceJumpGuardianStruct { SLdrIngSpaceJumpGuardianStruct(); ~SLdrIngSpaceJumpGuardianStruct(); - float taunt_chance; - float attack_chance; + float tauntChance; + float attackChance; float unknown_0x03698c10; - float locomotion_speed; + float locomotionSpeed; float unknown_0x3e370622; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrIngSpiderballGuardianStruct.hpp b/include/MetroidPrime/ScriptLoader/SLdrIngSpiderballGuardianStruct.hpp index 9ea0bca..9c18d6a 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrIngSpiderballGuardianStruct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrIngSpiderballGuardianStruct.hpp @@ -7,14 +7,14 @@ struct SLdrIngSpiderballGuardianStruct { SLdrIngSpiderballGuardianStruct(); ~SLdrIngSpiderballGuardianStruct(); - float min_patrol_speed; - float max_patrol_speed; - float linear_acceleration; - float angular_speed; + float minPatrolSpeed; + float maxPatrolSpeed; + float linearAcceleration; + float angularSpeed; float unknown; - float stunned_speed; - float stunned_time; - float max_charge_time; + float stunnedSpeed; + float stunnedTime; + float maxChargeTime; }; void LoadTypedefSLdrIngSpiderballGuardianStruct(SLdrIngSpiderballGuardianStruct&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrLayerInfo.hpp b/include/MetroidPrime/ScriptLoader/SLdrLayerInfo.hpp index d2e4fe9..4dcc67b 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrLayerInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrLayerInfo.hpp @@ -7,11 +7,11 @@ struct SLdrLayerInfo { SLdrLayerInfo(); ~SLdrLayerInfo(); - int motion_type; + int motionType; float unknown; float rotation; float amplitude; - float texture_scale; + float textureScale; }; void LoadTypedefSLdrLayerInfo(SLdrLayerInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrLayerSwitch.hpp b/include/MetroidPrime/ScriptLoader/SLdrLayerSwitch.hpp index fa81369..2ba4332 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrLayerSwitch.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrLayerSwitch.hpp @@ -7,8 +7,8 @@ struct SLdrLayerSwitch { SLdrLayerSwitch(); ~SLdrLayerSwitch(); - int area_id; - int layer_number; + int areaId; + int layerNumber; }; void LoadTypedefSLdrLayerSwitch(SLdrLayerSwitch&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrLightParameters.hpp b/include/MetroidPrime/ScriptLoader/SLdrLightParameters.hpp index 1f9ffcd..e02f080 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrLightParameters.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrLightParameters.hpp @@ -9,21 +9,21 @@ struct SLdrLightParameters { SLdrLightParameters(); ~SLdrLightParameters(); - bool cast_shadow; - float shadow_scale; + bool castShadow; + float shadowScale; int unknown_0xecda4163; - float shadow_alpha; - float max_shadow_height; - CColor ambient_color; + float shadowAlpha; + float maxShadowHeight; + CColor ambientColor; bool unknown_0xa71810e9; - int world_lighting_options; - int light_recalculation; - CVector3f lighting_position_offset; - int num_dynamic_lights; - int num_area_lights; - bool use_old_lighting; - bool ignore_ambient_lighting; - int use_light_set; + int worldLightingOptions; + int lightRecalculation; + CVector3f lightingPositionOffset; + int numDynamicLights; + int numAreaLights; + bool useOldLighting; + bool ignoreAmbientLighting; + int useLightSet; }; void LoadTypedefSLdrLightParameters(SLdrLightParameters&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrMysteryFlyerData.hpp b/include/MetroidPrime/ScriptLoader/SLdrMysteryFlyerData.hpp index 2dc1c7c..69e6233 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrMysteryFlyerData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrMysteryFlyerData.hpp @@ -9,11 +9,11 @@ struct SLdrMysteryFlyerData { SLdrMysteryFlyerData(); ~SLdrMysteryFlyerData(); - CAssetId shot_projectile; - SLdrDamageInfo shot_damage; - float hover_speed; - float hover_height; - float separation_distance; + CAssetId shotProjectile; + SLdrDamageInfo shotDamage; + float hoverSpeed; + float hoverHeight; + float separationDistance; bool unknown; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrPatternedAITypedef.hpp b/include/MetroidPrime/ScriptLoader/SLdrPatternedAITypedef.hpp index dbf10d6..c88111f 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrPatternedAITypedef.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrPatternedAITypedef.hpp @@ -16,47 +16,47 @@ struct SLdrPatternedAITypedef { float mass; float speed; - float turn_speed; - float detection_range; - float detection_height_range; - float detection_angle; - float min_attack_range; - float max_attack_range; - float average_attack_time; - float attack_time_variation; - float leash_radius; - float player_leash_radius; - float player_leash_time; - SLdrDamageInfo contact_damage; - float damage_wait_time; + float turnSpeed; + float detectionRange; + float detectionHeightRange; + float detectionAngle; + float minAttackRange; + float maxAttackRange; + float averageAttackTime; + float attackTimeVariation; + float leashRadius; + float playerLeashRadius; + float playerLeashTime; + SLdrDamageInfo contactDamage; + float damageWaitTime; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; - float collision_radius; - float collision_height; - CVector3f collision_offset; - float step_up_height; + float collisionRadius; + float collisionHeight; + CVector3f collisionOffset; + float stepUpHeight; float unknown_0xe287d8dd; float unknown_0x66cdc6e8; - float x_damage_delay; - int sound_x_damage; - SLdrAnimationParameters animation_information; - CAssetId state_machine; - CAssetId state_machine2; + float xDamageDelay; + int soundXDamage; + SLdrAnimationParameters animationInformation; + CAssetId stateMachine; + CAssetId stateMachine2; float unknown_0x87d22d43; float unknown_0xf0790c1b; - float freeze_duration; - int path_mesh_index; - CVector3f gib_particles_offset; - CAssetId gib_particles; + float freezeDuration; + int pathMeshIndex; + CVector3f gibParticlesOffset; + CAssetId gibParticles; CAssetId unknown_0xf35f5164; - CVector3f ice_gib_particles_offset; - CAssetId ice_gib_particles; + CVector3f iceGibParticlesOffset; + CAssetId iceGibParticles; int sound_0x7344d6cd; int sound_0x562cf323; - int sound_frozen; - CAssetId knockback_rules; - int creature_size; - SLdrEchoParameters echo_parameters; + int soundFrozen; + CAssetId knockbackRules; + int creatureSize; + SLdrEchoParameters echoParameters; }; void LoadTypedefSLdrPatternedAITypedef(SLdrPatternedAITypedef&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrPlasmaBeamInfo.hpp b/include/MetroidPrime/ScriptLoader/SLdrPlasmaBeamInfo.hpp index e0558ed..9cfb4f6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrPlasmaBeamInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrPlasmaBeamInfo.hpp @@ -10,23 +10,23 @@ struct SLdrPlasmaBeamInfo { ~SLdrPlasmaBeamInfo(); int unknown; - CAssetId weapon_system; - CAssetId contact_effect; - CAssetId pulse_effect; - CAssetId beam_texture; - CAssetId glow_texture; + CAssetId weaponSystem; + CAssetId contactEffect; + CAssetId pulseEffect; + CAssetId beamTexture; + CAssetId glowTexture; float length; float radius; - float expansion_speed; - float life_time; - float pulse_speed; - float shutdown_time; - float contact_effect_scale; - float pulse_effect_scale; - float travel_speed; - CColor inner_color; - CColor outer_color; - CAssetId beam_streaks; + float expansionSpeed; + float lifeTime; + float pulseSpeed; + float shutdownTime; + float contactEffectScale; + float pulseEffectScale; + float travelSpeed; + CColor innerColor; + CColor outerColor; + CAssetId beamStreaks; }; void LoadTypedefSLdrPlasmaBeamInfo(SLdrPlasmaBeamInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrPlatformMotionProperties.hpp b/include/MetroidPrime/ScriptLoader/SLdrPlatformMotionProperties.hpp index 9ff529e..e0f935d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrPlatformMotionProperties.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrPlatformMotionProperties.hpp @@ -8,14 +8,14 @@ struct SLdrPlatformMotionProperties { SLdrPlatformMotionProperties(); ~SLdrPlatformMotionProperties(); - SLdrSplineType motion_spline_type; - spline motion_control_spline; - float motion_spline_duration; - float initial_time; + SLdrSplineType motionSplineType; + spline motionControlSpline; + float motionSplineDuration; + float initialTime; int unknown; - spline roll_control_spline; - spline yaw_control_spline; - spline pitch_control_spline; + spline rollControlSpline; + spline yawControlSpline; + spline pitchControlSpline; }; void LoadTypedefSLdrPlatformMotionProperties(SLdrPlatformMotionProperties&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrPowerBombGuardianStageProperties.hpp b/include/MetroidPrime/ScriptLoader/SLdrPowerBombGuardianStageProperties.hpp index 44e0fd3..e242113 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrPowerBombGuardianStageProperties.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrPowerBombGuardianStageProperties.hpp @@ -15,7 +15,7 @@ struct SLdrPowerBombGuardianStageProperties { int unknown_0xc3e002ac; float unknown_0xbb4b6680; float unknown_0xd356c997; - float double_shot_chance; + float doubleShotChance; int unknown_0x87cc8ba4; int unknown_0x6491357e; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrRezbitData.hpp b/include/MetroidPrime/ScriptLoader/SLdrRezbitData.hpp index 91d9b41..3e492ee 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrRezbitData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrRezbitData.hpp @@ -12,51 +12,51 @@ struct SLdrRezbitData { SLdrRezbitData(); ~SLdrRezbitData(); - float hearing_radius; + float hearingRadius; float unknown_0x4a6c4b40; float unknown_0x30d11671; - CAssetId model_no_holos; - CAssetId skin_no_holos; - float shield_down_time; + CAssetId modelNoHolos; + CAssetId skinNoHolos; + float shieldDownTime; float unknown_0xffb37b81; - float shield_up_time; + float shieldUpTime; float unknown_0x0d1d1648; - CAssetId shield_explode_effect; - SLdrAudioPlaybackParms sound_shield_explode; - SLdrAudioPlaybackParms sound_shield_on; - SLdrAudioPlaybackParms sound_shield_off; - SLdrAudioPlaybackParms sound_flinch; + CAssetId shieldExplodeEffect; + SLdrAudioPlaybackParms soundShieldExplode; + SLdrAudioPlaybackParms soundShieldOn; + SLdrAudioPlaybackParms soundShieldOff; + SLdrAudioPlaybackParms soundFlinch; float unknown_0xad120ad7; float unknown_0xe70ef8a3; - SLdrAudioPlaybackParms audio_playback_parms; + SLdrAudioPlaybackParms audioPlaybackParms; float unknown_0x70e597d4; float unknown_0x94980a67; float unknown_0xd02f08b0; float unknown_0x53e84718; float unknown_0x6fbc1bf9; - float energy_bolt_chance; - float cutting_laser_chance; + float energyBoltChance; + float cuttingLaserChance; float unknown_0x075491ca; float unknown_0x54f2892e; - SLdrDamageInfo energy_bolt_damage; - CAssetId energy_bolt_projectile; - float energy_bolt_attack_duration; + SLdrDamageInfo energyBoltDamage; + CAssetId energyBoltProjectile; + float energyBoltAttackDuration; float unknown_0x28944183; float unknown_0xc7a69a59; - SLdrAudioPlaybackParms sound_energy_bolt; + SLdrAudioPlaybackParms soundEnergyBolt; float unknown_0x9ede657f; float unknown_0xcd787d9b; - float virus_attack_time; - SLdrDamageInfo virus_damage; - int sound_always_ff; + float virusAttackTime; + SLdrDamageInfo virusDamage; + int soundAlwaysFf; int sound_0xbb3f8a7b; int sound_0x601f846d; float unknown_0x64c7990d; float unknown_0x376181e9; - SLdrDamageInfo cutting_laser_damage; - SLdrAudioPlaybackParms sound_cutting_laser; - SLdrPlasmaBeamInfo cutting_laser_beam_info; - SLdrDamageVulnerability shield_vulnerability; + SLdrDamageInfo cuttingLaserDamage; + SLdrAudioPlaybackParms soundCuttingLaser; + SLdrPlasmaBeamInfo cuttingLaserBeamInfo; + SLdrDamageVulnerability shieldVulnerability; }; void LoadTypedefSLdrRezbitData(SLdrRezbitData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrRotationSplines.hpp b/include/MetroidPrime/ScriptLoader/SLdrRotationSplines.hpp index 38f54d3..70a8d06 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrRotationSplines.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrRotationSplines.hpp @@ -7,9 +7,9 @@ struct SLdrRotationSplines { SLdrRotationSplines(); ~SLdrRotationSplines(); - spline x_rotation; - spline y_rotation; - spline z_rotation; + spline xRotation; + spline yRotation; + spline zRotation; }; void LoadTypedefSLdrRotationSplines(SLdrRotationSplines&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSafeZoneStructA.hpp b/include/MetroidPrime/ScriptLoader/SLdrSafeZoneStructA.hpp index 3454325..5ff9dc6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSafeZoneStructA.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSafeZoneStructA.hpp @@ -12,9 +12,9 @@ struct SLdrSafeZoneStructA { bool enabled; int mode; CColor color; - SLdrVector2f near_far_plane; - float color_rate; - SLdrVector2f distance_rate; + SLdrVector2f nearFarPlane; + float colorRate; + SLdrVector2f distanceRate; }; void LoadTypedefSLdrSafeZoneStructA(SLdrSafeZoneStructA&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSafeZoneStructB.hpp b/include/MetroidPrime/ScriptLoader/SLdrSafeZoneStructB.hpp index f0439cc..e554a4a 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSafeZoneStructB.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSafeZoneStructB.hpp @@ -9,26 +9,26 @@ struct SLdrSafeZoneStructB { SLdrSafeZoneStructB(); ~SLdrSafeZoneStructB(); - int turn_on_sound; + int turnOnSound; float unknown_0xd4839a3f; - int active_loop_sound; - int turn_off_sound; - int player_enter_sound; - int player_exit_sound; - CAssetId dark_visor_spot_texture; - float dark_visor_spot_max_size; - CAssetId shell_environment_map; - float shell1_animated_horiz_rate; - float shell1_animated_vert_rate; - float shell1_scale_horiz; - float shell1_scale_vert; - CAssetId shell1_texture; - float shell2_animated_horiz_rate; - float shell2_animated_vert_rate; - float shell2_scale_horiz; - float shell2_scale_vert; - CAssetId shell2_texture; - CColor shell_color; + int activeLoopSound; + int turnOffSound; + int playerEnterSound; + int playerExitSound; + CAssetId darkVisorSpotTexture; + float darkVisorSpotMaxSize; + CAssetId shellEnvironmentMap; + float shell1AnimatedHorizRate; + float shell1AnimatedVertRate; + float shell1ScaleHoriz; + float shell1ScaleVert; + CAssetId shell1Texture; + float shell2AnimatedHorizRate; + float shell2AnimatedVertRate; + float shell2ScaleHoriz; + float shell2ScaleVert; + CAssetId shell2Texture; + CColor shellColor; CColor unknown_0xe68b1fa8; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrSandBossData.hpp b/include/MetroidPrime/ScriptLoader/SLdrSandBossData.hpp index cdcb648..9530372 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSandBossData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSandBossData.hpp @@ -13,33 +13,33 @@ struct SLdrSandBossData { SLdrSandBossData(); ~SLdrSandBossData(); - CAssetId scannable_info1; - int command_index; - CAssetId cracked_sphere1; - CAssetId cracked_sphere2; - CAssetId cracked_sphere3; - SLdrDamageInfo snap_jaw_damage; - SLdrDamageInfo spit_out_damage; + CAssetId scannableInfo1; + int commandIndex; + CAssetId crackedSphere1; + CAssetId crackedSphere2; + CAssetId crackedSphere3; + SLdrDamageInfo snapJawDamage; + SLdrDamageInfo spitOutDamage; float unknown_0xbf88fe4f; float unknown_0x74c702b3; - CAssetId dark_beam_projectile; - SLdrDamageInfo dark_beam_damage; + CAssetId darkBeamProjectile; + SLdrDamageInfo darkBeamDamage; float unknown_0x2b42dddf; float unknown_0x1562e0d6; float unknown_0xd0db2574; - float suck_air_time; - float suck_morphball_range; - float spit_morphball_time; + float suckAirTime; + float suckMorphballRange; + float spitMorphballTime; CAssetId part; - SLdrUnknownStruct40 unknown_struct40; - SLdrUnknownStruct41 unknown_struct41; - SLdrSandBossStructA sand_boss_struct_a_0x8b452a19; - SLdrSandBossStructA sand_boss_struct_a_0x0cf8c54c; - CAssetId model_with_tail_armor; - CAssetId skin_for_armored_tail; - SLdrDamageVulnerability damage_vulnerability; - SLdrDamageVulnerability stampede_vulnerability; - SLdrDamageVulnerability suck_air_vulnerability; + SLdrUnknownStruct40 unknownStruct40; + SLdrUnknownStruct41 unknownStruct41; + SLdrSandBossStructA sandBossStructA_0x8b452a19; + SLdrSandBossStructA sandBossStructA_0x0cf8c54c; + CAssetId modelWithTailArmor; + CAssetId skinForArmoredTail; + SLdrDamageVulnerability damageVulnerability; + SLdrDamageVulnerability stampedeVulnerability; + SLdrDamageVulnerability suckAirVulnerability; }; void LoadTypedefSLdrSandBossData(SLdrSandBossData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSandBossStructA.hpp b/include/MetroidPrime/ScriptLoader/SLdrSandBossStructA.hpp index dd3d942..b271897 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSandBossStructA.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSandBossStructA.hpp @@ -8,15 +8,15 @@ struct SLdrSandBossStructA { SLdrSandBossStructA(); ~SLdrSandBossStructA(); - CAssetId head_armor; - CAssetId armor_piece2; - CAssetId armor_piece3; - CAssetId armor_piece4; - CAssetId armor_piece5; - CAssetId armor_piece6; - CAssetId armor_piece7; - CAssetId tail_armor; - CAssetId sound_armor_impact; + CAssetId headArmor; + CAssetId armorPiece2; + CAssetId armorPiece3; + CAssetId armorPiece4; + CAssetId armorPiece5; + CAssetId armorPiece6; + CAssetId armorPiece7; + CAssetId tailArmor; + CAssetId soundArmorImpact; }; void LoadTypedefSLdrSandBossStructA(SLdrSandBossStructA&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSandBossStructB.hpp b/include/MetroidPrime/ScriptLoader/SLdrSandBossStructB.hpp index 461171e..e5cee0e 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSandBossStructB.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSandBossStructB.hpp @@ -10,16 +10,16 @@ struct SLdrSandBossStructB { SLdrDamageInfo damage; float duration; - float change_direction_interval; + float changeDirectionInterval; float unknown_0x1b57d422; - float change_direction_chance; - float inner_radius; - float outer_radius; + float changeDirectionChance; + float innerRadius; + float outerRadius; float unknown_0x52642b7e; float unknown_0xfda3eb4b; - float turn_speed; + float turnSpeed; float unknown_0x47cde539; - int sound_charge_beam; + int soundChargeBeam; int unknown_0x8d4f3b88; float unknown_0xbf88fe4f; float unknown_0x74c702b3; diff --git a/include/MetroidPrime/ScriptLoader/SLdrSandwormStruct.hpp b/include/MetroidPrime/ScriptLoader/SLdrSandwormStruct.hpp index 81469d2..20cd0f6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSandwormStruct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSandwormStruct.hpp @@ -10,7 +10,7 @@ struct SLdrSandwormStruct { float unknown_0x98106ee2; float unknown_0x95081226; float unknown_0xc2064265; - float move_speed_multiplier; + float moveSpeedMultiplier; int unknown_0x59f14d7c; int unknown_0x9606b4b0; int unknown_0xfc2697dd; diff --git a/include/MetroidPrime/ScriptLoader/SLdrScaleSplines.hpp b/include/MetroidPrime/ScriptLoader/SLdrScaleSplines.hpp index b8bd29c..6140d0c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrScaleSplines.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrScaleSplines.hpp @@ -7,9 +7,9 @@ struct SLdrScaleSplines { SLdrScaleSplines(); ~SLdrScaleSplines(); - spline x_scale; - spline y_scale; - spline z_scale; + spline xScale; + spline yScale; + spline zScale; }; void LoadTypedefSLdrScaleSplines(SLdrScaleSplines&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrScanInfoSecondaryModel.hpp b/include/MetroidPrime/ScriptLoader/SLdrScanInfoSecondaryModel.hpp index 3e8ede5..78ff958 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrScanInfoSecondaryModel.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrScanInfoSecondaryModel.hpp @@ -10,9 +10,9 @@ struct SLdrScanInfoSecondaryModel { SLdrScanInfoSecondaryModel(); ~SLdrScanInfoSecondaryModel(); - CAssetId secondary_static_model; - SLdrAnimationParameters secondary_animated_model; - rstl::string secondary_model_locator; + CAssetId secondaryStaticModel; + SLdrAnimationParameters secondaryAnimatedModel; + rstl::string secondaryModelLocator; }; void LoadTypedefSLdrScanInfoSecondaryModel(SLdrScanInfoSecondaryModel&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrScannableParameters.hpp b/include/MetroidPrime/ScriptLoader/SLdrScannableParameters.hpp index 2b03511..45008e4 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrScannableParameters.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrScannableParameters.hpp @@ -8,7 +8,7 @@ struct SLdrScannableParameters { SLdrScannableParameters(); ~SLdrScannableParameters(); - CAssetId scannable_info0; + CAssetId scannableInfo0; }; void LoadTypedefSLdrScannableParameters(SLdrScannableParameters&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrShockWaveInfo.hpp b/include/MetroidPrime/ScriptLoader/SLdrShockWaveInfo.hpp index d4c154c..47b91f3 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrShockWaveInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrShockWaveInfo.hpp @@ -9,15 +9,15 @@ struct SLdrShockWaveInfo { SLdrShockWaveInfo(); ~SLdrShockWaveInfo(); - CAssetId shock_wave_effect; + CAssetId shockWaveEffect; SLdrDamageInfo damage; float radius; float height; float unknown; - float radial_velocity; - float radial_velocity_acceleration; - CAssetId visor_electric_effect; - int sound_visor_electric; + float radialVelocity; + float radialVelocityAcceleration; + CAssetId visorElectricEffect; + int soundVisorElectric; }; void LoadTypedefSLdrShockWaveInfo(SLdrShockWaveInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSpacePirateWeaponData.hpp b/include/MetroidPrime/ScriptLoader/SLdrSpacePirateWeaponData.hpp index 8880041..5a9f519 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSpacePirateWeaponData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSpacePirateWeaponData.hpp @@ -10,21 +10,21 @@ struct SLdrSpacePirateWeaponData { ~SLdrSpacePirateWeaponData(); int unknown_0x647670ac; - CAssetId grenade_launcher; + CAssetId grenadeLauncher; int unknown_0xa95a025b; float unknown_0x25f822c4; float unknown_0x765e3a20; - SLdrDamageInfo grenade_damage; - CAssetId grenade_explosion; - CAssetId grenade_effect; - CAssetId grenade_trail; - float grenade_mass; + SLdrDamageInfo grenadeDamage; + CAssetId grenadeExplosion; + CAssetId grenadeEffect; + CAssetId grenadeTrail; + float grenadeMass; float unknown_0xed086ce0; float unknown_0x00fc6646; float unknown_0xa7c8e63f; int unknown_0x454f16b1; - int sound_grenade_bounce; - int sound_grenade_explode; + int soundGrenadeBounce; + int soundGrenadeExplode; }; void LoadTypedefSLdrSpacePirateWeaponData(SLdrSpacePirateWeaponData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSpawnPointStruct.hpp b/include/MetroidPrime/ScriptLoader/SLdrSpawnPointStruct.hpp index 92293a3..3c43505 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSpawnPointStruct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSpawnPointStruct.hpp @@ -7,115 +7,115 @@ struct SLdrSpawnPointStruct { SLdrSpawnPointStruct(); ~SLdrSpawnPointStruct(); - int power_beam; - int dark_beam; - int light_beam; - int annihilator_beam; - int power_beam_combo; - int dark_beam_combo; - int light_beam_combo; - int annihilator_beam_combo; - int charge_combo_upgrade; - int combat_visor; - int scan_visor; - int dark_visor; - int echo_visor; - int varia_suit; - int dark_suit; - int light_suit; - int morph_ball; - int boost_ball; - int spider_ball; + int powerBeam; + int darkBeam; + int lightBeam; + int annihilatorBeam; + int powerBeamCombo; + int darkBeamCombo; + int lightBeamCombo; + int annihilatorBeamCombo; + int chargeComboUpgrade; + int combatVisor; + int scanVisor; + int darkVisor; + int echoVisor; + int variaSuit; + int darkSuit; + int lightSuit; + int morphBall; + int boostBall; + int spiderBall; int bomb; - int light_bomb; - int dark_bomb; - int annihilator_bomb; - int charge_upgrade; - int grapple_beam; - int double_jump; - int gravity_boost; + int lightBomb; + int darkBomb; + int annihilatorBomb; + int chargeUpgrade; + int grappleBeam; + int doubleJump; + int gravityBoost; int seeker; - int screw_attack; - int translator_upgrade; - int temple_key1; - int temple_key2; - int temple_key3; - int temple_key4; - int temple_key5; - int temple_key6; - int temple_key7; - int temple_key8; - int temple_key9; - int sand_key1; - int sand_key2; - int sand_key3; - int swamp_key1; - int swamp_key2; - int swamp_key3; - int cliffside_key1; - int cliffside_key2; - int cliffside_key3; + int screwAttack; + int translatorUpgrade; + int templeKey1; + int templeKey2; + int templeKey3; + int templeKey4; + int templeKey5; + int templeKey6; + int templeKey7; + int templeKey8; + int templeKey9; + int sandKey1; + int sandKey2; + int sandKey3; + int swampKey1; + int swampKey2; + int swampKey3; + int cliffsideKey1; + int cliffsideKey2; + int cliffsideKey3; int energy; - int energy_tank; + int energyTank; int unknown_0x161898dc; - int power_bomb; + int powerBomb; int missile; - int dark_beam_ammo; - int light_beam_ammo; - int percentage_increase; - int misc_counter1; - int misc_counter2; - int misc_counter3; - int misc_counter4; - int change_to_power_beam; - int change_to_dark_beam; - int change_to_light_beam; - int change_to_annihilator_beam; - int multi_charge_upgrade; + int darkBeamAmmo; + int lightBeamAmmo; + int percentageIncrease; + int miscCounter1; + int miscCounter2; + int miscCounter3; + int miscCounter4; + int changeToPowerBeam; + int changeToDarkBeam; + int changeToLightBeam; + int changeToAnnihilatorBeam; + int multiChargeUpgrade; int invisibility; - int amplified_damage; + int amplifiedDamage; int invincibility; int unknown_0x66ae338e; int unknown_0x210e495e; int unknown_0x1c6e60ee; int unknown_0xae4ebcfe; - int frag_count; - int died_count; - int archenemy_count; - int persistent_counter1; - int persistent_counter2; - int persistent_counter3; - int persistent_counter4; - int persistent_counter5; - int persistent_counter6; - int persistent_counter7; - int persistent_counter8; - int change_to_combat_visor; - int change_to_scan_visor; - int change_to_dark_visor; - int change_to_echo_visor; - int coin_amplifier; - int coin_counter; - int unlimited_missiles; - int unlimited_beam_ammo; - int dark_shield; - int light_shield; - int absorb_attack; - int death_ball; - int scan_virus; - int visor_static; - int beam_weapons_disabled; - int missile_weapons_disabled; + int fragCount; + int diedCount; + int archenemyCount; + int persistentCounter1; + int persistentCounter2; + int persistentCounter3; + int persistentCounter4; + int persistentCounter5; + int persistentCounter6; + int persistentCounter7; + int persistentCounter8; + int changeToCombatVisor; + int changeToScanVisor; + int changeToDarkVisor; + int changeToEchoVisor; + int coinAmplifier; + int coinCounter; + int unlimitedMissiles; + int unlimitedBeamAmmo; + int darkShield; + int lightShield; + int absorbAttack; + int deathBall; + int scanVirus; + int visorStatic; + int beamWeaponsDisabled; + int missileWeaponsDisabled; int unknown_0x32f5e918; - int disable_ball; - int disable_double_jump; - int activate_morphball_boost; - int hacked_effect; - int activate_morphball_damage; - int translator_upgrade1; - int translator_upgrade2; - int translator_upgrade3; - int translator_upgrade4; + int disableBall; + int disableDoubleJump; + int activateMorphballBoost; + int hackedEffect; + int activateMorphballDamage; + int translatorUpgrade1; + int translatorUpgrade2; + int translatorUpgrade3; + int translatorUpgrade4; }; void LoadTypedefSLdrSpawnPointStruct(SLdrSpawnPointStruct&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSpindleCameraStruct.hpp b/include/MetroidPrime/ScriptLoader/SLdrSpindleCameraStruct.hpp index 07476d2..de2ee4a 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSpindleCameraStruct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSpindleCameraStruct.hpp @@ -7,8 +7,8 @@ struct SLdrSpindleCameraStruct { SLdrSpindleCameraStruct(); ~SLdrSpindleCameraStruct(); - int interpolant_type; - spline interpolant_spline; + int interpolantType; + spline interpolantSpline; }; void LoadTypedefSLdrSpindleCameraStruct(SLdrSpindleCameraStruct&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSplitterMainChassisData.hpp b/include/MetroidPrime/ScriptLoader/SLdrSplitterMainChassisData.hpp index 0626886..bdd3581 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSplitterMainChassisData.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSplitterMainChassisData.hpp @@ -11,32 +11,32 @@ struct SLdrSplitterMainChassisData { ~SLdrSplitterMainChassisData(); int unknown_0xcef5c2fe; - float leg_stab_attack_interval; + float legStabAttackInterval; float unknown_0xf6047d40; float unknown_0x5130fd39; - SLdrDamageInfo leg_stab_damage; - float min_dodge_interval; - float dodge_chance; - float deployment_speed; - float scan_duration; - float laser_sweep_interval; + SLdrDamageInfo legStabDamage; + float minDodgeInterval; + float dodgeChance; + float deploymentSpeed; + float scanDuration; + float laserSweepInterval; float unknown_0xb3ea58f8; float unknown_0x14ded881; float unknown_0x35eedd1c; float unknown_0x2dde6bfb; float unknown_0x8ae1ee93; float unknown_0x5027d1aa; - float spin_attack_interval; + float spinAttackInterval; float unknown_0xf65e430f; float unknown_0x43722555; float unknown_0x8935377c; float unknown_0x2e01b705; int unknown_0xd5f34476; float unknown_0x21296bdc; - SLdrDamageInfo spin_attack_damage; - int sound_alerted; - SLdrIngPossessionData ing_possession_data; - SLdrDamageVulnerability spin_attack_vulnerability; + SLdrDamageInfo spinAttackDamage; + int soundAlerted; + SLdrIngPossessionData ingPossessionData; + SLdrDamageVulnerability spinAttackVulnerability; }; void LoadTypedefSLdrSplitterMainChassisData(SLdrSplitterMainChassisData&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSurroundPan.hpp b/include/MetroidPrime/ScriptLoader/SLdrSurroundPan.hpp index 3b157e5..f2423c6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSurroundPan.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSurroundPan.hpp @@ -8,7 +8,7 @@ struct SLdrSurroundPan { ~SLdrSurroundPan(); float pan; - float surround_pan; + float surroundPan; }; void LoadTypedefSLdrSurroundPan(SLdrSurroundPan&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage1Struct.hpp b/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage1Struct.hpp index 9e75d8a..f980acf 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage1Struct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage1Struct.hpp @@ -12,10 +12,10 @@ struct SLdrSwampBossStage1Struct { float unknown_0x76ba1c18; int unknown_0xbb0ffdd6; int unknown_0x60b0ae31; - int first_attack; - int second_attack; - int third_attack; - int fourth_attack; + int firstAttack; + int secondAttack; + int thirdAttack; + int fourthAttack; }; void LoadTypedefSLdrSwampBossStage1Struct(SLdrSwampBossStage1Struct&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage2Data.hpp b/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage2Data.hpp index 41a7b66..bf4b9e3 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage2Data.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage2Data.hpp @@ -13,26 +13,26 @@ struct SLdrSwampBossStage2Data { SLdrSwampBossStage2Data(); ~SLdrSwampBossStage2Data(); - float hover_speed; - CAssetId upper_left_wing_target; - CAssetId lower_left_wing_target; - CAssetId upper_right_wing_target; - CAssetId lower_right_wing_target; + float hoverSpeed; + CAssetId upperLeftWingTarget; + CAssetId lowerLeftWingTarget; + CAssetId upperRightWingTarget; + CAssetId lowerRightWingTarget; float unknown_0xcabe6b96; - SLdrSwampBossStage2Struct swamp_boss_stage2_struct_0x7fa9256a; - SLdrSwampBossStage2Struct swamp_boss_stage2_struct_0x8b884b8e; - SLdrSwampBossStage2Struct swamp_boss_stage2_struct_0x04b7a789; - SLdrSwampBossStage2Struct swamp_boss_stage2_struct_0xf096c96d; - float stun_time; + SLdrSwampBossStage2Struct swampBossStage2Struct_0x7fa9256a; + SLdrSwampBossStage2Struct swampBossStage2Struct_0x8b884b8e; + SLdrSwampBossStage2Struct swampBossStage2Struct_0x04b7a789; + SLdrSwampBossStage2Struct swampBossStage2Struct_0xf096c96d; + float stunTime; int unknown_0x96ce7897; - CAssetId spit_projectile; - SLdrDamageInfo spit_damage; - CAssetId spit_visor_effect; - int sound_spit_visor; - float spit_projectile_radius; - SLdrDamageInfo swoop_damage; - float swoop_push; - float swoop_damage_time; + CAssetId spitProjectile; + SLdrDamageInfo spitDamage; + CAssetId spitVisorEffect; + int soundSpitVisor; + float spitProjectileRadius; + SLdrDamageInfo swoopDamage; + float swoopPush; + float swoopDamageTime; CAssetId splash; float unknown_0x7fc50ac2; float unknown_0x13448a4a; @@ -41,33 +41,33 @@ struct SLdrSwampBossStage2Data { float unknown_0x5a844633; float unknown_0x78e22d1b; float unknown_0x9e116385; - float radar_range; + float radarRange; float unknown_0xfe97e835; - SLdrShockWaveInfo splash_shock_wave; + SLdrShockWaveInfo splashShockWave; float unknown_0x9807497c; float unknown_0xe57ca27c; - CAssetId scan_info_light; - CAssetId scan_info_dark; - CAssetId bubble_telegraph_effect; - CAssetId wing_damage_effect; - SLdrUnknownStruct38 unknown_struct38; - CAssetId blow_effect; - SLdrDamageInfo blow_damage; + CAssetId scanInfoLight; + CAssetId scanInfoDark; + CAssetId bubbleTelegraphEffect; + CAssetId wingDamageEffect; + SLdrUnknownStruct38 unknownStruct38; + CAssetId blowEffect; + SLdrDamageInfo blowDamage; float unknown_0x6d89649b; - float blow_push; - float break_stun_damage; - SLdrAudioPlaybackParms stunned_sound; - SLdrAudioPlaybackParms audio_playback_parms_0x427a116a; - SLdrAudioPlaybackParms audio_playback_parms_0xc05d5c7a; - SLdrAudioPlaybackParms audio_playback_parms_0x2b3c923a; + float blowPush; + float breakStunDamage; + SLdrAudioPlaybackParms stunnedSound; + SLdrAudioPlaybackParms audioPlaybackParms_0x427a116a; + SLdrAudioPlaybackParms audioPlaybackParms_0xc05d5c7a; + SLdrAudioPlaybackParms audioPlaybackParms_0x2b3c923a; float unknown_0x8fe0bf01; - SLdrAudioPlaybackParms flinch_sound; - float flinch_sound_chance; - SLdrAudioPlaybackParms stunned_flinch_sound; - SLdrAudioPlaybackParms audio_playback_parms_0x878a6522; + SLdrAudioPlaybackParms flinchSound; + float flinchSoundChance; + SLdrAudioPlaybackParms stunnedFlinchSound; + SLdrAudioPlaybackParms audioPlaybackParms_0x878a6522; float unknown_0x19849710; - SLdrAudioPlaybackParms audio_playback_parms_0x692fa63c; - SLdrAudioPlaybackParms audio_playback_parms_0xbe3d39aa; + SLdrAudioPlaybackParms audioPlaybackParms_0x692fa63c; + SLdrAudioPlaybackParms audioPlaybackParms_0xbe3d39aa; }; void LoadTypedefSLdrSwampBossStage2Data(SLdrSwampBossStage2Data&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage2Struct.hpp b/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage2Struct.hpp index 7dac7d3..82735a6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage2Struct.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrSwampBossStage2Struct.hpp @@ -11,13 +11,13 @@ struct SLdrSwampBossStage2Struct { float unknown_0x76ba1c18; float unknown_0x29e6ead6; float unknown_0x1753225e; - float dash_chance; - float taunt_chance; - int first_attack; - int second_attack; - int third_attack; - int fourth_attack; - int fifth_attack; + float dashChance; + float tauntChance; + int firstAttack; + int secondAttack; + int thirdAttack; + int fourthAttack; + int fifthAttack; float health; int unknown_0x2e7e55f2; int unknown_0xef3efec0; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTBallTransitionResources.hpp b/include/MetroidPrime/ScriptLoader/SLdrTBallTransitionResources.hpp index 4d13ed8..04f38a6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTBallTransitionResources.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTBallTransitionResources.hpp @@ -16,7 +16,7 @@ struct SLdrTBallTransitionResources { spline unknown_0x15b6840d; spline unknown_0x23fb0e93; spline unknown_0x564262f0; - spline movement_control; + spline movementControl; }; void LoadTypedefSLdrTBallTransitionResources(SLdrTBallTransitionResources&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTBeamInfo.hpp b/include/MetroidPrime/ScriptLoader/SLdrTBeamInfo.hpp index 8b6a199..0fe710d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTBeamInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTBeamInfo.hpp @@ -9,7 +9,7 @@ struct SLdrTBeamInfo { ~SLdrTBeamInfo(); float cooldown; - SLdrTWeaponDamage damage_info; + SLdrTWeaponDamage damageInfo; }; void LoadTypedefSLdrTBeamInfo(SLdrTBeamInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTDamageInfo.hpp b/include/MetroidPrime/ScriptLoader/SLdrTDamageInfo.hpp index 1686cda..892a9c8 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTDamageInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTDamageInfo.hpp @@ -7,11 +7,11 @@ struct SLdrTDamageInfo { SLdrTDamageInfo(); ~SLdrTDamageInfo(); - int weapon_type; - float damage_amount; - float radius_damage_amount; - float damage_radius; - float knock_back_power; + int weaponType; + float damageAmount; + float radiusDamageAmount; + float damageRadius; + float knockBackPower; }; void LoadTypedefSLdrTDamageInfo(SLdrTDamageInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTGunResources.hpp b/include/MetroidPrime/ScriptLoader/SLdrTGunResources.hpp index bbbb3da..18d77de 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTGunResources.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTGunResources.hpp @@ -8,11 +8,11 @@ struct SLdrTGunResources { SLdrTGunResources(); ~SLdrTGunResources(); - rstl::string power_beam; - rstl::string ice_beam; - rstl::string wave_beam; - rstl::string plasma_beam; - rstl::string phazon_beam; + rstl::string powerBeam; + rstl::string iceBeam; + rstl::string waveBeam; + rstl::string plasmaBeam; + rstl::string phazonBeam; }; void LoadTypedefSLdrTGunResources(SLdrTGunResources&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTextProperties.hpp b/include/MetroidPrime/ScriptLoader/SLdrTextProperties.hpp index e9c07e3..d4fb971 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTextProperties.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTextProperties.hpp @@ -9,18 +9,18 @@ struct SLdrTextProperties { SLdrTextProperties(); ~SLdrTextProperties(); - int text_bounding_width; - int text_bounding_height; - float line_spacing; - int line_extra_space; - int character_extra_space; - CColor foreground_color; - CColor outline_color; - CColor geometry_color; - CAssetId default_font; + int textBoundingWidth; + int textBoundingHeight; + float lineSpacing; + int lineExtraSpace; + int characterExtraSpace; + CColor foregroundColor; + CColor outlineColor; + CColor geometryColor; + CAssetId defaultFont; int unknown_0x18dd95cd; int unknown_0x42091548; - bool wrap_text; + bool wrapText; }; void LoadTypedefSLdrTextProperties(SLdrTextProperties&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTriggerInfo.hpp b/include/MetroidPrime/ScriptLoader/SLdrTriggerInfo.hpp index 75845f6..4ff2584 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTriggerInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTriggerInfo.hpp @@ -10,8 +10,8 @@ struct SLdrTriggerInfo { ~SLdrTriggerInfo(); SLdrDamageInfo damage; - CVector3f force_field; - int flags_trigger; + CVector3f forceField; + int flagsTrigger; }; void LoadTypedefSLdrTriggerInfo(SLdrTriggerInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakAutoMapper_Base.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakAutoMapper_Base.hpp index 7305c0a..dfef43a 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakAutoMapper_Base.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakAutoMapper_Base.hpp @@ -10,14 +10,14 @@ struct SLdrTweakAutoMapper_Base { bool unknown_0xcbe595d8; bool unknown_0x8ecb53a6; - bool scale_move_speed_with_camera_distance; + bool scaleMoveSpeedWithCameraDistance; float unknown_0x6bea9324; float unknown_0x065dd754; float unknown_0x57a46c09; float unknown_0xb54255b5; float unknown_0x0c64cec4; float unknown_0x335ebc7e; - float map_screen_area_opacity; + float mapScreenAreaOpacity; CColor unknown_0x533c5684; float unknown_0xeb383668; float unknown_0x27151ede; @@ -42,9 +42,9 @@ struct SLdrTweakAutoMapper_Base { float unknown_0x30610062; float unknown_0xb6acea88; float unknown_0x73de4110; - float map_screen_zoom_speed; - float map_screen_circle_speed; - float map_screen_move_speed; + float mapScreenZoomSpeed; + float mapScreenCircleSpeed; + float mapScreenMoveSpeed; CColor unknown_0xab82e268; CColor unknown_0x1daacfae; CColor unknown_0xdad161a1; @@ -76,17 +76,17 @@ struct SLdrTweakAutoMapper_Base { float unknown_0x62f9ebf6; float unknown_0xa9a53853; float unknown_0x722b1bc0; - CColor player_model_color; + CColor playerModelColor; CColor unknown_0x5a87c156; - CColor player_surface_color; - CColor player_outline_color; - CColor text_color; - CColor text_outline_color; + CColor playerSurfaceColor; + CColor playerOutlineColor; + CColor textColor; + CColor textOutlineColor; CColor unknown_0x1a4b8068; - CColor frame_color; - CColor title_color; - CColor legend_background_color; - CColor legend_gradient_color; + CColor frameColor; + CColor titleColor; + CColor legendBackgroundColor; + CColor legendGradientColor; }; void LoadTypedefSLdrTweakAutoMapper_Base(SLdrTweakAutoMapper_Base&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakAutoMapper_DoorColors.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakAutoMapper_DoorColors.hpp index 29dddf3..5ec9ada 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakAutoMapper_DoorColors.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakAutoMapper_DoorColors.hpp @@ -8,18 +8,18 @@ struct SLdrTweakAutoMapper_DoorColors { SLdrTweakAutoMapper_DoorColors(); ~SLdrTweakAutoMapper_DoorColors(); - int num_door_colors; - CColor blue_door_color; - CColor missile_door_color; - CColor dark_beam_door_color; + int numDoorColors; + CColor blueDoorColor; + CColor missileDoorColor; + CColor darkBeamDoorColor; CColor unknown; - CColor annihilator_beam_door_color; - CColor light_beam_door_color; - CColor super_missile_door_color; - CColor seeker_door_color; - CColor power_bomb_door_color; - CColor grey_door_color; - CColor white_door_color; + CColor annihilatorBeamDoorColor; + CColor lightBeamDoorColor; + CColor superMissileDoorColor; + CColor seekerDoorColor; + CColor powerBombDoorColor; + CColor greyDoorColor; + CColor whiteDoorColor; }; void LoadTypedefSLdrTweakAutoMapper_DoorColors(SLdrTweakAutoMapper_DoorColors&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_BoostBall.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_BoostBall.hpp index 27516cc..f138bf0 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_BoostBall.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_BoostBall.hpp @@ -8,17 +8,17 @@ struct SLdrTweakBall_BoostBall { SLdrTweakBall_BoostBall(); ~SLdrTweakBall_BoostBall(); - float boost_ball_drain_time; - float boost_ball_min_charge_time; - float boost_ball_min_relative_speed_for_damage; - float boost_ball_charge_time1; - float boost_ball_charge_time2; - float boost_ball_max_charge_time; - float boost_ball_incremental_speed1; - float boost_ball_incremental_speed2; - float boost_ball_incremental_speed3; + float boostBallDrainTime; + float boostBallMinChargeTime; + float boostBallMinRelativeSpeedForDamage; + float boostBallChargeTime1; + float boostBallChargeTime2; + float boostBallMaxChargeTime; + float boostBallIncrementalSpeed1; + float boostBallIncrementalSpeed2; + float boostBallIncrementalSpeed3; float unknown_0xbe605660; - SLdrTDamageInfo boost_ball_damage; + SLdrTDamageInfo boostBallDamage; float unknown_0x6d210beb; float unknown_0xfdc6649d; float unknown_0x340be92f; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Camera.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Camera.hpp index 31981c4..7089865 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Camera.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Camera.hpp @@ -8,52 +8,52 @@ struct SLdrTweakBall_Camera { SLdrTweakBall_Camera(); ~SLdrTweakBall_Camera(); - float ball_camera_angle_per_second; - CVector3f ball_camera_offset; - float ball_camera_min_speed_distance; - float ball_camera_max_speed_distance; - float ball_camera_backwards_distance; - float ball_camera_elevation; - float ball_camera_spring_constant; - float ball_camera_spring_max; - float ball_camera_spring_tardis; - float ball_camera_centroid_spring_constant; - float ball_camera_centroid_spring_max; - float ball_camera_centroid_spring_tardis; - float ball_camera_centroid_distance_spring_constant; - float ball_camera_centroid_distance_spring_max; - float ball_camera_centroid_distance_spring_tardis; - float ball_camera_look_at_spring_constant; - float ball_camera_look_at_spring_max; - float ball_camera_look_at_spring_tardis; - float ball_camera_transition_time; - float ball_camera_free_look_speed; - float ball_camera_free_look_zoom_speed; - float ball_camera_free_look_min_distance; - float ball_camera_free_look_max_distance; - float ball_camera_free_look_max_vert_angle; + float ballCameraAnglePerSecond; + CVector3f ballCameraOffset; + float ballCameraMinSpeedDistance; + float ballCameraMaxSpeedDistance; + float ballCameraBackwardsDistance; + float ballCameraElevation; + float ballCameraSpringConstant; + float ballCameraSpringMax; + float ballCameraSpringTardis; + float ballCameraCentroidSpringConstant; + float ballCameraCentroidSpringMax; + float ballCameraCentroidSpringTardis; + float ballCameraCentroidDistanceSpringConstant; + float ballCameraCentroidDistanceSpringMax; + float ballCameraCentroidDistanceSpringTardis; + float ballCameraLookAtSpringConstant; + float ballCameraLookAtSpringMax; + float ballCameraLookAtSpringTardis; + float ballCameraTransitionTime; + float ballCameraFreeLookSpeed; + float ballCameraFreeLookZoomSpeed; + float ballCameraFreeLookMinDistance; + float ballCameraFreeLookMaxDistance; + float ballCameraFreeLookMaxVertAngle; float unknown_0x144db504; float unknown_0xee5bea64; - float ball_camera_chase_distance; - float ball_camera_chase_elevation; - float ball_camera_chase_yaw_speed; - float ball_camera_chase_dampen_angle; - float ball_camera_chase_angle_per_second; - CVector3f ball_camera_chase_look_at_offset; - float ball_camera_chase_spring_constant; - float ball_camera_chase_spring_max; - float ball_camera_chase_spring_tardis; - float ball_camera_boost_distance; - float ball_camera_boost_elevation; - float ball_camera_boost_yaw_speed; - float ball_camera_boost_dampen_angle; - float ball_camera_boost_angle_per_second; - CVector3f ball_camera_boost_look_at_offset; - float ball_camera_boost_spring_constant; - float ball_camera_boost_spring_max; - float ball_camera_boost_spring_tardis; - float ball_camera_control_distance; - float ball_camera_look_at_min_height; + float ballCameraChaseDistance; + float ballCameraChaseElevation; + float ballCameraChaseYawSpeed; + float ballCameraChaseDampenAngle; + float ballCameraChaseAnglePerSecond; + CVector3f ballCameraChaseLookAtOffset; + float ballCameraChaseSpringConstant; + float ballCameraChaseSpringMax; + float ballCameraChaseSpringTardis; + float ballCameraBoostDistance; + float ballCameraBoostElevation; + float ballCameraBoostYawSpeed; + float ballCameraBoostDampenAngle; + float ballCameraBoostAnglePerSecond; + CVector3f ballCameraBoostLookAtOffset; + float ballCameraBoostSpringConstant; + float ballCameraBoostSpringMax; + float ballCameraBoostSpringTardis; + float ballCameraControlDistance; + float ballCameraLookAtMinHeight; float unknown_0x50f77df0; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_CannonBall.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_CannonBall.hpp index 4f921de..f562417 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_CannonBall.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_CannonBall.hpp @@ -8,7 +8,7 @@ struct SLdrTweakBall_CannonBall { SLdrTweakBall_CannonBall(); ~SLdrTweakBall_CannonBall(); - SLdrTDamageInfo cannon_ball_damage; + SLdrTDamageInfo cannonBallDamage; }; void LoadTypedefSLdrTweakBall_CannonBall(SLdrTweakBall_CannonBall&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_DeathBall.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_DeathBall.hpp index c7d3807..dd0195d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_DeathBall.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_DeathBall.hpp @@ -8,8 +8,8 @@ struct SLdrTweakBall_DeathBall { SLdrTweakBall_DeathBall(); ~SLdrTweakBall_DeathBall(); - float death_ball_damage_delay; - SLdrTDamageInfo death_ball_damage; + float deathBallDamageDelay; + SLdrTDamageInfo deathBallDamage; }; void LoadTypedefSLdrTweakBall_DeathBall(SLdrTweakBall_DeathBall&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Misc.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Misc.hpp index 37108c6..9d26fa1 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Misc.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Misc.hpp @@ -10,8 +10,8 @@ struct SLdrTweakBall_Misc { float unknown_0x13cfde23; float unknown_0xf3499713; float unknown_0x895a47fb; - float ball_touch_radius; - float dark_world_light_radius; + float ballTouchRadius; + float darkWorldLightRadius; float unknown_0xad662ae9; float unknown_0xb0575d4e; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Movement.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Movement.hpp index c7a20f6..2d09843 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Movement.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_Movement.hpp @@ -7,54 +7,54 @@ struct SLdrTweakBall_Movement { SLdrTweakBall_Movement(); ~SLdrTweakBall_Movement(); - float forward_accel_normal; - float forward_accel_air; - float forward_accel_ice; - float forward_accel_organic; - float forward_accel_water; - float forward_accel_lava; - float forward_accel_phazon; - float forward_accel_shrubbery; - float movement_friction_normal; - float movement_friction_air; - float movement_friction_ice; - float movement_friction_organic; - float movement_friction_water; - float movement_friction_lava; - float movement_friction_phazon; - float movement_friction_shrubbery; - float forward_max_speed_normal; - float forward_max_speed_air; - float forward_max_speed_ice; - float forward_max_speed_organic; - float forward_max_speed_water; - float forward_max_speed_lava; - float forward_max_speed_phazon; - float forward_max_speed_shrubbery; + float forwardAccelNormal; + float forwardAccelAir; + float forwardAccelIce; + float forwardAccelOrganic; + float forwardAccelWater; + float forwardAccelLava; + float forwardAccelPhazon; + float forwardAccelShrubbery; + float movementFrictionNormal; + float movementFrictionAir; + float movementFrictionIce; + float movementFrictionOrganic; + float movementFrictionWater; + float movementFrictionLava; + float movementFrictionPhazon; + float movementFrictionShrubbery; + float forwardMaxSpeedNormal; + float forwardMaxSpeedAir; + float forwardMaxSpeedIce; + float forwardMaxSpeedOrganic; + float forwardMaxSpeedWater; + float forwardMaxSpeedLava; + float forwardMaxSpeedPhazon; + float forwardMaxSpeedShrubbery; float unknown_0x85ee51ed; float unknown_0x6d7811f5; - float ball_up_gravity; - float ball_down_gravity; - float ball_forward_braking_accel_normal; - float ball_forward_braking_accel_air; - float ball_forward_braking_accel_ice; - float ball_forward_braking_accel_organic; - float ball_forward_braking_accel_water; - float ball_forward_braking_accel_lava; - float ball_forward_braking_accel_phazon; - float ball_forward_braking_accel_shrubbery; - float ball_gravity; - float ball_water_gravity; + float ballUpGravity; + float ballDownGravity; + float ballForwardBrakingAccelNormal; + float ballForwardBrakingAccelAir; + float ballForwardBrakingAccelIce; + float ballForwardBrakingAccelOrganic; + float ballForwardBrakingAccelWater; + float ballForwardBrakingAccelLava; + float ballForwardBrakingAccelPhazon; + float ballForwardBrakingAccelShrubbery; + float ballGravity; + float ballWaterGravity; float unknown_0xeeb74968; - float ball_boost_height; + float ballBoostHeight; float unknown_0xe2bb0298; - float minimum_alignment_speed; + float minimumAlignmentSpeed; float tireness; - float max_lean_angle; - float tire_to_marble_threshold_speed; - float marble_to_tire_threshold_speed; - float force_to_lean_gain; - float lean_tracking_gain; + float maxLeanAngle; + float tireToMarbleThresholdSpeed; + float marbleToTireThresholdSpeed; + float forceToLeanGain; + float leanTrackingGain; }; void LoadTypedefSLdrTweakBall_Movement(SLdrTweakBall_Movement&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_ScrewAttack.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_ScrewAttack.hpp index 1b85e9d..40d8228 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakBall_ScrewAttack.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakBall_ScrewAttack.hpp @@ -8,20 +8,20 @@ struct SLdrTweakBall_ScrewAttack { SLdrTweakBall_ScrewAttack(); ~SLdrTweakBall_ScrewAttack(); - float screw_attack_gravity; + float screwAttackGravity; float unknown_0xcb77fb28; float unknown_0x3fdeb046; int unknown_0x691b244d; - float screw_attack_vertical_jump_velocity; - float screw_attack_horizontal_jump_velocity; + float screwAttackVerticalJumpVelocity; + float screwAttackHorizontalJumpVelocity; float unknown_0x3d03d8a6; float unknown_0xf1f2498f; float unknown_0x4b0aba1c; - float screw_attack_wall_jump_max_time; - float screw_attack_wall_jump_vertical_velocity; - float screw_attack_wall_jump_horizontal_velocity; - float screw_attack_wall_jump_gravity; - SLdrTDamageInfo screw_attack_damage; + float screwAttackWallJumpMaxTime; + float screwAttackWallJumpVerticalVelocity; + float screwAttackWallJumpHorizontalVelocity; + float screwAttackWallJumpGravity; + SLdrTDamageInfo screwAttackDamage; }; void LoadTypedefSLdrTweakBall_ScrewAttack(SLdrTweakBall_ScrewAttack&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGame_CoinLimitChoices.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGame_CoinLimitChoices.hpp index 759615c..9fd2a75 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGame_CoinLimitChoices.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGame_CoinLimitChoices.hpp @@ -7,11 +7,11 @@ struct SLdrTweakGame_CoinLimitChoices { SLdrTweakGame_CoinLimitChoices(); ~SLdrTweakGame_CoinLimitChoices(); - int coin_limit0; - int coin_limit1; - int coin_limit2; - int coin_limit3; - int coin_limit4; + int coinLimit0; + int coinLimit1; + int coinLimit2; + int coinLimit3; + int coinLimit4; }; void LoadTypedefSLdrTweakGame_CoinLimitChoices(SLdrTweakGame_CoinLimitChoices&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGame_FragLimitChoices.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGame_FragLimitChoices.hpp index eafc238..d3f2a48 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGame_FragLimitChoices.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGame_FragLimitChoices.hpp @@ -7,11 +7,11 @@ struct SLdrTweakGame_FragLimitChoices { SLdrTweakGame_FragLimitChoices(); ~SLdrTweakGame_FragLimitChoices(); - int frag_limit0; - int frag_limit1; - int frag_limit2; - int frag_limit3; - int frag_limit4; + int fragLimit0; + int fragLimit1; + int fragLimit2; + int fragLimit3; + int fragLimit4; }; void LoadTypedefSLdrTweakGame_FragLimitChoices(SLdrTweakGame_FragLimitChoices&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGame_TimeLimitChoices.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGame_TimeLimitChoices.hpp index 7e039bb..fc5a767 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGame_TimeLimitChoices.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGame_TimeLimitChoices.hpp @@ -7,11 +7,11 @@ struct SLdrTweakGame_TimeLimitChoices { SLdrTweakGame_TimeLimitChoices(); ~SLdrTweakGame_TimeLimitChoices(); - float time_limit0; - float time_limit1; - float time_limit2; - float time_limit3; - float time_limit4; + float timeLimit0; + float timeLimit1; + float timeLimit2; + float timeLimit3; + float timeLimit4; }; void LoadTypedefSLdrTweakGame_TimeLimitChoices(SLdrTweakGame_TimeLimitChoices&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_HUDColorsTypedef.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_HUDColorsTypedef.hpp index c76528e..cd205b2 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_HUDColorsTypedef.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_HUDColorsTypedef.hpp @@ -9,21 +9,21 @@ struct SLdrTweakGuiColors_HUDColorsTypedef { ~SLdrTweakGuiColors_HUDColorsTypedef(); CColor unknown_0xc8ddc662; - CColor threat_group_active_color; - CColor threat_group_inactive_color; + CColor threatGroupActiveColor; + CColor threatGroupInactiveColor; CColor unknown_0xa6609cc5; - CColor missile_group_active_color; - CColor missile_group_inactive_color; + CColor missileGroupActiveColor; + CColor missileGroupInactiveColor; CColor unknown_0xdcaab836; - CColor energy_bar_filled_color; - CColor energy_bar_shadow_color; - CColor energy_bar_empty_color; - CColor energy_tanks_filled_color; - CColor energy_tanks_empty_color; - CColor radar_widget_color; - CColor active_text_foreground_color; - CColor inactive_text_foreground_color; - CColor text_shadow_outline_color; + CColor energyBarFilledColor; + CColor energyBarShadowColor; + CColor energyBarEmptyColor; + CColor energyTanksFilledColor; + CColor energyTanksEmptyColor; + CColor radarWidgetColor; + CColor activeTextForegroundColor; + CColor inactiveTextForegroundColor; + CColor textShadowOutlineColor; }; void LoadTypedefSLdrTweakGuiColors_HUDColorsTypedef(SLdrTweakGuiColors_HUDColorsTypedef&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_Misc.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_Misc.hpp index 611bb7b..87494f2 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_Misc.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_Misc.hpp @@ -15,21 +15,21 @@ struct SLdrTweakGuiColors_Misc { CColor unknown_0x0d24ae6b; CColor unknown_0xddc561eb; CColor unknown_0x9be28150; - CColor hud_memo_text_foreground_color; - CColor hud_memo_text_outline_color; + CColor hudMemoTextForegroundColor; + CColor hudMemoTextOutlineColor; CColor unknown_0xc8ddc662; - CColor hud_glow_color; + CColor hudGlowColor; CColor unknown_0x5c336f85; CColor unknown_0xdefca700; - CColor selected_visor_beam_color; - CColor unselected_visor_beam_color; - CColor energy_bar_low_filled_color; - CColor energy_bar_low_shadow_color; - CColor energy_bar_low_empty_color; - CColor hud_damage_modulate_color; - CColor damage_indicator_color; - CColor hud_title_foreground_color; - CColor hud_title_outline_color; + CColor selectedVisorBeamColor; + CColor unselectedVisorBeamColor; + CColor energyBarLowFilledColor; + CColor energyBarLowShadowColor; + CColor energyBarLowEmptyColor; + CColor hudDamageModulateColor; + CColor damageIndicatorColor; + CColor hudTitleForegroundColor; + CColor hudTitleOutlineColor; CColor unknown_0xe7070332; CColor unknown_0x779c7b9c; CColor unknown_0x13bd3b64; @@ -44,34 +44,34 @@ struct SLdrTweakGuiColors_Misc { CColor unknown_0x4a7a4d45; CColor unknown_0xccee3feb; CColor unknown_0x07b2ec4e; - CColor energy_warning_color; - CColor threat_warning_color; - CColor missile_warning_color; + CColor energyWarningColor; + CColor threatWarningColor; + CColor missileWarningColor; CColor unknown_0x83040135; CColor unknown_0x1adea12b; - CColor threat_bar_shadow_color; - CColor threat_bar_empty_color; + CColor threatBarShadowColor; + CColor threatBarEmptyColor; CColor unknown_0x3c1ae0ff; - CColor missile_bar_shadow_color; - CColor missile_bar_empty_color; - CColor threat_group_color; + CColor missileBarShadowColor; + CColor missileBarEmptyColor; + CColor threatGroupColor; CColor unknown_0xa6609cc5; CColor unknown_0xbe3c29a1; CColor unknown_0xf4379cf4; - CColor threat_group_inactive_color; - CColor missile_group_inactive_color; - CColor missile_group_combo_charge_color; + CColor threatGroupInactiveColor; + CColor missileGroupInactiveColor; + CColor missileGroupComboChargeColor; CColor unknown_0x4c5aff4f; CColor unknown_0x0b17b693; CColor unknown_0xfad063d5; CColor unknown_0x2eafedf7; - CColor energy_bar_name_avoidance_color; + CColor energyBarNameAvoidanceColor; CColor unknown_0x8b0a4c90; - CColor energy_warning_outline_color; - CColor threat_warning_outline_color; - CColor missile_warning_outline_color; + CColor energyWarningOutlineColor; + CColor threatWarningOutlineColor; + CColor missileWarningOutlineColor; CColor unknown_0x78522461; - CColor flash_pass_color; + CColor flashPassColor; CColor unknown_0x79ea6f12; CColor unknown_0xdc901206; CColor unknown_0xc54fa7bc; @@ -90,19 +90,19 @@ struct SLdrTweakGuiColors_Misc { CColor unknown_0x0ca7beb2; CColor unknown_0x87d3ce8a; CColor unknown_0xeb7eb756; - CColor metroid_suck_pulse_color; + CColor metroidSuckPulseColor; CColor unknown_0xce7c9d8d; - CColor energy_bar_damage_color; + CColor energyBarDamageColor; CColor unknown_0xafe2d45d; - CColor x_ray_holo_grid_color; - CColor x_ray_seeker_color; - CColor x_ray_seeker_ticks_color; - CColor x_ray_seeker_ticks_outer_color; - CColor x_ray_top_puzzle_color; - CColor x_ray_bottom_puzzle_color; - CColor x_ray_left_puzzle_color; - CColor x_ray_right_puzzle_color; - CColor x_ray_corner_color; + CColor xRayHoloGridColor; + CColor xRaySeekerColor; + CColor xRaySeekerTicksColor; + CColor xRaySeekerTicksOuterColor; + CColor xRayTopPuzzleColor; + CColor xRayBottomPuzzleColor; + CColor xRayLeftPuzzleColor; + CColor xRayRightPuzzleColor; + CColor xRayCornerColor; CColor unknown_0x51c5aad9; CColor unknown_0x60e8322b; CColor unknown_0xa947a67c; @@ -111,10 +111,10 @@ struct SLdrTweakGuiColors_Misc { CColor unknown_0x76357179; CColor unknown_0x439a3774; CColor unknown_0x8ee94c81; - CColor scan_download_square_color; - CColor scan_dot_color; + CColor scanDownloadSquareColor; + CColor scanDotColor; CColor unknown_0x716e6398; - CColor steam_no_blur_color; + CColor steamNoBlurColor; CColor unknown_0x0f37e756; CColor unknown_0xf7283644; CColor unknown_0x37564b7d; @@ -125,18 +125,18 @@ struct SLdrTweakGuiColors_Misc { CColor unknown_0x5368a35f; CColor unknown_0x5a807b81; CColor unknown_0xeb63afed; - CColor scan_panel_color; + CColor scanPanelColor; CColor unknown_0x96f650c3; - CColor scan_images_color; + CColor scanImagesColor; CColor unknown_0xd3bafaf5; - CColor threat_group_damage_color; + CColor threatGroupDamageColor; CColor unknown_0x4f1d443e; CColor unknown_0x0f6451da; CColor unknown_0xc1ec3637; CColor unknown_0xb6a61e34; CColor unknown_0xfdcd9589; CColor unknown_0xb0253266; - CColor scan_seeker_color; + CColor scanSeekerColor; CColor unknown_0xe8401c5a; CColor unknown_0x659147ae; CColor unknown_0x43ed3310; @@ -144,9 +144,9 @@ struct SLdrTweakGuiColors_Misc { CColor unknown_0x35402188; CColor unknown_0x223058b5; CColor unknown_0xe846d37f; - CColor thermal_lock_color; - CColor log_book_color; - CColor inventory_equipped_color; + CColor thermalLockColor; + CColor logBookColor; + CColor inventoryEquippedColor; CColor unknown_0x02d5344f; CColor unknown_0xf37f8deb; CColor unknown_0x5a6587df; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_Multiplayer.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_Multiplayer.hpp index f812dc0..7f1a0d2 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_Multiplayer.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_Multiplayer.hpp @@ -8,16 +8,16 @@ struct SLdrTweakGuiColors_Multiplayer { SLdrTweakGuiColors_Multiplayer(); ~SLdrTweakGuiColors_Multiplayer(); - CColor score_text_color; + CColor scoreTextColor; CColor unknown_0xa09caefe; - CColor timer_text_color; - CColor timer_text_blink_color; + CColor timerTextColor; + CColor timerTextBlinkColor; CColor unknown_0xec4197e3; CColor unknown_0x823e2fb3; CColor unknown_0x95cc4ed8; CColor unknown_0xdb2ca6ff; - CColor lockon_indicator_on_color; - CColor lockon_indicator_off_color; + CColor lockonIndicatorOnColor; + CColor lockonIndicatorOffColor; }; void LoadTypedefSLdrTweakGuiColors_Multiplayer(SLdrTweakGuiColors_Multiplayer&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_TurretHudTypedef.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_TurretHudTypedef.hpp index ca686c6..c15efbe 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_TurretHudTypedef.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGuiColors_TurretHudTypedef.hpp @@ -8,12 +8,12 @@ struct SLdrTweakGuiColors_TurretHudTypedef { SLdrTweakGuiColors_TurretHudTypedef(); ~SLdrTweakGuiColors_TurretHudTypedef(); - CColor frame_color; - CColor font_color; - CColor font_outline_color; - CColor energy_bar_fill_color; - CColor energy_bar_shadow_color; - CColor energy_bar_empty_color; + CColor frameColor; + CColor fontColor; + CColor fontOutlineColor; + CColor energyBarFillColor; + CColor energyBarShadowColor; + CColor energyBarEmptyColor; }; void LoadTypedefSLdrTweakGuiColors_TurretHudTypedef(SLdrTweakGuiColors_TurretHudTypedef&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Completion.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Completion.hpp index 1f04ff3..0bb30e7 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Completion.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Completion.hpp @@ -10,17 +10,17 @@ struct SLdrTweakGui_Completion { ~SLdrTweakGui_Completion(); rstl::string unknown_0x81fc78c2; - rstl::string main_font; - rstl::string secondary_font; - CColor main_font_color; - CColor main_font_outline_color; - CColor stats_font_color; - CColor stats_font_outline_color; - CColor unlock_font_color; - CColor unlock_font_outline_color; + rstl::string mainFont; + rstl::string secondaryFont; + CColor mainFontColor; + CColor mainFontOutlineColor; + CColor statsFontColor; + CColor statsFontOutlineColor; + CColor unlockFontColor; + CColor unlockFontOutlineColor; float unknown_0xb6fe7398; float unknown_0x6af2871b; - float text_start_delay; + float textStartDelay; }; void LoadTypedefSLdrTweakGui_Completion(SLdrTweakGui_Completion&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Credits.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Credits.hpp index 0721f19..e179e36 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Credits.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Credits.hpp @@ -11,12 +11,12 @@ struct SLdrTweakGui_Credits { rstl::string unknown_0x81fc78c2; rstl::string unknown_0x2bcd300d; - rstl::string alternate_font; - CColor font_color; - CColor font_outline_color; - float total_time; - float text_fade_time; - float movie_fade_time; + rstl::string alternateFont; + CColor fontColor; + CColor fontOutlineColor; + float totalTime; + float textFadeTime; + float movieFadeTime; }; void LoadTypedefSLdrTweakGui_Credits(SLdrTweakGui_Credits&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_DarkVisor.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_DarkVisor.hpp index 44c8480..f19ca75 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_DarkVisor.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_DarkVisor.hpp @@ -8,14 +8,14 @@ struct SLdrTweakGui_DarkVisor { SLdrTweakGui_DarkVisor(); ~SLdrTweakGui_DarkVisor(); - CColor dark_world_base_color; - CColor dark_visor_static_color; - CColor dark_visor_palette_modulate; - float dark_visor_blur_speed; - int dark_visor_frame_top; - int dark_visor_frame_height; - int dark_visor_frame_left; - int dark_visor_frame_width; + CColor darkWorldBaseColor; + CColor darkVisorStaticColor; + CColor darkVisorPaletteModulate; + float darkVisorBlurSpeed; + int darkVisorFrameTop; + int darkVisorFrameHeight; + int darkVisorFrameLeft; + int darkVisorFrameWidth; }; void LoadTypedefSLdrTweakGui_DarkVisor(SLdrTweakGui_DarkVisor&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_EchoVisor.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_EchoVisor.hpp index 6c3a618..9763dff 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_EchoVisor.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_EchoVisor.hpp @@ -8,9 +8,9 @@ struct SLdrTweakGui_EchoVisor { SLdrTweakGui_EchoVisor(); ~SLdrTweakGui_EchoVisor(); - CColor echo_base_color; - CColor echo_outline_color; - CColor echo_damage_color; + CColor echoBaseColor; + CColor echoOutlineColor; + CColor echoDamageColor; CColor unknown_0xa288fe51; int unknown_0xf316c617; float unknown_0xb56d2286; @@ -19,7 +19,7 @@ struct SLdrTweakGui_EchoVisor { float unknown_0x5708b903; float unknown_0xafc8c571; float unknown_0x28bffdc5; - CColor echo_ring_color; + CColor echoRingColor; float unknown_0x99a65ca7; float unknown_0x51f19dea; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_HudColorTypedef.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_HudColorTypedef.hpp index 7ad14ce..6a5be35 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_HudColorTypedef.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_HudColorTypedef.hpp @@ -8,11 +8,11 @@ struct SLdrTweakGui_HudColorTypedef { SLdrTweakGui_HudColorTypedef(); ~SLdrTweakGui_HudColorTypedef(); - CColor energy_bar_filled_color; - CColor energy_bar_empty_color; - CColor energy_bar_shadow_color; - CColor energy_tanks_filled_color; - CColor energy_tanks_empty_color; + CColor energyBarFilledColor; + CColor energyBarEmptyColor; + CColor energyBarShadowColor; + CColor energyTanksFilledColor; + CColor energyTanksEmptyColor; CColor unknown_0x1fd3d43a; CColor unknown_0xe1ff2a4f; CColor unknown_0x9cfb8a36; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_LogBook.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_LogBook.hpp index e25fdf3..46742d5 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_LogBook.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_LogBook.hpp @@ -9,50 +9,50 @@ struct SLdrTweakGui_LogBook { SLdrTweakGui_LogBook(); ~SLdrTweakGui_LogBook(); - CColor main_window_border_color; - CColor main_window_text_color; - CColor main_window_selected_text_color; + CColor mainWindowBorderColor; + CColor mainWindowTextColor; + CColor mainWindowSelectedTextColor; CColor unknown_0xfe98f30e; CColor unknown_0x39e57ac0; - CColor legend_background_color; - CColor node_color; - CColor selected_node_color; - CColor parent_node_color; + CColor legendBackgroundColor; + CColor nodeColor; + CColor selectedNodeColor; + CColor parentNodeColor; CColor unknown_0x56843943; - CColor selected_text_cursor_color; + CColor selectedTextCursorColor; float unknown_0x905ce2c0; - float text_scale; - float selected_text_scale; - float transition_time; - spline node_collapse_motion; - spline selected_node_collapse_motion; - spline node_expand_motion; - float rotation_speed; - float node_scale; - float selected_node_scale; - float selected_text_cursor_scale; - float scan_model_scale; + float textScale; + float selectedTextScale; + float transitionTime; + spline nodeCollapseMotion; + spline selectedNodeCollapseMotion; + spline nodeExpandMotion; + float rotationSpeed; + float nodeScale; + float selectedNodeScale; + float selectedTextCursorScale; + float scanModelScale; spline unknown_0x925b9d4a; CColor unknown_0x075a0734; float unknown_0x8ef43309; - float fog_near; - float fog_far; - CColor fog_color; + float fogNear; + float fogFar; + CColor fogColor; float unknown_0xeef15783; float unknown_0x78055ab2; float unknown_0x09e3197f; float unknown_0xfaffce1f; float unknown_0xe5280e7c; - CColor background_sweep_color; - float background_sweep_radius; - float background_sweep_time; - CColor scan_text_window_background_color; - CColor scan_text_window_border_color; - CColor scan_text_window_font_color; - CColor legend_window_background_color; - CColor legend_window_border_color; - CColor legend_window_font_color; - float legend_hide_time; + CColor backgroundSweepColor; + float backgroundSweepRadius; + float backgroundSweepTime; + CColor scanTextWindowBackgroundColor; + CColor scanTextWindowBorderColor; + CColor scanTextWindowFontColor; + CColor legendWindowBackgroundColor; + CColor legendWindowBorderColor; + CColor legendWindowFontColor; + float legendHideTime; CColor unknown_0x7f35c573; CColor unknown_0xe0d77cf1; CColor unknown_0x903d9b7e; @@ -62,27 +62,27 @@ struct SLdrTweakGui_LogBook { CColor unknown_0x8b3f7902; CColor unknown_0xdc1abb82; CColor unknown_0x306b2b24; - CColor frame_color; + CColor frameColor; CColor unknown_0x1a4b8068; - CColor slider_background_color; - CColor slider_selection_color; - float slider_scale; - float slider_speed; + CColor sliderBackgroundColor; + CColor sliderSelectionColor; + float sliderScale; + float sliderSpeed; float unknown_0x58795865; float unknown_0x35e0bd31; - CColor menu_option_color; - CColor menu_option_enabled_arrow_color; - CColor menu_option_disabled_arrow_color; - float menu_option_scale; - float menu_option_arrow_scale; - float model_rotation_speed; + CColor menuOptionColor; + CColor menuOptionEnabledArrowColor; + CColor menuOptionDisabledArrowColor; + float menuOptionScale; + float menuOptionArrowScale; + float modelRotationSpeed; float unknown_0x60914b79; float unknown_0x1fd44d9b; - CVector3f model_light1_position; - CColor model_light1_color; - CVector3f model_light2_position; - CColor model_light2_color; - CColor model_ambient_light_color; + CVector3f modelLight1Position; + CColor modelLight1Color; + CVector3f modelLight2Position; + CColor modelLight2Color; + CColor modelAmbientLightColor; }; void LoadTypedefSLdrTweakGui_LogBook(SLdrTweakGui_LogBook&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Misc.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Misc.hpp index 4b825d3..a3e4a07 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Misc.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_Misc.hpp @@ -13,7 +13,7 @@ struct SLdrTweakGui_Misc { bool unknown_0x2f9d48b8; float unknown_0x71b475d0; float unknown_0x744165c4; - float radar_world_radius; + float radarWorldRadius; float unknown_0xa585c592; float unknown_0x04f4a6fe; float unknown_0x3c327181; @@ -63,7 +63,7 @@ struct SLdrTweakGui_Misc { float unknown_0x4dd9d6d1; float unknown_0xad4d37cd; float unknown_0x95c78e5d; - float threat_world_radius; + float threatWorldRadius; float unknown_0x78174d4b; float unknown_0x3cb2115b; float unknown_0xfc30bb21; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_ScanVisor.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_ScanVisor.hpp index 7997109..a890060 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_ScanVisor.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_ScanVisor.hpp @@ -8,22 +8,22 @@ struct SLdrTweakGui_ScanVisor { SLdrTweakGui_ScanVisor(); ~SLdrTweakGui_ScanVisor(); - CColor inactive_color; - CColor inactive_external_color; - CColor non_critical_color; - CColor critical_color; - CColor burn_in_color; - CColor highlight_color; - CColor critical_highlight_color; + CColor inactiveColor; + CColor inactiveExternalColor; + CColor nonCriticalColor; + CColor criticalColor; + CColor burnInColor; + CColor highlightColor; + CColor criticalHighlightColor; CColor unknown_0xe8f5018b; CColor unknown_0xba1ae1e5; CColor unknown_0xb39d450e; CColor unknown_0x1042455b; CColor unknown_0xd72435ad; CColor unknown_0x75cdc913; - CColor sweep_bar_color; - float burn_in_time; - float fade_out_time; + CColor sweepBarColor; + float burnInTime; + float fadeOutTime; }; void LoadTypedefSLdrTweakGui_ScanVisor(SLdrTweakGui_ScanVisor&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_VisorColorSchemeTypedef.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_VisorColorSchemeTypedef.hpp index b68dd64..1a425c0 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakGui_VisorColorSchemeTypedef.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakGui_VisorColorSchemeTypedef.hpp @@ -8,7 +8,7 @@ struct SLdrTweakGui_VisorColorSchemeTypedef { SLdrTweakGui_VisorColorSchemeTypedef(); ~SLdrTweakGui_VisorColorSchemeTypedef(); - CColor hud_hue; + CColor hudHue; CColor unknown; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerControls_UnknownStruct1.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerControls_UnknownStruct1.hpp index e7e6cc7..4b0a4bf 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerControls_UnknownStruct1.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerControls_UnknownStruct1.hpp @@ -9,79 +9,79 @@ struct SLdrTweakPlayerControls_UnknownStruct1 { int forward; int backward; - int turn_left; - int turn_right; - int strafe_left; - int strafe_right; - int look_left; - int look_right; - int look_up; - int look_down; + int turnLeft; + int turnRight; + int strafeLeft; + int strafeRight; + int lookLeft; + int lookRight; + int lookUp; + int lookDown; int jump; int jump2; - int fire_beam; - int fire_beam2; - int auto_fire_beam; - int charge_beam; - int charge_beam2; - int use_item; - int aim_up; - int aim_down; - int cycle_beam_up; - int cycle_beam_down; - int cycle_item; - int select_power_beam; - int select_ice_beam; - int select_wave_beam; - int select_plasma_beam; - int gun_toggle_holster; - int orbit_close; - int orbit_far; - int orbit_object; - int orbit_select; - int orbit_confirm; - int orbit_left; - int orbit_right; - int orbit_up; - int orbit_down; - int hold_look1; - int hold_look2; - int look_zoom_in; - int look_zoom_out; - int hold_aim; - int map_circle_up; - int map_circle_down; - int map_circle_left; - int map_circle_right; - int map_move_forward; - int map_move_back; - int map_move_left; - int map_move_right; - int map_zoom_in; - int map_zoom_out; - int spider_ball; - int chase_camera; - int x_ray_visor; - int thermo_visor; - int enviro_visor; - int no_visor; - int visor_menu; - int cycle_visor_up; - int cycle_visor_down; - int dark_visor_toggle; + int fireBeam; + int fireBeam2; + int autoFireBeam; + int chargeBeam; + int chargeBeam2; + int useItem; + int aimUp; + int aimDown; + int cycleBeamUp; + int cycleBeamDown; + int cycleItem; + int selectPowerBeam; + int selectIceBeam; + int selectWaveBeam; + int selectPlasmaBeam; + int gunToggleHolster; + int orbitClose; + int orbitFar; + int orbitObject; + int orbitSelect; + int orbitConfirm; + int orbitLeft; + int orbitRight; + int orbitUp; + int orbitDown; + int holdLook1; + int holdLook2; + int lookZoomIn; + int lookZoomOut; + int holdAim; + int mapCircleUp; + int mapCircleDown; + int mapCircleLeft; + int mapCircleRight; + int mapMoveForward; + int mapMoveBack; + int mapMoveLeft; + int mapMoveRight; + int mapZoomIn; + int mapZoomOut; + int spiderBall; + int chaseCamera; + int xRayVisor; + int thermoVisor; + int enviroVisor; + int noVisor; + int visorMenu; + int cycleVisorUp; + int cycleVisorDown; + int darkVisorToggle; int crosshairs; int unknown_0x29293fb1; - int use_shield; - int scan_item; - int inventory_screen; - int map_screen; - int options_screen; - int log_screen; + int useShield; + int scanItem; + int inventoryScreen; + int mapScreen; + int optionsScreen; + int logScreen; int unknown_0xbf218f4f; int unknown_0x05ef2422; - int boost_ball; - int morph_into_ball; - int morph_from_ball; + int boostBall; + int morphIntoBall; + int morphFromBall; }; void LoadTypedefSLdrTweakPlayerControls_UnknownStruct1(SLdrTweakPlayerControls_UnknownStruct1&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerControls_UnknownStruct2.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerControls_UnknownStruct2.hpp index c6271d6..b560285 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerControls_UnknownStruct2.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerControls_UnknownStruct2.hpp @@ -9,22 +9,22 @@ struct SLdrTweakPlayerControls_UnknownStruct2 { bool unknown_0xff1b0413; bool unknown_0xe0c1d958; - bool toggle_aim_position; + bool toggleAimPosition; bool unknown_0x1f99c6ba; bool unknown_0x18eb3ab5; bool unknown_0xbdc01c71; - bool fixed_vertical_aim; + bool fixedVerticalAim; bool unknown_0xda97bbcd; - bool orbit_around_enemies; + bool orbitAroundEnemies; bool unknown_0xc224d966; - bool add_grenade_alert; + bool addGrenadeAlert; bool unknown_0x3fb16819; bool unknown_0x4fcf4b70; bool unknown_0x07bb06a6; bool unknown_0x04d8d57b; bool unknown_0x5282c47e; - bool falling_double_jump; - bool impulse_double_jump; + bool fallingDoubleJump; + bool impulseDoubleJump; bool unknown_0xa796a8b9; bool unknown_0x7c0599c8; bool unknown_0x522ab1ac; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Beam_Misc.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Beam_Misc.hpp index 3d625d8..243f533 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Beam_Misc.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Beam_Misc.hpp @@ -10,10 +10,10 @@ struct SLdrTweakPlayerGun_Beam_Misc { SLdrTDamageInfo unknown_0x8aacfc27; SLdrTDamageInfo unknown_0xa054ff1c; - SLdrTDamageInfo imploder_annihilator; - float ai_burn_damage; + SLdrTDamageInfo imploderAnnihilator; + float aiBurnDamage; float unknown_0x4848f444; - int max_absorbed_phazon_shots; + int maxAbsorbedPhazonShots; float unknown_0x3ae5d1fa; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Holstering.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Holstering.hpp index b080964..8d7a798 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Holstering.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Holstering.hpp @@ -7,9 +7,9 @@ struct SLdrTweakPlayerGun_Holstering { SLdrTweakPlayerGun_Holstering(); ~SLdrTweakPlayerGun_Holstering(); - float gun_holster_time; - float gun_not_firing_time; - float gun_holstered_angle; + float gunHolsterTime; + float gunNotFiringTime; + float gunHolsteredAngle; }; void LoadTypedefSLdrTweakPlayerGun_Holstering(SLdrTweakPlayerGun_Holstering&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Misc.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Misc.hpp index cc96584..100638b 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Misc.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Misc.hpp @@ -7,18 +7,18 @@ struct SLdrTweakPlayerGun_Misc { SLdrTweakPlayerGun_Misc(); ~SLdrTweakPlayerGun_Misc(); - float up_look_angle; - float down_look_angle; - float vertical_spread; - float horizontal_spread; - float high_vertical_spread; - float high_horizontal_spread; - float low_vertical_spread; - float low_horizontal_spread; - float aim_vertical_speed; - float aim_horizontal_speed; - float hologram_display_time; - float gun_transform_time; + float upLookAngle; + float downLookAngle; + float verticalSpread; + float horizontalSpread; + float highVerticalSpread; + float highHorizontalSpread; + float lowVerticalSpread; + float lowHorizontalSpread; + float aimVerticalSpeed; + float aimHorizontalSpeed; + float hologramDisplayTime; + float gunTransformTime; }; void LoadTypedefSLdrTweakPlayerGun_Misc(SLdrTweakPlayerGun_Misc&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_RicochetDamage_Factor.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_RicochetDamage_Factor.hpp index d32ee69..66a9e3f 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_RicochetDamage_Factor.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_RicochetDamage_Factor.hpp @@ -7,11 +7,11 @@ struct SLdrTweakPlayerGun_RicochetDamage_Factor { SLdrTweakPlayerGun_RicochetDamage_Factor(); ~SLdrTweakPlayerGun_RicochetDamage_Factor(); - float power_beam; - float dark_beam; - float light_beam; - float annihilator_beam; - float phazon_beam; + float powerBeam; + float darkBeam; + float lightBeam; + float annihilatorBeam; + float phazonBeam; float missile; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_UnknownStruct1.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_UnknownStruct1.hpp index 4db9dcf..b81f31c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_UnknownStruct1.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_UnknownStruct1.hpp @@ -8,10 +8,10 @@ struct SLdrTweakPlayerGun_UnknownStruct1 { SLdrTweakPlayerGun_UnknownStruct1(); ~SLdrTweakPlayerGun_UnknownStruct1(); - SLdrTDamageInfo super_missile; + SLdrTDamageInfo superMissile; SLdrTDamageInfo darkburst; SLdrTDamageInfo sunburst; - SLdrTDamageInfo sonic_boom; + SLdrTDamageInfo sonicBoom; SLdrTDamageInfo unknown; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Weapons.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Weapons.hpp index 739de68..9db40dd 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Weapons.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerGun_Weapons.hpp @@ -12,14 +12,14 @@ struct SLdrTweakPlayerGun_Weapons { SLdrTDamageInfo bomb; float unknown_0xe8907530; float unknown_0x0a9186cb; - SLdrTDamageInfo power_bomb; + SLdrTDamageInfo powerBomb; SLdrTDamageInfo missile; - SLdrTBeamInfo power_beam; - SLdrTBeamInfo dark_beam; - SLdrTDamageInfo dark_beam_blob; - SLdrTBeamInfo light_beam; - SLdrTBeamInfo annihilator_beam; - SLdrTBeamInfo phazon_beam; + SLdrTBeamInfo powerBeam; + SLdrTBeamInfo darkBeam; + SLdrTDamageInfo darkBeamBlob; + SLdrTBeamInfo lightBeam; + SLdrTBeamInfo annihilatorBeam; + SLdrTBeamInfo phazonBeam; }; void LoadTypedefSLdrTweakPlayerGun_Weapons(SLdrTweakPlayerGun_Weapons&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerRes_AutoMapperIcons.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerRes_AutoMapperIcons.hpp index e9dbd51..a4f95f6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerRes_AutoMapperIcons.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerRes_AutoMapperIcons.hpp @@ -8,15 +8,15 @@ struct SLdrTweakPlayerRes_AutoMapperIcons { SLdrTweakPlayerRes_AutoMapperIcons(); ~SLdrTweakPlayerRes_AutoMapperIcons(); - rstl::string save_station_icon; - rstl::string missile_station_icon; - rstl::string elevator_icon_icon; - rstl::string portal_icon; + rstl::string saveStationIcon; + rstl::string missileStationIcon; + rstl::string elevatorIconIcon; + rstl::string portalIcon; rstl::string unknown_0xfbf479ec; rstl::string unknown_0x5566b6e4; rstl::string unknown_0x51fe3f1f; rstl::string unknown_0xa4127a5a; - rstl::string translator_door_icon; + rstl::string translatorDoorIcon; }; void LoadTypedefSLdrTweakPlayerRes_AutoMapperIcons(SLdrTweakPlayerRes_AutoMapperIcons&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerRes_MapScreenIcons.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerRes_MapScreenIcons.hpp index 1d5a562..05527a6 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerRes_MapScreenIcons.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayerRes_MapScreenIcons.hpp @@ -8,38 +8,38 @@ struct SLdrTweakPlayerRes_MapScreenIcons { SLdrTweakPlayerRes_MapScreenIcons(); ~SLdrTweakPlayerRes_MapScreenIcons(); - rstl::string l_stick_n; - rstl::string l_stick_u; - rstl::string l_stick_ul; - rstl::string l_stick_l; - rstl::string l_stick_dl; - rstl::string l_stick_d; - rstl::string l_stick_dr; - rstl::string l_stick_r; - rstl::string l_stick_ur; - rstl::string c_stick_n; - rstl::string c_stick_u; - rstl::string c_stick_ul; - rstl::string c_stick_l; - rstl::string c_stick_dl; - rstl::string c_stick_d; - rstl::string c_stick_dr; - rstl::string c_stick_r; - rstl::string c_stick_ur; - rstl::string l_trigger_out; - rstl::string l_trigger_in; - rstl::string r_trigger_out; - rstl::string r_trigger_in; - rstl::string start_button_out; - rstl::string start_button_in; - rstl::string a_button_out; - rstl::string a_button_in; - rstl::string b_button_out; - rstl::string b_button_in; - rstl::string x_button_out; - rstl::string x_button_in; - rstl::string y_button_out; - rstl::string y_button_in; + rstl::string lStickN; + rstl::string lStickU; + rstl::string lStickUl; + rstl::string lStickL; + rstl::string lStickDl; + rstl::string lStickD; + rstl::string lStickDr; + rstl::string lStickR; + rstl::string lStickUr; + rstl::string cStickN; + rstl::string cStickU; + rstl::string cStickUl; + rstl::string cStickL; + rstl::string cStickDl; + rstl::string cStickD; + rstl::string cStickDr; + rstl::string cStickR; + rstl::string cStickUr; + rstl::string lTriggerOut; + rstl::string lTriggerIn; + rstl::string rTriggerOut; + rstl::string rTriggerIn; + rstl::string startButtonOut; + rstl::string startButtonIn; + rstl::string aButtonOut; + rstl::string aButtonIn; + rstl::string bButtonOut; + rstl::string bButtonIn; + rstl::string xButtonOut; + rstl::string xButtonIn; + rstl::string yButtonOut; + rstl::string yButtonIn; }; void LoadTypedefSLdrTweakPlayerRes_MapScreenIcons(SLdrTweakPlayerRes_MapScreenIcons&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_AimStuff.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_AimStuff.hpp index d3d8071..7052895 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_AimStuff.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_AimStuff.hpp @@ -7,22 +7,22 @@ struct SLdrTweakPlayer_AimStuff { SLdrTweakPlayer_AimStuff(); ~SLdrTweakPlayer_AimStuff(); - float aim_min_time; - float aim_max_time; - float aim_max_distance; - float aim_max_angle_left; - float aim_max_angle_right; - float aim_max_angle_up; - float aim_max_angle_down; - float aim_angle_per_second; - float aim_threshold_distance; - float aim_turn_angle_per_second; + float aimMinTime; + float aimMaxTime; + float aimMaxDistance; + float aimMaxAngleLeft; + float aimMaxAngleRight; + float aimMaxAngleUp; + float aimMaxAngleDown; + float aimAnglePerSecond; + float aimThresholdDistance; + float aimTurnAnglePerSecond; float unknown; - float aim_box_width; - float aim_box_height; - float aim_target_timer; - float aim_assist_horizontal_angle; - float aim_assist_vertical_angle; + float aimBoxWidth; + float aimBoxHeight; + float aimTargetTimer; + float aimAssistHorizontalAngle; + float aimAssistVerticalAngle; }; void LoadTypedefSLdrTweakPlayer_AimStuff(SLdrTweakPlayer_AimStuff&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Collision.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Collision.hpp index 739d334..3c2b0cb 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Collision.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Collision.hpp @@ -7,11 +7,11 @@ struct SLdrTweakPlayer_Collision { SLdrTweakPlayer_Collision(); ~SLdrTweakPlayer_Collision(); - float player_height; - float player_radius; - float step_up_height; - float step_down_height; - float ball_radius; + float playerHeight; + float playerRadius; + float stepUpHeight; + float stepDownHeight; + float ballRadius; }; void LoadTypedefSLdrTweakPlayer_Collision(SLdrTweakPlayer_Collision&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_DarkWorld.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_DarkWorld.hpp index b6ba9d4..529f1be 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_DarkWorld.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_DarkWorld.hpp @@ -8,10 +8,10 @@ struct SLdrTweakPlayer_DarkWorld { SLdrTweakPlayer_DarkWorld(); ~SLdrTweakPlayer_DarkWorld(); - float damage_grace_period; + float damageGracePeriod; float unknown_0xa4e33ef0; - SLdrDamageInfo damage_per_second; - float dark_suit_damage_reduction; + SLdrDamageInfo damagePerSecond; + float darkSuitDamageReduction; float unknown_0xee452490; float unknown_0x19275a97; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_FirstPersonCamera.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_FirstPersonCamera.hpp index 383110b..3307d37 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_FirstPersonCamera.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_FirstPersonCamera.hpp @@ -9,7 +9,7 @@ struct SLdrTweakPlayer_FirstPersonCamera { ~SLdrTweakPlayer_FirstPersonCamera(); float unknown_0xba5eb7f5; - float camera_elevation; + float cameraElevation; float unknown_0xb400ebd6; float unknown_0xfd26b7b9; float unknown_0x97b14dc6; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Frozen.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Frozen.hpp index 0cb183a..b6f0ceb 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Frozen.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Frozen.hpp @@ -7,9 +7,9 @@ struct SLdrTweakPlayer_Frozen { SLdrTweakPlayer_Frozen(); ~SLdrTweakPlayer_Frozen(); - float frozen_timer; - int frozen_jump_counter; - float frozen_damage_threshold; + float frozenTimer; + int frozenJumpCounter; + float frozenDamageThreshold; }; void LoadTypedefSLdrTweakPlayer_Frozen(SLdrTweakPlayer_Frozen&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Grapple.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Grapple.hpp index a0f8d80..4165e08 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Grapple.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Grapple.hpp @@ -8,21 +8,21 @@ struct SLdrTweakPlayer_Grapple { SLdrTweakPlayer_Grapple(); ~SLdrTweakPlayer_Grapple(); - float grapple_distance; - float grapple_beam_length; - float grapple_swing_time; - float grapple_max_velocity; - float grapple_camera_speed; - float grapple_pull_close_distance; - float grapple_pull_dampen_distance; - float grapple_pull_velocity; - float grapple_pull_camera_speed; - float grapple_turn_rate; - float grapple_jump_force; - float grapple_release_time; - int grapple_control_scheme; - bool grapple_hold_orbit_button; - bool grapple_turn_controls_reversed; + float grappleDistance; + float grappleBeamLength; + float grappleSwingTime; + float grappleMaxVelocity; + float grappleCameraSpeed; + float grapplePullCloseDistance; + float grapplePullDampenDistance; + float grapplePullVelocity; + float grapplePullCameraSpeed; + float grappleTurnRate; + float grappleJumpForce; + float grappleReleaseTime; + int grappleControlScheme; + bool grappleHoldOrbitButton; + bool grappleTurnControlsReversed; SLdrTweakPlayer_GrappleBeam beam; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_GrappleBeam.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_GrappleBeam.hpp index 5e61a47..b03bdea 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_GrappleBeam.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_GrappleBeam.hpp @@ -7,10 +7,10 @@ struct SLdrTweakPlayer_GrappleBeam { SLdrTweakPlayer_GrappleBeam(); ~SLdrTweakPlayer_GrappleBeam(); - float travel_speed; - float x_wave_amplitude; - float z_wave_amplitude; - float angle_phase_delta; + float travelSpeed; + float xWaveAmplitude; + float zWaveAmplitude; + float anglePhaseDelta; }; void LoadTypedefSLdrTweakPlayer_GrappleBeam(SLdrTweakPlayer_GrappleBeam&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Misc.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Misc.hpp index d988267..4fbb1cf 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Misc.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Misc.hpp @@ -7,21 +7,21 @@ struct SLdrTweakPlayer_Misc { SLdrTweakPlayer_Misc(); ~SLdrTweakPlayer_Misc(); - float eye_offset; - float normal_turn_factor; - float free_look_turn_factor; - float free_look_max_x; - float free_look_max_z; - float free_look_speed; - float free_look_snap_speed; - float free_look_fade_angle; - float free_look_min_angle; - float free_look_centered_time; - float free_look_dampen_factor; - bool null_analog_scales; + float eyeOffset; + float normalTurnFactor; + float freeLookTurnFactor; + float freeLookMaxX; + float freeLookMaxZ; + float freeLookSpeed; + float freeLookSnapSpeed; + float freeLookFadeAngle; + float freeLookMinAngle; + float freeLookCenteredTime; + float freeLookDampenFactor; + bool nullAnalogScales; float unknown; - float left_analog_max; - float right_analog_max; + float leftAnalogMax; + float rightAnalogMax; }; void LoadTypedefSLdrTweakPlayer_Misc(SLdrTweakPlayer_Misc&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Motion.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Motion.hpp index e296d7b..34ff185 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Motion.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Motion.hpp @@ -7,82 +7,82 @@ struct SLdrTweakPlayer_Motion { SLdrTweakPlayer_Motion(); ~SLdrTweakPlayer_Motion(); - float forward_accel_normal; - float forward_accel_air; - float forward_accel_ice; - float forward_accel_organic; - float forward_accel_water; - float forward_accel_lava; - float forward_accel_phazon; - float forward_accel_shrubbery; - float rotational_accel_normal; - float rotational_accel_air; - float rotational_accel_ice; - float rotational_accel_organic; - float rotational_accel_water; - float rotational_accel_lava; - float rotational_accel_phazon; - float rotational_accel_shrubbery; - float movement_friction_normal; - float movement_friction_air; - float movement_friction_ice; - float movement_friction_organic; - float movement_friction_water; - float movement_friction_lava; - float movement_friction_phazon; - float movement_friction_shrubbery; - float rotation_friction_normal; - float rotation_friction_air; - float rotation_friction_ice; - float rotation_friction_organic; - float rotation_friction_water; - float rotation_friction_lava; - float rotation_friction_phazon; - float rotation_friction_shrubbery; - float rotation_max_speed_normal; - float rotation_max_speed_air; - float rotation_max_speed_ice; - float rotation_max_speed_organic; - float rotation_max_speed_water; - float rotation_max_speed_lava; - float rotation_max_speed_phazon; - float rotation_max_speed_shrubbery; - float forward_max_speed_normal; - float forward_max_speed_air; - float forward_max_speed_ice; - float forward_max_speed_organic; - float forward_max_speed_water; - float forward_max_speed_lava; - float forward_max_speed_phazon; - float forward_max_speed_shrubbery; - float gravitational_accel; - float fluid_gravitational_accel; - float vertical_jump_accel; - float horizontal_jump_accel; - float vertical_double_jump_accel; - float horizontal_double_jump_accel; - float water_jump_factor; - float water_ball_jump_factor; - float lava_jump_factor; - float lava_ball_jump_factor; - float phazon_jump_factor; - float phazon_ball_jump_factor; - float allowed_jump_time; - float allowed_double_jump_time; - float min_double_jump_window; - float max_double_jump_window; + float forwardAccelNormal; + float forwardAccelAir; + float forwardAccelIce; + float forwardAccelOrganic; + float forwardAccelWater; + float forwardAccelLava; + float forwardAccelPhazon; + float forwardAccelShrubbery; + float rotationalAccelNormal; + float rotationalAccelAir; + float rotationalAccelIce; + float rotationalAccelOrganic; + float rotationalAccelWater; + float rotationalAccelLava; + float rotationalAccelPhazon; + float rotationalAccelShrubbery; + float movementFrictionNormal; + float movementFrictionAir; + float movementFrictionIce; + float movementFrictionOrganic; + float movementFrictionWater; + float movementFrictionLava; + float movementFrictionPhazon; + float movementFrictionShrubbery; + float rotationFrictionNormal; + float rotationFrictionAir; + float rotationFrictionIce; + float rotationFrictionOrganic; + float rotationFrictionWater; + float rotationFrictionLava; + float rotationFrictionPhazon; + float rotationFrictionShrubbery; + float rotationMaxSpeedNormal; + float rotationMaxSpeedAir; + float rotationMaxSpeedIce; + float rotationMaxSpeedOrganic; + float rotationMaxSpeedWater; + float rotationMaxSpeedLava; + float rotationMaxSpeedPhazon; + float rotationMaxSpeedShrubbery; + float forwardMaxSpeedNormal; + float forwardMaxSpeedAir; + float forwardMaxSpeedIce; + float forwardMaxSpeedOrganic; + float forwardMaxSpeedWater; + float forwardMaxSpeedLava; + float forwardMaxSpeedPhazon; + float forwardMaxSpeedShrubbery; + float gravitationalAccel; + float fluidGravitationalAccel; + float verticalJumpAccel; + float horizontalJumpAccel; + float verticalDoubleJumpAccel; + float horizontalDoubleJumpAccel; + float waterJumpFactor; + float waterBallJumpFactor; + float lavaJumpFactor; + float lavaBallJumpFactor; + float phazonJumpFactor; + float phazonBallJumpFactor; + float allowedJumpTime; + float allowedDoubleJumpTime; + float minDoubleJumpWindow; + float maxDoubleJumpWindow; float unknown; - float min_jump_time; - float min_double_jump_time; - float ledge_fall_time; - float double_jump_impulse; - float backwards_force_multiplier; - float bomb_jump_height; - float bomb_jump_radius; - float gravity_boost_time; - float gravity_boost_force; - float gravity_boost_cancel_dampening; - bool gravity_boost_multiple_allowed; + float minJumpTime; + float minDoubleJumpTime; + float ledgeFallTime; + float doubleJumpImpulse; + float backwardsForceMultiplier; + float bombJumpHeight; + float bombJumpRadius; + float gravityBoostTime; + float gravityBoostForce; + float gravityBoostCancelDampening; + bool gravityBoostMultipleAllowed; }; void LoadTypedefSLdrTweakPlayer_Motion(SLdrTweakPlayer_Motion&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Orbit.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Orbit.hpp index b189e9a..e65080d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Orbit.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Orbit.hpp @@ -7,54 +7,54 @@ struct SLdrTweakPlayer_Orbit { SLdrTweakPlayer_Orbit(); ~SLdrTweakPlayer_Orbit(); - float orbit_close_min_distance; - float orbit_close_normal_distance; - float orbit_close_max_distance; - float orbit_far_min_distance; - float orbit_far_normal_distance; - float orbit_far_max_distance; - float orbit_carcass_min_distance; - float orbit_carcass_normal_distance; - float orbit_carcass_max_distance; - float orbit_max_angular_change; - float orbit_mode_timer; - float orbit_camera_speed; - float orbit_upper_angle; - float orbit_lower_angle; - float orbit_horiz_angle; - float orbit_upper_camera_angle; - float orbit_lower_camera_angle; - float orbit_max_target_distance; - float orbit_max_lock_distance; + float orbitCloseMinDistance; + float orbitCloseNormalDistance; + float orbitCloseMaxDistance; + float orbitFarMinDistance; + float orbitFarNormalDistance; + float orbitFarMaxDistance; + float orbitCarcassMinDistance; + float orbitCarcassNormalDistance; + float orbitCarcassMaxDistance; + float orbitMaxAngularChange; + float orbitModeTimer; + float orbitCameraSpeed; + float orbitUpperAngle; + float orbitLowerAngle; + float orbitHorizAngle; + float orbitUpperCameraAngle; + float orbitLowerCameraAngle; + float orbitMaxTargetDistance; + float orbitMaxLockDistance; float unknown_0x55f7d145; - float orbit_distance_threshold; - int orbit_zone_width; - int orbit_zone_height; + float orbitDistanceThreshold; + int orbitZoneWidth; + int orbitZoneHeight; int unknown_0x58ee9d03; int unknown_0xe052fa66; int unknown_0xc452b61e; int unknown_0x7ceed17b; - int orbit_scan_zone_width; - int orbit_scan_zone_height; + int orbitScanZoneWidth; + int orbitScanZoneHeight; int unknown_0xec529a5e; int unknown_0x54eefd3b; int unknown_0x73ebdce2; int unknown_0xcb57bb87; - float orbit_box_width; - float orbit_box_height; - float orbit_min_camera_pitch_distance; - float orbit_max_camera_pitch_distance; + float orbitBoxWidth; + float orbitBoxHeight; + float orbitMinCameraPitchDistance; + float orbitMaxCameraPitchDistance; float unknown_0x478c15f9; - float orbit_z_range; - float orbit_selection_close_angle; - float orbit_selection_max_angle; + float orbitZRange; + float orbitSelectionCloseAngle; + float orbitSelectionMaxAngle; float unknown_0x90b71b2e; - float orbit_prevention_time; - bool orbit_dash; - bool orbit_dash_uses_tap; - float orbit_dash_tap_time; - float orbit_dash_stick_threshold; - float orbit_dash_double_jump_impulse; + float orbitPreventionTime; + bool orbitDash; + bool orbitDashUsesTap; + float orbitDashTapTime; + float orbitDashStickThreshold; + float orbitDashDoubleJumpImpulse; float unknown_0x75a00cfb; float unknown_0xc4775e5f; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_ScanVisor.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_ScanVisor.hpp index c9eb740..5edeb0f 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_ScanVisor.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_ScanVisor.hpp @@ -7,13 +7,13 @@ struct SLdrTweakPlayer_ScanVisor { SLdrTweakPlayer_ScanVisor(); ~SLdrTweakPlayer_ScanVisor(); - float scan_distance; - bool scan_retention; - bool scan_freezes_game; - bool scan_line_of_sight; - float scan_max_target_distance; - float scan_max_lock_distance; - float scan_camera_speed; + float scanDistance; + bool scanRetention; + bool scanFreezesGame; + bool scanLineOfSight; + float scanMaxTargetDistance; + float scanMaxLockDistance; + float scanCameraSpeed; }; void LoadTypedefSLdrTweakPlayer_ScanVisor(SLdrTweakPlayer_ScanVisor&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Shield.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Shield.hpp index 1701427..0c19da0 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Shield.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakPlayer_Shield.hpp @@ -7,10 +7,10 @@ struct SLdrTweakPlayer_Shield { SLdrTweakPlayer_Shield(); ~SLdrTweakPlayer_Shield(); - float max_energy; - float usage_rate; - float recharge_rate; - bool allows_motion; + float maxEnergy; + float usageRate; + float rechargeRate; + bool allowsMotion; }; void LoadTypedefSLdrTweakPlayer_Shield(SLdrTweakPlayer_Shield&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_Charge_Gauge.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_Charge_Gauge.hpp index 8b77903..e6c2e0b 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_Charge_Gauge.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_Charge_Gauge.hpp @@ -12,8 +12,8 @@ struct SLdrTweakTargeting_Charge_Gauge { float unknown_0xa118e250; float unknown_0xdb1ac8ee; float unknown_0xecd100f8; - float charge_gauge_scale; - CColor charge_gauge_color; + float chargeGaugeScale; + CColor chargeGaugeColor; int unknown_0xed78e6eb; float unknown_0x2c3d9e27; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_LockDagger.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_LockDagger.hpp index 4d6379d..1715030 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_LockDagger.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_LockDagger.hpp @@ -8,12 +8,12 @@ struct SLdrTweakTargeting_LockDagger { SLdrTweakTargeting_LockDagger(); ~SLdrTweakTargeting_LockDagger(); - float lock_dagger_normal_scale; + float lockDaggerNormalScale; float unknown; - CColor lock_dagger_color; - float lock_dagger0_angle; - float lock_dagger1_angle; - float lock_dagger2_angle; + CColor lockDaggerColor; + float lockDagger0Angle; + float lockDagger1Angle; + float lockDagger2Angle; }; void LoadTypedefSLdrTweakTargeting_LockDagger(SLdrTweakTargeting_LockDagger&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_LockFire.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_LockFire.hpp index b11d9b5..5268f53 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_LockFire.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_LockFire.hpp @@ -8,9 +8,9 @@ struct SLdrTweakTargeting_LockFire { SLdrTweakTargeting_LockFire(); ~SLdrTweakTargeting_LockFire(); - float lock_fire_reticle_scale; - float lock_fire_anim_time; - CColor lock_fire_color; + float lockFireReticleScale; + float lockFireAnimTime; + CColor lockFireColor; }; void LoadTypedefSLdrTweakTargeting_LockFire(SLdrTweakTargeting_LockFire&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_OuterBeamIcon.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_OuterBeamIcon.hpp index e601ef6..1bbdb95 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_OuterBeamIcon.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_OuterBeamIcon.hpp @@ -10,8 +10,8 @@ struct SLdrTweakTargeting_OuterBeamIcon { float unknown_0x383e2b2d; float unknown_0xeaac42d0; - float but_settings_color; - CColor but_settings_scale; + float butSettingsColor; + CColor butSettingsScale; int unknown_0xe7d57d6a; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_Scan.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_Scan.hpp index f523d4a..0e4dafb 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_Scan.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_Scan.hpp @@ -8,12 +8,12 @@ struct SLdrTweakTargeting_Scan { SLdrTweakTargeting_Scan(); ~SLdrTweakTargeting_Scan(); - float scan_lock_scale; - float scan_lock_transition_time; - float scan_lock_translation; + float scanLockScale; + float scanLockTransitionTime; + float scanLockTranslation; CColor unknown; - CColor scan_lock_locked_color; - CColor scan_lock_unlocked_color; + CColor scanLockLockedColor; + CColor scanLockUnlockedColor; }; void LoadTypedefSLdrTweakTargeting_Scan(SLdrTweakTargeting_Scan&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_VulnerabilityIndicator.hpp b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_VulnerabilityIndicator.hpp index 43eacc4..4504c6a 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_VulnerabilityIndicator.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrTweakTargeting_VulnerabilityIndicator.hpp @@ -8,8 +8,8 @@ struct SLdrTweakTargeting_VulnerabilityIndicator { SLdrTweakTargeting_VulnerabilityIndicator(); ~SLdrTweakTargeting_VulnerabilityIndicator(); - float indicator_angle; - CColor indicator_color; + float indicatorAngle; + CColor indicatorColor; }; void LoadTypedefSLdrTweakTargeting_VulnerabilityIndicator(SLdrTweakTargeting_VulnerabilityIndicator&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct10.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct10.hpp index dbcc7e3..2800ff3 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct10.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct10.hpp @@ -9,23 +9,23 @@ struct SLdrUnknownStruct10 { SLdrUnknownStruct10(); ~SLdrUnknownStruct10(); - float grenade_min_attack_interval; + float grenadeMinAttackInterval; float unknown_0xb7994ea1; - float grenade_attack_chance; + float grenadeAttackChance; float unknown_0x25f822c4; float unknown_0x765e3a20; - SLdrDamageInfo grenade_damage; - CAssetId grenade_explosion; - CAssetId grenade_effect; - CAssetId grenade_trail; - float grenade_mass; + SLdrDamageInfo grenadeDamage; + CAssetId grenadeExplosion; + CAssetId grenadeEffect; + CAssetId grenadeTrail; + float grenadeMass; float unknown_0xed086ce0; float unknown_0x00fc6646; float unknown_0xa7c8e63f; int unknown_0x454f16b1; float unknown_0x2d4706e8; - int sound_grenade_bounce; - int sound_grenade_explode; + int soundGrenadeBounce; + int soundGrenadeExplode; }; void LoadTypedefSLdrUnknownStruct10(SLdrUnknownStruct10&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct11.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct11.hpp index b369223..eff8b5c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct11.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct11.hpp @@ -10,21 +10,21 @@ struct SLdrUnknownStruct11 { SLdrUnknownStruct11(); ~SLdrUnknownStruct11(); - SLdrDamageInfo shield_charge_damage; - SLdrDamageVulnerability shield_vulnerability; + SLdrDamageInfo shieldChargeDamage; + SLdrDamageVulnerability shieldVulnerability; float unknown_0xc1d9dbc6; float unknown_0x927fc322; - float shield_charge_speed; - CAssetId shield_explode_effect; - int sound_shield_explode; + float shieldChargeSpeed; + CAssetId shieldExplodeEffect; + int soundShieldExplode; float unknown_0x6cb0da5a; float unknown_0xc3938663; - float arm_shield_chance; - float arm_shield_time; + float armShieldChance; + float armShieldTime; float unknown_0xe1b0efa0; - CAssetId arm_shield_explode_effect; - CAssetId shield_charge_effect; - CAssetId arm_shield_effect; + CAssetId armShieldExplodeEffect; + CAssetId shieldChargeEffect; + CAssetId armShieldEffect; int sound_0xbf3c59b6; int sound_0x78be3b8d; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct12.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct12.hpp index b497c90..fb5419b 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct12.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct12.hpp @@ -10,20 +10,20 @@ struct SLdrUnknownStruct12 { ~SLdrUnknownStruct12(); float unknown_0xb33a0cbc; - float min_attack_range; - float max_attack_range; - SLdrDamageInfo grenade_damage; - CAssetId grenade_explosion; - CAssetId grenade_effect; - CAssetId grenade_trail; - float grenade_mass; + float minAttackRange; + float maxAttackRange; + SLdrDamageInfo grenadeDamage; + CAssetId grenadeExplosion; + CAssetId grenadeEffect; + CAssetId grenadeTrail; + float grenadeMass; float unknown_0xed086ce0; float unknown_0x00fc6646; float unknown_0xa7c8e63f; int unknown_0x454f16b1; float unknown_0x2d4706e8; - int sound_grenade_bounce; - int sound_grenade_explode; + int soundGrenadeBounce; + int soundGrenadeExplode; }; void LoadTypedefSLdrUnknownStruct12(SLdrUnknownStruct12&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct13.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct13.hpp index f85f398..d29d64d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct13.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct13.hpp @@ -11,13 +11,13 @@ struct SLdrUnknownStruct13 { ~SLdrUnknownStruct13(); float unknown; - float min_attack_range; - float max_attack_range; + float minAttackRange; + float maxAttackRange; SLdrDamageInfo damage; CAssetId projectile; - CAssetId mold_effect; - SLdrDamageInfo mold_damage; - SLdrAudioPlaybackParms sound_mold; + CAssetId moldEffect; + SLdrDamageInfo moldDamage; + SLdrAudioPlaybackParms soundMold; }; void LoadTypedefSLdrUnknownStruct13(SLdrUnknownStruct13&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct14.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct14.hpp index 144b252..04d473c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct14.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct14.hpp @@ -12,14 +12,14 @@ struct SLdrUnknownStruct14 { float unknown_0xa0d037ee; float unknown_0x4f522994; - float shadow_dash_speed; + float shadowDashSpeed; float unknown_0x5d02f384; CAssetId part; - SLdrAudioPlaybackParms audio_playback_parms; - SLdrAudioPlaybackParms sound_cloak; - SLdrAudioPlaybackParms sound_de_cloak; - SLdrDamageVulnerability shadow_decoy_vulnerability; - SLdrDamageVulnerability shadow_dash_vulnerability; + SLdrAudioPlaybackParms audioPlaybackParms; + SLdrAudioPlaybackParms soundCloak; + SLdrAudioPlaybackParms soundDeCloak; + SLdrDamageVulnerability shadowDecoyVulnerability; + SLdrDamageVulnerability shadowDashVulnerability; }; void LoadTypedefSLdrUnknownStruct14(SLdrUnknownStruct14&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct17.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct17.hpp index b72f32c..3df644c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct17.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct17.hpp @@ -14,10 +14,10 @@ struct SLdrUnknownStruct17 { float unknown_0x08c0b02c; float unknown_0x695f68c7; float unknown_0xd061ff99; - float pause_duration_min; - float pause_duration_max; - float chance_to_double_dash; - SLdrUnknownStruct16 unknown_struct16; + float pauseDurationMin; + float pauseDurationMax; + float chanceToDoubleDash; + SLdrUnknownStruct16 unknownStruct16; bool unknown_0x3ff87a8c; bool unknown_0x49b9936d; bool unknown_0xc96b8223; @@ -26,24 +26,24 @@ struct SLdrUnknownStruct17 { bool unknown_0xaa85c885; float pause; float taunt; - bool look_around; - float melee_attack; - float melee_dash; - float scatter_shot; + bool lookAround; + float meleeAttack; + float meleeDash; + float scatterShot; float unknown_0x94f48974; - float dive_attack; + float diveAttack; bool unknown_0xb2c1e4fa; bool unknown_0xf5cf3c0f; - float normal_missile; - float missile_jump; - float super_missile; + float normalMissile; + float missileJump; + float superMissile; float unknown_0xe63286eb; float unknown_0x4aae6186; - float sweep_beam; - float boost_ball; + float sweepBeam; + float boostBall; bool unknown_0x2d7551e6; - float phazon_attack; - float phazon_enrage; + float phazonAttack; + float phazonEnrage; bool unknown_0x911a2476; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct21.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct21.hpp index c526ab7..1e0f5fa 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct21.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct21.hpp @@ -10,8 +10,8 @@ struct SLdrUnknownStruct21 { ~SLdrUnknownStruct21(); CAssetId projectile; - SLdrDamageInfo projectile_damage; - CAssetId projectile_visor_effect; + SLdrDamageInfo projectileDamage; + CAssetId projectileVisorEffect; }; void LoadTypedefSLdrUnknownStruct21(SLdrUnknownStruct21&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct22.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct22.hpp index 575b0a5..16f00cb 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct22.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct22.hpp @@ -10,9 +10,9 @@ struct SLdrUnknownStruct22 { SLdrUnknownStruct22(); ~SLdrUnknownStruct22(); - CAssetId portal_effect; - SLdrAnimationParameters attack_tip; - SLdrDamageInfo stab_damage; + CAssetId portalEffect; + SLdrAnimationParameters attackTip; + SLdrDamageInfo stabDamage; int unknown_0xecfab026; int unknown_0x94880277; int sound_0x1c3e84b6; diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct23.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct23.hpp index 7ff5979..baf7a72 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct23.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct23.hpp @@ -8,9 +8,9 @@ struct SLdrUnknownStruct23 { SLdrUnknownStruct23(); ~SLdrUnknownStruct23(); - float loop_duration; - int destroy_percentage; - SLdrShockWaveInfo shock_wave_info; + float loopDuration; + int destroyPercentage; + SLdrShockWaveInfo shockWaveInfo; int sound; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct24.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct24.hpp index 3830e02..5a0e12e 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct24.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct24.hpp @@ -9,7 +9,7 @@ struct SLdrUnknownStruct24 { SLdrUnknownStruct24(); ~SLdrUnknownStruct24(); - SLdrPlasmaBeamInfo beam_info; + SLdrPlasmaBeamInfo beamInfo; SLdrDamageInfo damage; int sound; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct26.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct26.hpp index 269f5f0..102b388 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct26.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct26.hpp @@ -11,9 +11,9 @@ struct SLdrUnknownStruct26 { ~SLdrUnknownStruct26(); CAssetId effect; - int portal_open_sound; - SLdrDamageInfo projectile_damage; - SLdrPlasmaBeamInfo beam_info; + int portalOpenSound; + SLdrDamageInfo projectileDamage; + SLdrPlasmaBeamInfo beamInfo; }; void LoadTypedefSLdrUnknownStruct26(SLdrUnknownStruct26&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct28.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct28.hpp index e0837dd..2d3792a 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct28.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct28.hpp @@ -13,21 +13,21 @@ struct SLdrUnknownStruct28 { ~SLdrUnknownStruct28(); int unknown_0x01789abd; - float hearing_radius; - float ing_spot_max_speed; + float hearingRadius; + float ingSpotMaxSpeed; float unknown_0x8d42a8d5; float unknown_0x84586bfd; float unknown_0x50398a06; - float ing_spot_turn_speed; - CAssetId ing_spot_blob_effect; - CAssetId ing_spot_hit_normal_damage; - CAssetId ing_spot_hit_heavy_damage; - CAssetId ing_spot_death; - int sound_ing_spot_idle; - int sound_ing_spot_move; + float ingSpotTurnSpeed; + CAssetId ingSpotBlobEffect; + CAssetId ingSpotHitNormalDamage; + CAssetId ingSpotHitHeavyDamage; + CAssetId ingSpotDeath; + int soundIngSpotIdle; + int soundIngSpotMove; int sound_0xb392943a; int sound_0x24ecc1e9; - int sound_ing_spot_death; + int soundIngSpotDeath; CAssetId part_0x3c2d681e; CAssetId srsc; CAssetId part_0x3da219c7; @@ -36,37 +36,37 @@ struct SLdrUnknownStruct28 { float unknown_0xcb39eccb; float unknown_0x587ca175; float unknown_0x0bd7d5a9; - int sound_swarm_move; + int soundSwarmMove; int sound_0x5650366a; - int sound_body_projectile_blaster_middle; + int soundBodyProjectileBlasterMiddle; int sound_0x0c13c5a8; int sound_0x148b81e4; float unknown_0x5d0d2c40; float unknown_0xc620183a; - float frustration_time; - float taunt_chance; + float frustrationTime; + float tauntChance; float aggressiveness; - SLdrDamageInfo arm_swipe_damage; - SLdrDamageInfo body_projectile_contact_damage; + SLdrDamageInfo armSwipeDamage; + SLdrDamageInfo bodyProjectileContactDamage; float unknown_0xa0d63374; - float body_projectile_suck_time; - CAssetId body_projectile_splat_effect; - float body_projectile_speed; - float body_projectile_drop_time; + float bodyProjectileSuckTime; + CAssetId bodyProjectileSplatEffect; + float bodyProjectileSpeed; + float bodyProjectileDropTime; float unknown_0xe6ddb662; float unknown_0xb57bae86; - int sound_body_projectile; - int sound_body_projectile_splat_wall; - float body_projectile_odds; + int soundBodyProjectile; + int soundBodyProjectileSplatWall; + float bodyProjectileOdds; float unknown_0xfa6edeb5; float unknown_0xa9c8c651; - CAssetId mini_portal_effect; - int sound_mini_portal; - SLdrDamageInfo mini_portal_projectile_damage; - SLdrPlasmaBeamInfo mini_portal_beam_info; - CColor light_color; - float light_attenuation; - SLdrDamageVulnerability ing_spot_vulnerability; + CAssetId miniPortalEffect; + int soundMiniPortal; + SLdrDamageInfo miniPortalProjectileDamage; + SLdrPlasmaBeamInfo miniPortalBeamInfo; + CColor lightColor; + float lightAttenuation; + SLdrDamageVulnerability ingSpotVulnerability; }; void LoadTypedefSLdrUnknownStruct28(SLdrUnknownStruct28&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct29.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct29.hpp index 0b0785f..56c4a6e 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct29.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct29.hpp @@ -12,37 +12,37 @@ struct SLdrUnknownStruct29 { SLdrUnknownStruct29(); ~SLdrUnknownStruct29(); - CVector3f boost_ball_scale; - float boost_ball_mass; + CVector3f boostBallScale; + float boostBallMass; float unknown_0xbea96fb7; - spline boost_ball_speed; - SLdrDamageInfo damage_info_0x0e1a78bd; - SLdrDamageInfo damage_info_0x19c3d263; + spline boostBallSpeed; + SLdrDamageInfo damageInfo_0x0e1a78bd; + SLdrDamageInfo damageInfo_0x19c3d263; float unknown_0xd8047cba; float unknown_0x7b21e31a; - CAssetId boost_ball_model; + CAssetId boostBallModel; CAssetId part_0x15534429; - CAssetId boost_ball_shield_effect; + CAssetId boostBallShieldEffect; CAssetId spsc; - int sound_bounce; - int sound_into_ball; - int sound_outof_ball; + int soundBounce; + int soundIntoBall; + int soundOutofBall; int sound; - int sound_boost; - int sound_rolling; - SLdrDamageVulnerability boost_ball_vulnerability; + int soundBoost; + int soundRolling; + SLdrDamageVulnerability boostBallVulnerability; int unknown_0xee69b993; int unknown_0x4b2de673; - float search_cone_angle; + float searchConeAngle; float unknown_0xb0e85d53; - SLdrDamageInfo damage_info_0x5616d5f1; - SLdrDamageInfo damage_info_0xed685533; + SLdrDamageInfo damageInfo_0x5616d5f1; + SLdrDamageInfo damageInfo_0xed685533; CAssetId part_0xd771ec43; CAssetId part_0x2009a977; CAssetId part_0x62ab33a2; - SLdrIngBoostBallGuardianStruct ing_boost_ball_guardian_struct_0xbab98497; - SLdrIngBoostBallGuardianStruct ing_boost_ball_guardian_struct_0xfe18a18f; - SLdrIngBoostBallGuardianStruct ing_boost_ball_guardian_struct_0xc2784287; + SLdrIngBoostBallGuardianStruct ingBoostBallGuardianStruct_0xbab98497; + SLdrIngBoostBallGuardianStruct ingBoostBallGuardianStruct_0xfe18a18f; + SLdrIngBoostBallGuardianStruct ingBoostBallGuardianStruct_0xc2784287; }; void LoadTypedefSLdrUnknownStruct29(SLdrUnknownStruct29&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct3.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct3.hpp index b9cd598..fdf9d6c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct3.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct3.hpp @@ -15,21 +15,21 @@ struct SLdrUnknownStruct3 { float unknown_0x1473dad2; float unknown_0x3650ce75; float unknown_0x78520e6e; - float damage_angle; - float horiz_speed; - float vert_speed; - float fire_rate; + float damageAngle; + float horizSpeed; + float vertSpeed; + float fireRate; float unknown_0xf9bd253e; - float max_attack_angle; - float max_attack_range; - float start_attack_range; - float attack_leash_timer; - SLdrDamageInfo weapon_damage; - CAssetId weapon_effect; + float maxAttackAngle; + float maxAttackRange; + float startAttackRange; + float attackLeashTimer; + SLdrDamageInfo weaponDamage; + CAssetId weaponEffect; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; - CAssetId state_machine; - CAssetId telegraph_effect; + CAssetId stateMachine; + CAssetId telegraphEffect; }; void LoadTypedefSLdrUnknownStruct3(SLdrUnknownStruct3&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct30.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct30.hpp index 0da9088..8132273 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct30.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct30.hpp @@ -10,18 +10,18 @@ struct SLdrUnknownStruct30 { SLdrUnknownStruct30(); ~SLdrUnknownStruct30(); - CAssetId state_machine; + CAssetId stateMachine; SLdrHealthInfo health; - float puddle_speed; - CAssetId blob_effect; + float puddleSpeed; + CAssetId blobEffect; CAssetId part_0xe8a6e174; CAssetId part_0x1ab2b090; - CAssetId puddle_death; - int sound_ing_spot_idle; - int sound_ing_spot_move; + CAssetId puddleDeath; + int soundIngSpotIdle; + int soundIngSpotMove; int sound_0xb392943a; int sound_0x24ecc1e9; - int sound_ing_spot_death; + int soundIngSpotDeath; SLdrDamageVulnerability vulnerability; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct31.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct31.hpp index 6185eea..3c9d709 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct31.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct31.hpp @@ -10,21 +10,21 @@ struct SLdrUnknownStruct31 { SLdrUnknownStruct31(); ~SLdrUnknownStruct31(); - SLdrIngSpiderballGuardianStruct ing_spiderball_guardian_struct_0x152db484; - SLdrIngSpiderballGuardianStruct ing_spiderball_guardian_struct_0x2d163ff7; - SLdrIngSpiderballGuardianStruct ing_spiderball_guardian_struct_0x8c2fbb19; - SLdrIngSpiderballGuardianStruct ing_spiderball_guardian_struct_0x5d612911; - SLdrIngSpiderballGuardianStruct ing_spiderball_guardian_struct_0xfc58adff; - SLdrIngSpiderballGuardianStruct ing_spiderball_guardian_struct_0xc463268c; - float damage_radius; - SLdrDamageInfo proximity_damage; + SLdrIngSpiderballGuardianStruct ingSpiderballGuardianStruct_0x152db484; + SLdrIngSpiderballGuardianStruct ingSpiderballGuardianStruct_0x2d163ff7; + SLdrIngSpiderballGuardianStruct ingSpiderballGuardianStruct_0x8c2fbb19; + SLdrIngSpiderballGuardianStruct ingSpiderballGuardianStruct_0x5d612911; + SLdrIngSpiderballGuardianStruct ingSpiderballGuardianStruct_0xfc58adff; + SLdrIngSpiderballGuardianStruct ingSpiderballGuardianStruct_0xc463268c; + float damageRadius; + SLdrDamageInfo proximityDamage; float unknown; - SLdrAudioPlaybackParms audio_playback_parms_0xaed23abc; - SLdrAudioPlaybackParms sound_spiderball_rolling; - SLdrAudioPlaybackParms audio_playback_parms_0xcee38f10; - SLdrAudioPlaybackParms audio_playback_parms_0x796fa303; - SLdrAudioPlaybackParms sound_enter_stunned; - SLdrAudioPlaybackParms audio_playback_parms_0x44c1f241; + SLdrAudioPlaybackParms audioPlaybackParms_0xaed23abc; + SLdrAudioPlaybackParms soundSpiderballRolling; + SLdrAudioPlaybackParms audioPlaybackParms_0xcee38f10; + SLdrAudioPlaybackParms audioPlaybackParms_0x796fa303; + SLdrAudioPlaybackParms soundEnterStunned; + SLdrAudioPlaybackParms audioPlaybackParms_0x44c1f241; }; void LoadTypedefSLdrUnknownStruct31(SLdrUnknownStruct31&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct32.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct32.hpp index 5490482..befb413 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct32.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct32.hpp @@ -13,19 +13,19 @@ struct SLdrUnknownStruct32 { SLdrUnknownStruct32(); ~SLdrUnknownStruct32(); - CAssetId ing_spot_blob_effect; + CAssetId ingSpotBlobEffect; int sound; - SLdrIngSpaceJumpGuardianStruct ing_space_jump_guardian_struct_0x5e1d1931; - SLdrIngSpaceJumpGuardianStruct ing_space_jump_guardian_struct_0x6b08e2e5; - SLdrIngSpaceJumpGuardianStruct ing_space_jump_guardian_struct_0xf223aa76; - SLdrIngSpaceJumpGuardianStruct ing_space_jump_guardian_struct_0xd0db5f7a; - CColor light_color; - float light_attenuation; - CAssetId mini_portal_effect; - int sound_mini_portal; - SLdrDamageInfo mini_portal_projectile_damage; - SLdrPlasmaBeamInfo mini_portal_beam_info; - SLdrShockWaveInfo shock_wave_info; + SLdrIngSpaceJumpGuardianStruct ingSpaceJumpGuardianStruct_0x5e1d1931; + SLdrIngSpaceJumpGuardianStruct ingSpaceJumpGuardianStruct_0x6b08e2e5; + SLdrIngSpaceJumpGuardianStruct ingSpaceJumpGuardianStruct_0xf223aa76; + SLdrIngSpaceJumpGuardianStruct ingSpaceJumpGuardianStruct_0xd0db5f7a; + CColor lightColor; + float lightAttenuation; + CAssetId miniPortalEffect; + int soundMiniPortal; + SLdrDamageInfo miniPortalProjectileDamage; + SLdrPlasmaBeamInfo miniPortalBeamInfo; + SLdrShockWaveInfo shockWaveInfo; }; void LoadTypedefSLdrUnknownStruct32(SLdrUnknownStruct32&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct33.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct33.hpp index 0b3f864..b8f282d 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct33.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct33.hpp @@ -11,22 +11,22 @@ struct SLdrUnknownStruct33 { ~SLdrUnknownStruct33(); SLdrDamageInfo damage; - float bomb_stun_duration; + float bombStunDuration; float unknown_0x46aaced3; - float max_speed; - float max_wall_speed; - float ball_pursuit_speed; - float speed_modifier; - float turn_speed; - CAssetId blob_effect; - CAssetId hit_normal_damage; - CAssetId hit_heavy_damage; + float maxSpeed; + float maxWallSpeed; + float ballPursuitSpeed; + float speedModifier; + float turnSpeed; + CAssetId blobEffect; + CAssetId hitNormalDamage; + CAssetId hitHeavyDamage; CAssetId death; - int sound_idle; - int sound_move; + int soundIdle; + int soundMove; int sound_0xb392943a; int sound_0x24ecc1e9; - int sound_death; + int soundDeath; float unknown_0x7569fdba; float unknown_0xd55938d2; SLdrDamageVulnerability vulnerability; diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct34.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct34.hpp index 9995f1a..56c271c 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct34.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct34.hpp @@ -17,17 +17,17 @@ struct SLdrUnknownStruct34 { CAssetId trail; float mass; float unknown_0x417f4a91; - float min_launch_speed; - float max_launch_speed; + float minLaunchSpeed; + float maxLaunchSpeed; int unknown_0xfbcdb101; - int sound_bounce; - int sound_explode; - float max_turn_angle; + int soundBounce; + int soundExplode; + float maxTurnAngle; float unknown_0x47f99fbc; - int min_generation; - int max_generation; + int minGeneration; + int maxGeneration; float unknown_0xfbf8ea0a; - bool allow_lock_on; + bool allowLockOn; }; void LoadTypedefSLdrUnknownStruct34(SLdrUnknownStruct34&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct35.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct35.hpp index 4558a02..cd933c7 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct35.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct35.hpp @@ -8,8 +8,8 @@ struct SLdrUnknownStruct35 { SLdrUnknownStruct35(); ~SLdrUnknownStruct35(); - float rotation_speed; - CAssetId state_machine; + float rotationSpeed; + CAssetId stateMachine; }; void LoadTypedefSLdrUnknownStruct35(SLdrUnknownStruct35&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct36.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct36.hpp index 6c14a19..f20758e 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct36.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct36.hpp @@ -8,16 +8,16 @@ struct SLdrUnknownStruct36 { SLdrUnknownStruct36(); ~SLdrUnknownStruct36(); - SLdrAudioPlaybackParms audio_playback_parms_0x4f904909; - SLdrAudioPlaybackParms audio_playback_parms_0x82e108de; - SLdrAudioPlaybackParms audio_playback_parms_0xdf090545; - SLdrAudioPlaybackParms audio_playback_parms_0x3dd5b3cf; - SLdrAudioPlaybackParms audio_playback_parms_0xf82231bb; - SLdrAudioPlaybackParms audio_playback_parms_0x009e3658; - SLdrAudioPlaybackParms audio_playback_parms_0x62bd75b1; + SLdrAudioPlaybackParms audioPlaybackParms_0x4f904909; + SLdrAudioPlaybackParms audioPlaybackParms_0x82e108de; + SLdrAudioPlaybackParms audioPlaybackParms_0xdf090545; + SLdrAudioPlaybackParms audioPlaybackParms_0x3dd5b3cf; + SLdrAudioPlaybackParms audioPlaybackParms_0xf82231bb; + SLdrAudioPlaybackParms audioPlaybackParms_0x009e3658; + SLdrAudioPlaybackParms audioPlaybackParms_0x62bd75b1; float unknown; - SLdrAudioPlaybackParms audio_playback_parms_0x32969cba; - SLdrAudioPlaybackParms audio_playback_parms_0x597d2ac9; + SLdrAudioPlaybackParms audioPlaybackParms_0x32969cba; + SLdrAudioPlaybackParms audioPlaybackParms_0x597d2ac9; }; void LoadTypedefSLdrUnknownStruct36(SLdrUnknownStruct36&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct37.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct37.hpp index bd9eea8..1eede5b 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct37.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct37.hpp @@ -13,32 +13,32 @@ struct SLdrUnknownStruct37 { SLdrUnknownStruct37(); ~SLdrUnknownStruct37(); - CAssetId dark_water_ring_effect; + CAssetId darkWaterRingEffect; float unknown_0x27a06f6a; float unknown_0x233a5e40; - CAssetId pre_jump_telegraph_effect; - SLdrShockWaveInfo splash_shock_wave; - CAssetId tongue_particle_effect; - CAssetId tongue_particle_model; - CAssetId tongue_tip_model; - SLdrDamageInfo damage_info; + CAssetId preJumpTelegraphEffect; + SLdrShockWaveInfo splashShockWave; + CAssetId tongueParticleEffect; + CAssetId tongueParticleModel; + CAssetId tongueTipModel; + SLdrDamageInfo damageInfo; CAssetId part; float unknown_0x78755da3; float unknown_0x74e1a041; float unknown_0x1f4e7c2c; float unknown_0xee6b6f47; float unknown_0x3ce96c9d; - SLdrDamageVulnerability weak_spot_vulnerability; - float weak_spot_damage_multiplier; - CAssetId spit_projectile; - SLdrDamageInfo spit_damage; - CAssetId spit_visor_effect; - int sound_spit_visor; - float spit_projectile_radius; - SLdrUnknownStruct36 unknown_struct36; - SLdrSwampBossStage1Struct swamp_boss_stage1_struct_0x4500f774; - SLdrSwampBossStage1Struct swamp_boss_stage1_struct_0x3e1e7597; - SLdrSwampBossStage1Struct swamp_boss_stage1_struct_0xa1c4f609; + SLdrDamageVulnerability weakSpotVulnerability; + float weakSpotDamageMultiplier; + CAssetId spitProjectile; + SLdrDamageInfo spitDamage; + CAssetId spitVisorEffect; + int soundSpitVisor; + float spitProjectileRadius; + SLdrUnknownStruct36 unknownStruct36; + SLdrSwampBossStage1Struct swampBossStage1Struct_0x4500f774; + SLdrSwampBossStage1Struct swampBossStage1Struct_0x3e1e7597; + SLdrSwampBossStage1Struct swampBossStage1Struct_0xa1c4f609; }; void LoadTypedefSLdrUnknownStruct37(SLdrUnknownStruct37&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct38.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct38.hpp index 33b7779..68b8d89 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct38.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct38.hpp @@ -9,10 +9,10 @@ struct SLdrUnknownStruct38 { ~SLdrUnknownStruct38(); float range; - float turn_rate; - int sound_effect; - float warp_scale; - CVector3f repel_offset; + float turnRate; + int soundEffect; + float warpScale; + CVector3f repelOffset; }; void LoadTypedefSLdrUnknownStruct38(SLdrUnknownStruct38&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct39.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct39.hpp index b90b1a1..2110a40 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct39.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct39.hpp @@ -8,20 +8,20 @@ struct SLdrUnknownStruct39 { SLdrUnknownStruct39(); ~SLdrUnknownStruct39(); - int start_state; - SLdrDamageInfo explosion_damage; - float min_height; - float max_height; - float min_down_height; - float max_down_height; - float separation_distance; - float min_life_time; - float max_life_time; - float normal_knockback; - float heavy_knockback; - float knockback_decline; - bool is_dark_shredder; - float desired_distance; + int startState; + SLdrDamageInfo explosionDamage; + float minHeight; + float maxHeight; + float minDownHeight; + float maxDownHeight; + float separationDistance; + float minLifeTime; + float maxLifeTime; + float normalKnockback; + float heavyKnockback; + float knockbackDecline; + bool isDarkShredder; + float desiredDistance; }; void LoadTypedefSLdrUnknownStruct39(SLdrUnknownStruct39&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct4.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct4.hpp index 0cb8cca..9679527 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct4.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct4.hpp @@ -7,7 +7,7 @@ struct SLdrUnknownStruct4 { SLdrUnknownStruct4(); ~SLdrUnknownStruct4(); - int behaviour_type; + int behaviourType; }; void LoadTypedefSLdrUnknownStruct4(SLdrUnknownStruct4&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct40.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct40.hpp index 17e2cbd..5752ef9 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct40.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct40.hpp @@ -16,7 +16,7 @@ struct SLdrUnknownStruct40 { CAssetId part_0x8f06342a; int sound_0xd8b11129; int sound_0xe99e5316; - SLdrDamageInfo damage_info; + SLdrDamageInfo damageInfo; CAssetId part_0x686489fd; }; diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct41.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct41.hpp index 599837e..cdc09f5 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct41.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct41.hpp @@ -9,9 +9,9 @@ struct SLdrUnknownStruct41 { SLdrUnknownStruct41(); ~SLdrUnknownStruct41(); - SLdrSandBossStructB sand_boss_struct_b_0xb9784f0e; - SLdrSandBossStructB sand_boss_struct_b_0xb8ae1bdc; - SLdrPlasmaBeamInfo charge_beam_info; + SLdrSandBossStructB sandBossStructB_0xb9784f0e; + SLdrSandBossStructB sandBossStructB_0xb8ae1bdc; + SLdrPlasmaBeamInfo chargeBeamInfo; }; void LoadTypedefSLdrUnknownStruct41(SLdrUnknownStruct41&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct42.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct42.hpp index ce8dbf1..f82e918 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct42.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct42.hpp @@ -9,13 +9,13 @@ struct SLdrUnknownStruct42 { ~SLdrUnknownStruct42(); float angle; - CColor cloud_color1; - CColor cloud_color2; - CColor add_color1; - CColor add_color2; - float cloud_scale; - float fade_off_size; - float open_speed; + CColor cloudColor1; + CColor cloudColor2; + CColor addColor1; + CColor addColor2; + float cloudScale; + float fadeOffSize; + float openSpeed; }; void LoadTypedefSLdrUnknownStruct42(SLdrUnknownStruct42&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct43.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct43.hpp index 2adb5df..ad80a43 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct43.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct43.hpp @@ -14,34 +14,34 @@ struct SLdrUnknownStruct43 { ~SLdrUnknownStruct43(); int unknown_0xbd80fd94; - float max_linear_velocity; - float max_turn_speed; - float scanning_turn_speed; + float maxLinearVelocity; + float maxTurnSpeed; + float scanningTurnSpeed; float unknown_0xe32fcae9; float unknown_0xc5e0b92c; float unknown_0xc17a8806; int unknown_0xe75bae9e; - CAssetId laser_pulse_projectile; - SLdrDamageInfo laser_pulse_damage; + CAssetId laserPulseProjectile; + SLdrDamageInfo laserPulseDamage; int unknown_0xeda45014; int unknown_0x7dd740fe; - float dodge_chance; - float reset_shield_time; - float split_destroyed_priority; - float laser_sweep_turn_speed; - SLdrDamageInfo laser_sweep_damage; - SLdrPlasmaBeamInfo laser_sweep_beam_info; - SLdrUnknownStruct42 unknown_struct42; - int sound_laser_sweep; - int sound_laser_charge_up; - int sound_docking; - int sound_scanning; - int sound_light_shield; - int sound_dark_shield; - int sound_shield_on; - SLdrIngPossessionData ing_possession_data; - SLdrDamageVulnerability light_shield_vulnerability; - SLdrDamageVulnerability dark_shield_vulnerability; + float dodgeChance; + float resetShieldTime; + float splitDestroyedPriority; + float laserSweepTurnSpeed; + SLdrDamageInfo laserSweepDamage; + SLdrPlasmaBeamInfo laserSweepBeamInfo; + SLdrUnknownStruct42 unknownStruct42; + int soundLaserSweep; + int soundLaserChargeUp; + int soundDocking; + int soundScanning; + int soundLightShield; + int soundDarkShield; + int soundShieldOn; + SLdrIngPossessionData ingPossessionData; + SLdrDamageVulnerability lightShieldVulnerability; + SLdrDamageVulnerability darkShieldVulnerability; }; void LoadTypedefSLdrUnknownStruct43(SLdrUnknownStruct43&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct8.hpp b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct8.hpp index cbebb7d..cc97b94 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct8.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrUnknownStruct8.hpp @@ -8,7 +8,7 @@ struct SLdrUnknownStruct8 { ~SLdrUnknownStruct8(); bool override; - float z_offset; + float zOffset; }; void LoadTypedefSLdrUnknownStruct8(SLdrUnknownStruct8&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrVisorParameters.hpp b/include/MetroidPrime/ScriptLoader/SLdrVisorParameters.hpp index 93186cd..82aaa31 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrVisorParameters.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrVisorParameters.hpp @@ -7,8 +7,8 @@ struct SLdrVisorParameters { SLdrVisorParameters(); ~SLdrVisorParameters(); - bool scan_through; - int visor_flags; + bool scanThrough; + int visorFlags; }; void LoadTypedefSLdrVisorParameters(SLdrVisorParameters&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/SLdrWeaponVulnerability.hpp b/include/MetroidPrime/ScriptLoader/SLdrWeaponVulnerability.hpp index 679f4a4..79ed6ce 100644 --- a/include/MetroidPrime/ScriptLoader/SLdrWeaponVulnerability.hpp +++ b/include/MetroidPrime/ScriptLoader/SLdrWeaponVulnerability.hpp @@ -7,9 +7,9 @@ struct SLdrWeaponVulnerability { SLdrWeaponVulnerability(); ~SLdrWeaponVulnerability(); - float damage_multiplier; + float damageMultiplier; int effect; - bool ignore_radius; + bool ignoreRadius; }; void LoadTypedefSLdrWeaponVulnerability(SLdrWeaponVulnerability&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIHint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIHint.hpp index 7c470d4..ef33401 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIHint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIHint.hpp @@ -8,12 +8,12 @@ struct SLdrAIHint { SLdrAIHint(); ~SLdrAIHint(); - SLdrEditorProperties editor_properties; - int hint_type; + SLdrEditorProperties editorProperties; + int hintType; float radius; - float value_parm; - float value_parm2; - float value_parm3; + float valueParm; + float valueParm2; + float valueParm3; }; void LoadTypedefSLdrAIHint(SLdrAIHint&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIJumpPoint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIJumpPoint.hpp index 46682cc..d646429 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIJumpPoint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIJumpPoint.hpp @@ -8,8 +8,8 @@ struct SLdrAIJumpPoint { SLdrAIJumpPoint(); ~SLdrAIJumpPoint(); - SLdrEditorProperties editor_properties; - float jump_apex; + SLdrEditorProperties editorProperties; + float jumpApex; int type; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIKeyframe.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIKeyframe.hpp index d620e15..49b2091 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIKeyframe.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIKeyframe.hpp @@ -8,13 +8,13 @@ struct SLdrAIKeyframe { SLdrAIKeyframe(); ~SLdrAIKeyframe(); - SLdrEditorProperties editor_properties; - int animation_index; + SLdrEditorProperties editorProperties; + int animationIndex; bool loop; - float loop_duration; + float loopDuration; int unknown_0x58810503; int unknown_0x6d62ef74; - float playback_rate; + float playbackRate; }; void LoadTypedefSLdrAIKeyframe(SLdrAIKeyframe&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIMannedTurret.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIMannedTurret.hpp index b9045f1..a1f2d94 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIMannedTurret.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIMannedTurret.hpp @@ -9,10 +9,10 @@ struct SLdrAIMannedTurret { SLdrAIMannedTurret(); ~SLdrAIMannedTurret(); - SLdrEditorProperties editor_properties; - SLdrUnknownStruct3 unknown_struct3; - spline patrol_horiz_spline; - spline patrol_vertical_spline; + SLdrEditorProperties editorProperties; + SLdrUnknownStruct3 unknownStruct3; + spline patrolHorizSpline; + spline patrolVerticalSpline; }; void LoadTypedefSLdrAIMannedTurret(SLdrAIMannedTurret&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIWaypoint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIWaypoint.hpp index 38600eb..0ee15e3 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAIWaypoint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAIWaypoint.hpp @@ -8,11 +8,11 @@ struct SLdrAIWaypoint { SLdrAIWaypoint(); ~SLdrAIWaypoint(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; float speed; float pause; int unknown_0xc6705a00; - int locator_index; + int locatorIndex; int unknown_0x166979d4; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrActor.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrActor.hpp index cb3e6c1..bd36d38 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrActor.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrActor.hpp @@ -16,30 +16,30 @@ struct SLdrActor { SLdrActor(); ~SLdrActor(); - SLdrEditorProperties editor_properties; - CVector3f collision_box; - CVector3f collision_offset; + SLdrEditorProperties editorProperties; + CVector3f collisionBox; + CVector3f collisionOffset; float mass; float gravity; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; CAssetId model; - CAssetId collision_model; - SLdrAnimationParameters animation_information; - SLdrActorParameters actor_information; - SLdrEchoParameters echo_information; - bool is_loop; + CAssetId collisionModel; + SLdrAnimationParameters animationInformation; + SLdrActorParameters actorInformation; + SLdrEchoParameters echoInformation; + bool isLoop; bool immovable; - bool is_solid; - bool is_camera_through; - bool is_scan_through; - int render_texture_set; - bool draws_shadow; - bool scale_animation; - bool ai_shoot_through; - float random_animation_offset; + bool isSolid; + bool isCameraThrough; + bool isScanThrough; + int renderTextureSet; + bool drawsShadow; + bool scaleAnimation; + bool aiShootThrough; + float randomAnimationOffset; CAssetId projectile; - SLdrDamageInfo projectile_damage; + SLdrDamageInfo projectileDamage; }; void LoadTypedefSLdrActor(SLdrActor&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrActorKeyframe.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrActorKeyframe.hpp index 459f3b4..e2ea60b 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrActorKeyframe.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrActorKeyframe.hpp @@ -8,12 +8,12 @@ struct SLdrActorKeyframe { SLdrActorKeyframe(); ~SLdrActorKeyframe(); - SLdrEditorProperties editor_properties; - int animation_index; + SLdrEditorProperties editorProperties; + int animationIndex; bool loop; - float loop_duration; + float loopDuration; int unknown; - float playback_rate; + float playbackRate; }; void LoadTypedefSLdrActorKeyframe(SLdrActorKeyframe&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrActorRotate.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrActorRotate.hpp index a19a897..22b169b 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrActorRotate.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrActorRotate.hpp @@ -10,11 +10,11 @@ struct SLdrActorRotate { SLdrActorRotate(); ~SLdrActorRotate(); - SLdrEditorProperties editor_properties; - int flags_actor_rotate; + SLdrEditorProperties editorProperties; + int flagsActorRotate; float duration; - SLdrRotationSplines rotation_controls; - SLdrScaleSplines scale_controls; + SLdrRotationSplines rotationControls; + SLdrScaleSplines scaleControls; }; void LoadTypedefSLdrActorRotate(SLdrActorRotate&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAdvancedCounter.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAdvancedCounter.hpp index a27f1f1..9f01dd9 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAdvancedCounter.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAdvancedCounter.hpp @@ -8,20 +8,20 @@ struct SLdrAdvancedCounter { SLdrAdvancedCounter(); ~SLdrAdvancedCounter(); - SLdrEditorProperties editor_properties; - int initial_count; - int max_count; - bool auto_reset; - int counter_condition1; - int counter_condition2; - int counter_condition3; - int counter_condition4; - int counter_condition5; - int counter_condition6; - int counter_condition7; - int counter_condition8; - int counter_condition9; - int counter_condition10; + SLdrEditorProperties editorProperties; + int initialCount; + int maxCount; + bool autoReset; + int counterCondition1; + int counterCondition2; + int counterCondition3; + int counterCondition4; + int counterCondition5; + int counterCondition6; + int counterCondition7; + int counterCondition8; + int counterCondition9; + int counterCondition10; }; void LoadTypedefSLdrAdvancedCounter(SLdrAdvancedCounter&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAmbientAI.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAmbientAI.hpp index 2d20e9b..3aa1129 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAmbientAI.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAmbientAI.hpp @@ -13,16 +13,16 @@ struct SLdrAmbientAI { SLdrAmbientAI(); ~SLdrAmbientAI(); - SLdrEditorProperties editor_properties; - CVector3f collision_box; - CVector3f collision_offset; + SLdrEditorProperties editorProperties; + CVector3f collisionBox; + CVector3f collisionOffset; float mass; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; - SLdrAnimationParameters animation_information; - SLdrActorParameters actor_information; - float detect_radius; - float explode_radius; + SLdrAnimationParameters animationInformation; + SLdrActorParameters actorInformation; + float detectRadius; + float explodeRadius; int unknown_0xbfe017de; int unknown_0xed5f16ac; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAreaAttributes.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAreaAttributes.hpp index abf0f10..0ebad8e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAreaAttributes.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAreaAttributes.hpp @@ -9,15 +9,15 @@ struct SLdrAreaAttributes { SLdrAreaAttributes(); ~SLdrAreaAttributes(); - SLdrEditorProperties editor_properties; - bool need_sky; - bool dark_world; - int environment_effects; - int environment_group_sound; + SLdrEditorProperties editorProperties; + bool needSky; + bool darkWorld; + int environmentEffects; + int environmentGroupSound; float density; - float normal_lighting; - CAssetId override_sky; - int phazon_damage; + float normalLighting; + CAssetId overrideSky; + int phazonDamage; }; void LoadTypedefSLdrAreaAttributes(SLdrAreaAttributes&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAreaDamage.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAreaDamage.hpp index 6a8f03c..7ab43fd 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAreaDamage.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAreaDamage.hpp @@ -9,10 +9,10 @@ struct SLdrAreaDamage { SLdrAreaDamage(); ~SLdrAreaDamage(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrDamageInfo damage; - float pulse_time; - float grace_time; + float pulseTime; + float graceTime; }; void LoadTypedefSLdrAreaDamage(SLdrAreaDamage&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAtomicAlpha.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAtomicAlpha.hpp index 939dd8d..06ab18c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAtomicAlpha.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAtomicAlpha.hpp @@ -12,17 +12,17 @@ struct SLdrAtomicAlpha { SLdrAtomicAlpha(); ~SLdrAtomicAlpha(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - CAssetId bomb_weapon; - CAssetId bomb_model; - SLdrDamageInfo bomb_damage; - float bomb_drop_delay; - float bomb_reappear_delay; - float bomb_reappear_time; + SLdrActorParameters actorInformation; + CAssetId bombWeapon; + CAssetId bombModel; + SLdrDamageInfo bombDamage; + float bombDropDelay; + float bombReappearDelay; + float bombReappearTime; bool invisible; - bool home_while_charging; + bool homeWhileCharging; }; void LoadTypedefSLdrAtomicAlpha(SLdrAtomicAlpha&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrAtomicBeta.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrAtomicBeta.hpp index 5c2b998..9bacff6 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrAtomicBeta.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrAtomicBeta.hpp @@ -13,24 +13,24 @@ struct SLdrAtomicBeta { SLdrAtomicBeta(); ~SLdrAtomicBeta(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - CAssetId beam_effect; + SLdrActorParameters actorInformation; + CAssetId beamEffect; CAssetId beam; - SLdrDamageInfo beam_damage; - CAssetId contact_fx; - float beam_fade_time; - float beam_radius; - float hover_speed; - SLdrDamageVulnerability frozen_vulnerability; - float normal_rotate_speed; - float charging_rotate_speed; - float speed_change_rate; + SLdrDamageInfo beamDamage; + CAssetId contactFx; + float beamFadeTime; + float beamRadius; + float hoverSpeed; + SLdrDamageVulnerability frozenVulnerability; + float normalRotateSpeed; + float chargingRotateSpeed; + float speedChangeRate; int sound_0x14038b71; int sound_0x16a435cb; int sound_0x67edefc2; - float damage_delay; + float damageDelay; }; void LoadTypedefSLdrAtomicBeta(SLdrAtomicBeta&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrBacteriaSwarm.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrBacteriaSwarm.hpp index 3acd380..a623236 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrBacteriaSwarm.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrBacteriaSwarm.hpp @@ -13,38 +13,38 @@ struct SLdrBacteriaSwarm { SLdrBacteriaSwarm(); ~SLdrBacteriaSwarm(); - SLdrEditorProperties editor_properties; - SLdrActorParameters actor_information; - SLdrAnimationParameters animation_information; + SLdrEditorProperties editorProperties; + SLdrActorParameters actorInformation; + SLdrAnimationParameters animationInformation; bool active; - SLdrBasicSwarmProperties basic_swarm_properties; + SLdrBasicSwarmProperties basicSwarmProperties; float unknown_0x4a85a2da; - float containment_priority; - float bacteria_patrol_speed; + float containmentPriority; + float bacteriaPatrolSpeed; float unknown_0x7de56d56; float unknown_0x39098c47; - float bacteria_acceleration; - float bacteria_deceleration; - float patrol_turn_speed; + float bacteriaAcceleration; + float bacteriaDeceleration; + float patrolTurnSpeed; float unknown_0xbdcdb9c0; - CAssetId bacteria_particle_effect; - CColor bacteria_patrol_color; - CColor bacteria_player_pursuit_color; - float color_change_time; - int patrol_sound; - int pursuit_sound; + CAssetId bacteriaParticleEffect; + CColor bacteriaPatrolColor; + CColor bacteriaPlayerPursuitColor; + float colorChangeTime; + int patrolSound; + int pursuitSound; float unknown_0xad4ce8f3; float unknown_0xa9d6d9d9; - float patrol_sound_weight; + float patrolSoundWeight; float unknown_0x90f8e29f; float unknown_0x4b47b178; - float pursuit_sound_weight; + float pursuitSoundWeight; float unknown_0xd2986c43; - float max_audible_distance; - int min_volume; - int max_volume; - CAssetId bacteria_scan_model; - bool spawn_instantly; + float maxAudibleDistance; + int minVolume; + int maxVolume; + CAssetId bacteriaScanModel; + bool spawnInstantly; }; void LoadTypedefSLdrBacteriaSwarm(SLdrBacteriaSwarm&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrBallTrigger.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrBallTrigger.hpp index 261adb1..516bd42 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrBallTrigger.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrBallTrigger.hpp @@ -10,14 +10,14 @@ struct SLdrBallTrigger { SLdrBallTrigger(); ~SLdrBallTrigger(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrTriggerInfo trigger; - float attraction_force; - float attraction_angle; - float attraction_distance; - CVector3f attraction_direction; - bool no_ball_movement; - float bounds_size_multiplier; + float attractionForce; + float attractionAngle; + float attractionDistance; + CVector3f attractionDirection; + bool noBallMovement; + float boundsSizeMultiplier; }; void LoadTypedefSLdrBallTrigger(SLdrBallTrigger&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrBlogg.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrBlogg.hpp index 7dac6c1..7cc545e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrBlogg.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrBlogg.hpp @@ -15,47 +15,47 @@ struct SLdrBlogg { SLdrBlogg(); ~SLdrBlogg(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float min_attack_angle; - float max_attack_angle; + SLdrActorParameters actorInformation; + float minAttackAngle; + float maxAttackAngle; float unknown_0x32455774; float unknown_0xc1c8d862; int unknown_0xa19d5f62; - CAssetId projectile_particle_effect; - SLdrDamageInfo projectile_damage; - float body_damage_multiplier; - float mouth_damage_multiplier; - float mouth_damage_angle; - SLdrDamageVulnerability armor_vulnerability; - float charge_damage_radius; - float charge_damage; - float bite_damage; - float ball_spit_damage; - float charge_turn_speed; - float fish_attraction_radius; - float fish_attraction_priority; + CAssetId projectileParticleEffect; + SLdrDamageInfo projectileDamage; + float bodyDamageMultiplier; + float mouthDamageMultiplier; + float mouthDamageAngle; + SLdrDamageVulnerability armorVulnerability; + float chargeDamageRadius; + float chargeDamage; + float biteDamage; + float ballSpitDamage; + float chargeTurnSpeed; + float fishAttractionRadius; + float fishAttractionPriority; float aggressiveness; float unknown_0x479ccc37; float unknown_0x689a803f; float unknown_0x800a2b0d; - float charge_speed_multiplier; - float max_melee_range; + float chargeSpeedMultiplier; + float maxMeleeRange; float unknown_0x6a78c607; float unknown_0x2c8d9fc4; float unknown_0xd1f82f92; float unknown_0x5109fb4e; - float max_collision_time; - int mouth_open_sound; - SLdrIngPossessionData ing_possession_data; - SLdrDamageVulnerability ing_possessed_armor_vulnerability; - bool is_mega_blogg; - float projectile_blur_radius; - float projectile_blur_time; - SLdrBloggStruct blogg_struct_0x3874576d; - SLdrBloggStruct blogg_struct_0x97dd1aa7; - SLdrBloggStruct blogg_struct_0xf2ba21e1; + float maxCollisionTime; + int mouthOpenSound; + SLdrIngPossessionData ingPossessionData; + SLdrDamageVulnerability ingPossessedArmorVulnerability; + bool isMegaBlogg; + float projectileBlurRadius; + float projectileBlurTime; + SLdrBloggStruct bloggStruct_0x3874576d; + SLdrBloggStruct bloggStruct_0x97dd1aa7; + SLdrBloggStruct bloggStruct_0xf2ba21e1; }; void LoadTypedefSLdrBlogg(SLdrBlogg&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrBrizgee.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrBrizgee.hpp index fed0420..24c921e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrBrizgee.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrBrizgee.hpp @@ -13,26 +13,26 @@ struct SLdrBrizgee { SLdrBrizgee(); ~SLdrBrizgee(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float waypoint_approach_distance; - float wall_turn_speed; - float floor_turn_speed; - float down_turn_speed; - float visible_distance; - float forward_moving_priority; - CAssetId no_shell_model; - CAssetId no_shell_skin; - SLdrDamageVulnerability shell_vulnerability; - float shell_health; - SLdrDamageInfo shell_contact_damage; + SLdrActorParameters actorInformation; + float waypointApproachDistance; + float wallTurnSpeed; + float floorTurnSpeed; + float downTurnSpeed; + float visibleDistance; + float forwardMovingPriority; + CAssetId noShellModel; + CAssetId noShellSkin; + SLdrDamageVulnerability shellVulnerability; + float shellHealth; + SLdrDamageInfo shellContactDamage; float unknown; - SLdrDamageInfo poison_damage; - float poison_time; - int shell_break_sound; - int poison_hit_sound; - int player_poison_sound; + SLdrDamageInfo poisonDamage; + float poisonTime; + int shellBreakSound; + int poisonHitSound; + int playerPoisonSound; }; void LoadTypedefSLdrBrizgee(SLdrBrizgee&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCamera.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCamera.hpp index c0971dc..f52a9c5 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCamera.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCamera.hpp @@ -9,17 +9,17 @@ struct SLdrCamera { SLdrCamera(); ~SLdrCamera(); - SLdrEditorProperties editor_properties; - float animation_time; + SLdrEditorProperties editorProperties; + float animationTime; int unknown_0x05c5fc6e; int unknown_0xd4b29446; - SLdrSplineType motion_spline_type; - SLdrSplineType target_spline_type; - spline motion_control_spline; - spline target_control_spline; - spline fov_spline; - spline roll_spline; - spline slowmo_control_spline; + SLdrSplineType motionSplineType; + SLdrSplineType targetSplineType; + spline motionControlSpline; + spline targetControlSpline; + spline fovSpline; + spline rollSpline; + spline slowmoControlSpline; }; void LoadTypedefSLdrCamera(SLdrCamera&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraBlurKeyframe.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraBlurKeyframe.hpp index 1f1f0c6..f128af4 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraBlurKeyframe.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraBlurKeyframe.hpp @@ -8,12 +8,12 @@ struct SLdrCameraBlurKeyframe { SLdrCameraBlurKeyframe(); ~SLdrCameraBlurKeyframe(); - SLdrEditorProperties editor_properties; - int blur_type; - float blur_radius; - int which_filter_group; - float interpolate_in_time; - float interpolate_out_time; + SLdrEditorProperties editorProperties; + int blurType; + float blurRadius; + int whichFilterGroup; + float interpolateInTime; + float interpolateOutTime; }; void LoadTypedefSLdrCameraBlurKeyframe(SLdrCameraBlurKeyframe&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraFilterKeyframe.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraFilterKeyframe.hpp index d8b53aa..e6d50a2 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraFilterKeyframe.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraFilterKeyframe.hpp @@ -10,14 +10,14 @@ struct SLdrCameraFilterKeyframe { SLdrCameraFilterKeyframe(); ~SLdrCameraFilterKeyframe(); - SLdrEditorProperties editor_properties; - int filter_type; - int filter_shape; - int filter_stage; - int which_filter_group; + SLdrEditorProperties editorProperties; + int filterType; + int filterShape; + int filterStage; + int whichFilterGroup; CColor color; - float interpolate_in_time; - float interpolate_out_time; + float interpolateInTime; + float interpolateOutTime; CAssetId texture; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraHint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraHint.hpp index 7d0362d..67ca84d 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraHint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraHint.hpp @@ -18,27 +18,27 @@ struct SLdrCameraHint { SLdrCameraHint(); ~SLdrCameraHint(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int priority; float timer; - SLdrUnknownStruct4 unknown_struct4; - int flags_camera_hint; - SLdrCameraHintStructB camera_hint_struct_a_0x456d05c6; - SLdrCameraHintStructB camera_hint_struct_a_0xf5521ffa; - SLdrCameraHintStructB camera_hint_struct_a_0x89658a06; - SLdrUnknownStruct5 unknown_struct5; - CVector3f world_offset; - SLdrUnknownStruct6 unknown_struct6; - SLdrCameraHintStructC camera_hint_struct_b_0x664c450a; - SLdrCameraHintStructC camera_hint_struct_b_0xc82395fa; - SLdrUnknownStruct7 unknown_struct7; - SLdrUnknownStruct8 unknown_struct8; + SLdrUnknownStruct4 unknownStruct4; + int flagsCameraHint; + SLdrCameraHintStructB cameraHintStructA_0x456d05c6; + SLdrCameraHintStructB cameraHintStructA_0xf5521ffa; + SLdrCameraHintStructB cameraHintStructA_0x89658a06; + SLdrUnknownStruct5 unknownStruct5; + CVector3f worldOffset; + SLdrUnknownStruct6 unknownStruct6; + SLdrCameraHintStructC cameraHintStructB_0x664c450a; + SLdrCameraHintStructC cameraHintStructB_0xc82395fa; + SLdrUnknownStruct7 unknownStruct7; + SLdrUnknownStruct8 unknownStruct8; float unknown_0x2ae08be1; float unknown_0x4361d075; float unknown_0xc91ef813; - SLdrCameraHintStructA camera_hint_struct_a1; - SLdrUnknownStruct9 unknown_struct9; - SLdrCameraHintStructA camera_hint_struct_a_0x138729a7; + SLdrCameraHintStructA cameraHintStructA1; + SLdrUnknownStruct9 unknownStruct9; + SLdrCameraHintStructA cameraHintStructA_0x138729a7; }; void LoadTypedefSLdrCameraHint(SLdrCameraHint&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraPitch.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraPitch.hpp index f1c39c5..d430874 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraPitch.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraPitch.hpp @@ -9,10 +9,10 @@ struct SLdrCameraPitch { SLdrCameraPitch(); ~SLdrCameraPitch(); - SLdrEditorProperties editor_properties; - spline forwards_pitch; - spline backwards_pitch; - SLdrSplineType spline_type; + SLdrEditorProperties editorProperties; + spline forwardsPitch; + spline backwardsPitch; + SLdrSplineType splineType; bool unknown; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraShaker.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraShaker.hpp index 748c8ba..1f1ac63 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraShaker.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraShaker.hpp @@ -9,8 +9,8 @@ struct SLdrCameraShaker { SLdrCameraShaker(); ~SLdrCameraShaker(); - SLdrEditorProperties editor_properties; - SLdrCameraShakerData shaker_data; + SLdrEditorProperties editorProperties; + SLdrCameraShakerData shakerData; }; void LoadTypedefSLdrCameraShaker(SLdrCameraShaker&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraWaypoint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraWaypoint.hpp index 1f370ad..76ecce4 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraWaypoint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCameraWaypoint.hpp @@ -8,7 +8,7 @@ struct SLdrCameraWaypoint { SLdrCameraWaypoint(); ~SLdrCameraWaypoint(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; }; void LoadTypedefSLdrCameraWaypoint(SLdrCameraWaypoint&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCannonBall.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCannonBall.hpp index 11e4c79..53158ff 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCannonBall.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCannonBall.hpp @@ -9,7 +9,7 @@ struct SLdrCannonBall { SLdrCannonBall(); ~SLdrCannonBall(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; CAssetId effect; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrChozoGhost.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrChozoGhost.hpp index f82a74f..2bddeb3 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrChozoGhost.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrChozoGhost.hpp @@ -13,34 +13,34 @@ struct SLdrChozoGhost { SLdrChozoGhost(); ~SLdrChozoGhost(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float hearing_radius; - float fade_out_delay; - float attack_delay; - float freeze_time; + SLdrActorParameters actorInformation; + float hearingRadius; + float fadeOutDelay; + float attackDelay; + float freezeTime; CAssetId unknown_0x54151870; - SLdrDamageInfo damage_info_0xffcda1f8; + SLdrDamageInfo damageInfo_0xffcda1f8; CAssetId unknown_0x3a58089c; - SLdrDamageInfo damage_info_0x1ff047a9; - SLdrBehaveChance behave_chance_0xe832241f; - SLdrBehaveChance behave_chance_0x1e2c8483; - SLdrBehaveChance behave_chance_0x78d76034; - int sound_impact; + SLdrDamageInfo damageInfo_0x1ff047a9; + SLdrBehaveChance behaveChance_0xe832241f; + SLdrBehaveChance behaveChance_0x1e2c8483; + SLdrBehaveChance behaveChance_0x78d76034; + int soundImpact; float unknown_0xc87d7ec7; - int right_disappear_crossfade; + int rightDisappearCrossfade; int sound; int unknown_0xec76940c; float unknown_0x723542bb; int unknown_0xfe9eac26; - float hurl_recover_time; - CAssetId projectile_visor_effect; - int sound_projectile_visor; + float hurlRecoverTime; + CAssetId projectileVisorEffect; + int soundProjectileVisor; float unknown_0x61e511b3; float unknown_0x2369607a; - int near_chance; - int mid_chance; + int nearChance; + int midChance; }; void LoadTypedefSLdrChozoGhost(SLdrChozoGhost&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCoin.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCoin.hpp index 13c6eae..5cf45b9 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCoin.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCoin.hpp @@ -12,50 +12,50 @@ struct SLdrCoin { SLdrCoin(); ~SLdrCoin(); - SLdrEditorProperties editor_properties; - float cone_spread; - float minimum_speed; - float maximum_speed; - float minimum_spin_speed; - float maximum_spin_speed; - float minimum_life_time; - float maximum_life_time; - float disable_collision_time; - float fade_in_end_percentage; - float fade_out_start_percentage; - CColor start_color; - CColor end_color; - float scale_start_percentage; - CVector3f final_scale; + SLdrEditorProperties editorProperties; + float coneSpread; + float minimumSpeed; + float maximumSpeed; + float minimumSpinSpeed; + float maximumSpinSpeed; + float minimumLifeTime; + float maximumLifeTime; + float disableCollisionTime; + float fadeInEndPercentage; + float fadeOutStartPercentage; + CColor startColor; + CColor endColor; + float scaleStartPercentage; + CVector3f finalScale; float unknown_0x417f4a91; float gravity; - CVector3f position_offset; + CVector3f positionOffset; CAssetId model; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; CAssetId particle1; - int bounce_sound; - int max_bounce_sounds; + int bounceSound; + int maxBounceSounds; float unknown_0x76c79503; float unknown_0x310dfac8; - CVector3f particle_system1_scale; - bool particle_system1_uses_global_translation; - bool particle_system1_wait_for_particles_to_die; - int particle_system1_orientation; + CVector3f particleSystem1Scale; + bool particleSystem1UsesGlobalTranslation; + bool particleSystem1WaitForParticlesToDie; + int particleSystem1Orientation; CAssetId particle2; - CVector3f particle_system2_scale; - bool particle_system2_uses_global_translation; - bool particle_system2_wait_for_particles_to_die; - int particle_system2_orientation; - CAssetId death_particle; - CVector3f death_particle_system_scale; - int death_particle_system_orientation; - bool is_collider; - bool is_shootable; - bool die_on_collision; + CVector3f particleSystem2Scale; + bool particleSystem2UsesGlobalTranslation; + bool particleSystem2WaitForParticlesToDie; + int particleSystem2Orientation; + CAssetId deathParticle; + CVector3f deathParticleSystemScale; + int deathParticleSystemOrientation; + bool isCollider; + bool isShootable; + bool dieOnCollision; bool unknown_0xdcaa0f22; bool unknown_0xbfd82a19; bool unknown_0x723d42d6; - float disable_physics_threshold; + float disablePhysicsThreshold; }; void LoadTypedefSLdrCoin(SLdrCoin&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrColorModulate.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrColorModulate.hpp index 5dae833..7a99cf1 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrColorModulate.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrColorModulate.hpp @@ -9,23 +9,23 @@ struct SLdrColorModulate { SLdrColorModulate(); ~SLdrColorModulate(); - SLdrEditorProperties editor_properties; - CColor color_a; - CColor color_b; - int blend_mode; - float time_a2_b; - float time_b2_a; - bool do_reverse; - bool reset_target_when_done; - bool depth_compare; - bool depth_update; - bool depth_backwards; - bool auto_start; - bool update_time; - bool loop_forever; - bool external_time; - bool copy_model_color_to_color_a; - spline control_spline; + SLdrEditorProperties editorProperties; + CColor colorA; + CColor colorB; + int blendMode; + float timeA2B; + float timeB2A; + bool doReverse; + bool resetTargetWhenDone; + bool depthCompare; + bool depthUpdate; + bool depthBackwards; + bool autoStart; + bool updateTime; + bool loopForever; + bool externalTime; + bool copyModelColorToColorA; + spline controlSpline; }; void LoadTypedefSLdrColorModulate(SLdrColorModulate&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCommandoPirate.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCommandoPirate.hpp index 4efe00b..17a9fa6 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCommandoPirate.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCommandoPirate.hpp @@ -15,27 +15,27 @@ struct SLdrCommandoPirate { SLdrCommandoPirate(); ~SLdrCommandoPirate(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrIngPossessionData ing_possession_data; + SLdrActorParameters actorInformation; + SLdrIngPossessionData ingPossessionData; int sound; float aggressiveness; - float cover_check; - float search_radius; - float dodge_check; - int sound_impact; - int sound_hurled; - int sound_death; - int always_ff_0xfca76593; - int always_ff_0x467c3d94; - SLdrDamageInfo blade_damage; + float coverCheck; + float searchRadius; + float dodgeCheck; + int soundImpact; + int soundHurled; + int soundDeath; + int alwaysFf_0xfca76593; + int alwaysFf_0x467c3d94; + SLdrDamageInfo bladeDamage; CAssetId projectile; - SLdrDamageInfo projectile_damage; - int sound_projectile; - float hearing_radius; - SLdrUnknownStruct10 unknown_struct10; - SLdrUnknownStruct11 unknown_struct11; + SLdrDamageInfo projectileDamage; + int soundProjectile; + float hearingRadius; + SLdrUnknownStruct10 unknownStruct10; + SLdrUnknownStruct11 unknownStruct11; float unknown_0x71587b45; float unknown_0x7903312e; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrConditionalRelay.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrConditionalRelay.hpp index 514c3c6..568bc6c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrConditionalRelay.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrConditionalRelay.hpp @@ -9,9 +9,9 @@ struct SLdrConditionalRelay { SLdrConditionalRelay(); ~SLdrConditionalRelay(); - SLdrEditorProperties editor_properties; - bool trigger_on_first_think; - int multiplayer_mask_and_negate; + SLdrEditorProperties editorProperties; + bool triggerOnFirstThink; + int multiplayerMaskAndNegate; SLdrConditionalTest conditional1; SLdrConditionalTest conditional2; SLdrConditionalTest conditional3; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrControlHint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrControlHint.hpp index 4af7f7c..dcd78c7 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrControlHint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrControlHint.hpp @@ -9,13 +9,13 @@ struct SLdrControlHint { SLdrControlHint(); ~SLdrControlHint(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int priority; float timer; - int cancel_method; - int cancel_press_count; - float cancel_press_time; - float cancel_timer; + int cancelMethod; + int cancelPressCount; + float cancelPressTime; + float cancelTimer; int unknown; SLdrControlHintStruct command1; SLdrControlHintStruct command2; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrControllerAction.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrControllerAction.hpp index af79418..2a5a2b6 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrControllerAction.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrControllerAction.hpp @@ -9,9 +9,9 @@ struct SLdrControllerAction { SLdrControllerAction(); ~SLdrControllerAction(); - SLdrEditorProperties editor_properties; - SLdrControllerActionStruct controller_action_struct; - bool one_shot; + SLdrEditorProperties editorProperties; + SLdrControllerActionStruct controllerActionStruct; + bool oneShot; }; void LoadTypedefSLdrControllerAction(SLdrControllerAction&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCounter.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCounter.hpp index 490bf69..9a2834f 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCounter.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCounter.hpp @@ -8,10 +8,10 @@ struct SLdrCounter { SLdrCounter(); ~SLdrCounter(); - SLdrEditorProperties editor_properties; - int initial_count; - int max_count; - bool auto_reset; + SLdrEditorProperties editorProperties; + int initialCount; + int maxCount; + bool autoReset; bool wrap; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCoverPoint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCoverPoint.hpp index b1f53fd..b52b103 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCoverPoint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCoverPoint.hpp @@ -8,12 +8,12 @@ struct SLdrCoverPoint { SLdrCoverPoint(); ~SLdrCoverPoint(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int unknown; - bool should_crouch; - float horizontal_safe_angle; - float vertical_safe_angle; - float lock_time; + bool shouldCrouch; + float horizontalSafeAngle; + float verticalSafeAngle; + float lockTime; }; void LoadTypedefSLdrCoverPoint(SLdrCoverPoint&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrCrystallite.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrCrystallite.hpp index 9c72141..ed77654 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrCrystallite.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrCrystallite.hpp @@ -10,16 +10,16 @@ struct SLdrCrystallite { SLdrCrystallite(); ~SLdrCrystallite(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float waypoint_approach_distance; - float wall_turn_speed; - float floor_turn_speed; - float down_turn_speed; - float visible_distance; - float forward_moving_priority; - float stun_time; + SLdrActorParameters actorInformation; + float waypointApproachDistance; + float wallTurnSpeed; + float floorTurnSpeed; + float downTurnSpeed; + float visibleDistance; + float forwardMovingPriority; + float stunTime; }; void LoadTypedefSLdrCrystallite(SLdrCrystallite&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageActor.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageActor.hpp index e668767..c9713ea 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageActor.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageActor.hpp @@ -9,7 +9,7 @@ struct SLdrDamageActor { SLdrDamageActor(); ~SLdrDamageActor(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrDamageInfo damage; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageableTrigger.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageableTrigger.hpp index 5faddd6..44a68f6 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageableTrigger.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageableTrigger.hpp @@ -11,11 +11,11 @@ struct SLdrDamageableTrigger { SLdrDamageableTrigger(); ~SLdrDamageableTrigger(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; bool orbitable; - bool enable_seeker_lock_on; + bool enableSeekerLockOn; bool invulnerable; SLdrVisorParameters visor; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageableTriggerOrientated.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageableTriggerOrientated.hpp index 3854e14..6c1e622 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageableTriggerOrientated.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDamageableTriggerOrientated.hpp @@ -11,11 +11,11 @@ struct SLdrDamageableTriggerOrientated { SLdrDamageableTriggerOrientated(); ~SLdrDamageableTriggerOrientated(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; bool orbitable; - bool enable_seeker_lock_on; + bool enableSeekerLockOn; bool invulnerable; SLdrVisorParameters visor; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkCommando.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkCommando.hpp index 950ca84..f7f811d 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkCommando.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkCommando.hpp @@ -11,10 +11,10 @@ struct SLdrDarkCommando { SLdrDarkCommando(); ~SLdrDarkCommando(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrDarkCommandoData dark_commando_properties; + SLdrActorParameters actorInformation; + SLdrDarkCommandoData darkCommandoProperties; }; void LoadTypedefSLdrDarkCommando(SLdrDarkCommando&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkSamus.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkSamus.hpp index 87fc27f..f9e4144 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkSamus.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkSamus.hpp @@ -14,69 +14,69 @@ struct SLdrDarkSamus { SLdrDarkSamus(); ~SLdrDarkSamus(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; float unknown_0x72edeb7d; float unknown_0x74fa22f0; - int glide_sound; - int missile_ricochet_sound; + int glideSound; + int missileRicochetSound; bool unknown_0x6689925b; CAssetId txtr_0x3863160b; float unknown_0x2c6a3344; - SLdrDamageInfo melee_attack_damage; + SLdrDamageInfo meleeAttackDamage; CAssetId part_0x6d40aa56; CAssetId part_0x9603a544; - SLdrDamageInfo dive_attack_damage; + SLdrDamageInfo diveAttackDamage; float unknown_0x4aa5dd62; float unknown_0x1ad7dc21; - CAssetId dive_attack_effect; - CAssetId scatter_shot_projectile; - CAssetId scatter_shot_projectile2; - SLdrDamageInfo scatter_shot_damage; + CAssetId diveAttackEffect; + CAssetId scatterShotProjectile; + CAssetId scatterShotProjectile2; + SLdrDamageInfo scatterShotDamage; float unknown_0x378285b9; float unknown_0xd242e25f; - CAssetId normal_missile_projectile; - SLdrDamageInfo normal_missile_damage; + CAssetId normalMissileProjectile; + SLdrDamageInfo normalMissileDamage; int unknown_0x1f1ef7a9; int unknown_0xc4a1a44e; - CAssetId super_missile_projectile; - SLdrDamageInfo super_missile_damage; - CAssetId freeze_beam_projectile; - SLdrDamageInfo freeze_beam_damage; + CAssetId superMissileProjectile; + SLdrDamageInfo superMissileDamage; + CAssetId freezeBeamProjectile; + SLdrDamageInfo freezeBeamDamage; CAssetId txtr_0x7ffeb33d; - float damage_interrupt_threshold; + float damageInterruptThreshold; float unknown_0xf317f4d5; - CAssetId sweep_swoosh; - SLdrDamageInfo sweep_beam_damage; + CAssetId sweepSwoosh; + SLdrDamageInfo sweepBeamDamage; CAssetId crsc; - int sweep_beam_sound; + int sweepBeamSound; int unknown_0x0ef8dc15; - CAssetId invulnerable_model; - CAssetId invulnerable_skin_rules; - SLdrAnimationParameters boost_ball_model; - SLdrDamageInfo boost_ball_damage; - CAssetId boost_ball_glow; + CAssetId invulnerableModel; + CAssetId invulnerableSkinRules; + SLdrAnimationParameters boostBallModel; + SLdrDamageInfo boostBallDamage; + CAssetId boostBallGlow; CAssetId swhc_0x449aa4aa; CAssetId swhc_0x0345fa17; int sound_0x2c72576b; - int boost_ball_hit_player_sound; - CAssetId boost_ball_collision; - SLdrAudioPlaybackParms audio_playback_parms; + int boostBallHitPlayerSound; + CAssetId boostBallCollision; + SLdrAudioPlaybackParms audioPlaybackParms; CAssetId part_0xa6c42023; - int ice_spread_sound; + int iceSpreadSound; CAssetId part_0x908b06e9; CAssetId part_0x494de4a4; int sound_0xa861649f; - SLdrDamageInfo damage_info_0x18402aa9; + SLdrDamageInfo damageInfo_0x18402aa9; CAssetId part_0xe701daea; - CAssetId phazon_projectile; + CAssetId phazonProjectile; CAssetId wpsc; - SLdrDamageInfo damage_info_0x58769eb2; - SLdrDamageInfo phazon_projectile_damage; - CAssetId phazon_enrage_sphere; - SLdrDamageInfo damage_info_0x8f3af226; - CAssetId alternate_scannable_info; + SLdrDamageInfo damageInfo_0x58769eb2; + SLdrDamageInfo phazonProjectileDamage; + CAssetId phazonEnrageSphere; + SLdrDamageInfo damageInfo_0x8f3af226; + CAssetId alternateScannableInfo; }; void LoadTypedefSLdrDarkSamus(SLdrDarkSamus&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkSamusBattleStage.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkSamusBattleStage.hpp index 8e85cfa..8e3015e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkSamusBattleStage.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkSamusBattleStage.hpp @@ -9,8 +9,8 @@ struct SLdrDarkSamusBattleStage { SLdrDarkSamusBattleStage(); ~SLdrDarkSamusBattleStage(); - SLdrEditorProperties editor_properties; - SLdrUnknownStruct17 unknown_struct17; + SLdrEditorProperties editorProperties; + SLdrUnknownStruct17 unknownStruct17; }; void LoadTypedefSLdrDarkSamusBattleStage(SLdrDarkSamusBattleStage&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkTrooper.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkTrooper.hpp index b308e13..f927fb7 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkTrooper.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDarkTrooper.hpp @@ -13,25 +13,25 @@ struct SLdrDarkTrooper { SLdrDarkTrooper(); ~SLdrDarkTrooper(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrIngPossessionData ing_possession_data; + SLdrActorParameters actorInformation; + SLdrIngPossessionData ingPossessionData; bool flotsam; - bool avoid_down_frames; - float melee_attack_min_range; - float melee_attack_max_range; - SLdrDamageInfo melee_attack_damage; + bool avoidDownFrames; + float meleeAttackMinRange; + float meleeAttackMaxRange; + SLdrDamageInfo meleeAttackDamage; float unknown; - float ranged_attack_min_range; - float ranged_attack_max_range; - SLdrDamageInfo ranged_attack_damage; - CAssetId ranged_attack_projectile; - int ragdoll_impact_sound; - bool fires_missiles; - CAssetId missile_projectile; - SLdrDamageInfo missile_damage; - CAssetId scannable_info_when_attacking; + float rangedAttackMinRange; + float rangedAttackMaxRange; + SLdrDamageInfo rangedAttackDamage; + CAssetId rangedAttackProjectile; + int ragdollImpactSound; + bool firesMissiles; + CAssetId missileProjectile; + SLdrDamageInfo missileDamage; + CAssetId scannableInfoWhenAttacking; }; void LoadTypedefSLdrDarkTrooper(SLdrDarkTrooper&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDebris.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDebris.hpp index cd60912..de559bd 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDebris.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDebris.hpp @@ -12,20 +12,20 @@ struct SLdrDebris { SLdrDebris(); ~SLdrDebris(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; float impulse; - CVector3f impulse_variance; - CColor fade_out_color; + CVector3f impulseVariance; + CColor fadeOutColor; float mass; float unknown_0x417f4a91; - float life_time; - int scale_type; - bool random_spin; + float lifeTime; + int scaleType; + bool randomSpin; CAssetId model; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; CAssetId particle; - CVector3f particle_system_scale; - bool is_collider; + CVector3f particleSystemScale; + bool isCollider; bool unknown_0x4edb1d0e; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDebrisExtended.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDebrisExtended.hpp index 8047be0..4963142 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDebrisExtended.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDebrisExtended.hpp @@ -12,52 +12,52 @@ struct SLdrDebrisExtended { SLdrDebrisExtended(); ~SLdrDebrisExtended(); - SLdrEditorProperties editor_properties; - float cone_spread; - CVector3f movement_direction; - float minimum_speed; - float maximum_speed; - float minimum_spin_speed; - float maximum_spin_speed; - float minimum_life_time; - float maximum_life_time; - float disable_collision_time; - float fade_in_end_percentage; - float fade_out_start_percentage; - CColor start_color; - CColor end_color; - float scale_start_percentage; - CVector3f final_scale; + SLdrEditorProperties editorProperties; + float coneSpread; + CVector3f movementDirection; + float minimumSpeed; + float maximumSpeed; + float minimumSpinSpeed; + float maximumSpinSpeed; + float minimumLifeTime; + float maximumLifeTime; + float disableCollisionTime; + float fadeInEndPercentage; + float fadeOutStartPercentage; + CColor startColor; + CColor endColor; + float scaleStartPercentage; + CVector3f finalScale; float unknown_0x417f4a91; float gravity; - CVector3f position_offset; + CVector3f positionOffset; CAssetId model; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; CAssetId particle1; - int bounce_sound; - int max_bounce_sounds; + int bounceSound; + int maxBounceSounds; float unknown_0x76c79503; float unknown_0x310dfac8; - CVector3f particle_system1_scale; - bool particle_system1_uses_global_translation; - bool particle_system1_wait_for_particles_to_die; - int particle_system1_orientation; + CVector3f particleSystem1Scale; + bool particleSystem1UsesGlobalTranslation; + bool particleSystem1WaitForParticlesToDie; + int particleSystem1Orientation; CAssetId particle2; - CVector3f particle_system2_scale; - bool particle_system2_uses_global_translation; - bool particle_system2_wait_for_particles_to_die; - int particle_system2_orientation; - CAssetId death_particle; - CVector3f death_particle_system_scale; - int death_particle_system_orientation; - bool is_collider; - bool is_shootable; - bool die_on_collision; + CVector3f particleSystem2Scale; + bool particleSystem2UsesGlobalTranslation; + bool particleSystem2WaitForParticlesToDie; + int particleSystem2Orientation; + CAssetId deathParticle; + CVector3f deathParticleSystemScale; + int deathParticleSystemOrientation; + bool isCollider; + bool isShootable; + bool dieOnCollision; bool unknown_0xdcaa0f22; bool unknown_0xbfd82a19; bool unknown_0x723d42d6; bool unknown_0x4edb1d0e; - float disable_physics_threshold; + float disablePhysicsThreshold; }; void LoadTypedefSLdrDebrisExtended(SLdrDebrisExtended&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDestructibleBarrier.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDestructibleBarrier.hpp index 1ad49a4..6bf83b8 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDestructibleBarrier.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDestructibleBarrier.hpp @@ -13,17 +13,17 @@ struct SLdrDestructibleBarrier { SLdrDestructibleBarrier(); ~SLdrDestructibleBarrier(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int unknown_0xcd4f7e71; int unknown_0xa7f551f7; int unknown_0x609c6240; - CVector3f chunk_size; - CAssetId left_model; - CAssetId center_model; - CAssetId right_model; + CVector3f chunkSize; + CAssetId leftModel; + CAssetId centerModel; + CAssetId rightModel; CAssetId unknown_0x396660b4; CAssetId unknown_0x48e25884; - CAssetId base_model; + CAssetId baseModel; CAssetId unknown_0x1eb90d06; int unknown_0x9d852dfe; CAssetId unknown_0x982d7fa8; @@ -43,7 +43,7 @@ struct SLdrDestructibleBarrier { bool unknown_0x4d3109e3; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; }; void LoadTypedefSLdrDestructibleBarrier(SLdrDestructibleBarrier&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDigitalGuardian.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDigitalGuardian.hpp index a3d28d6..9dfa5ae 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDigitalGuardian.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDigitalGuardian.hpp @@ -11,10 +11,10 @@ struct SLdrDigitalGuardian { SLdrDigitalGuardian(); ~SLdrDigitalGuardian(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrDigitalGuardianData digital_guardian_data; + SLdrActorParameters actorInformation; + SLdrDigitalGuardianData digitalGuardianData; }; void LoadTypedefSLdrDigitalGuardian(SLdrDigitalGuardian&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDigitalGuardianHead.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDigitalGuardianHead.hpp index e243064..91285f6 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDigitalGuardianHead.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDigitalGuardianHead.hpp @@ -11,10 +11,10 @@ struct SLdrDigitalGuardianHead { SLdrDigitalGuardianHead(); ~SLdrDigitalGuardianHead(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrDigitalGuardianHeadData digital_guardian_head_data; + SLdrActorParameters actorInformation; + SLdrDigitalGuardianHeadData digitalGuardianHeadData; }; void LoadTypedefSLdrDigitalGuardianHead(SLdrDigitalGuardianHead&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDistanceFog.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDistanceFog.hpp index c24e2d2..435bcb7 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDistanceFog.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDistanceFog.hpp @@ -10,13 +10,13 @@ struct SLdrDistanceFog { SLdrDistanceFog(); ~SLdrDistanceFog(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int mode; CColor color; - SLdrVector2f near_far_plane; - float color_rate; - SLdrVector2f distance_rate; - bool force_settings; + SLdrVector2f nearFarPlane; + float colorRate; + SLdrVector2f distanceRate; + bool forceSettings; }; void LoadTypedefSLdrDistanceFog(SLdrDistanceFog&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDock.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDock.hpp index 7eefec3..18b609f 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDock.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDock.hpp @@ -8,12 +8,12 @@ struct SLdrDock { SLdrDock(); ~SLdrDock(); - SLdrEditorProperties editor_properties; - int dock_number; - int area_number; - bool is_virtual; - bool load_connected_immediate; - bool show_soft_transition; + SLdrEditorProperties editorProperties; + int dockNumber; + int areaNumber; + bool isVirtual; + bool loadConnectedImmediate; + bool showSoftTransition; }; void LoadTypedefSLdrDock(SLdrDock&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDoor.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDoor.hpp index f441c67..73d2361 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDoor.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDoor.hpp @@ -16,28 +16,28 @@ struct SLdrDoor { SLdrDoor(); ~SLdrDoor(); - SLdrEditorProperties editor_properties; - CVector3f collision_box; - CVector3f collision_offset; + SLdrEditorProperties editorProperties; + CVector3f collisionBox; + CVector3f collisionOffset; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; - SLdrAnimationParameters animation_information; - CAssetId shell_model; - CAssetId blue_shell_model; - CColor shell_color; - CAssetId burn_texture; - SLdrActorParameters actor_information; - CVector3f orbit_offset; - bool is_open; - bool is_locked; - float open_animation_time; - float close_animation_time; - float close_delay; - float shield_fade_out_time; - float shield_fade_in_time; - bool morph_ball_tunnel; + SLdrAnimationParameters animationInformation; + CAssetId shellModel; + CAssetId blueShellModel; + CColor shellColor; + CAssetId burnTexture; + SLdrActorParameters actorInformation; + CVector3f orbitOffset; + bool isOpen; + bool isLocked; + float openAnimationTime; + float closeAnimationTime; + float closeDelay; + float shieldFadeOutTime; + float shieldFadeInTime; + bool morphBallTunnel; bool horizontal; - SLdrScannableParameters alt_scannable; + SLdrScannableParameters altScannable; }; void LoadTypedefSLdrDoor(SLdrDoor&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrDynamicLight.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrDynamicLight.hpp index c787042..e816c74 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrDynamicLight.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrDynamicLight.hpp @@ -14,14 +14,14 @@ struct SLdrDynamicLight { SLdrDynamicLight(); ~SLdrDynamicLight(); - SLdrEditorProperties editor_properties; - int light_type; - int light_set; + SLdrEditorProperties editorProperties; + int lightType; + int lightSet; CColor color; SLdrDynamicLightIntensity intensity; SLdrDynamicLightFalloff falloff; SLdrDynamicLightSpotlight spotlight; - SLdrDynamicLightMotionSpline motion_spline; + SLdrDynamicLightMotionSpline motionSpline; SLdrDynamicLightParent parent; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrEMPulse.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrEMPulse.hpp index b438f95..aecfb6a 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrEMPulse.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrEMPulse.hpp @@ -9,13 +9,13 @@ struct SLdrEMPulse { SLdrEMPulse(); ~SLdrEMPulse(); - SLdrEditorProperties editor_properties; - float initial_size; - float final_size; + SLdrEditorProperties editorProperties; + float initialSize; + float finalSize; float duration; float unknown_0x96bd6426; float unknown_0xd7aa5ba0; - float backward_forward_sweep_chance; + float backwardForwardSweepChance; float unknown_0xce54e50e; CAssetId explosion; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrEffect.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrEffect.hpp index 60c2004..764ba18 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrEffect.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrEffect.hpp @@ -11,10 +11,10 @@ struct SLdrEffect { SLdrEffect(); ~SLdrEffect(); - SLdrEditorProperties editor_properties; - CAssetId particle_effect; + SLdrEditorProperties editorProperties; + CAssetId particleEffect; bool unknown_0x3df5a489; - bool restart_on_activate; + bool restartOnActivate; bool unknown_0xee538174; float unknown_0xa94b0efd; float unknown_0x93756968; @@ -25,16 +25,16 @@ struct SLdrEffect { float unknown_0xa7d7d767; float unknown_0xfe69615c; bool unknown_0x88d914a6; - bool visible_in_dark; - bool visible_in_echo; + bool visibleInDark; + bool visibleInEcho; bool unknown_0x6714021c; bool unknown_0xbe931927; - int render_order; + int renderOrder; SLdrLightParameters lighting; - bool motion_spline_path_loops; - SLdrSplineType motion_spline_type; - spline motion_control_spline; - float motion_spline_duration; + bool motionSplinePathLoops; + SLdrSplineType motionSplineType; + spline motionControlSpline; + float motionSplineDuration; bool unknown_0x73e63382; bool unknown_0x608ecac5; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrElitePirate.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrElitePirate.hpp index 838a9cf..3474821 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrElitePirate.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrElitePirate.hpp @@ -15,49 +15,49 @@ struct SLdrElitePirate { SLdrElitePirate(); ~SLdrElitePirate(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrDamageInfo melee_damage; - float max_melee_range; - float min_shockwave_range; - float max_shockwave_range; - float min_rocket_range; - float max_rocket_range; + SLdrActorParameters actorInformation; + SLdrDamageInfo meleeDamage; + float maxMeleeRange; + float minShockwaveRange; + float maxShockwaveRange; + float minRocketRange; + float maxRocketRange; float unknown_0x5236c2b6; float unknown_0x01eaab17; - CAssetId shielded_model; - CAssetId shielded_skin_rules; - CAssetId dark_shield; - int dark_shield_sound; - CAssetId dark_shield_pop; - CAssetId light_shield; - int light_shield_sound; - CAssetId light_shield_pop; - float taunt_interval; - float taunt_variance; - SLdrShockWaveInfo single_shock_wave_info; - SLdrShockWaveInfo double_shock_wave_info; + CAssetId shieldedModel; + CAssetId shieldedSkinRules; + CAssetId darkShield; + int darkShieldSound; + CAssetId darkShieldPop; + CAssetId lightShield; + int lightShieldSound; + CAssetId lightShieldPop; + float tauntInterval; + float tauntVariance; + SLdrShockWaveInfo singleShockWaveInfo; + SLdrShockWaveInfo doubleShockWaveInfo; float unknown_0x28b39197; float unknown_0xe27de71b; float unknown_0x665e7ace; float unknown_0xacd4d06d; CAssetId rocket; - SLdrDamageInfo rocket_damage; + SLdrDamageInfo rocketDamage; int unknown_0x624222f8; int unknown_0x31e43a1c; - float repeated_attack_chance; - float energy_absorb_duration; + float repeatedAttackChance; + float energyAbsorbDuration; float unknown_0xe47334ae; float unknown_0x3dad897b; - int always_ff_0x06cf4324; - int always_ff_0x23f5e1ee; - SLdrActorParameters rocket_launcher_actor_info; - SLdrAnimationParameters rocket_launcher_anim_info; + int alwaysFf_0x06cf4324; + int alwaysFf_0x23f5e1ee; + SLdrActorParameters rocketLauncherActorInfo; + SLdrAnimationParameters rocketLauncherAnimInfo; SLdrAnimationParameters unknown_0x7e6e0d38; - CAssetId visor_electric_effect; - int sound_visor_electric; - SLdrIngPossessionData ing_possession_data; + CAssetId visorElectricEffect; + int soundVisorElectric; + SLdrIngPossessionData ingPossessionData; }; void LoadTypedefSLdrElitePirate(SLdrElitePirate&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage1.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage1.hpp index f6aa898..d035e0e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage1.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage1.hpp @@ -11,9 +11,9 @@ struct SLdrEmperorIngStage1 { SLdrEmperorIngStage1(); ~SLdrEmperorIngStage1(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; SLdrEmperorIngStage1Data data; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage2Tentacle.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage2Tentacle.hpp index 6c8a685..77e7af0 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage2Tentacle.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage2Tentacle.hpp @@ -11,9 +11,9 @@ struct SLdrEmperorIngStage2Tentacle { SLdrEmperorIngStage2Tentacle(); ~SLdrEmperorIngStage2Tentacle(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; SLdrEmperorIngStage2TentacleData data; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage3.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage3.hpp index fbcf0e2..ac98ca3 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage3.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrEmperorIngStage3.hpp @@ -11,9 +11,9 @@ struct SLdrEmperorIngStage3 { SLdrEmperorIngStage3(); ~SLdrEmperorIngStage3(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; SLdrEmperorIngStage3Data data; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrEnvFxDensityController.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrEnvFxDensityController.hpp index aca7554..7ffe744 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrEnvFxDensityController.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrEnvFxDensityController.hpp @@ -8,9 +8,9 @@ struct SLdrEnvFxDensityController { SLdrEnvFxDensityController(); ~SLdrEnvFxDensityController(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; float density; - int fade_speed; + int fadeSpeed; }; void LoadTypedefSLdrEnvFxDensityController(SLdrEnvFxDensityController&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrEyeBall.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrEyeBall.hpp index 4fef6f1..30b7e61 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrEyeBall.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrEyeBall.hpp @@ -13,27 +13,27 @@ struct SLdrEyeBall { SLdrEyeBall(); ~SLdrEyeBall(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float close_time; - float fire_wait_time; + SLdrActorParameters actorInformation; + float closeTime; + float fireWaitTime; CAssetId projectile; - SLdrDamageInfo ray_damage; - CAssetId plasma_burn; - CAssetId plasma_pulse; - CAssetId plasma_texture; - CAssetId plasma_glow; - CColor laser_inner_color; - CColor laser_outer_color; + SLdrDamageInfo rayDamage; + CAssetId plasmaBurn; + CAssetId plasmaPulse; + CAssetId plasmaTexture; + CAssetId plasmaGlow; + CColor laserInnerColor; + CColor laserOuterColor; int unknown_0x81d14be8; int unknown_0x6e1320d6; int unknown_0x85249bd5; int unknown_0x6ae6f0eb; - int laser_sound; - bool should_be_triggered; - float max_audible_distance; - float drop_off; + int laserSound; + bool shouldBeTriggered; + float maxAudibleDistance; + float dropOff; }; void LoadTypedefSLdrEyeBall(SLdrEyeBall&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrFishCloud.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrFishCloud.hpp index 11fb74e..e82765a 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrFishCloud.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrFishCloud.hpp @@ -11,39 +11,39 @@ struct SLdrFishCloud { SLdrFishCloud(); ~SLdrFishCloud(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; bool active; - CAssetId fish_model; - SLdrAnimationParameters animation_information; - float fish_count; + CAssetId fishModel; + SLdrAnimationParameters animationInformation; + float fishCount; float speed; - float influence_distance; + float influenceDistance; float unknown_0x61959f0d; - float alignment_priority; - float separation_priority; - float projectile_priority; - float player_priority; - float containment_priority; - float wander_priority; - float wander_amount; - float player_ball_priority; - float player_ball_distance; - float projectile_decay_rate; - float player_decay_rate; - float look_ahead_time; - int update_frame; - CColor material_color; - bool can_be_killed; - float collision_radius; - CAssetId death_effect0; - int death_effect0_count; - CAssetId death_effect1; - int death_effect1_count; - CAssetId death_effect2; - int death_effect2_count; - CAssetId death_effect3; - int death_effect3_count; - int death_sound; + float alignmentPriority; + float separationPriority; + float projectilePriority; + float playerPriority; + float containmentPriority; + float wanderPriority; + float wanderAmount; + float playerBallPriority; + float playerBallDistance; + float projectileDecayRate; + float playerDecayRate; + float lookAheadTime; + int updateFrame; + CColor materialColor; + bool canBeKilled; + float collisionRadius; + CAssetId deathEffect0; + int deathEffect0Count; + CAssetId deathEffect1; + int deathEffect1Count; + CAssetId deathEffect2; + int deathEffect2Count; + CAssetId deathEffect3; + int deathEffect3Count; + int deathSound; bool unknown_0xc320a050; bool unknown_0xcd4c81a1; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrFishCloudModifier.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrFishCloudModifier.hpp index 64a9983..e7051aa 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrFishCloudModifier.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrFishCloudModifier.hpp @@ -8,12 +8,12 @@ struct SLdrFishCloudModifier { SLdrFishCloudModifier(); ~SLdrFishCloudModifier(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; bool active; bool unknown; bool rotate; - float influence_distance; - float influence_priority; + float influenceDistance; + float influencePriority; }; void LoadTypedefSLdrFishCloudModifier(SLdrFishCloudModifier&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrFlyerSwarm.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrFlyerSwarm.hpp index 8d4fe5b..95a0da9 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrFlyerSwarm.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrFlyerSwarm.hpp @@ -11,17 +11,17 @@ struct SLdrFlyerSwarm { SLdrFlyerSwarm(); ~SLdrFlyerSwarm(); - SLdrEditorProperties editor_properties; - SLdrActorParameters actor_information; - SLdrAnimationParameters animation_information; + SLdrEditorProperties editorProperties; + SLdrActorParameters actorInformation; + SLdrAnimationParameters animationInformation; bool active; - SLdrBasicSwarmProperties basic_swarm_properties; + SLdrBasicSwarmProperties basicSwarmProperties; float unknown_0x4a85a2da; float unknown_0x10cccd3c; float unknown_0x1e8e90a4; float unknown_0x262e586d; - float roll_upright_speed; - float roll_upright_min_angle; + float rollUprightSpeed; + float rollUprightMinAngle; }; void LoadTypedefSLdrFlyerSwarm(SLdrFlyerSwarm&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrFlyingPirate.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrFlyingPirate.hpp index 2f59e51..c3a819b 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrFlyingPirate.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrFlyingPirate.hpp @@ -12,39 +12,39 @@ struct SLdrFlyingPirate { SLdrFlyingPirate(); ~SLdrFlyingPirate(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float search_radius; - float hearing_radius; + SLdrActorParameters actorInformation; + float searchRadius; + float hearingRadius; int unknown_0x20daf45e; CAssetId projectile; - SLdrDamageInfo projectile_damage; - int sound_projectile; + SLdrDamageInfo projectileDamage; + int soundProjectile; CAssetId missile; - SLdrDamageInfo missile_damage; + SLdrDamageInfo missileDamage; CAssetId wpsc; - float hurl_recover_time; - float hover_height; + float hurlRecoverTime; + float hoverHeight; CAssetId part_0x6475fc6f; - SLdrDamageInfo rocket_pack_explosion_damage; - float spiral_chance; - float minimum_missile_time; + SLdrDamageInfo rocketPackExplosionDamage; + float spiralChance; + float minimumMissileTime; float unknown_0xb9bb2f64; - float flight_thrust; - int sound_impact; - int sound_spiral; - float land_chance; + float flightThrust; + int soundImpact; + int soundSpiral; + float landChance; float unknown_0x71587b45; float unknown_0x7903312e; CAssetId part_0x317212ab; CAssetId part_0xbc113d7b; CAssetId part_0x738bbbaa; - int sound_hurled; - int sound_death; - float double_attack_chance; + int soundHurled; + int soundDeath; + float doubleAttackChance; float unknown_0x3427d27f; - float stop_homing_range; + float stopHomingRange; float unknown_0xccf05648; float unknown_0x2a90f9a9; float unknown_0x9ca8f357; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrFogOverlay.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrFogOverlay.hpp index bed4fbc..bcb903a 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrFogOverlay.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrFogOverlay.hpp @@ -10,16 +10,16 @@ struct SLdrFogOverlay { SLdrFogOverlay(); ~SLdrFogOverlay(); - SLdrEditorProperties editor_properties; - float full_alpha; - float fade_down_time; - float fade_up_time; - bool start_faded_out; + SLdrEditorProperties editorProperties; + float fullAlpha; + float fadeDownTime; + float fadeUpTime; + bool startFadedOut; CColor color; - float ambient_radius_x; - float ambient_radius_y; - float ambient_speed; - float ambient_speed_target; + float ambientRadiusX; + float ambientRadiusY; + float ambientSpeed; + float ambientSpeedTarget; float unknown_0x6a111b96; float unknown_0xff226ea3; CVector3f unknown_0x2190ab0a; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrFogVolume.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrFogVolume.hpp index 66b8d30..305404d 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrFogVolume.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrFogVolume.hpp @@ -9,10 +9,10 @@ struct SLdrFogVolume { SLdrFogVolume(); ~SLdrFogVolume(); - SLdrEditorProperties editor_properties; - float fog_bob_height; - float fog_bob_freq; - CColor fog_color; + SLdrEditorProperties editorProperties; + float fogBobHeight; + float fogBobFreq; + CColor fogColor; }; void LoadTypedefSLdrFogVolume(SLdrFogVolume&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrForgottenObject.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrForgottenObject.hpp index e66f88f..769ab92 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrForgottenObject.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrForgottenObject.hpp @@ -8,7 +8,7 @@ struct SLdrForgottenObject { SLdrForgottenObject(); ~SLdrForgottenObject(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; }; void LoadTypedefSLdrForgottenObject(SLdrForgottenObject&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrFrontEndDataNetwork.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrFrontEndDataNetwork.hpp index a13faa9..45d0da6 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrFrontEndDataNetwork.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrFrontEndDataNetwork.hpp @@ -10,33 +10,33 @@ struct SLdrFrontEndDataNetwork { SLdrFrontEndDataNetwork(); ~SLdrFrontEndDataNetwork(); - SLdrEditorProperties editor_properties; - bool is_root; + SLdrEditorProperties editorProperties; + bool isRoot; bool unknown_0x77f59f4a; bool unknown_0x29c0cb7f; - bool can_be_selected; - bool is_proxy; - bool is_locked; + bool canBeSelected; + bool isProxy; + bool isLocked; bool unknown_0x8b8fa0fe; bool unknown_0xd0f2d612; - float connection_radius; - CAssetId hot_dot_texture; + float connectionRadius; + CAssetId hotDotTexture; CAssetId txtr_0x547fffc3; CAssetId txtr_0xcdaaba00; - CColor selected_color; - CColor unselected_min_color; - CColor unselected_max_color; - CColor disabled_color; - int rotation_sound; - spline transition_shrink_spline; - float transition_shrink_time; - spline transition_move_spline; - float transition_move_time; - spline transition_expand_spline; - float transition_expand_time; - spline transition_move_in_spline; - float transition_move_in_time; - int rotation_sound_volume; + CColor selectedColor; + CColor unselectedMinColor; + CColor unselectedMaxColor; + CColor disabledColor; + int rotationSound; + spline transitionShrinkSpline; + float transitionShrinkTime; + spline transitionMoveSpline; + float transitionMoveTime; + spline transitionExpandSpline; + float transitionExpandTime; + spline transitionMoveInSpline; + float transitionMoveInTime; + int rotationSoundVolume; }; void LoadTypedefSLdrFrontEndDataNetwork(SLdrFrontEndDataNetwork&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGenerator.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGenerator.hpp index 7313d1e..200204d 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGenerator.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGenerator.hpp @@ -9,14 +9,14 @@ struct SLdrGenerator { SLdrGenerator(); ~SLdrGenerator(); - SLdrEditorProperties editor_properties; - int random_count; - bool unique_locations; - bool keep_orientation; - bool use_originator_transform; + SLdrEditorProperties editorProperties; + int randomCount; + bool uniqueLocations; + bool keepOrientation; + bool useOriginatorTransform; CVector3f offset; - float random_scale_min; - float random_scale_max; + float randomScaleMin; + float randomScaleMax; }; void LoadTypedefSLdrGenerator(SLdrGenerator&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGlowbug.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGlowbug.hpp index bb9f8db..2de9d08 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGlowbug.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGlowbug.hpp @@ -12,21 +12,21 @@ struct SLdrGlowbug { SLdrGlowbug(); ~SLdrGlowbug(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - CAssetId death_flash_effect; + SLdrActorParameters actorInformation; + CAssetId deathFlashEffect; CAssetId part; - CAssetId attack_effect; - CAssetId attack_telegraph_effect; - CAssetId attack_echo_effect; - float attack_duration; - float attack_telegraph_duration; - CVector3f attack_aim_offset; - int attack_telegraph_sound; - int attack_sound; - CAssetId scan_model; - bool is_in_light_world; + CAssetId attackEffect; + CAssetId attackTelegraphEffect; + CAssetId attackEchoEffect; + float attackDuration; + float attackTelegraphDuration; + CVector3f attackAimOffset; + int attackTelegraphSound; + int attackSound; + CAssetId scanModel; + bool isInLightWorld; }; void LoadTypedefSLdrGlowbug(SLdrGlowbug&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGrapplePoint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGrapplePoint.hpp index 7ff325e..3fa65a9 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGrapplePoint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGrapplePoint.hpp @@ -9,8 +9,8 @@ struct SLdrGrapplePoint { SLdrGrapplePoint(); ~SLdrGrapplePoint(); - SLdrEditorProperties editor_properties; - SLdrGrappleParameters grapple_info; + SLdrEditorProperties editorProperties; + SLdrGrappleParameters grappleInfo; }; void LoadTypedefSLdrGrapplePoint(SLdrGrapplePoint&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGrenchler.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGrenchler.hpp index 6ac74d3..324c8ab 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGrenchler.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGrenchler.hpp @@ -16,23 +16,23 @@ struct SLdrGrenchler { SLdrGrenchler(); ~SLdrGrenchler(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; float unknown_0x04d51e3a; - bool is_grapple_guardian; - bool has_health_bar; - SLdrDamageVulnerability damage_vulnerability; + bool isGrappleGuardian; + bool hasHealthBar; + SLdrDamageVulnerability damageVulnerability; SLdrAnimationParameters tail; SLdrAnimationParameters unknown_0x0abef809; - CAssetId tailless_model; - CAssetId tailless_skin_rules; + CAssetId taillessModel; + CAssetId taillessSkinRules; SLdrAnimationParameters unknown_0x9b193ae8; SLdrAnimationParameters unknown_0xc24cf580; CAssetId cmdl; CAssetId cskr; - int tail_hit_sound; - int tail_destroyed_sound; + int tailHitSound; + int tailDestroyedSound; float unknown_0x5d8f2bee; float unknown_0x7bd1a35f; float unknown_0xea4b88c8; @@ -42,43 +42,43 @@ struct SLdrGrenchler { float unknown_0x2e6096ee; float unknown_0x6e2fee98; float unknown_0x49632b31; - SLdrDamageInfo bite_damage; + SLdrDamageInfo biteDamage; float unknown_0x262b2508; float unknown_0x66645d7e; float unknown_0x909e6095; float unknown_0xd0d118e3; - CAssetId electric_effect; - SLdrDamageInfo beam_damage; + CAssetId electricEffect; + SLdrDamageInfo beamDamage; float unknown_0x680ce795; - SLdrAudioPlaybackParms audio_playback_parms_0xad47febe; + SLdrAudioPlaybackParms audioPlaybackParms_0xad47febe; float unknown_0x06f7ceed; float unknown_0x46b8b69b; float unknown_0xb0428b70; float unknown_0xf00df306; float unknown_0xb00775e6; - CAssetId burst_projectile; - SLdrDamageInfo burst_damage; - CAssetId surface_rings_effect; + CAssetId burstProjectile; + SLdrDamageInfo burstDamage; + CAssetId surfaceRingsEffect; CAssetId part_0xbf4daae6; - CAssetId part_always_ff; + CAssetId partAlwaysFf; CAssetId part_0xffcee1a9; - CAssetId grapple_swoosh; - CAssetId grapple_beam_part; - CAssetId grapple_hit_fx; - SLdrDamageInfo grapple_damage; - SLdrAudioPlaybackParms audio_playback_parms_0xb6b9074b; - CAssetId beam_effect; + CAssetId grappleSwoosh; + CAssetId grappleBeamPart; + CAssetId grappleHitFx; + SLdrDamageInfo grappleDamage; + SLdrAudioPlaybackParms audioPlaybackParms_0xb6b9074b; + CAssetId beamEffect; int unknown_0xd4753ff4; float unknown_0x05fc6001; float unknown_0x13e5b580; float unknown_0xfc6f199d; - CAssetId grapple_visor_effect; - SLdrDamageInfo damage_info; + CAssetId grappleVisorEffect; + SLdrDamageInfo damageInfo; CAssetId part_0x54b6bfa1; - SLdrAudioPlaybackParms audio_playback_parms_0x5cf705f2; + SLdrAudioPlaybackParms audioPlaybackParms_0x5cf705f2; CAssetId part_0xb9f9f4f2; - CAssetId alternate_scannable_info; - SLdrIngPossessionData ing_possession_data; + CAssetId alternateScannableInfo; + SLdrIngPossessionData ingPossessionData; }; void LoadTypedefSLdrGrenchler(SLdrGrenchler&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiMenu.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiMenu.hpp index 62596b4..52d9633 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiMenu.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiMenu.hpp @@ -9,11 +9,11 @@ struct SLdrGuiMenu { SLdrGuiMenu(); ~SLdrGuiMenu(); - SLdrEditorProperties editor_properties; - SLdrGuiWidgetProperties gui_widget_properties; - int control_direction; - bool wrap_selection; - int selection_changed_sound; + SLdrEditorProperties editorProperties; + SLdrGuiWidgetProperties guiWidgetProperties; + int controlDirection; + bool wrapSelection; + int selectionChangedSound; }; void LoadTypedefSLdrGuiMenu(SLdrGuiMenu&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiPlayerJoinManager.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiPlayerJoinManager.hpp index 98d7ff4..4b8fa62 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiPlayerJoinManager.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiPlayerJoinManager.hpp @@ -8,7 +8,7 @@ struct SLdrGuiPlayerJoinManager { SLdrGuiPlayerJoinManager(); ~SLdrGuiPlayerJoinManager(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; }; void LoadTypedefSLdrGuiPlayerJoinManager(SLdrGuiPlayerJoinManager&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiScreen.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiScreen.hpp index 1e872b8..a799c8c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiScreen.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiScreen.hpp @@ -9,9 +9,9 @@ struct SLdrGuiScreen { SLdrGuiScreen(); ~SLdrGuiScreen(); - SLdrEditorProperties editor_properties; - int which_screen; - CAssetId string_table; + SLdrEditorProperties editorProperties; + int whichScreen; + CAssetId stringTable; }; void LoadTypedefSLdrGuiScreen(SLdrGuiScreen&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiSlider.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiSlider.hpp index 66ef237..2aa2627 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiSlider.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiSlider.hpp @@ -9,14 +9,14 @@ struct SLdrGuiSlider { SLdrGuiSlider(); ~SLdrGuiSlider(); - SLdrEditorProperties editor_properties; - SLdrGuiWidgetProperties gui_widget_properties; - float min_value; - float max_value; + SLdrEditorProperties editorProperties; + SLdrGuiWidgetProperties guiWidgetProperties; + float minValue; + float maxValue; float increment; - float slide_speed; - int slide_sound; - int slide_sound_volume; + float slideSpeed; + int slideSound; + int slideSoundVolume; }; void LoadTypedefSLdrGuiSlider(SLdrGuiSlider&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiWidget.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiWidget.hpp index 1ca2a2e..c79f3bf 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiWidget.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGuiWidget.hpp @@ -9,9 +9,9 @@ struct SLdrGuiWidget { SLdrGuiWidget(); ~SLdrGuiWidget(); - SLdrEditorProperties editor_properties; - SLdrGuiWidgetProperties gui_widget_properties; - int controller_number; + SLdrEditorProperties editorProperties; + SLdrGuiWidgetProperties guiWidgetProperties; + int controllerNumber; }; void LoadTypedefSLdrGuiWidget(SLdrGuiWidget&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGunTurretBase.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGunTurretBase.hpp index 6195d98..89ccbfc 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGunTurretBase.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGunTurretBase.hpp @@ -12,10 +12,10 @@ struct SLdrGunTurretBase { SLdrGunTurretBase(); ~SLdrGunTurretBase(); - SLdrEditorProperties editor_properties; - SLdrDamageInfo attack_damage; - float hurt_sleep_delay; - float gun_aim_turn_speed; + SLdrEditorProperties editorProperties; + SLdrDamageInfo attackDamage; + float hurtSleepDelay; + float gunAimTurnSpeed; float unknown_0xc80bc7c5; float unknown_0x95e7a2c2; float unknown_0x76ba1c18; @@ -26,27 +26,27 @@ struct SLdrGunTurretBase { float unknown_0x5ade66a9; float unknown_0x8dd2c329; float unknown_0xfc036e93; - float shot_angle_variance; - float patrol_delay; - float withdraw_delay; + float shotAngleVariance; + float patrolDelay; + float withdrawDelay; float unknown_0x8a35b1ea; float unknown_0xd49bec5a; float unknown_0x80ce481a; - float attack_delay; - float detection_height_up; - float detection_height_down; - float attack_leash_time; - bool gun_respawns; + float attackDelay; + float detectionHeightUp; + float detectionHeightDown; + float attackLeashTime; + bool gunRespawns; bool unknown_0x5cf12e9a; bool unknown_0x479d8dc4; - bool is_pirate_turret; + bool isPirateTurret; CAssetId crsc; - CAssetId pirate_projectile_effect; - int always_ff; + CAssetId pirateProjectileEffect; + int alwaysFf; int sound_0x23316032; int sound_0xa3b39766; - int lock_on_sound; - int gun_pan_sound; + int lockOnSound; + int gunPanSound; int sound_0xf57880ec; int sound_0x99fe97f6; int sound_0xa2714856; @@ -55,11 +55,11 @@ struct SLdrGunTurretBase { int sound_0x00628c84; int sound_0x40533b8d; int sound_0x613cafd8; - int pole_sparks_sound; - float max_audible_distance; + int poleSparksSound; + float maxAudibleDistance; float unknown_0xd2986c43; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; }; void LoadTypedefSLdrGunTurretBase(SLdrGunTurretBase&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrGunTurretTop.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrGunTurretTop.hpp index 72cecb1..9e20721 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrGunTurretTop.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrGunTurretTop.hpp @@ -12,18 +12,18 @@ struct SLdrGunTurretTop { SLdrGunTurretTop(); ~SLdrGunTurretTop(); - SLdrEditorProperties editor_properties; - float power_up_time; - float power_down_time; + SLdrEditorProperties editorProperties; + float powerUpTime; + float powerDownTime; CAssetId part_0xbf87e353; CAssetId part_0xaf6e671a; - int always_ff_0x67c8a8f4; - int always_ff_0x68d8b844; - CColor light_color; + int alwaysFf_0x67c8a8f4; + int alwaysFf_0x68d8b844; + CColor lightColor; int sound_0xe4aeeba4; int sound_0x5d9ed447; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; }; void LoadTypedefSLdrGunTurretTop(SLdrGunTurretTop&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrHUDHint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrHUDHint.hpp index d967c96..be6e5ab 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrHUDHint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrHUDHint.hpp @@ -9,13 +9,13 @@ struct SLdrHUDHint { SLdrHUDHint(); ~SLdrHUDHint(); - SLdrEditorProperties editor_properties; - CAssetId hud_texture; + SLdrEditorProperties editorProperties; + CAssetId hudTexture; float unknown_0x6078a651; float unknown_0xf00bb6bb; - float icon_scale; - float animation_time; - int animation_frames; + float iconScale; + float animationTime; + int animationFrames; int unknown_0xd993f97b; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrHUDMemo.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrHUDMemo.hpp index af4c294..d4a1a73 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrHUDMemo.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrHUDMemo.hpp @@ -9,16 +9,16 @@ struct SLdrHUDMemo { SLdrHUDMemo(); ~SLdrHUDMemo(); - SLdrEditorProperties editor_properties; - float display_time; - bool clear_window; + SLdrEditorProperties editorProperties; + float displayTime; + bool clearWindow; bool player1; bool player2; bool player3; bool player4; - bool type_out; - bool use_originator; - int display_type; + bool typeOut; + bool useOriginator; + int displayType; CAssetId string; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrIng.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrIng.hpp index 80f1e6a..2d268ba 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrIng.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrIng.hpp @@ -15,26 +15,26 @@ struct SLdrIng { SLdrIng(); ~SLdrIng(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; int unknown_0x092fbad0; - CAssetId face_plate_model; - float hearing_radius; - float ing_spot_max_speed; + CAssetId facePlateModel; + float hearingRadius; + float ingSpotMaxSpeed; float unknown_0x8d42a8d5; float unknown_0x84586bfd; float unknown_0x50398a06; - float ing_spot_turn_speed; - CAssetId ing_spot_blob_effect; - CAssetId ing_spot_hit_normal_damage; - CAssetId ing_spot_hit_heavy_damage; - CAssetId ing_spot_death; - int sound_ing_spot_idle; - int sound_ing_spot_move; + float ingSpotTurnSpeed; + CAssetId ingSpotBlobEffect; + CAssetId ingSpotHitNormalDamage; + CAssetId ingSpotHitHeavyDamage; + CAssetId ingSpotDeath; + int soundIngSpotIdle; + int soundIngSpotMove; int sound_0xb392943a; int sound_0x24ecc1e9; - int sound_ing_spot_death; + int soundIngSpotDeath; CAssetId part_0x3c2d681e; CAssetId srsc; CAssetId part_0x3da219c7; @@ -43,47 +43,47 @@ struct SLdrIng { float unknown_0xcb39eccb; float unknown_0x587ca175; float unknown_0x0bd7d5a9; - int sound_swarm_move; + int soundSwarmMove; int sound_0x5650366a; - int sound_body_projectile_blaster_middle; + int soundBodyProjectileBlasterMiddle; int sound_0x0c13c5a8; int sound_0x148b81e4; float unknown_0x5d0d2c40; float unknown_0xc620183a; - float frustration_time; - float taunt_chance; + float frustrationTime; + float tauntChance; float aggressiveness; - SLdrDamageInfo arm_swipe_damage; - SLdrDamageInfo body_projectile_contact_damage; + SLdrDamageInfo armSwipeDamage; + SLdrDamageInfo bodyProjectileContactDamage; float unknown_0xa0d63374; - float body_projectile_suck_time; - CAssetId body_projectile_splat_effect; - float body_projectile_speed; - float body_projectile_drop_time; + float bodyProjectileSuckTime; + CAssetId bodyProjectileSplatEffect; + float bodyProjectileSpeed; + float bodyProjectileDropTime; float unknown_0xe6ddb662; float unknown_0xb57bae86; - int sound_body_projectile; - int sound_body_projectile_splat_wall; - float body_projectile_odds; + int soundBodyProjectile; + int soundBodyProjectileSplatWall; + float bodyProjectileOdds; float unknown_0xfa6edeb5; float unknown_0xa9c8c651; - CAssetId mini_portal_effect; - int sound_mini_portal; - SLdrDamageInfo mini_portal_projectile_damage; - SLdrPlasmaBeamInfo mini_portal_beam_info; + CAssetId miniPortalEffect; + int soundMiniPortal; + SLdrDamageInfo miniPortalProjectileDamage; + SLdrPlasmaBeamInfo miniPortalBeamInfo; float unknown_0x67f6c10e; - SLdrDamageInfo exit_grapple_damage; - float exit_grapple_spit_force; - int sound_grapple; - int sound_exit_grapple; + SLdrDamageInfo exitGrappleDamage; + float exitGrappleSpitForce; + int soundGrapple; + int soundExitGrapple; float unknown_0x421651f6; float unknown_0x560b4a95; float unknown_0x8bdcc614; - CColor light_color; - float light_attenuation; - SLdrDamageVulnerability ing_spot_vulnerability; - SLdrDamageVulnerability grapple_ball_vulnerability; - SLdrDamageVulnerability trigger_vulnerability; + CColor lightColor; + float lightAttenuation; + SLdrDamageVulnerability ingSpotVulnerability; + SLdrDamageVulnerability grappleBallVulnerability; + SLdrDamageVulnerability triggerVulnerability; }; void LoadTypedefSLdrIng(SLdrIng&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngBlobSwarm.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngBlobSwarm.hpp index 824db83..934b7fa 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngBlobSwarm.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngBlobSwarm.hpp @@ -12,19 +12,19 @@ struct SLdrIngBlobSwarm { SLdrIngBlobSwarm(); ~SLdrIngBlobSwarm(); - SLdrEditorProperties editor_properties; - SLdrActorParameters actor_information; - SLdrAnimationParameters animation_information; + SLdrEditorProperties editorProperties; + SLdrActorParameters actorInformation; + SLdrAnimationParameters animationInformation; bool active; - SLdrBasicSwarmProperties basic_swarm_properties; + SLdrBasicSwarmProperties basicSwarmProperties; int unknown_0x7399abbb; int unknown_0x734d923b; - float max_attack_angle; - float into_attack_speed; - float attack_speed; + float maxAttackAngle; + float intoAttackSpeed; + float attackSpeed; float mass; - float max_attack_height; - CVector3f attack_aim_offset; + float maxAttackHeight; + CVector3f attackAimOffset; }; void LoadTypedefSLdrIngBlobSwarm(SLdrIngBlobSwarm&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngBoostBallGuardian.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngBoostBallGuardian.hpp index 77f4ea7..7153360 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngBoostBallGuardian.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngBoostBallGuardian.hpp @@ -12,11 +12,11 @@ struct SLdrIngBoostBallGuardian { SLdrIngBoostBallGuardian(); ~SLdrIngBoostBallGuardian(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrUnknownStruct28 unknown_struct28; - SLdrUnknownStruct29 unknown_struct29; + SLdrActorParameters actorInformation; + SLdrUnknownStruct28 unknownStruct28; + SLdrUnknownStruct29 unknownStruct29; }; void LoadTypedefSLdrIngBoostBallGuardian(SLdrIngBoostBallGuardian&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngPuddle.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngPuddle.hpp index d2b4e30..6a8369e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngPuddle.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngPuddle.hpp @@ -10,9 +10,9 @@ struct SLdrIngPuddle { SLdrIngPuddle(); ~SLdrIngPuddle(); - SLdrEditorProperties editor_properties; - SLdrActorParameters actor_information; - SLdrUnknownStruct30 unknown_struct30; + SLdrEditorProperties editorProperties; + SLdrActorParameters actorInformation; + SLdrUnknownStruct30 unknownStruct30; }; void LoadTypedefSLdrIngPuddle(SLdrIngPuddle&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSnatchingSwarm.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSnatchingSwarm.hpp index a529e31..4033f0e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSnatchingSwarm.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSnatchingSwarm.hpp @@ -11,31 +11,31 @@ struct SLdrIngSnatchingSwarm { SLdrIngSnatchingSwarm(); ~SLdrIngSnatchingSwarm(); - SLdrEditorProperties editor_properties; - CAssetId state_machine; - CAssetId swarm_particle_system; + SLdrEditorProperties editorProperties; + CAssetId stateMachine; + CAssetId swarmParticleSystem; float unknown_0x7cae2ed5; CAssetId part_0x35a88fa1; float unknown_0xf65e7ec5; float lifetime; - float max_linear_speed; - float max_linear_acceleration; - float max_turn_speed; + float maxLinearSpeed; + float maxLinearAcceleration; + float maxTurnSpeed; bool unknown_0xdffdf5a2; - bool ignore_player; + bool ignorePlayer; float unknown_0xe6b57a25; - float exit_portal_distance; + float exitPortalDistance; float unknown_0x2de5a19a; float unknown_0x4e79f717; float unknown_0xe8e0b5a6; - float begin_snatching_range; + float beginSnatchingRange; CAssetId part_0x2d2afc26; - SLdrDamageInfo impact_damage; - int sound_impact; - int sound_idle; - int sound_move; + SLdrDamageInfo impactDamage; + int soundImpact; + int soundIdle; + int soundMove; float health; - SLdrDamageVulnerability swarm_vulnerability; + SLdrDamageVulnerability swarmVulnerability; }; void LoadTypedefSLdrIngSnatchingSwarm(SLdrIngSnatchingSwarm&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSpaceJumpGuardian.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSpaceJumpGuardian.hpp index 2924048..96ccc7d 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSpaceJumpGuardian.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSpaceJumpGuardian.hpp @@ -11,10 +11,10 @@ struct SLdrIngSpaceJumpGuardian { SLdrIngSpaceJumpGuardian(); ~SLdrIngSpaceJumpGuardian(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrUnknownStruct32 unknown_struct32; + SLdrActorParameters actorInformation; + SLdrUnknownStruct32 unknownStruct32; }; void LoadTypedefSLdrIngSpaceJumpGuardian(SLdrIngSpaceJumpGuardian&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSpiderballGuardian.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSpiderballGuardian.hpp index 9af886a..ebb1fc3 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSpiderballGuardian.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrIngSpiderballGuardian.hpp @@ -11,10 +11,10 @@ struct SLdrIngSpiderballGuardian { SLdrIngSpiderballGuardian(); ~SLdrIngSpiderballGuardian(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrUnknownStruct31 unknown_struct31; + SLdrActorParameters actorInformation; + SLdrUnknownStruct31 unknownStruct31; }; void LoadTypedefSLdrIngSpiderballGuardian(SLdrIngSpiderballGuardian&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrKralee.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrKralee.hpp index fa092e0..c9076ee 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrKralee.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrKralee.hpp @@ -11,35 +11,35 @@ struct SLdrKralee { SLdrKralee(); ~SLdrKralee(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int flavor; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float waypoint_approach_distance; - float visible_distance; - float wall_turn_speed; - float floor_turn_speed; - float down_turn_speed; + SLdrActorParameters actorInformation; + float waypointApproachDistance; + float visibleDistance; + float wallTurnSpeed; + float floorTurnSpeed; + float downTurnSpeed; float unknown_0xd5c25506; - float projectile_bounds_multiplier; - float collision_look_ahead; - float warp_in_time; - float warp_out_time; - float visible_time; + float projectileBoundsMultiplier; + float collisionLookAhead; + float warpInTime; + float warpOutTime; + float visibleTime; float unknown_0x7bba36ff; - float invisible_time; + float invisibleTime; float unknown_0x4e4ae0e4; - float warp_attack_radius; - float warp_attack_knockback; - float warp_attack_damage; - float anim_speed_scalar; - float max_audible_distance; - CAssetId warp_in_particle_effect; - CAssetId warp_out_particle_effect; - int warp_in_sound; - int warp_out_sound; - bool initially_paused; - bool initially_invisible; + float warpAttackRadius; + float warpAttackKnockback; + float warpAttackDamage; + float animSpeedScalar; + float maxAudibleDistance; + CAssetId warpInParticleEffect; + CAssetId warpOutParticleEffect; + int warpInSound; + int warpOutSound; + bool initiallyPaused; + bool initiallyInvisible; }; void LoadTypedefSLdrKralee(SLdrKralee&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrKrocuss.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrKrocuss.hpp index 30fac1c..0072f6c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrKrocuss.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrKrocuss.hpp @@ -13,31 +13,31 @@ struct SLdrKrocuss { SLdrKrocuss(); ~SLdrKrocuss(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int flavor; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float waypoint_approach_distance; - float visible_distance; - float wall_turn_speed; - float floor_turn_speed; - float down_turn_speed; + SLdrActorParameters actorInformation; + float waypointApproachDistance; + float visibleDistance; + float wallTurnSpeed; + float floorTurnSpeed; + float downTurnSpeed; float unknown_0xd5c25506; - float projectile_bounds_multiplier; - float collision_look_ahead; - float anim_speed_scalar; - bool initially_paused; + float projectileBoundsMultiplier; + float collisionLookAhead; + float animSpeedScalar; + bool initiallyPaused; float unknown_0xf04cadca; float unknown_0x497d54e8; float unknown_0x3371c963; float unknown_0x22d37771; float unknown_0xbbebed9e; - SLdrDamageVulnerability shell_closed_vulnerability; - CColor wing_light_color; + SLdrDamageVulnerability shellClosedVulnerability; + CColor wingLightColor; CAssetId dpsc; - int shell_open_sound; - int shell_close_sound; - float max_audible_distance; + int shellOpenSound; + int shellCloseSound; + float maxAudibleDistance; }; void LoadTypedefSLdrKrocuss(SLdrKrocuss&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrLumite.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrLumite.hpp index 152cf9d..1d25167 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrLumite.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrLumite.hpp @@ -12,23 +12,23 @@ struct SLdrLumite { SLdrLumite(); ~SLdrLumite(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; float unknown_0x2d9ebd7f; float unknown_0x6dd1c509; - CAssetId small_shot_projectile; - SLdrDamageInfo small_shot_damage; + CAssetId smallShotProjectile; + SLdrDamageInfo smallShotDamage; float unknown_0x6d5356bb; float unknown_0x2d1c2ecd; - CAssetId big_shot_projectile; - SLdrDamageInfo big_shot_damage; - CAssetId trail_effect; - CAssetId sunlight_enter_exit_effect; + CAssetId bigShotProjectile; + SLdrDamageInfo bigShotDamage; + CAssetId trailEffect; + CAssetId sunlightEnterExitEffect; float unknown_0xe05d93ef; float unknown_0x47691396; - int phase_in_sound; - int phase_out_sound; + int phaseInSound; + int phaseOutSound; }; void LoadTypedefSLdrLumite(SLdrLumite&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrMediumIng.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrMediumIng.hpp index 06a0475..d9218b0 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrMediumIng.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrMediumIng.hpp @@ -16,39 +16,39 @@ struct SLdrMediumIng { SLdrMediumIng(); ~SLdrMediumIng(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - int spawn_mode; - SLdrActorParameters actor_information; + int spawnMode; + SLdrActorParameters actorInformation; float aggressiveness; float unknown_0x4d1d840d; - float min_melee_attack_interval; - float max_melee_attack_range; - SLdrDamageInfo melee_damage; + float minMeleeAttackInterval; + float maxMeleeAttackRange; + SLdrDamageInfo meleeDamage; float unknown_0x636f11e5; - SLdrDamageInfo mist_damage; - float min_mist_attack_interval; - SLdrDamageVulnerability misting_vulnerability; - float min_arm_attack_interval; + SLdrDamageInfo mistDamage; + float minMistAttackInterval; + SLdrDamageVulnerability mistingVulnerability; + float minArmAttackInterval; float unknown_0x9d3cfeb0; float unknown_0xdc2bc136; - float min_tentacle_length; - float max_tentacle_length; - float arm_attack_time; + float minTentacleLength; + float maxTentacleLength; + float armAttackTime; float unknown_0x8f1d597c; - SLdrAnimationParameters attack_tentacle; - SLdrActorParameters actor_parameters; - spline attack_motion; - SLdrCameraShakerData camera_shaker_data; - SLdrDamageInfo attack_tentacle_damage; - float taunt_chance; - float double_dash_chance; - CColor light_color; - float light_attenuation; + SLdrAnimationParameters attackTentacle; + SLdrActorParameters actorParameters; + spline attackMotion; + SLdrCameraShakerData cameraShakerData; + SLdrDamageInfo attackTentacleDamage; + float tauntChance; + float doubleDashChance; + CColor lightColor; + float lightAttenuation; spline unknown_0xb459c3e9; - spline dash_speed; - CAssetId ing_spot_blob_fx; - int ing_spot_sound; + spline dashSpeed; + CAssetId ingSpotBlobFx; + int ingSpotSound; float unknown_0x0e3d3708; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrMemoryRelay.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrMemoryRelay.hpp index 7f8d96f..e371c2c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrMemoryRelay.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrMemoryRelay.hpp @@ -8,9 +8,9 @@ struct SLdrMemoryRelay { SLdrMemoryRelay(); ~SLdrMemoryRelay(); - SLdrEditorProperties editor_properties; - bool one_shot; - bool delayed_action; + SLdrEditorProperties editorProperties; + bool oneShot; + bool delayedAction; }; void LoadTypedefSLdrMemoryRelay(SLdrMemoryRelay&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrMetaree.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrMetaree.hpp index f1e8fd5..deb0e26 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrMetaree.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrMetaree.hpp @@ -13,17 +13,17 @@ struct SLdrMetaree { SLdrMetaree(); ~SLdrMetaree(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrDamageInfo radius_damage; - float drop_height; + SLdrActorParameters actorInformation; + SLdrDamageInfo radiusDamage; + float dropHeight; CVector3f unknown; - float attack_speed; - float drop_delay; - float halt_delay; - float launch_speed; - SLdrAudioPlaybackParms turn_sound; + float attackSpeed; + float dropDelay; + float haltDelay; + float launchSpeed; + SLdrAudioPlaybackParms turnSound; }; void LoadTypedefSLdrMetaree(SLdrMetaree&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrMetareeSwarm.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrMetareeSwarm.hpp index 2e2b7ed..ffffad5 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrMetareeSwarm.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrMetareeSwarm.hpp @@ -11,16 +11,16 @@ struct SLdrMetareeSwarm { SLdrMetareeSwarm(); ~SLdrMetareeSwarm(); - SLdrEditorProperties editor_properties; - SLdrActorParameters actor_information; - SLdrAnimationParameters animation_information; + SLdrEditorProperties editorProperties; + SLdrActorParameters actorInformation; + SLdrAnimationParameters animationInformation; bool active; - SLdrBasicSwarmProperties basic_swarm_properties; + SLdrBasicSwarmProperties basicSwarmProperties; int unknown_0x7399abbb; int unknown_0x734d923b; - float max_attack_angle; - float into_attack_speed; - float attack_speed; + float maxAttackAngle; + float intoAttackSpeed; + float attackSpeed; }; void LoadTypedefSLdrMetareeSwarm(SLdrMetareeSwarm&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrMetroidAlpha.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrMetroidAlpha.hpp index 65215bf..e8cf360 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrMetroidAlpha.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrMetroidAlpha.hpp @@ -13,16 +13,16 @@ struct SLdrMetroidAlpha { SLdrMetroidAlpha(); ~SLdrMetroidAlpha(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrDamageVulnerability frozen_vulnerability; - SLdrDamageVulnerability energy_drain_vulnerability; - SLdrDamageVulnerability damage_vulnerability; + SLdrActorParameters actorInformation; + SLdrDamageVulnerability frozenVulnerability; + SLdrDamageVulnerability energyDrainVulnerability; + SLdrDamageVulnerability damageVulnerability; float unknown_0x72439b39; float unknown_0x3af75fcc; - float telegraph_attack_time; - float baby_metroid_scale; + float telegraphAttackTime; + float babyMetroidScale; float unknown_0x03362858; float unknown_0x852d3bb0; float unknown_0x1c783744; @@ -31,9 +31,9 @@ struct SLdrMetroidAlpha { float unknown_0x4c1f78f3; float unknown_0x5f3f294c; float unknown_0x06b460f4; - float chance_to_dodge; + float chanceToDodge; int unknown_0xfa51d735; - SLdrIngPossessionData ing_possession_data; + SLdrIngPossessionData ingPossessionData; }; void LoadTypedefSLdrMetroidAlpha(SLdrMetroidAlpha&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrMidi.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrMidi.hpp index 4685db0..e2275d9 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrMidi.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrMidi.hpp @@ -9,10 +9,10 @@ struct SLdrMidi { SLdrMidi(); ~SLdrMidi(); - SLdrEditorProperties editor_properties; - CAssetId song_file; - float fade_in_time; - float fade_out_time; + SLdrEditorProperties editorProperties; + CAssetId songFile; + float fadeInTime; + float fadeOutTime; int volume; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrMinorIng.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrMinorIng.hpp index b688ba5..6cb448f 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrMinorIng.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrMinorIng.hpp @@ -14,17 +14,17 @@ struct SLdrMinorIng { SLdrMinorIng(); ~SLdrMinorIng(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrDamageInfo projectile_damage; + SLdrActorParameters actorInformation; + SLdrDamageInfo projectileDamage; CAssetId projectile; float unknown_0xa03e450c; - float attack_angle_limit; + float attackAngleLimit; float unknown_0x99bb2559; float unknown_0xd6c8eac2; float unknown_0x2a5449ba; - float hearing_radius; + float hearingRadius; bool unknown_0x399d1eaa; bool unknown_0xbce16644; bool unknown_0x142433d3; @@ -32,8 +32,8 @@ struct SLdrMinorIng { bool unknown_0xe601f7bd; bool unknown_0x09207f51; bool unknown_0x2107e4fb; - SLdrUnknownStruct33 unknown_struct33; - SLdrUnknownStruct34 unknown_struct34; + SLdrUnknownStruct33 unknownStruct33; + SLdrUnknownStruct34 unknownStruct34; }; void LoadTypedefSLdrMinorIng(SLdrMinorIng&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrMysteryFlyer.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrMysteryFlyer.hpp index 6ff2c22..9ef006f 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrMysteryFlyer.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrMysteryFlyer.hpp @@ -11,10 +11,10 @@ struct SLdrMysteryFlyer { SLdrMysteryFlyer(); ~SLdrMysteryFlyer(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrMysteryFlyerData mystery_flyer_properties; + SLdrActorParameters actorInformation; + SLdrMysteryFlyerData mysteryFlyerProperties; }; void LoadTypedefSLdrMysteryFlyer(SLdrMysteryFlyer&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrOctapedeSegment.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrOctapedeSegment.hpp index 703ffcb..8f05c2e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrOctapedeSegment.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrOctapedeSegment.hpp @@ -12,23 +12,23 @@ struct SLdrOctapedeSegment { SLdrOctapedeSegment(); ~SLdrOctapedeSegment(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int flavor; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float waypoint_approach_distance; - float visible_distance; - float wall_turn_speed; - float floor_turn_speed; - float down_turn_speed; + SLdrActorParameters actorInformation; + float waypointApproachDistance; + float visibleDistance; + float wallTurnSpeed; + float floorTurnSpeed; + float downTurnSpeed; float unknown_0xd5c25506; - float projectile_bounds_multiplier; - float collision_look_ahead; - float anim_speed_scalar; - float max_audible_distance; - bool initially_paused; + float projectileBoundsMultiplier; + float collisionLookAhead; + float animSpeedScalar; + float maxAudibleDistance; + bool initiallyPaused; float unknown_0x4fb8747e; - CAssetId between_segments_effect; + CAssetId betweenSegmentsEffect; float unknown_0x9b9c46fc; float unknown_0x9f0677d6; float unknown_0xc0241fc1; @@ -42,12 +42,12 @@ struct SLdrOctapedeSegment { int unknown_0xd6f71bb3; int unknown_0x96b863c5; float unknown_0x417f4a91; - SLdrDamageInfo explosion_damage; - int walk_sound; - int idle_sound; - int seperate_sound; - int bounce_sound; - int explode_sound; + SLdrDamageInfo explosionDamage; + int walkSound; + int idleSound; + int seperateSound; + int bounceSound; + int explodeSound; float unknown_0x0c4763d7; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrParasite.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrParasite.hpp index 182c0db..7b93f0e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrParasite.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrParasite.hpp @@ -10,28 +10,28 @@ struct SLdrParasite { SLdrParasite(); ~SLdrParasite(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int flavor; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float telegraph_distance; - float waypoint_approach_distance; - float wall_turn_speed; - float floor_turn_speed; - float down_turn_speed; - float stuck_time; + SLdrActorParameters actorInformation; + float telegraphDistance; + float waypointApproachDistance; + float wallTurnSpeed; + float floorTurnSpeed; + float downTurnSpeed; + float stuckTime; float unknown_0xd5c25506; - float behavior_influence_radius; - float separation_distance; - float separation_priority; - float alignment_priority; + float behaviorInfluenceRadius; + float separationDistance; + float separationPriority; + float alignmentPriority; float unknown_0x61959f0d; - float path_following_priority; - float forward_moving_priority; - float player_avoidance_distance; - float player_avoidance_priority; - float parasite_visible_distance; - bool initially_paused; + float pathFollowingPriority; + float forwardMovingPriority; + float playerAvoidanceDistance; + float playerAvoidancePriority; + float parasiteVisibleDistance; + bool initiallyPaused; }; void LoadTypedefSLdrParasite(SLdrParasite&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPathCamera.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPathCamera.hpp index 29725ca..845cc00 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPathCamera.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPathCamera.hpp @@ -9,22 +9,22 @@ struct SLdrPathCamera { SLdrPathCamera(); ~SLdrPathCamera(); - SLdrEditorProperties editor_properties; - int flags_path_camera; + SLdrEditorProperties editorProperties; + int flagsPathCamera; int unknown_0xd4b29446; - SLdrSplineType motion_spline_type; - spline motion_control_spline; - SLdrSplineType target_spline_type; - spline target_control_spline; - spline fov_spline; - spline speed_control_spline; - SLdrSplineType spline_type; + SLdrSplineType motionSplineType; + spline motionControlSpline; + SLdrSplineType targetSplineType; + spline targetControlSpline; + spline fovSpline; + spline speedControlSpline; + SLdrSplineType splineType; bool unknown_0x431769c6; float distance; float speed; - float dampen_distance; - int initial_position; - float angular_speed; + float dampenDistance; + int initialPosition; + float angularSpeed; spline unknown_0x12861f7d; spline unknown_0x96ac52b0; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPathMeshCtrl.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPathMeshCtrl.hpp index 5be69b1..71512a0 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPathMeshCtrl.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPathMeshCtrl.hpp @@ -8,9 +8,9 @@ struct SLdrPathMeshCtrl { SLdrPathMeshCtrl(); ~SLdrPathMeshCtrl(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int type; - int initial_count; + int initialCount; }; void LoadTypedefSLdrPathMeshCtrl(SLdrPathMeshCtrl&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPickup.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPickup.hpp index 8e1fd9b..f1c2daa 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPickup.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPickup.hpp @@ -13,32 +13,32 @@ struct SLdrPickup { SLdrPickup(); - SLdrEditorProperties editor_properties; - CVector3f collision_size; - CVector3f collision_offset; - SLdrPlayerItem item_to_give; - int capacity_increase; - int item_percentage_increase; + SLdrEditorProperties editorProperties; + CVector3f collisionSize; + CVector3f collisionOffset; + SLdrPlayerItem itemToGive; + int capacityIncrease; + int itemPercentageIncrease; int amount; - float respawn_time; - float pickup_effect_lifetime; + float respawnTime; + float pickupEffectLifetime; float lifetime; float fadetime; CAssetId model; - SLdrAnimationParameters animation_information; - SLdrActorParameters actor_information; - SLdrEchoParameters echo_information; - float activation_delay; - CAssetId pickup_effect; - bool absolute_value; - bool calculate_visibility; + SLdrAnimationParameters animationInformation; + SLdrActorParameters actorInformation; + SLdrEchoParameters echoInformation; + float activationDelay; + CAssetId pickupEffect; + bool absoluteValue; + bool calculateVisibility; bool unknown; - float auto_home_range; - float delay_until_home; - float homing_speed; - bool auto_spin; - bool blink_out; - CVector3f orbit_offset; + float autoHomeRange; + float delayUntilHome; + float homingSpeed; + bool autoSpin; + bool blinkOut; + CVector3f orbitOffset; }; void LoadTypedefSLdrPickup(SLdrPickup&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPickupGenerator.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPickupGenerator.hpp index eb88764..2c56bf0 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPickupGenerator.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPickupGenerator.hpp @@ -10,9 +10,9 @@ struct SLdrPickupGenerator { SLdrPickupGenerator(); ~SLdrPickupGenerator(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; CVector3f offset; - bool offset_is_local_space; + bool offsetIsLocalSpace; CAssetId rules; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPillBug.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPillBug.hpp index e78ae70..e01c749 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPillBug.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPillBug.hpp @@ -11,21 +11,21 @@ struct SLdrPillBug { SLdrPillBug(); ~SLdrPillBug(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; int unknown_0xde7e9f94; - float floor_turn_speed; - float stick_radius; - float waypoint_approach_distance; - float visible_distance; - SLdrDamageVulnerability damage_vulnerability; - SLdrDamageVulnerability wander_vulnerability; - float crawl_radius; - float roll_radius; + float floorTurnSpeed; + float stickRadius; + float waypointApproachDistance; + float visibleDistance; + SLdrDamageVulnerability damageVulnerability; + SLdrDamageVulnerability wanderVulnerability; + float crawlRadius; + float rollRadius; float unknown_0x519c7197; float unknown_0xa265383c; - float forward_priority; + float forwardPriority; float unknown_0x558c0692; float unknown_0x0f991bf1; float unknown_0x385a1bed; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlantScarabSwarm.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlantScarabSwarm.hpp index c3a9969..411ccc2 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlantScarabSwarm.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlantScarabSwarm.hpp @@ -13,31 +13,31 @@ struct SLdrPlantScarabSwarm { SLdrPlantScarabSwarm(); ~SLdrPlantScarabSwarm(); - SLdrEditorProperties editor_properties; - SLdrActorParameters actor_information; - SLdrAnimationParameters animation_information; + SLdrEditorProperties editorProperties; + SLdrActorParameters actorInformation; + SLdrAnimationParameters animationInformation; bool active; - SLdrBasicSwarmProperties basic_swarm_properties; + SLdrBasicSwarmProperties basicSwarmProperties; int unknown_0x7399abbb; int unknown_0x734d923b; - float max_attack_angle; - float into_attack_speed; - float attack_speed; - float grenade_mass; - float grenade_launch_speed; + float maxAttackAngle; + float intoAttackSpeed; + float attackSpeed; + float grenadeMass; + float grenadeLaunchSpeed; float unknown_0xed086ce0; int unknown_0x454f16b1; - SLdrDamageInfo grenade_damage; - float grenade_explosion_proximity; - CAssetId grenade_explosion_effect; + SLdrDamageInfo grenadeDamage; + float grenadeExplosionProximity; + CAssetId grenadeExplosionEffect; CAssetId part; - CAssetId grenade_trail_effect; - CAssetId grenade_effect; - int grenade_bounce_sound; - float grenade_bounce_sound_fall_off; + CAssetId grenadeTrailEffect; + CAssetId grenadeEffect; + int grenadeBounceSound; + float grenadeBounceSoundFallOff; float unknown_0x15e0c159; - int grenade_explosion_sound; - float grenade_explosion_sound_fall_off; + int grenadeExplosionSound; + float grenadeExplosionSoundFallOff; float unknown_0xab84892e; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlatform.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlatform.hpp index 50537e6..3a17786 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlatform.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlatform.hpp @@ -15,23 +15,23 @@ struct SLdrPlatform { SLdrPlatform(); ~SLdrPlatform(); - SLdrEditorProperties editor_properties; - CVector3f collision_box; - CVector3f collision_offset; + SLdrEditorProperties editorProperties; + CVector3f collisionBox; + CVector3f collisionOffset; CAssetId model; - SLdrAnimationParameters animation_information; - SLdrActorParameters actor_information; - CAssetId collision_model; + SLdrAnimationParameters animationInformation; + SLdrActorParameters actorInformation; + CAssetId collisionModel; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; - float x_ray_transparency; - int maximum_splashes; - int splash_generation_rate; - bool render_rain_splashes; + float xRayTransparency; + int maximumSplashes; + int splashGenerationRate; + bool renderRainSplashes; bool unknown_0xf203bc81; - SLdrPlatformMotionProperties motion_properties; + SLdrPlatformMotionProperties motionProperties; CVector3f unknown_0x24fdeea1; - float random_animation_offset; + float randomAnimationOffset; }; void LoadTypedefSLdrPlatform(SLdrPlatform&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerActor.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerActor.hpp index c4be236..ee44212 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerActor.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerActor.hpp @@ -14,21 +14,21 @@ struct SLdrPlayerActor { SLdrPlayerActor(); ~SLdrPlayerActor(); - SLdrEditorProperties editor_properties; - CVector3f collision_box; - CVector3f collision_offset; + SLdrEditorProperties editorProperties; + CVector3f collisionBox; + CVector3f collisionOffset; float mass; float gravity; SLdrHealthInfo health; SLdrDamageVulnerability vulnerability; - CAssetId no_model; - SLdrAnimationParameters animation_information; - SLdrActorParameters actor_information; - bool is_loop; + CAssetId noModel; + SLdrAnimationParameters animationInformation; + SLdrActorParameters actorInformation; + bool isLoop; bool immovable; - bool is_solid; - int flags_player_actor; - int render_gun_override; + bool isSolid; + int flagsPlayerActor; + int renderGunOverride; }; void LoadTypedefSLdrPlayerActor(SLdrPlayerActor&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerController.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerController.hpp index 11711fa..a985f9c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerController.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerController.hpp @@ -13,19 +13,19 @@ struct SLdrPlayerController { SLdrPlayerController(); ~SLdrPlayerController(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int unknown_0xe71de331; CAssetId model; - SLdrAnimationParameters animation_information; - SLdrActorParameters actor_information; - int proxy_type; - CVector3f player_offset; - int initial_state; - int player_visor; + SLdrAnimationParameters animationInformation; + SLdrActorParameters actorInformation; + int proxyType; + CVector3f playerOffset; + int initialState; + int playerVisor; float unknown_0xf09c2b4b; float unknown_0x760859e5; float unknown_0xbd548a40; - CVector3f rotation_for_type3; + CVector3f rotationForType3; rstl::string unknown_0x70bc90a6; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerHint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerHint.hpp index 539bbed..9ee5c2f 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerHint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerHint.hpp @@ -8,11 +8,11 @@ struct SLdrPlayerHint { SLdrPlayerHint(); ~SLdrPlayerHint(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int priority; float timer; float unknown; - int flags_player_hint; + int flagsPlayerHint; }; void LoadTypedefSLdrPlayerHint(SLdrPlayerHint&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerStateChange.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerStateChange.hpp index 97aa1c1..0e92901 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerStateChange.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerStateChange.hpp @@ -8,12 +8,12 @@ struct SLdrPlayerStateChange { SLdrPlayerStateChange(); ~SLdrPlayerStateChange(); - SLdrEditorProperties editor_properties; - int item_to_change; - int capacity_increase; + SLdrEditorProperties editorProperties; + int itemToChange; + int capacityIncrease; int amount; int command; - int command_action; + int commandAction; }; void LoadTypedefSLdrPlayerStateChange(SLdrPlayerStateChange&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerTurret.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerTurret.hpp index c79fefb..113cdd0 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerTurret.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPlayerTurret.hpp @@ -10,18 +10,18 @@ struct SLdrPlayerTurret { SLdrPlayerTurret(); ~SLdrPlayerTurret(); - SLdrEditorProperties editor_properties; - int flags_player_turret; + SLdrEditorProperties editorProperties; + int flagsPlayerTurret; float unknown_0x17cd8b2a; float unknown_0x1473dad2; float unknown_0x3650ce75; float unknown_0x78520e6e; - float damage_angle; - float horiz_speed; - float vert_speed; - float fire_rate; - SLdrDamageInfo weapon_damage; - CAssetId weapon_effect; + float damageAngle; + float horizSpeed; + float vertSpeed; + float fireRate; + SLdrDamageInfo weaponDamage; + CAssetId weaponEffect; CAssetId wpsc; int unknown_0xe7234f72; int unknown_0x3e2f7afb; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPointOfInterest.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPointOfInterest.hpp index 1508dc2..ee1d0e5 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPointOfInterest.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPointOfInterest.hpp @@ -9,10 +9,10 @@ struct SLdrPointOfInterest { SLdrPointOfInterest(); ~SLdrPointOfInterest(); - SLdrEditorProperties editor_properties; - SLdrScannableParameters scan_info; - float scan_offset; - bool look_at_poi; + SLdrEditorProperties editorProperties; + SLdrScannableParameters scanInfo; + float scanOffset; + bool lookAtPoi; }; void LoadTypedefSLdrPointOfInterest(SLdrPointOfInterest&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPortalTransition.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPortalTransition.hpp index 17a8ebf..24d5d3d 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPortalTransition.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPortalTransition.hpp @@ -11,16 +11,16 @@ struct SLdrPortalTransition { SLdrPortalTransition(); ~SLdrPortalTransition(); - SLdrEditorProperties editor_properties; - SLdrAnimationParameters animation_information; - CVector3f player_scale; + SLdrEditorProperties editorProperties; + SLdrAnimationParameters animationInformation; + CVector3f playerScale; int volume; int pan; CAssetId agsc_0xe08e2172; CAssetId agsc_0xb3e6c4e3; - int start_portal; - int in_portal1; - int in_portal2; + int startPortal; + int inPortal1; + int inPortal2; int direction; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPuddleSpore.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPuddleSpore.hpp index af8e170..fc9ca9a 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPuddleSpore.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPuddleSpore.hpp @@ -11,20 +11,20 @@ struct SLdrPuddleSpore { SLdrPuddleSpore(); ~SLdrPuddleSpore(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int flavor; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; bool unknown_0x5cdc877d; - float charge_time; - float time_open; - float platform_time; + float chargeTime; + float timeOpen; + float platformTime; float unknown_0xf1c2d224; float unknown_0x3c6af2ac; - float hit_detection_angle; - float shock_wave_height; + float hitDetectionAngle; + float shockWaveHeight; int sound; - SLdrShockWaveInfo shock_wave_info; + SLdrShockWaveInfo shockWaveInfo; }; void LoadTypedefSLdrPuddleSpore(SLdrPuddleSpore&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrPuffer.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrPuffer.hpp index 0097a00..7281103 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrPuffer.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrPuffer.hpp @@ -12,19 +12,19 @@ struct SLdrPuffer { SLdrPuffer(); ~SLdrPuffer(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - float hover_speed; - CAssetId cloud_effect; - SLdrDamageInfo cloud_damage; - CAssetId cloud_steam; - float cloud_steam_alpha; - bool orbit_interpolant_followed; - bool cloud_in_dark; - bool cloud_in_echo; - SLdrDamageInfo explosion_damage; - int sound_turn; + SLdrActorParameters actorInformation; + float hoverSpeed; + CAssetId cloudEffect; + SLdrDamageInfo cloudDamage; + CAssetId cloudSteam; + float cloudSteamAlpha; + bool orbitInterpolantFollowed; + bool cloudInDark; + bool cloudInEcho; + SLdrDamageInfo explosionDamage; + int soundTurn; }; void LoadTypedefSLdrPuffer(SLdrPuffer&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRadialDamage.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRadialDamage.hpp index 465156e..a1270eb 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRadialDamage.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRadialDamage.hpp @@ -9,11 +9,11 @@ struct SLdrRadialDamage { SLdrRadialDamage(); ~SLdrRadialDamage(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrDamageInfo damage; float radius; - bool auto_action; - bool auto_delete; + bool autoAction; + bool autoDelete; bool originator; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRandomRelay.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRandomRelay.hpp index 7876f51..fc2c08b 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRandomRelay.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRandomRelay.hpp @@ -8,11 +8,11 @@ struct SLdrRandomRelay { SLdrRandomRelay(); ~SLdrRandomRelay(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int count; - int random_adjust; - bool percent_count; - bool is_random_chance; + int randomAdjust; + bool percentCount; + bool isRandomChance; }; void LoadTypedefSLdrRandomRelay(SLdrRandomRelay&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRepulsor.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRepulsor.hpp index 6ce3ed9..9a55354 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRepulsor.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRepulsor.hpp @@ -8,11 +8,11 @@ struct SLdrRepulsor { SLdrRepulsor(); ~SLdrRepulsor(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int shape; float radius; float value; - int flags_repulsor; + int flagsRepulsor; }; void LoadTypedefSLdrRepulsor(SLdrRepulsor&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRezbit.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRezbit.hpp index 18319f2..70135eb 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRezbit.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRezbit.hpp @@ -11,10 +11,10 @@ struct SLdrRezbit { SLdrRezbit(); ~SLdrRezbit(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrRezbitData rezbit_data; + SLdrActorParameters actorInformation; + SLdrRezbitData rezbitData; }; void LoadTypedefSLdrRezbit(SLdrRezbit&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRiftPortal.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRiftPortal.hpp index 7249f59..68df251 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRiftPortal.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRiftPortal.hpp @@ -10,20 +10,20 @@ struct SLdrRiftPortal { SLdrRiftPortal(); ~SLdrRiftPortal(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; CAssetId model; - SLdrAnimationParameters animation_information; - CAssetId background_model; - SLdrAnimationParameters background_animation; - CAssetId incandescent_model; - SLdrAnimationParameters incandescent_animation; - CAssetId line_model; - SLdrAnimationParameters line_animation; - bool rip_portal; - int projectile_attraction; - float projectile_box_width; - float projectile_angle; - float projectile_destruction_radius; + SLdrAnimationParameters animationInformation; + CAssetId backgroundModel; + SLdrAnimationParameters backgroundAnimation; + CAssetId incandescentModel; + SLdrAnimationParameters incandescentAnimation; + CAssetId lineModel; + SLdrAnimationParameters lineAnimation; + bool ripPortal; + int projectileAttraction; + float projectileBoxWidth; + float projectileAngle; + float projectileDestructionRadius; }; void LoadTypedefSLdrRiftPortal(SLdrRiftPortal&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRipper.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRipper.hpp index 97a2950..b311067 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRipper.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRipper.hpp @@ -11,11 +11,11 @@ struct SLdrRipper { SLdrRipper(); ~SLdrRipper(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int flavor; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrGrappleParameters grapple_info; + SLdrActorParameters actorInformation; + SLdrGrappleParameters grappleInfo; }; void LoadTypedefSLdrRipper(SLdrRipper&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRipple.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRipple.hpp index cccb560..a713138 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRipple.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRipple.hpp @@ -8,7 +8,7 @@ struct SLdrRipple { SLdrRipple(); ~SLdrRipple(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; float energy; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRoomAcoustics.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRoomAcoustics.hpp index 91f4c30..e4924eb 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRoomAcoustics.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRoomAcoustics.hpp @@ -8,38 +8,38 @@ struct SLdrRoomAcoustics { SLdrRoomAcoustics(); ~SLdrRoomAcoustics(); - SLdrEditorProperties editor_properties; - int room_volume; + SLdrEditorProperties editorProperties; + int roomVolume; int priority; - bool reverb_hi_enabled; + bool reverbHiEnabled; bool unknown_0x3263c26e; - float reverb_hi_time; - float reverb_hi_pre_delay; - float reverb_hi_damping; - float reverb_hi_coloration; - float reverb_hi_cross_talk; - float reverb_hi_mix; - bool chorus_enabled; - float chorus_base_delay; - float chorus_variation; - float chorus_period; - bool reverb_std_enabled; + float reverbHiTime; + float reverbHiPreDelay; + float reverbHiDamping; + float reverbHiColoration; + float reverbHiCrossTalk; + float reverbHiMix; + bool chorusEnabled; + float chorusBaseDelay; + float chorusVariation; + float chorusPeriod; + bool reverbStdEnabled; bool unknown_0x4a5bbf90; - float reverb_std_time; - float reverb_std_pre_delay; - float reverb_std_damping; - float reverb_std_coloration; - float reverb_std_mix; - bool delay_enabled; + float reverbStdTime; + float reverbStdPreDelay; + float reverbStdDamping; + float reverbStdColoration; + float reverbStdMix; + bool delayEnabled; int delay0; int delay1; int delay2; - int delay_feedback0; - int delay_feedback1; - int delay_feedback2; - int delay_output0; - int delay_output1; - int delay_output2; + int delayFeedback0; + int delayFeedback1; + int delayFeedback2; + int delayOutput0; + int delayOutput1; + int delayOutput2; int unknown_0xcf45711c; int unknown_0x626d1e9b; bool unknown_0x7d8ee273; @@ -51,17 +51,17 @@ struct SLdrRoomAcoustics { float unknown_0xe2bd3706; float unknown_0x5e29cef8; float unknown_0x35ae9f10; - bool bitcrusher_enabled; + bool bitcrusherEnabled; int unknown_0xf51a1d6a; - float bitcrusher_gain; - int bitcrusher_bit_depth; + float bitcrusherGain; + int bitcrusherBitDepth; float unknown_0x58096e0b; - bool phaser_enabled; - float phaser_frequency; - float phaser_feedback; - float phaser_invert; - float phaser_mix; - float phaser_sweep; + bool phaserEnabled; + float phaserFrequency; + float phaserFeedback; + float phaserInvert; + float phaserMix; + float phaserSweep; }; void LoadTypedefSLdrRoomAcoustics(SLdrRoomAcoustics&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRsfAudio.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRsfAudio.hpp index 74cdb61..606ef98 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRsfAudio.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRsfAudio.hpp @@ -9,12 +9,12 @@ struct SLdrRsfAudio { SLdrRsfAudio(); ~SLdrRsfAudio(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; rstl::string unknown; - int loop_start; - int loop_end; - float fade_in_time; - float fade_out_time; + int loopStart; + int loopEnd; + float fadeInTime; + float fadeOutTime; int volume; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRubiksPuzzle.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRubiksPuzzle.hpp index 14828d2..935d190 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRubiksPuzzle.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRubiksPuzzle.hpp @@ -9,8 +9,8 @@ struct SLdrRubiksPuzzle { SLdrRubiksPuzzle(); ~SLdrRubiksPuzzle(); - SLdrEditorProperties editor_properties; - SLdrUnknownStruct35 unknown_struct35; + SLdrEditorProperties editorProperties; + SLdrUnknownStruct35 unknownStruct35; }; void LoadTypedefSLdrRubiksPuzzle(SLdrRubiksPuzzle&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrRumbleEffect.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrRumbleEffect.hpp index a50fdef..637cc08 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrRumbleEffect.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrRumbleEffect.hpp @@ -8,10 +8,10 @@ struct SLdrRumbleEffect { SLdrRumbleEffect(); ~SLdrRumbleEffect(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; float radius; int effect; - int flags_rumble; + int flagsRumble; }; void LoadTypedefSLdrRumbleEffect(SLdrRumbleEffect&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZone.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZone.hpp index 5524fe6..d3f3908 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZone.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZone.hpp @@ -16,38 +16,38 @@ struct SLdrSafeZone { SLdrSafeZone(); ~SLdrSafeZone(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrTriggerInfo trigger; - bool deactivate_on_enter; - bool deactivate_on_exit; - float activation_time; - float deactivation_time; + bool deactivateOnEnter; + bool deactivateOnExit; + float activationTime; + float deactivationTime; float lifetime; - float random_lifetime_offset; - CAssetId impact_effect; - bool filter_sound_effects; + float randomLifetimeOffset; + CAssetId impactEffect; + bool filterSoundEffects; int unknown_0x414379ea; - bool ignore_cinematic_camera; - SLdrSafeZoneStructB normal_safe_zone_struct; - SLdrSafeZoneStructB energized_safe_zone_struct; - SLdrSafeZoneStructB supercharged_safe_zone_struct; - SLdrDamageInfo normal_damage; - SLdrDamageInfo damage_info; - float inside_fade_start; - float inside_fade_time; + bool ignoreCinematicCamera; + SLdrSafeZoneStructB normalSafeZoneStruct; + SLdrSafeZoneStructB energizedSafeZoneStruct; + SLdrSafeZoneStructB superchargedSafeZoneStruct; + SLdrDamageInfo normalDamage; + SLdrDamageInfo damageInfo; + float insideFadeStart; + float insideFadeTime; float unknown_0x6c14904c; - float flash_time; - float flash_brightness; - int flash_sound; - int safezone_shape; + float flashTime; + float flashBrightness; + int flashSound; + int safezoneShape; bool mobile; - bool generate_mobile_light; - CVector3f mobile_light_offset; + bool generateMobileLight; + CVector3f mobileLightOffset; CColor unknown_0xe71b43e1; float unknown_0x9f638987; - SLdrSafeZoneStructA safe_zone_struct_a_0x8a09f99a; - SLdrSafeZoneStructA safe_zone_struct_a_0xafb855b8; - SLdrEchoParameters echo_parameters; + SLdrSafeZoneStructA safeZoneStructA_0x8a09f99a; + SLdrSafeZoneStructA safeZoneStructA_0xafb855b8; + SLdrEchoParameters echoParameters; }; void LoadTypedefSLdrSafeZone(SLdrSafeZone&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZoneCrystal.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZoneCrystal.hpp index 23b925e..1012996 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZoneCrystal.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSafeZoneCrystal.hpp @@ -11,34 +11,34 @@ struct SLdrSafeZoneCrystal { SLdrSafeZoneCrystal(); ~SLdrSafeZoneCrystal(); - SLdrEditorProperties editor_properties; - SLdrActorParameters actor_parameters; - CAssetId scannable_info_collapsed; - CAssetId scannable_info_entangled; - CAssetId scannable_info_light; - CAssetId scannable_info_annihilator; - int safezone_type; - bool initially_entangled; - CAssetId collapsed_effect; - CAssetId expanded_effect; - CAssetId entangled_effect; + SLdrEditorProperties editorProperties; + SLdrActorParameters actorParameters; + CAssetId scannableInfoCollapsed; + CAssetId scannableInfoEntangled; + CAssetId scannableInfoLight; + CAssetId scannableInfoAnnihilator; + int safezoneType; + bool initiallyEntangled; + CAssetId collapsedEffect; + CAssetId expandedEffect; + CAssetId entangledEffect; CAssetId part; - CAssetId echo_effect; - CAssetId normal_crystal; - CAssetId entangled_crystal; - CAssetId energized_model; - CAssetId echo_crystal; - float max_time_expanded; - float max_time_entangled; + CAssetId echoEffect; + CAssetId normalCrystal; + CAssetId entangledCrystal; + CAssetId energizedModel; + CAssetId echoCrystal; + float maxTimeExpanded; + float maxTimeEntangled; float unknown_0xf0a45c32; float unknown_0xd8116003; float unknown_0x415046ed; float unknown_0xec9c01b2; float unknown_0x545540e5; - CAssetId power_beam_refresh_effect; - CVector3f hit_radius; - CVector3f hit_offset; - CVector3f effect_offset; + CAssetId powerBeamRefreshEffect; + CVector3f hitRadius; + CVector3f hitOffset; + CVector3f effectOffset; spline unknown_0xbbbee60b; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSandBoss.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSandBoss.hpp index e04d998..aa6231e 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSandBoss.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSandBoss.hpp @@ -11,10 +11,10 @@ struct SLdrSandBoss { SLdrSandBoss(); ~SLdrSandBoss(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrSandBossData sand_boss_data; + SLdrActorParameters actorInformation; + SLdrSandBossData sandBossData; }; void LoadTypedefSLdrSandBoss(SLdrSandBoss&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeCategory.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeCategory.hpp index 40959fa..8405b11 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeCategory.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeCategory.hpp @@ -10,9 +10,9 @@ struct SLdrScanTreeCategory { SLdrScanTreeCategory(); ~SLdrScanTreeCategory(); - SLdrEditorProperties editor_properties; - CAssetId name_string_table; - rstl::string name_string_name; + SLdrEditorProperties editorProperties; + CAssetId nameStringTable; + rstl::string nameStringName; }; void LoadTypedefSLdrScanTreeCategory(SLdrScanTreeCategory&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeInventory.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeInventory.hpp index 6a7aab7..b0b4c54 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeInventory.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeInventory.hpp @@ -12,11 +12,11 @@ struct SLdrScanTreeInventory { SLdrScanTreeInventory(); ~SLdrScanTreeInventory(); - SLdrEditorProperties editor_properties; - CAssetId name_string_table; - rstl::string name_string_name; - SLdrInventorySlot inventory_slot; - SLdrScannableParameters scannable_parameters; + SLdrEditorProperties editorProperties; + CAssetId nameStringTable; + rstl::string nameStringName; + SLdrInventorySlot inventorySlot; + SLdrScannableParameters scannableParameters; }; void LoadTypedefSLdrScanTreeInventory(SLdrScanTreeInventory&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeMenu.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeMenu.hpp index 7f113d0..2d4432c 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeMenu.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeMenu.hpp @@ -10,18 +10,18 @@ struct SLdrScanTreeMenu { SLdrScanTreeMenu(); ~SLdrScanTreeMenu(); - SLdrEditorProperties editor_properties; - CAssetId name_string_table; - rstl::string name_string_name; + SLdrEditorProperties editorProperties; + CAssetId nameStringTable; + rstl::string nameStringName; int unknown_0x0261a4e0; - CAssetId menu_options_string_table; - rstl::string option_1_string_name; + CAssetId menuOptionsStringTable; + rstl::string option1StringName; int unknown_0x50bce632; - rstl::string option_2_string_name; + rstl::string option2StringName; int unknown_0x420949dc; - rstl::string option_3_string_name; + rstl::string option3StringName; int unknown_0xfab52eb9; - rstl::string option_4_string_name; + rstl::string option4StringName; int unknown_0x67621600; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeScan.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeScan.hpp index fb9cf21..a5b44f3 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeScan.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeScan.hpp @@ -11,10 +11,10 @@ struct SLdrScanTreeScan { SLdrScanTreeScan(); ~SLdrScanTreeScan(); - SLdrEditorProperties editor_properties; - CAssetId name_string_table; - rstl::string name_string_name; - SLdrScannableParameters scannable_parameters; + SLdrEditorProperties editorProperties; + CAssetId nameStringTable; + rstl::string nameStringName; + SLdrScannableParameters scannableParameters; }; void LoadTypedefSLdrScanTreeScan(SLdrScanTreeScan&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeSlider.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeSlider.hpp index 112866d..76f9db8 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeSlider.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrScanTreeSlider.hpp @@ -10,9 +10,9 @@ struct SLdrScanTreeSlider { SLdrScanTreeSlider(); ~SLdrScanTreeSlider(); - SLdrEditorProperties editor_properties; - CAssetId name_string_table; - rstl::string name_string_name; + SLdrEditorProperties editorProperties; + CAssetId nameStringTable; + rstl::string nameStringName; int unknown; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrScannableObjectInfo.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrScannableObjectInfo.hpp index ea871b8..3dd9bd1 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrScannableObjectInfo.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrScannableObjectInfo.hpp @@ -12,25 +12,25 @@ struct SLdrScannableObjectInfo { ~SLdrScannableObjectInfo(); CAssetId string; - SLdrScanSpeed scan_speed; + SLdrScanSpeed scanSpeed; bool critical; bool unknown_0x1733b1ec; CAssetId unknown_0x53336141; - float model_initial_pitch; - float model_initial_yaw; - float model_scale; - CAssetId static_model; - SLdrAnimationParameters animated_model; + float modelInitialPitch; + float modelInitialYaw; + float modelScale; + CAssetId staticModel; + SLdrAnimationParameters animatedModel; SLdrAnimationParameters unknown_0x58f9fe99; - SLdrScanInfoSecondaryModel secondary_model0; - SLdrScanInfoSecondaryModel secondary_model1; - SLdrScanInfoSecondaryModel secondary_model2; - SLdrScanInfoSecondaryModel secondary_model3; - SLdrScanInfoSecondaryModel secondary_model4; - SLdrScanInfoSecondaryModel secondary_model5; - SLdrScanInfoSecondaryModel secondary_model6; - SLdrScanInfoSecondaryModel secondary_model7; - SLdrScanInfoSecondaryModel secondary_model8; + SLdrScanInfoSecondaryModel secondaryModel0; + SLdrScanInfoSecondaryModel secondaryModel1; + SLdrScanInfoSecondaryModel secondaryModel2; + SLdrScanInfoSecondaryModel secondaryModel3; + SLdrScanInfoSecondaryModel secondaryModel4; + SLdrScanInfoSecondaryModel secondaryModel5; + SLdrScanInfoSecondaryModel secondaryModel6; + SLdrScanInfoSecondaryModel secondaryModel7; + SLdrScanInfoSecondaryModel secondaryModel8; }; void LoadTypedefSLdrScannableObjectInfo(SLdrScannableObjectInfo&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrScriptLayerController.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrScriptLayerController.hpp index b9617d3..79c4af5 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrScriptLayerController.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrScriptLayerController.hpp @@ -9,9 +9,9 @@ struct SLdrScriptLayerController { SLdrScriptLayerController(); ~SLdrScriptLayerController(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrLayerSwitch layer; - bool is_dynamic; + bool isDynamic; }; void LoadTypedefSLdrScriptLayerController(SLdrScriptLayerController&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrShadowProjector.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrShadowProjector.hpp index 9b9a014..f83c018 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrShadowProjector.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrShadowProjector.hpp @@ -9,12 +9,12 @@ struct SLdrShadowProjector { SLdrShadowProjector(); ~SLdrShadowProjector(); - SLdrEditorProperties editor_properties; - float shadow_scale; - CVector3f shadow_offset; - float shadow_height; - float shadow_alpha; - float shadow_fade_time; + SLdrEditorProperties editorProperties; + float shadowScale; + CVector3f shadowOffset; + float shadowHeight; + float shadowAlpha; + float shadowFadeTime; bool unknown_0xbca8b742; int unknown_0x606e341c; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrShredder.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrShredder.hpp index f9b8916..e51cf2f 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrShredder.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrShredder.hpp @@ -11,9 +11,9 @@ struct SLdrShredder { SLdrShredder(); ~SLdrShredder(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; SLdrUnknownStruct39 data; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrShrieker.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrShrieker.hpp index ad9a5de..00fd632 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrShrieker.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrShrieker.hpp @@ -14,34 +14,34 @@ struct SLdrShrieker { SLdrShrieker(); ~SLdrShrieker(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrDamageVulnerability buried_vulnerability; - float hostile_accumulate_priority; - SLdrDamageInfo damage_info; + SLdrActorParameters actorInformation; + SLdrDamageVulnerability buriedVulnerability; + float hostileAccumulatePriority; + SLdrDamageInfo damageInfo; CAssetId part; - SLdrDamageInfo projectile_damage; + SLdrDamageInfo projectileDamage; CAssetId projectile; - int combat_visor_max_volume; - int echo_visor_max_volume; - SLdrDamageInfo melee_damage; - CAssetId melee_effect; + int combatVisorMaxVolume; + int echoVisorMaxVolume; + SLdrDamageInfo meleeDamage; + CAssetId meleeEffect; float unknown_0x9b6a4437; - float melee_attack_time_variation; - float melee_range; - float hover_height; - CVector3f missile_deflection_offset; - float missile_deflection_radius; + float meleeAttackTimeVariation; + float meleeRange; + float hoverHeight; + CVector3f missileDeflectionOffset; + float missileDeflectionRadius; float unknown_0xe70ef8a3; - int sound_missile_deflection; - float dodge_time; - float dodge_percentage; - float detection_height; + int soundMissileDeflection; + float dodgeTime; + float dodgePercentage; + float detectionHeight; float unknown_0x4753beb1; - float pop_detection_radius; - float morphball_detection_radius; - float visibility_change_time; + float popDetectionRadius; + float morphballDetectionRadius; + float visibilityChangeTime; }; void LoadTypedefSLdrShrieker(SLdrShrieker&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSilhouette.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSilhouette.hpp index 51d35b0..711e389 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSilhouette.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSilhouette.hpp @@ -9,11 +9,11 @@ struct SLdrSilhouette { SLdrSilhouette(); ~SLdrSilhouette(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; float unknown; - CColor silhouette_color; - float fade_in_time; - float fade_out_time; + CColor silhouetteColor; + float fadeInTime; + float fadeOutTime; }; void LoadTypedefSLdrSilhouette(SLdrSilhouette&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSkyRipple.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSkyRipple.hpp index dce279a..bb27959 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSkyRipple.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSkyRipple.hpp @@ -8,7 +8,7 @@ struct SLdrSkyRipple { SLdrSkyRipple(); ~SLdrSkyRipple(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; }; void LoadTypedefSLdrSkyRipple(SLdrSkyRipple&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSnakeWeedSwarm.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSnakeWeedSwarm.hpp index 5ab6af0..d2803da 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSnakeWeedSwarm.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSnakeWeedSwarm.hpp @@ -11,28 +11,28 @@ struct SLdrSnakeWeedSwarm { SLdrSnakeWeedSwarm(); ~SLdrSnakeWeedSwarm(); - SLdrEditorProperties editor_properties; - SLdrAnimationParameters animation_information; - SLdrActorParameters actor_information; + SLdrEditorProperties editorProperties; + SLdrAnimationParameters animationInformation; + SLdrActorParameters actorInformation; float density; - float max_depth; - float location_variance; - float detection_radius; - float grab_radius; + float maxDepth; + float locationVariance; + float detectionRadius; + float grabRadius; float unknown_0x723737bc; float unknown_0x57452dd9; - float retreat_depth; - float move_speed; + float retreatDepth; + float moveSpeed; float unknown_0x11f854e2; - float max_slope; - float min_size; - float max_size; - float height_offset; - SLdrDamageInfo contact_damage; - float damage_wait_time; - int sound_looped; - int sound_into_ground; - int sound_outof_ground; + float maxSlope; + float minSize; + float maxSize; + float heightOffset; + SLdrDamageInfo contactDamage; + float damageWaitTime; + int soundLooped; + int soundIntoGround; + int soundOutofGround; }; void LoadTypedefSLdrSnakeWeedSwarm(SLdrSnakeWeedSwarm&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSound.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSound.hpp index 46e57df..8423346 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSound.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSound.hpp @@ -9,27 +9,27 @@ struct SLdrSound { SLdrSound(); ~SLdrSound(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int sound; - float max_audible_distance; - float drop_off; - float delay_time; - int min_volume; - int max_volume; + float maxAudibleDistance; + float dropOff; + float delayTime; + int minVolume; + int maxVolume; int priority; - SLdrSurroundPan surround_pan; + SLdrSurroundPan surroundPan; bool loop; bool ambient; bool unknown; - bool auto_start; - bool can_occlude; - bool use_room_acoustics; + bool autoStart; + bool canOcclude; + bool useRoomAcoustics; bool persistent; - bool play_always; - bool all_area; - bool sound_is_music; + bool playAlways; + bool allArea; + bool soundIsMusic; int pitch; - int echo_visor_max_volume; + int echoVisorMaxVolume; }; void LoadTypedefSLdrSound(SLdrSound&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSoundModifier.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSoundModifier.hpp index 76ea6bc..dd12830 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSoundModifier.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSoundModifier.hpp @@ -8,13 +8,13 @@ struct SLdrSoundModifier { SLdrSoundModifier(); ~SLdrSoundModifier(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; float time; - bool auto_reset; - bool auto_start; + bool autoReset; + bool autoStart; spline volume; spline pan; - spline surround_pan; + spline surroundPan; spline pitch; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpacePirate.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpacePirate.hpp index 014c261..def5fca 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpacePirate.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpacePirate.hpp @@ -14,43 +14,43 @@ struct SLdrSpacePirate { SLdrSpacePirate(); ~SLdrSpacePirate(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrIngPossessionData ing_possession_data; + SLdrActorParameters actorInformation; + SLdrIngPossessionData ingPossessionData; float aggressiveness; - float cover_check; - float search_radius; - float fall_back_check; - float fall_back_radius; - float hearing_radius; + float coverCheck; + float searchRadius; + float fallBackCheck; + float fallBackRadius; + float hearingRadius; int sound; bool unknown_0xce670970; CAssetId projectile; - SLdrDamageInfo projectile_damage; - int sound_projectile; - SLdrDamageInfo blade_damage; - float kneel_attack_chance; - CAssetId kneel_attack_shot; - SLdrDamageInfo kneel_attack_damage; - float dodge_check; - int sound_impact; + SLdrDamageInfo projectileDamage; + int soundProjectile; + SLdrDamageInfo bladeDamage; + float kneelAttackChance; + CAssetId kneelAttackShot; + SLdrDamageInfo kneelAttackDamage; + float dodgeCheck; + int soundImpact; float unknown_0x71587b45; float unknown_0x7903312e; float unknown_0x5080162a; float unknown_0xc78b40e0; - int sound_alert; - float gun_track_delay; + int soundAlert; + float gunTrackDelay; int unknown_0x1b454a27; - float cloak_opacity; - float max_cloak_opacity; + float cloakOpacity; + float maxCloakOpacity; float unknown_0x61e801d4; float unknown_0xf19b113e; - int sound_hurled; - int sound_death; + int soundHurled; + int soundDeath; float unknown_0x8708b7d3; - float avoid_distance; - SLdrSpacePirateWeaponData weapon_data; + float avoidDistance; + SLdrSpacePirateWeaponData weaponData; }; void LoadTypedefSLdrSpacePirate(SLdrSpacePirate&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpankWeed.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpankWeed.hpp index 8be15fa..a02f04f 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpankWeed.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpankWeed.hpp @@ -10,14 +10,14 @@ struct SLdrSpankWeed { SLdrSpankWeed(); ~SLdrSpankWeed(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; bool unknown; - float wake_up_radius; - float search_radius; - float attack_radius; - float hurt_sleep_delay; + float wakeUpRadius; + float searchRadius; + float attackRadius; + float hurtSleepDelay; }; void LoadTypedefSLdrSpankWeed(SLdrSpankWeed&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpawnPoint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpawnPoint.hpp index c21275d..daaa1d7 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpawnPoint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpawnPoint.hpp @@ -9,8 +9,8 @@ struct SLdrSpawnPoint { SLdrSpawnPoint(); ~SLdrSpawnPoint(); - SLdrEditorProperties editor_properties; - bool first_spawn; + SLdrEditorProperties editorProperties; + bool firstSpawn; bool morphed; SLdrSpawnPointStruct amount; SLdrSpawnPointStruct capacity; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpecialFunction.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpecialFunction.hpp index 5ac97a3..0473bc2 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpecialFunction.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpecialFunction.hpp @@ -10,16 +10,16 @@ struct SLdrSpecialFunction { SLdrSpecialFunction(); ~SLdrSpecialFunction(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int function; - rstl::string string_parm; - float value_parm; - float value_parm2; - float value_parm3; - float value_parm4; - int int_parm1; - int int_parm2; - SLdrPlayerItem inventory_item_parm; + rstl::string stringParm; + float valueParm; + float valueParm2; + float valueParm3; + float valueParm4; + int intParm1; + int intParm2; + SLdrPlayerItem inventoryItemParm; int sound1; int sound2; int sound3; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpiderBallAttractionSurface.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpiderBallAttractionSurface.hpp index 0d1dc1e..8b4fae4 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpiderBallAttractionSurface.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpiderBallAttractionSurface.hpp @@ -8,7 +8,7 @@ struct SLdrSpiderBallAttractionSurface { SLdrSpiderBallAttractionSurface(); ~SLdrSpiderBallAttractionSurface(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; }; void LoadTypedefSLdrSpiderBallAttractionSurface(SLdrSpiderBallAttractionSurface&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpiderBallWaypoint.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpiderBallWaypoint.hpp index 35a1776..1288bf5 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpiderBallWaypoint.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpiderBallWaypoint.hpp @@ -8,7 +8,7 @@ struct SLdrSpiderBallWaypoint { SLdrSpiderBallWaypoint(); ~SLdrSpiderBallWaypoint(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; int flags; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpindleCamera.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpindleCamera.hpp index 59aa7c9..658d009 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpindleCamera.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpindleCamera.hpp @@ -10,28 +10,28 @@ struct SLdrSpindleCamera { SLdrSpindleCamera(); ~SLdrSpindleCamera(); - SLdrEditorProperties editor_properties; - int flags_spindle_camera; - SLdrSpindleCameraStruct spindle_camera_struct_0xe56495fb; - SLdrSpindleCameraStruct spindle_camera_struct_0x239debfc; - SLdrSpindleCameraStruct spindle_camera_struct_0x27e8d703; - SLdrSpindleCameraStruct spindle_camera_struct_0x2f914525; - SLdrSpindleCameraStruct spindle_camera_struct_0x23aa31b7; - SLdrSpindleCameraStruct spindle_camera_struct_0xe9e388af; - SLdrSpindleCameraStruct spindle_camera_struct_0xde5a2c87; - SLdrSpindleCameraStruct spindle_camera_struct_0x1b3b2394; - SLdrSpindleCameraStruct spindle_camera_struct_0xf5666b6e; - SLdrSpindleCameraStruct spindle_camera_struct_0x66c618aa; - SLdrSpindleCameraStruct spindle_camera_struct_0xb36d0fb6; - SLdrSpindleCameraStruct spindle_camera_struct_0xcbb013cb; - SLdrSpindleCameraStruct spindle_camera_struct_0x4abfb789; - SLdrSpindleCameraStruct spindle_camera_struct_0xfb6a407a; - SLdrSpindleCameraStruct spindle_camera_struct_0x3ae66f80; - SLdrSpindleCameraStruct spindle_camera_struct_0x6654ae92; - SLdrSplineType target_spline_type; + SLdrEditorProperties editorProperties; + int flagsSpindleCamera; + SLdrSpindleCameraStruct spindleCameraStruct_0xe56495fb; + SLdrSpindleCameraStruct spindleCameraStruct_0x239debfc; + SLdrSpindleCameraStruct spindleCameraStruct_0x27e8d703; + SLdrSpindleCameraStruct spindleCameraStruct_0x2f914525; + SLdrSpindleCameraStruct spindleCameraStruct_0x23aa31b7; + SLdrSpindleCameraStruct spindleCameraStruct_0xe9e388af; + SLdrSpindleCameraStruct spindleCameraStruct_0xde5a2c87; + SLdrSpindleCameraStruct spindleCameraStruct_0x1b3b2394; + SLdrSpindleCameraStruct spindleCameraStruct_0xf5666b6e; + SLdrSpindleCameraStruct spindleCameraStruct_0x66c618aa; + SLdrSpindleCameraStruct spindleCameraStruct_0xb36d0fb6; + SLdrSpindleCameraStruct spindleCameraStruct_0xcbb013cb; + SLdrSpindleCameraStruct spindleCameraStruct_0x4abfb789; + SLdrSpindleCameraStruct spindleCameraStruct_0xfb6a407a; + SLdrSpindleCameraStruct spindleCameraStruct_0x3ae66f80; + SLdrSpindleCameraStruct spindleCameraStruct_0x6654ae92; + SLdrSplineType targetSplineType; bool unknown_0x33b4f106; - spline target_control_spline; - SLdrSplineType spline_type; + spline targetControlSpline; + SLdrSplineType splineType; bool unknown_0x431769c6; }; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpinner.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpinner.hpp index e0ba552..1d21521 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSpinner.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSpinner.hpp @@ -8,18 +8,18 @@ struct SLdrSpinner { SLdrSpinner(); ~SLdrSpinner(); - SLdrEditorProperties editor_properties; - float forward_speed; - float backward_speed; + SLdrEditorProperties editorProperties; + float forwardSpeed; + float backwardSpeed; float unknown_0x449dd059; float unknown_0xfc849759; - bool shot_spinner; - bool allow_wrap; - bool no_backward; - bool spline_control; - int loop_sound; - int start_sound; - int stop_sound; + bool shotSpinner; + bool allowWrap; + bool noBackward; + bool splineControl; + int loopSound; + int startSound; + int stopSound; }; void LoadTypedefSLdrSpinner(SLdrSpinner&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSplinter.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSplinter.hpp index b7ce4be..4e62cf6 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSplinter.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSplinter.hpp @@ -14,9 +14,9 @@ struct SLdrSplinter { SLdrSplinter(); ~SLdrSplinter(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; float unknown_0x72edeb7d; float unknown_0xb8ed9ffa; float unknown_0x5e8d301b; @@ -24,16 +24,16 @@ struct SLdrSplinter { float unknown_0x5feb176e; int unknown_0x726cd31d; int unknown_0x376e909f; - SLdrDamageInfo attack_damage; + SLdrDamageInfo attackDamage; int unknown_0xb63b810c; SLdrAnimationParameters unknown_0x6d752efc; SLdrAnimationParameters unknown_0x0d6ab7b5; CAssetId part_0x630d93a1; - SLdrDamageInfo damage_info_0x4436a388; - SLdrIngPossessionData ing_possession_data; - bool is_mega_splinter; + SLdrDamageInfo damageInfo_0x4436a388; + SLdrIngPossessionData ingPossessionData; + bool isMegaSplinter; CAssetId wpsc; - SLdrDamageInfo damage_info_0x02fd0913; + SLdrDamageInfo damageInfo_0x02fd0913; CAssetId part_0x496f191b; float unknown_0x51be00d3; float unknown_0xb7deaf32; diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSplitterCommandModule.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSplitterCommandModule.hpp index 923b9ad..3024697 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSplitterCommandModule.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSplitterCommandModule.hpp @@ -11,10 +11,10 @@ struct SLdrSplitterCommandModule { SLdrSplitterCommandModule(); ~SLdrSplitterCommandModule(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrUnknownStruct43 unknown_struct43; + SLdrActorParameters actorInformation; + SLdrUnknownStruct43 unknownStruct43; }; void LoadTypedefSLdrSplitterCommandModule(SLdrSplitterCommandModule&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSplitterMainChassis.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSplitterMainChassis.hpp index 0cf4421..bc289ad 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSplitterMainChassis.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSplitterMainChassis.hpp @@ -11,10 +11,10 @@ struct SLdrSplitterMainChassis { SLdrSplitterMainChassis(); ~SLdrSplitterMainChassis(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrSplitterMainChassisData splitter_main_chassis_data; + SLdrActorParameters actorInformation; + SLdrSplitterMainChassisData splitterMainChassisData; }; void LoadTypedefSLdrSplitterMainChassis(SLdrSplitterMainChassis&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbBase.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbBase.hpp index d60b720..addefa7 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbBase.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbBase.hpp @@ -14,35 +14,35 @@ struct SLdrSporbBase { SLdrSporbBase(); ~SLdrSporbBase(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; float unknown_0x95e7a2c2; float unknown_0x76ba1c18; float unknown_0x3eb2de35; float unknown_0xe50d8dd2; int unknown_0x64d482d5; int unknown_0xc3e002ac; - float shot_angle_variance; - CVector3f attack_aim_offset; - CAssetId tendril_particle_effect; + float shotAngleVariance; + CVector3f attackAimOffset; + CAssetId tendrilParticleEffect; float unknown_0x35557a83; - float grabber_out_acceleration; - float grabber_in_acceleration; + float grabberOutAcceleration; + float grabberInAcceleration; float unknown_0xbfddabd4; float unknown_0x62bfaa35; - float grabber_attach_time; + float grabberAttachTime; float unknown_0xed82c56a; float unknown_0xe918f440; - float spit_force; - float spit_damage; - float grab_damage; + float spitForce; + float spitDamage; + float grabDamage; float unknown_0x2cfade2c; float unknown_0xb68e75cc; float unknown_0x6d31262b; - bool is_power_bomb_guardian; + bool isPowerBombGuardian; CAssetId wpsc; - SLdrDamageInfo power_bomb_projectile_damage; + SLdrDamageInfo powerBombProjectileDamage; float unknown_0x03a76d35; float unknown_0x6d4e0f5a; float unknown_0x3538d49b; @@ -54,21 +54,21 @@ struct SLdrSporbBase { float unknown_0xdd8502cc; float unknown_0x4ab8cf7d; float unknown_0xf5e28404; - int grabber_fire_sound; - int grabber_flight_sound; - int grabber_hit_player_sound; - int grabber_hit_world_sound; - int grabber_retract_sound; + int grabberFireSound; + int grabberFlightSound; + int grabberHitPlayerSound; + int grabberHitWorldSound; + int grabberRetractSound; int sound_0x64e9152d; - int morphball_spit_sound; - int grabber_explosion_sound; - int ball_escape_sound; - int needle_telegraph_sound; - int grabber_telegraph_sound; - SLdrPowerBombGuardianStageProperties power_bomb_guardian_stage_properties_0x510dba97; - SLdrPowerBombGuardianStageProperties power_bomb_guardian_stage_properties_0x0b6c85f7; - SLdrPowerBombGuardianStageProperties power_bomb_guardian_stage_properties_0x8b9c92e8; - SLdrPowerBombGuardianStageProperties power_bomb_guardian_stage_properties_0xbfaefb37; + int morphballSpitSound; + int grabberExplosionSound; + int ballEscapeSound; + int needleTelegraphSound; + int grabberTelegraphSound; + SLdrPowerBombGuardianStageProperties powerBombGuardianStageProperties_0x510dba97; + SLdrPowerBombGuardianStageProperties powerBombGuardianStageProperties_0x0b6c85f7; + SLdrPowerBombGuardianStageProperties powerBombGuardianStageProperties_0x8b9c92e8; + SLdrPowerBombGuardianStageProperties powerBombGuardianStageProperties_0xbfaefb37; }; void LoadTypedefSLdrSporbBase(SLdrSporbBase&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbNeedle.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbNeedle.hpp index 7b65719..3a68f3b 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbNeedle.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbNeedle.hpp @@ -11,20 +11,20 @@ struct SLdrSporbNeedle { SLdrSporbNeedle(); ~SLdrSporbNeedle(); - SLdrEditorProperties editor_properties; - SLdrActorParameters actor_information; + SLdrEditorProperties editorProperties; + SLdrActorParameters actorInformation; CAssetId model; - float initial_speed; + float initialSpeed; float mass; - SLdrDamageInfo attack_damage; - float fuse_time; - CAssetId trail_effect; - CAssetId explosion_effect; - int launch_sound; - int flight_sound; - int hit_player_sound; - int collision_sound; - int explosion_sound; + SLdrDamageInfo attackDamage; + float fuseTime; + CAssetId trailEffect; + CAssetId explosionEffect; + int launchSound; + int flightSound; + int hitPlayerSound; + int collisionSound; + int explosionSound; }; void LoadTypedefSLdrSporbNeedle(SLdrSporbNeedle&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbProjectile.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbProjectile.hpp index b8b8a99..597b55a 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbProjectile.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbProjectile.hpp @@ -11,11 +11,11 @@ struct SLdrSporbProjectile { SLdrSporbProjectile(); ~SLdrSporbProjectile(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - CAssetId ball_spit_particle_effect; - CAssetId ball_escape_particle_effect; + SLdrActorParameters actorInformation; + CAssetId ballSpitParticleEffect; + CAssetId ballEscapeParticleEffect; }; void LoadTypedefSLdrSporbProjectile(SLdrSporbProjectile&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbTop.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbTop.hpp index de83273..48f7f56 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbTop.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSporbTop.hpp @@ -10,9 +10,9 @@ struct SLdrSporbTop { SLdrSporbTop(); ~SLdrSporbTop(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; + SLdrActorParameters actorInformation; }; void LoadTypedefSLdrSporbTop(SLdrSporbTop&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrStreamedMovie.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrStreamedMovie.hpp index ab66738..0e75de4 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrStreamedMovie.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrStreamedMovie.hpp @@ -9,15 +9,15 @@ struct SLdrStreamedMovie { SLdrStreamedMovie(); ~SLdrStreamedMovie(); - SLdrEditorProperties editor_properties; - rstl::string movie_file; + SLdrEditorProperties editorProperties; + rstl::string movieFile; bool loop; - bool video_filter_enabled; + bool videoFilterEnabled; int unknown; int volume; - int volume_type; - float cache_length; - float fade_out_time; + int volumeType; + float cacheLength; + float fadeOutTime; }; void LoadTypedefSLdrStreamedMovie(SLdrStreamedMovie&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSwampBossStage1.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSwampBossStage1.hpp index 7450a59..723ee42 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSwampBossStage1.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSwampBossStage1.hpp @@ -11,10 +11,10 @@ struct SLdrSwampBossStage1 { SLdrSwampBossStage1(); ~SLdrSwampBossStage1(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrUnknownStruct37 unknown_struct37; + SLdrActorParameters actorInformation; + SLdrUnknownStruct37 unknownStruct37; }; void LoadTypedefSLdrSwampBossStage1(SLdrSwampBossStage1&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrSwampBossStage2.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrSwampBossStage2.hpp index c875211..a79aca0 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrSwampBossStage2.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrSwampBossStage2.hpp @@ -12,11 +12,11 @@ struct SLdrSwampBossStage2 { SLdrSwampBossStage2(); ~SLdrSwampBossStage2(); - SLdrEditorProperties editor_properties; + SLdrEditorProperties editorProperties; SLdrPatternedAITypedef patterned; - SLdrActorParameters actor_information; - SLdrIngPossessionData ing_possession_data; - SLdrSwampBossStage2Data swamp_boss_stage2_data; + SLdrActorParameters actorInformation; + SLdrIngPossessionData ingPossessionData; + SLdrSwampBossStage2Data swampBossStage2Data; }; void LoadTypedefSLdrSwampBossStage2(SLdrSwampBossStage2&, CInputStream&); diff --git a/include/MetroidPrime/ScriptLoader/Struct/SLdrVisorFlare.hpp b/include/MetroidPrime/ScriptLoader/Struct/SLdrVisorFlare.hpp index 3d3b2af..69df6c9 100644 --- a/include/MetroidPrime/ScriptLoader/Struct/SLdrVisorFlare.hpp +++ b/include/MetroidPrime/ScriptLoader/Struct/SLdrVisorFlare.hpp @@ -9,15 +9,15 @@ struct SLdrVisorFlare { SLdrVisorFlare(); ~SLdrVisorFlare(); - SLdrEditorProperties editor_properties; - int blend_mode; - bool constant_scale; - float fade_time; - float fade_factor; - float rotate_factor; - int combat_visor_mode; + SLdrEditorProperties editorProperties; + int blendMode; + bool constantScale; + float fadeTime; + float fadeFactor; + float rotateFactor; + int combatVisorMode; bool unknown; - bool no_occlusion_test; + bool noOcclusionTest; SLdrFlareDef flare1; SLdrFlareDef flare2; SLdrFlareDef flare3; diff --git a/src/MetroidPrime/ScriptObjects/CScriptPickup.cpp b/src/MetroidPrime/ScriptObjects/CScriptPickup.cpp index 328da3e..33d9ddf 100644 --- a/src/MetroidPrime/ScriptObjects/CScriptPickup.cpp +++ b/src/MetroidPrime/ScriptObjects/CScriptPickup.cpp @@ -259,31 +259,31 @@ CScriptPickup* LoadPickup(CStateManager& mgr, CInputStream& input, const CEntity u16 propertySize = input.ReadUint16(); switch (propertyId) { case 0x255a4580: - LoadTypedefSLdrEditorProperties(sldrPickup.editor_properties, input); + LoadTypedefSLdrEditorProperties(sldrPickup.editorProperties, input); break; case 0x3a3e03ba: - sldrPickup.collision_size = CVector3f(input); + sldrPickup.collisionSize = CVector3f(input); break; case 0x2e686c2a: - sldrPickup.collision_offset = CVector3f(input); + sldrPickup.collisionOffset = CVector3f(input); break; case 0xa02ef0c4: - LoadTypedefSLdrPlayerItem(sldrPickup.item_to_give, input); + LoadTypedefSLdrPlayerItem(sldrPickup.itemToGive, input); break; case 0x28c71b54: - sldrPickup.capacity_increase = input.ReadInt32(); + sldrPickup.capacityIncrease = input.ReadInt32(); break; case 0x165ab069: - sldrPickup.item_percentage_increase = input.ReadInt32(); + sldrPickup.itemPercentageIncrease = input.ReadInt32(); break; case 0x94af1445: sldrPickup.amount = input.ReadInt32(); break; case 0xf7fbaaa5: - sldrPickup.respawn_time = input.ReadFloat(); + sldrPickup.respawnTime = input.ReadFloat(); break; case 0xc80fc827: - sldrPickup.pickup_effect_lifetime = input.ReadFloat(); + sldrPickup.pickupEffectLifetime = input.ReadFloat(); break; case 0x32dc67f6: sldrPickup.lifetime = input.ReadFloat(); @@ -295,46 +295,46 @@ CScriptPickup* LoadPickup(CStateManager& mgr, CInputStream& input, const CEntity sldrPickup.model = input.ReadInt32(); break; case 0xe25fb08c: - LoadTypedefSLdrAnimationParameters(sldrPickup.animation_information, input); + LoadTypedefSLdrAnimationParameters(sldrPickup.animationInformation, input); break; case 0x7e397fed: - LoadTypedefSLdrActorParameters(sldrPickup.actor_information, input); + LoadTypedefSLdrActorParameters(sldrPickup.actorInformation, input); break; case 0x192b0e70: - LoadTypedefSLdrEchoParameters(sldrPickup.echo_information, input); + LoadTypedefSLdrEchoParameters(sldrPickup.echoInformation, input); break; case 0xe585f166: - sldrPickup.activation_delay = input.ReadFloat(); + sldrPickup.activationDelay = input.ReadFloat(); break; case 0xa9fe872a: - sldrPickup.pickup_effect = input.ReadInt32(); + sldrPickup.pickupEffect = input.ReadInt32(); break; case 0xe10bcb96: - sldrPickup.absolute_value = input.ReadBool(); + sldrPickup.absoluteValue = input.ReadBool(); break; case 0xce33239f: - sldrPickup.calculate_visibility = input.ReadBool(); + sldrPickup.calculateVisibility = input.ReadBool(); break; case 0x2de4a294: sldrPickup.unknown = input.ReadBool(); break; case 0xa6ea280d: - sldrPickup.auto_home_range = input.ReadFloat(); + sldrPickup.autoHomeRange = input.ReadFloat(); break; case 0xc2b11cfd: - sldrPickup.delay_until_home = input.ReadFloat(); + sldrPickup.delayUntilHome = input.ReadFloat(); break; case 0x2db59fcf: - sldrPickup.homing_speed = input.ReadFloat(); + sldrPickup.homingSpeed = input.ReadFloat(); break; case 0x961c0d17: - sldrPickup.auto_spin = input.ReadBool(); + sldrPickup.autoSpin = input.ReadBool(); break; case 0xa755eb02: - sldrPickup.blink_out = input.ReadBool(); + sldrPickup.blinkOut = input.ReadBool(); break; case 0x850115e4: - sldrPickup.orbit_offset = CVector3f(input); + sldrPickup.orbitOffset = CVector3f(input); break; default: input.ReadBytes(nullptr, propertySize); @@ -343,27 +343,27 @@ CScriptPickup* LoadPickup(CStateManager& mgr, CInputStream& input, const CEntity } rstl::optional_object< CModelData > modelData( - LoadModelData(sldrPickup.editor_properties.transform.scale, sldrPickup.model, - sldrPickup.animation_information, true)); + LoadModelData(sldrPickup.editorProperties.transform.scale, sldrPickup.model, + sldrPickup.animationInformation, true)); if (!modelData) { return nullptr; } CAABox box = - LoadCAABox(mgr, info.GetAreaId(), sldrPickup.collision_size, sldrPickup.collision_offset); - if (sldrPickup.collision_size == CVector3f::Zero()) { - box = modelData->GetBounds(CTransform4f(LoadEditorTransform(sldrPickup.editor_properties))); + LoadCAABox(mgr, info.GetAreaId(), sldrPickup.collisionSize, sldrPickup.collisionOffset); + if (sldrPickup.collisionSize == CVector3f::Zero()) { + box = modelData->GetBounds(CTransform4f(LoadEditorTransform(sldrPickup.editorProperties))); } return new CScriptPickup( - mgr.AllocateUniqueId(), sldrPickup.editor_properties.name, - EntityInfoWithEditorProperties(info, sldrPickup.editor_properties), - LoadEditorTransform(sldrPickup.editor_properties), *modelData, - LoadActorParameters(sldrPickup.actor_information), - LoadEchoParameters(sldrPickup.echo_information), box, - CPlayerState::EItemType(sldrPickup.item_to_give.value), sldrPickup.amount, - sldrPickup.capacity_increase, sldrPickup.item_percentage_increase, sldrPickup.pickup_effect, - sldrPickup.absolute_value, sldrPickup.unknown, sldrPickup.auto_spin, sldrPickup.blink_out, - sldrPickup.lifetime, sldrPickup.respawn_time, sldrPickup.fadetime, - sldrPickup.activation_delay, sldrPickup.pickup_effect_lifetime, sldrPickup.auto_home_range, - sldrPickup.delay_until_home, sldrPickup.homing_speed, CVector3f(sldrPickup.orbit_offset)); + mgr.AllocateUniqueId(), sldrPickup.editorProperties.name, + EntityInfoWithEditorProperties(info, sldrPickup.editorProperties), + LoadEditorTransform(sldrPickup.editorProperties), *modelData, + LoadActorParameters(sldrPickup.actorInformation), + LoadEchoParameters(sldrPickup.echoInformation), box, + CPlayerState::EItemType(sldrPickup.itemToGive.value), sldrPickup.amount, + sldrPickup.capacityIncrease, sldrPickup.itemPercentageIncrease, sldrPickup.pickupEffect, + sldrPickup.absoluteValue, sldrPickup.unknown, sldrPickup.autoSpin, sldrPickup.blinkOut, + sldrPickup.lifetime, sldrPickup.respawnTime, sldrPickup.fadetime, + sldrPickup.activationDelay, sldrPickup.pickupEffectLifetime, sldrPickup.autoHomeRange, + sldrPickup.delayUntilHome, sldrPickup.homingSpeed, CVector3f(sldrPickup.orbitOffset)); }