summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h16
-rw-r--r--include/constants/battle_move_effects.h2
-rw-r--r--include/data/battle_moves.h142
-rw-r--r--include/pokemon.h1
4 files changed, 81 insertions, 80 deletions
diff --git a/include/battle.h b/include/battle.h
index 5225b72e3..971b9e4f5 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -66,14 +66,14 @@
#define MSG_DISPLAY 0x7
#define BATTLE_COMMUNICATION_ENTRIES_COUNT 0x8
-#define MOVE_TARGET_SELECTED 0x0
-#define MOVE_TARGET_DEPENDS 0x1
-#define MOVE_TARGET_USER 0x2
-#define MOVE_TARGET_RANDOM 0x4
-#define MOVE_TARGET_x10 0x10
-#define MOVE_TARGET_BOTH 0x8
-#define MOVE_TARGET_FOES_AND_ALLY 0x20
-#define MOVE_TARGET_OPPONENTS_FIELD 0x40
+#define MOVE_TARGET_SELECTED 0x0
+#define MOVE_TARGET_DEPENDS 0x1
+#define MOVE_TARGET_USER_OR_SELECTED 0x2
+#define MOVE_TARGET_RANDOM 0x4
+#define MOVE_TARGET_BOTH 0x8
+#define MOVE_TARGET_USER 0x10
+#define MOVE_TARGET_FOES_AND_ALLY 0x20
+#define MOVE_TARGET_OPPONENTS_FIELD 0x40
// defines for the u8 array gTypeEffectiveness
#define TYPE_EFFECT_ATK_TYPE(i)((gTypeEffectiveness[i + 0]))
diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h
index 1b59f2f64..b54f01353 100644
--- a/include/constants/battle_move_effects.h
+++ b/include/constants/battle_move_effects.h
@@ -151,7 +151,7 @@
#define EFFECT_EARTHQUAKE 147
#define EFFECT_FUTURE_SIGHT 148
#define EFFECT_GUST 149
-#define EFFECT_FLINCH_HIT_2 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM
+#define EFFECT_FLINCH_MINIMIZE_HIT 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM
#define EFFECT_SOLARBEAM 151
#define EFFECT_THUNDER 152
#define EFFECT_TELEPORT 153
diff --git a/include/data/battle_moves.h b/include/data/battle_moves.h
index ba3ca1ce1..6489fe07f 100644
--- a/include/data/battle_moves.h
+++ b/include/data/battle_moves.h
@@ -164,7 +164,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -257,7 +257,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
},
{ // MOVE_STOMP
- .effect = EFFECT_FLINCH_HIT_2,
+ .effect = EFFECT_FLINCH_MINIMIZE_HIT,
.power = 65,
.type = TYPE_NORMAL,
.accuracy = 100,
@@ -604,7 +604,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -824,7 +824,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 40,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1066,7 +1066,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 40,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1077,7 +1077,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1110,7 +1110,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -1154,7 +1154,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 15,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1165,7 +1165,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1176,7 +1176,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1187,7 +1187,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1220,7 +1220,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 40,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1231,7 +1231,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 40,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1242,7 +1242,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1253,7 +1253,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1264,7 +1264,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED,
},
@@ -1275,7 +1275,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1286,7 +1286,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1297,7 +1297,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
},
@@ -1473,7 +1473,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1495,7 +1495,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
},
@@ -1660,7 +1660,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 40,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -1671,7 +1671,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 40,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1726,7 +1726,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1759,7 +1759,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1770,7 +1770,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -1814,7 +1814,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -1946,7 +1946,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 30,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -2012,7 +2012,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 3,
.flags = 0,
},
@@ -2067,7 +2067,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2144,7 +2144,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -2155,7 +2155,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -2177,7 +2177,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 3,
.flags = 0,
},
@@ -2221,7 +2221,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -2243,7 +2243,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 3,
.flags = 0,
},
@@ -2298,7 +2298,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_SNATCH_AFFECTED,
},
@@ -2375,7 +2375,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2419,7 +2419,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 25,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2496,7 +2496,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 40,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -2584,7 +2584,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2595,7 +2595,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2606,7 +2606,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2650,7 +2650,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -2661,7 +2661,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -2804,7 +2804,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2826,7 +2826,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2848,7 +2848,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED,
},
@@ -2936,7 +2936,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 3,
.flags = 0,
},
@@ -2958,7 +2958,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -2980,7 +2980,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 5,
.flags = 0,
},
@@ -3013,7 +3013,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED,
},
@@ -3035,7 +3035,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3068,7 +3068,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -3156,7 +3156,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED,
},
@@ -3167,7 +3167,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3178,7 +3178,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
},
@@ -3233,7 +3233,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3244,7 +3244,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3310,7 +3310,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 15,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -3326,7 +3326,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
},
{ // MOVE_NEEDLE_ARM
- .effect = EFFECT_FLINCH_HIT_2,
+ .effect = EFFECT_FLINCH_MINIMIZE_HIT,
.power = 60,
.type = TYPE_GRASS,
.accuracy = 100,
@@ -3343,7 +3343,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 10,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3414,7 +3414,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
},
{ // MOVE_ASTONISH
- .effect = EFFECT_FLINCH_HIT_2,
+ .effect = EFFECT_FLINCH_MINIMIZE_HIT,
.power = 30,
.type = TYPE_GHOST,
.accuracy = 100,
@@ -3442,7 +3442,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3552,7 +3552,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3590,7 +3590,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
},
{ // MOVE_EXTRASENSORY
- .effect = EFFECT_FLINCH_HIT_2,
+ .effect = EFFECT_FLINCH_MINIMIZE_HIT,
.power = 80,
.type = TYPE_PSYCHIC,
.accuracy = 100,
@@ -3684,7 +3684,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 15,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3706,7 +3706,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 40,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3739,7 +3739,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3816,7 +3816,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 100,
.pp = 15,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = 0,
},
@@ -3827,7 +3827,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
@@ -3849,7 +3849,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] =
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
- .target = MOVE_TARGET_x10,
+ .target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
},
diff --git a/include/pokemon.h b/include/pokemon.h
index 6df9ce313..cd79a217d 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -468,6 +468,7 @@ extern struct Pokemon gEnemyParty[PARTY_SIZE];
extern struct SpriteTemplate gUnknown_0202499C;
extern struct PokemonStorage* gPokemonStoragePtr;
+extern const struct BattleMove gBattleMoves[];
extern const u8 gFacilityClassToPicIndex[];
extern const u8 gFacilityClassToTrainerClass[];
extern const struct BaseStats gBaseStats[];
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-15 22:47:52 +0000