Added and implemented TrailType enum (#5059)

* added TrailType enum

* fixed build, moved declaration

* added enhancement comment

* Apply suggestions from code review

---------

Co-authored-by: link5669 <acqmiles@gmail.com>

2 files changed, 11 insertions, 11 deletions

diff --git a/soh/src/code/z_eff_blure.c b/soh/src/code/z_eff_blure.c
index 82e50fc65..f5716dc16 100644
--- a/soh/src/code/z_eff_blure.c
+++ b/soh/src/code/z_eff_blure.c
@@ -206,8 +206,8 @@ s32 EffectBlure_Update(void* thisx) {
     static u8 changed = 0;
     u8 reset = 0;
 
-    switch (this->trailType) { //there HAS to be a better way to do this.
-        case 2:
+    switch (this->trailType) {
+        case TRAIL_TYPE_BOOMERANG:
             if (CVarGetInteger(CVAR_COSMETIC("Trails.Boomerang.Changed"), 0)) {
                 color = CVarGetColor(CVAR_COSMETIC("Trails.Boomerang.Value"), (Color_RGBA8){ 255, 255, 100, 255 });
                 changed = 1;
@@ -216,7 +216,7 @@ s32 EffectBlure_Update(void* thisx) {
                 reset = 1;
             }
             break;
-        case 3:
+        case TRAIL_TYPE_BOMBCHU:
             if (CVarGetInteger(CVAR_COSMETIC("Trails.Bombchu.Changed"), 0)) {
                 color = CVarGetColor(CVAR_COSMETIC("Trails.Bombchu.Value"), (Color_RGBA8){ 250, 0, 0, 255 });
                 this->p1StartColor.r = color.r;
@@ -247,7 +247,7 @@ s32 EffectBlure_Update(void* thisx) {
                 this->p2EndColor.b = color.b * 0.4f;
             }
             break;
-        case 4:
+        case TRAIL_TYPE_KOKIRI_SWORD:
             if (CVarGetInteger(CVAR_COSMETIC("Trails.KokiriSword.Changed"), 0)) {
                 color = CVarGetColor(CVAR_COSMETIC("Trails.KokiriSword.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
                 changed = 1;
@@ -256,7 +256,7 @@ s32 EffectBlure_Update(void* thisx) {
                 reset = 1;
             }
             break;
-        case 5:
+        case TRAIL_TYPE_MASTER_SWORD:
             if (CVarGetInteger(CVAR_COSMETIC("Trails.MasterSword.Changed"), 0)) {
                 color = CVarGetColor(CVAR_COSMETIC("Trails.MasterSword.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
                 changed = 1;
@@ -265,7 +265,7 @@ s32 EffectBlure_Update(void* thisx) {
                 reset = 1;
             }
             break;
-        case 6:
+        case TRAIL_TYPE_BIGGORON_SWORD:
             if (CVarGetInteger(CVAR_COSMETIC("Trails.BiggoronSword.Changed"), 0)) {
                 color = CVarGetColor(CVAR_COSMETIC("Trails.BiggoronSword.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
                 changed = 1;
@@ -274,7 +274,7 @@ s32 EffectBlure_Update(void* thisx) {
                 reset = 1;
             }
             break;
-        case 7:
+        case TRAIL_TYPE_STICK:
             if (CVarGetInteger(CVAR_COSMETIC("Trails.Stick.Changed"), 0)) {
                 color = CVarGetColor(CVAR_COSMETIC("Trails.Stick.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
                 changed = 1;
@@ -283,7 +283,7 @@ s32 EffectBlure_Update(void* thisx) {
                 reset = 1;
             }
             break;
-        case 8:
+        case TRAIL_TYPE_HAMMER:
             if (CVarGetInteger(CVAR_COSMETIC("Trails.Hammer.Changed"), 0)) {
                 color = CVarGetColor(CVAR_COSMETIC("Trails.Hammer.Value"), (Color_RGBA8){ 255, 255, 255, 255 });
                 changed = 1;
@@ -316,7 +316,7 @@ s32 EffectBlure_Update(void* thisx) {
     }
 
     // Don't override boomerang and bombchu trail durations
-    if (this->trailType != 2 && this->trailType != 3) {
+    if (this->trailType != TRAIL_TYPE_BOOMERANG && this->trailType != TRAIL_TYPE_BOMBCHU) {
         if (CVarGetInteger(CVAR_COSMETIC("Trails.Duration.Changed"), 0)) {
             this->elemDuration = CVarGetInteger(CVAR_COSMETIC("Trails.Duration.Value"), 4);
         }
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index dd15a4932..9d4b55091 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -1748,7 +1748,7 @@ f32 sMeleeWeaponLengths[] = {
 };
 
 f32 sSwordTypes[] = {
-    0, 5, 4, 6, 0, 8,
+    TRAIL_TYPE_REST, TRAIL_TYPE_MASTER_SWORD, TRAIL_TYPE_KOKIRI_SWORD, TRAIL_TYPE_BIGGORON_SWORD, TRAIL_TYPE_REST, TRAIL_TYPE_HAMMER,
 };
 
 Gfx* sBottleDLists[] = { gLinkAdultBottleDL, gLinkChildBottleDL };
@@ -1821,7 +1821,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
                 D_80126080.x = this->unk_85C * 5000.0f;
                 func_80090A28(this, sp124);
                 if (this->meleeWeaponState != 0) {
-                    EffectBlure_ChangeType(Effect_GetByIndex(this->meleeWeaponEffectIndex), 7); // stick sword type
+                    EffectBlure_ChangeType(Effect_GetByIndex(this->meleeWeaponEffectIndex), TRAIL_TYPE_STICK);
                     func_800906D4(play, this, sp124);
                 } else {
                     Math_Vec3f_Copy(&this->meleeWeaponInfo[0].tip, &sp124[0]);