add various cosmetic options

include/d/actor/d_a_alink.h

@@ -6397,7 +6397,8 @@ public:
 
 class daAlinkHIO_huLight_c0 {
 public:
-    static daAlinkHIO_huLight_c1 const m;
+    static daAlinkHIO_huLight_c1 IF_NOT_DUSK(const) m;
+    IF_DUSK(static daAlinkHIO_huLight_c1 const original;)
 };
 
 class daAlinkHIO_wlLight_c1 {
@@ -6471,7 +6472,8 @@ public:
 
 class daAlinkHIO_kandelaar_c0 {
 public:
-    static daAlinkHIO_kandelaar_c1 const m;
+    static daAlinkHIO_kandelaar_c1 IF_NOT_DUSK(const) m;
+    IF_DUSK(static daAlinkHIO_kandelaar_c1 const original;)
 };
 
 class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c {

include/dusk/settings.h

@@ -297,6 +297,29 @@ struct UserSettings {
     struct {
         std::array<ConfigVar<std::string>, 3> seedHashes;
     } randomizer;
+
+    // Cosmetics
+    struct {
+        ConfigVar<std::string> herosTunicCapColor;
+        ConfigVar<std::string> herosTunicTorsoColor;
+        ConfigVar<std::string> herosTunicSkirtColor;
+        ConfigVar<std::string> zoraArmorCapColor;
+        ConfigVar<std::string> zoraArmorHelmetColor;
+        ConfigVar<std::string> zoraArmorTorsoColor;
+        ConfigVar<std::string> zoraArmorScalesColor;
+        ConfigVar<std::string> zoraArmorFlippersColor;
+        ConfigVar<std::string> lanternGlowColor;
+        ConfigVar<std::string> woodenSwordColor;
+        ConfigVar<std::string> msBladeColor;
+        ConfigVar<std::string> msHandleColor;
+        ConfigVar<std::string> lightSwordGlowColor;
+        ConfigVar<std::string> boomerangColor;
+        ConfigVar<std::string> ironBootsColor;
+        ConfigVar<std::string> spinnerColor;
+        ConfigVar<std::string> linkHairColor;
+        ConfigVar<std::string> wolfLinkColor;
+        ConfigVar<std::string> eponaColor;
+    } cosmetics;
 };
 
 UserSettings& getSettings();

include/m_Do/m_Do_dvd_thread.h

@@ -67,6 +67,10 @@ public:
 
     JKRMemArchive* getArchive() const { return mArchive; }
     JKRHeap* getHeap() const { return mHeap; }
+#if TARGET_PC
+    s32 getEntryNumber() const { return mEntryNumber; }
+#endif
+
 
 private:
     /* 0x14 */ u8 mMountDirection;