Remove redundant battle constants

6 files changed, 123 insertions, 184 deletions

diff --git a/constants/battle.inc b/constants/battle.inc
index dfaa14779..287e9abf6 100644
--- a/constants/battle.inc
+++ b/constants/battle.inc
@@ -53,49 +53,3 @@
 	enum SP_DEFENSE
 	enum ACCURACY
 	enum EVASION
-
-@ status animation table
-.equiv B_ANIM_STATUS_PSN,              0x0
-.equiv B_ANIM_STATUS_CONFUSION,        0x1
-.equiv B_ANIM_STATUS_BRN,              0x2
-.equiv B_ANIM_STATUS_INFATUATION,      0x3
-.equiv B_ANIM_STATUS_SLP,              0x4
-.equiv B_ANIM_STATUS_PRZ,              0x5
-.equiv B_ANIM_STATUS_FRZ,              0x6
-.equiv B_ANIM_STATUS_CURSED,           0x7
-.equiv B_ANIM_STATUS_NIGHTMARE,        0x8
-.equiv B_ANIM_STATUS_WRAPPED,          0x9
-
-@ general animation table
-.equiv B_ANIM_CASTFORM_CHANGE,         0x0
-.equiv B_ANIM_STATS_CHANGE,            0x1
-.equiv B_ANIM_SUBSTITUTE_FADE,         0x2
-.equiv B_ANIM_SUBSTITUTE_APPEAR,       0x3
-.equiv B_ANIM_POKEBLOCK_THROW,         0x4
-.equiv B_ANIM_ITEM_KNOCKOFF,           0x5
-.equiv B_ANIM_TURN_TRAP,               0x6
-.equiv B_ANIM_ITEM_EFFECT,             0x7
-.equiv B_ANIM_SMOKEBALL_ESCAPE,        0x8
-.equiv B_ANIM_HANGED_ON,               0x9
-.equiv B_ANIM_RAIN_CONTINUES,          0xA
-.equiv B_ANIM_SUN_CONTINUES,           0xB
-.equiv B_ANIM_SANDSTORM_CONTINUES,     0xC
-.equiv B_ANIM_HAIL_CONTINUES,          0xD
-.equiv B_ANIM_LEECH_SEED_DRAIN,        0xE
-.equiv B_ANIM_MON_HIT,                 0xF
-.equiv B_ANIM_ITEM_STEAL,              0x10
-.equiv B_ANIM_SNATCH_MOVE,             0x11
-.equiv B_ANIM_FUTURE_SIGHT_HIT,        0x12
-.equiv B_ANIM_DOOM_DESIRE_HIT,         0x13
-.equiv B_ANIM_FOCUS_PUNCH_SET_UP,      0x14
-.equiv B_ANIM_INGRAIN_HEAL,            0x15
-.equiv B_ANIM_WISH_HEAL,               0x16
-
-@ special animation table
-.equiv B_ANIM_LVL_UP,                  0x0
-.equiv B_ANIM_SWITCH_OUT_PLAYER_MON,   0x1
-.equiv B_ANIM_SWITCH_OUT_OPPONENT_MON, 0x2
-.equiv B_ANIM_BALL_THROW,              0x3
-.equiv B_ANIM_SAFARI_BALL_THROW,       0x4
-.equiv B_ANIM_SUBSTITUTE_TO_MON,       0x5
-.equiv B_ANIM_MON_TO_SUBSTITUTE,       0x6
diff --git a/constants/battle_move_constants.inc b/constants/battle_move_constants.inc
deleted file mode 100644
index a05da3db3..000000000
--- a/constants/battle_move_constants.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-	.set TARGET_SELECTED_POKEMON, 0
-
-	.set F_TARGET_SPECIAL,         1 << 0
-	.set F_TARGET_RANDOM,          1 << 2
-	.set F_TARGET_BOTH_ENEMIES,    1 << 3
-	.set F_TARGET_USER,            1 << 4
-	.set F_TARGET_ALL_EXCEPT_USER, 1 << 5
-	.set F_TARGET_ENEMY_SIDE,      1 << 6
-
-	.set F_MAKES_CONTACT,          1 << 0
-	.set F_AFFECTED_BY_PROTECT,    1 << 1
-	.set F_AFFECTED_BY_MAGIC_COAT, 1 << 2
-	.set F_AFFECTED_BY_SNATCH,     1 << 3
-	.set F_MIRROR_MOVE_COMPATIBLE, 1 << 4
-	.set F_AFFECTED_BY_KINGS_ROCK, 1 << 5
diff --git a/constants/constants.inc b/constants/constants.inc
index 1ec25462f..57b6ae2a5 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -3,7 +3,6 @@
 	.include "constants/type_constants.inc"
 	.include "constants/contest_constants.inc"
 	.include "constants/item_data_constants.inc"
