diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h
index a102f926ae..0a7ba2303f 100644
--- a/include/constants/battle_config.h
+++ b/include/constants/battle_config.h
@@ -51,7 +51,8 @@
 #define B_FAINT_SWITCH_IN           GEN_LATEST // In Gen4+, sending out a new Pokémon after the previous one fainted happens at the end of the turn. Before, it would happen after each action.
 
 // Move data settings
-#define B_UPDATED_MOVE_DATA         GEN_LATEST // Updates move data in gBattleMoves, including Power, Accuracy, PP, stat changes, targets, chances of secondary effects, etc.
+#define B_UPDATED_MOVE_DATA         GEN_LATEST // Updates move data in gBattleMoves, including Power, Accuracy, PP, stat changes, targets and chances of secondary effects.
+#define B_UPDATED_MOVE_TYPES        GEN_LATEST // Updates move types.
 #define B_PHYSICAL_SPECIAL_SPLIT    GEN_LATEST // In Gen3, the move's type determines if it will do physical or special damage. The split icon in the summary will reflect this.
 #define B_RECOIL_IF_MISS_DMG        GEN_LATEST // In Gen5+, Jump Kick and High Jump Kick will always do half of the user's max HP when missing.
 #define B_KLUTZ_FLING_INTERACTION   GEN_LATEST // In Gen5+, Pokémon with the Klutz ability can't use Fling.
diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index 89e1a042c6..2a0f884d46 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -3122,7 +3122,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
 
     [MOVE_CURSE] =
     {
-        #if B_UPDATED_MOVE_DATA >= GEN_5
+        #if B_UPDATED_MOVE_TYPES >= GEN_5
             .type = TYPE_GHOST,
         #else
             .type = TYPE_MYSTERY,
@@ -3342,7 +3342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
 
     [MOVE_SWEET_KISS] =
     {
-        #if B_UPDATED_MOVE_DATA >= GEN_6
+        #if B_UPDATED_MOVE_TYPES >= GEN_6
             .type = TYPE_FAIRY,
         #else
             .type = TYPE_NORMAL,
@@ -3687,7 +3687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
 
     [MOVE_CHARM] =
     {
-        #if B_UPDATED_MOVE_DATA >= GEN_6
+        #if B_UPDATED_MOVE_TYPES >= GEN_6
             .type = TYPE_FAIRY,
         #else
             .type = TYPE_NORMAL,
@@ -4233,7 +4233,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
 
     [MOVE_MOONLIGHT] =
     {
-        #if B_UPDATED_MOVE_DATA >= GEN_6
+        #if B_UPDATED_MOVE_TYPES >= GEN_6
             .type = TYPE_FAIRY,
         #else
             .type = TYPE_NORMAL,