Major scoped-enum refactor

DataSpec/DNAMP1/ScriptObjects/Parameters.hpp

@@ -9,82 +9,82 @@ namespace Retro
 namespace DNAMP1
 {
 
-enum EPickupType
+enum class EPickupType : atUint32
 {
-    PkPowerBeam,
-    PkIceBeam,
-    PkWaveBeam,
-    PkPlasmaBeam,
-    PkMissile,
-    PkScanVisor,
-    PkMorphBallBomb,
-    PkPowerBomb,
-    PkFlamethrower,
-    PkChargeBeam,
-    PkXRayVisor,
-    PkIceSpreader,
-    PkSpaceJump,
-    PkMorphBall,
-    PkCombatVisor,
-    PkSpiderBall,
-    PkPowerSuit,
-    PkGravitySuit,
-    PkVariaSuit,
-    PkPhazonSuit,
-    PkEnergyTank,
-    PkUnknownItem1,
-    PkHealthRefill,
-    PkUnknownItem2,
-    PkWaveBuster,
-    PkTruth,
-    PkStrength,
-    PkElder,
-    PkWild,
-    PkLifeGiver,
-    PkWarrior,
-    PkChozo,
-    PkNature,
-    PkSun,
-    PkWorld,
-    PkSpirit,
-    PkNewborn
+    PowerBeam,
+    IceBeam,
+    WaveBeam,
+    PlasmaBeam,
+    Missile,
+    ScanVisor,
+    MorphBallBomb,
+    PowerBomb,
+    Flamethrower,
+    ChargeBeam,
+    XRayVisor,
+    IceSpreader,
+    SpaceJump,
+    MorphBall,
+    CombatVisor,
+    SpiderBall,
+    PowerSuit,
+    GravitySuit,
+    VariaSuit,
+    PhazonSuit,
+    EnergyTank,
+    UnknownItem1,
+    HealthRefill,
+    UnknownItem2,
+    WaveBuster,
+    Truth,
+    Strength,
+    Elder,
+    Wild,
+    LifeGiver,
+    Warrior,
+    Chozo,
+    Nature,
+    Sun,
+    World,
+    Spirit,
+    Newborn
 };
 
-enum ESpecialFunctionType
+enum class ESpecialFunctionType : atUint32
 {
-    SpFnWhat,
-    SpFnPlayerFollowLocator,
-    SpFnSpinnerController,
-    SpFnObjectFollowLocator,
-    SpFnFunction4,
-    SpFnInventoryActivator,
-    SpFnMapStation,
-    SpFnSaveStation,
-    SpFnIntroBossRingController,
-    SpFnViewFrustumTest,
-    SpFnShotSpinnerController,
-    SpFnEscapeSequence,
-    SpFnBossEnergyBar,
-    SpFnEndGame,
-    SpFnHUDFadeIn,
-    SpFnCinematicSkip,
-    SpFnScriptLyaerController,
-    SpFnRainSimulator,
-    SpFnAreaDamage,
-    SpFnObjectFollowObject,
-    SpFnHintSystem,
-    SpFnDropBomb,
-    SpFnFunction22,
-    SpFnMissileStation,
-    SpFnBillboard,
-    SpFnPlayerInAreaRelay,
-    SpFnHUDTarget,
-    SpFnFogFader,
-    SpFnEnterLogbook,
-    SpFnPowerBombStation,
-    SpFnEnding,
-    SpFnFusionRelay,
-    SpFnWeaponSwitch // PAL Only
+    What,
+    PlayerFollowLocator,
+    SpinnerController,
+    ObjectFollowLocator,
+    Function4,
+    InventoryActivator,
+    MapStation,
+    SaveStation,
+    IntroBossRingController,
+    ViewFrustumTest,
+    ShotSpinnerController,
+    EscapeSequence,
+    BossEnergyBar,
+    EndGame,
+    HUDFadeIn,
+    CinematicSkip,
+    ScriptLyaerController,
+    RainSimulator,
+    AreaDamage,
+    ObjectFollowObject,
+    HintSystem,
+    DropBomb,
+    Function22,
+    MissileStation,
+    Billboard,
+    PlayerInAreaRelay,
+    HUDTarget,
+    FogFader,
+    EnterLogbook,
+    PowerBombStation,
+    Ending,
+    FusionRelay,
+    WeaponSwitch // PAL Only
 };
 
 struct AnimationParameters : BigYAML