-	.include "constants/battle_move_constants.inc"
 	.include "constants/trainer_constants.inc"
 	.include "constants/berry_constants.inc"
 	.include "constants/version.inc"
diff --git a/data/battle_moves.s b/data/battle_moves.s
index 9a7398999..2c65bd3a5 100644
--- a/data/battle_moves.s
+++ b/data/battle_moves.s
@@ -1,3 +1,4 @@
+#include "constants/battle_constants.h"
 #include "constants/battle_move_effects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
@@ -156,7 +157,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -167,7 +168,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -420,7 +421,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 100 @ secondary effect chance
-	.byte F_TARGET_RANDOM
+	.byte TARGET_RANDOM
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
@@ -442,7 +443,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -486,7 +487,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -508,7 +509,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -574,7 +575,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 30 @ PP
 	.byte 10 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -607,7 +608,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -640,7 +641,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 15 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -662,7 +663,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 70 @ accuracy
 	.byte 5 @ PP
 	.byte 10 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -761,7 +762,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte -5 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_MAKES_CONTACT @ misc. flags
 
@@ -827,7 +828,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -838,7 +839,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 95 @ accuracy
 	.byte 25 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -893,7 +894,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 100 @ secondary effect chance
-	.byte F_TARGET_RANDOM
+	.byte TARGET_RANDOM
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
@@ -904,7 +905,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 95 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -992,7 +993,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_ALL_EXCEPT_USER
+	.byte TARGET_ALL_EXCEPT_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -1069,7 +1070,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1080,7 +1081,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1113,7 +1114,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -1157,7 +1158,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 15 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1168,7 +1169,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1179,7 +1180,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1190,7 +1191,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1223,7 +1224,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1234,7 +1235,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1245,7 +1246,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1256,7 +1257,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1267,7 +1268,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -1278,7 +1279,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1289,7 +1290,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1300,7 +1301,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
@@ -1311,7 +1312,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -1322,7 +1323,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -1333,7 +1334,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_ALL_EXCEPT_USER
+	.byte TARGET_ALL_EXCEPT_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -1432,7 +1433,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -1476,7 +1477,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1498,7 +1499,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1608,7 +1609,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 30 @ PP
 	.byte 10 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -1663,7 +1664,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -1674,7 +1675,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1696,7 +1697,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_ALL_EXCEPT_USER
+	.byte TARGET_ALL_EXCEPT_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -1729,7 +1730,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1740,7 +1741,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 90 @ accuracy
 	.byte 10 @ PP
 	.byte 30 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -1762,7 +1763,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1773,7 +1774,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -1817,7 +1818,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -1949,7 +1950,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2004,7 +2005,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 25 @ PP
 	.byte 10 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2015,7 +2016,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 3 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2070,7 +2071,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2114,7 +2115,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_ENEMY_SIDE
+	.byte TARGET_ENEMY_SIDE
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2147,7 +2148,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2158,7 +2159,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2169,7 +2170,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 95 @ accuracy
 	.byte 15 @ PP
 	.byte 100 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2180,7 +2181,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 3 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2213,7 +2214,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 15 @ PP
 	.byte 100 @ secondary effect chance
-	.byte F_TARGET_RANDOM
+	.byte TARGET_RANDOM
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
 
@@ -2224,7 +2225,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2246,7 +2247,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 3 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2301,7 +2302,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2367,7 +2368,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2378,7 +2379,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2422,7 +2423,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 25 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2455,7 +2456,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 30 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_ALL_EXCEPT_USER
+	.byte TARGET_ALL_EXCEPT_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2499,7 +2500,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2543,7 +2544,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2587,7 +2588,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2598,7 +2599,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2609,7 +2610,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2642,7 +2643,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 20 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2653,7 +2654,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2664,7 +2665,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2686,7 +2687,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte -5 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags
 
