diff --git a/include/constants/moves.h b/include/constants/moves.h
index 49a59c2c9..9edf402ef 100644
--- a/include/constants/moves.h
+++ b/include/constants/moves.h
@@ -693,6 +693,6 @@
 
 #define MOVES_COUNT_GEN7 673
 
-#define MOVES_COUNT MOVES_COUNT_GEN6
+#define MOVES_COUNT MOVES_COUNT_GEN7
 
 #endif  // GUARD_CONSTANTS_MOVES_H
diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index 7ccf94a89..714d8fe25 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_DATA_BATTLE_MOVES
 #define GUARD_DATA_BATTLE_MOVES
 
-const struct BattleMove gBattleMoves[MOVES_COUNT_GEN6] =
+const struct BattleMove gBattleMoves[MOVES_COUNT] =
 {
     { // MOVE_NONE
 		.effect = EFFECT_HIT,
@@ -7463,6 +7463,630 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_GEN6] =
 		.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
 		.split = SPLIT_PHYSICAL,
 	},
+	{ // MOVE_HYPERSPACE_FURY
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SHORE_UP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_FIRST_IMPRESSION
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_BANEFUL_BUNKER
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SPIRIT_SHACKLE
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_DARKEST_LARIAT
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SPARKLING_ARIA
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_ICE_HAMMER
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_FLORAL_HEALING
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_HIGH_HORSEPOWER
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_STRENGTH_SAP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SOLAR_BLADE
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_LEAFAGE
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SPOTLIGHT
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_TOXIC_THREAD
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_LASER_FOCUS
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_GEAR_UP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_THROAT_CHOP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_POLLEN_PUFF
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_ANCHOR_SHOT
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_PSYCHIC_TERRAIN
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_LUNGE
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_FIRE_LASH
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_POWER_TRIP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_BURN_UP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SPEED_SWAP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SMART_STRIKE
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_PURIFY
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_REVELATION_DANCE
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_CORE_ENFORCER
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_TROP_KICK
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_INSTRUCT
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_BEAK_BLAST
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_CLANGING_SCALES
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_DRAGON_HAMMER
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_BRUTAL_SWING
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_AURORA_VEIL
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SHELL_TRAP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_FLEUR_CANNON
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_PSYCHIC_FANGS
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_STOMPING_TANTRUM
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SHADOW_BONE
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_ACCELEROCK
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_LIQUIDATION
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_PRISMATIC_LASER
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SPECTRAL_THIEF
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_SUNSTEEL_STRIKE
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_MOONGEIST_BEAM
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_TEARFUL_LOOK
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_ZING_ZAP
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_NATURES_MADNESS
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
+	{ // MOVE_MULTI_ATTACK
+		.effect = EFFECT_PLACEHOLDER,
+		.power = 0,
+		.type = TYPE_MYSTERY,
+		.accuracy = 0,
+		.pp = 0,
+		.secondaryEffectChance = 0,
+		.target = MOVE_TARGET_SELECTED,
+		.priority = 0,
+		.flags = 0,
+		.split = SPLIT_PHYSICAL,
+	},
 };
 
 #endif // GUARD_DATA_BATTLE_MOVES