fix some enum usage

ACreTeam · Nov 30, 2024 · fa49683 · fa49683
1 parent ed18ce2
commit fa49683
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/actor/ac_effectbg.c b/src/actor/ac_effectbg.c
@@ -654,9 +654,9 @@ static void EffectBG_Make_Leafs(EffectBg_c* efbg, GAME* game, xyz_t pos, s16 cou
         bush_yuki_type = 0;
 
         if (Common_Get(time).term_idx == mTM_TERM_4) {
-            bush_happa_type = eEC_BUSH_HAPPA_CEDAR | eEC_BUSH_HAPPA_PALM | 6;
+            bush_happa_type = eEC_BUSH_HAPPA_GOLD | 6;
         } else {
-            bush_happa_type = eEC_BUSH_HAPPA_CEDAR | eEC_BUSH_HAPPA_PALM | 4;
+            bush_happa_type = eEC_BUSH_HAPPA_GOLD | 4;
         }
     } else {
         if (Common_Get(time).term_idx == 4) {
@@ -669,7 +669,7 @@ static void EffectBG_Make_Leafs(EffectBg_c* efbg, GAME* game, xyz_t pos, s16 cou
     }
 
     if ((efbg->status & EffectBg_STATUS_GOLD) != 0 || efbg->variant == EffectBG_VARIANT_GOLD_SMALL) {
-        bush_happa_type |= eEC_BUSH_HAPPA_CEDAR | eEC_BUSH_HAPPA_PALM;
+        bush_happa_type |= eEC_BUSH_HAPPA_GOLD;
     } else if ((efbg->status & EffectBg_STATUS_PALM) != 0 || efbg->variant == EffectBG_VARIANT_PALM_SMALL) {
         bush_happa_type |= eEC_BUSH_HAPPA_PALM;
     } else if ((efbg->status & EffectBg_STATUS_CEDAR) != 0 || efbg->variant == EffectBG_VARIANT_CEDAR_SMALL) {

diff --git a/src/effect/ef_young_tree.c b/src/effect/ef_young_tree.c
@@ -90,7 +90,7 @@ static void eYoung_Tree_mv(eEC_Effect_c* effect, GAME* game) {
             } else if (effect->arg1 == 2) {
                 uVar2 |= eEC_BUSH_HAPPA_CEDAR;
             } else if (effect->arg1 == 3) {
-                uVar2 |= eEC_BUSH_HAPPA_PALM | eEC_BUSH_HAPPA_CEDAR;
+                uVar2 |= eEC_BUSH_HAPPA_GOLD;
             }
 
             effPos.x = effPos.x + fqrand2() * 30.0f;