@@ -2796,7 +2797,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 100 @ secondary effect chance
-	.byte F_TARGET_RANDOM
+	.byte TARGET_RANDOM
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2807,7 +2808,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2829,7 +2830,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2840,7 +2841,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 90 @ accuracy
 	.byte 10 @ PP
 	.byte 10 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2851,7 +2852,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -2939,7 +2940,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 3 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2950,7 +2951,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 95 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -2961,7 +2962,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -2983,7 +2984,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 5 @ priority
 	.4byte 0 @ misc. flags
 
@@ -3016,7 +3017,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3027,7 +3028,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -3038,7 +3039,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3060,7 +3061,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 15 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte 4 @ priority
 	.4byte 0 @ misc. flags
 
@@ -3071,7 +3072,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -3137,7 +3138,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3159,7 +3160,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3170,7 +3171,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3181,7 +3182,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3192,7 +3193,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_SPECIAL
+	.byte TARGET_SPECIAL
 	.byte 4 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags
 
@@ -3236,7 +3237,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3247,7 +3248,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3291,7 +3292,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_ALL_EXCEPT_USER
+	.byte TARGET_ALL_EXCEPT_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3313,7 +3314,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 15 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -3346,7 +3347,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3357,7 +3358,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 10 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3445,7 +3446,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3467,7 +3468,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 95 @ accuracy
 	.byte 25 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3555,7 +3556,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3566,7 +3567,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 5 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3643,7 +3644,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 85 @ accuracy
 	.byte 10 @ PP
 	.byte 30 @ secondary effect chance
-	.byte F_TARGET_BOTH_ENEMIES
+	.byte TARGET_BOTH_ENEMIES
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
 
@@ -3687,7 +3688,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 15 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3709,7 +3710,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 40 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3742,7 +3743,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3819,7 +3820,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 100 @ accuracy
 	.byte 15 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte 0 @ misc. flags
 
@@ -3830,7 +3831,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
@@ -3852,7 +3853,7 @@ gBattleMoves:: @ 81FB12C
 	.byte 0 @ accuracy
 	.byte 20 @ PP
 	.byte 0 @ secondary effect chance
-	.byte F_TARGET_USER
+	.byte TARGET_USER
 	.byte 0 @ priority
 	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
 
diff --git a/include/constants/battle_constants.h b/include/constants/battle_constants.h
index c446b916b..c61d54f76 100644
--- a/include/constants/battle_constants.h
+++ b/include/constants/battle_constants.h
@@ -124,14 +124,14 @@
 #define SIDE_STATUS_MIST             (1 << 8)
 #define SIDE_STATUS_SPIKES_DAMAGED   (1 << 9)
 
-#define F_TARGET_SELECTED_POKEMON 0
-#define F_TARGET_SPECIAL          (1 << 0)
-#define F_TARGET_UNK2             (1 << 1)
-#define F_TARGET_RANDOM           (1 << 2)
-#define F_TARGET_BOTH_ENEMIES     (1 << 3)
-#define F_TARGET_USER             (1 << 4)
-#define F_TARGET_ALL_EXCEPT_USER  (1 << 5)
-#define F_TARGET_ENEMY_SIDE       (1 << 6)
+#define TARGET_SELECTED_POKEMON 0
+#define TARGET_SPECIAL          (1 << 0)
+#define TARGET_UNK2             (1 << 1)
+#define TARGET_RANDOM           (1 << 2)
+#define TARGET_BOTH_ENEMIES     (1 << 3)
+#define TARGET_USER             (1 << 4)
+#define TARGET_ALL_EXCEPT_USER  (1 << 5)
+#define TARGET_ENEMY_SIDE       (1 << 6)
 
 #define F_MAKES_CONTACT           (1 << 0)
 #define F_AFFECTED_BY_PROTECT     (1 << 1)
diff --git a/src/contest.c b/src/contest.c
index 91fc91b78..f5aab709d 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -5419,14 +5419,14 @@ void SelectContestMoveBankTarget(u16 move)
 {
     switch (gBattleMoves[move].target)
     {
-    case F_TARGET_UNK2:
-    case F_TARGET_USER:
+    case TARGET_UNK2:
+    case TARGET_USER:
         gBankTarget = 2;
         break;
-    case F_TARGET_SELECTED_POKEMON:
-    case F_TARGET_RANDOM:
-    case F_TARGET_BOTH_ENEMIES:
-    case F_TARGET_ALL_EXCEPT_USER:
+    case TARGET_SELECTED_POKEMON:
+    case TARGET_RANDOM:
+    case TARGET_BOTH_ENEMIES:
+    case TARGET_ALL_EXCEPT_USER:
     default:
         gBankTarget = 3;
         break;