summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-30 22:29:07 -0600
committerMarcus Huderle <huderlem@gmail.com>2017-12-30 22:29:07 -0600
commitc21bde059812ed521952512e4d800038e0e1deb7 (patch)
tree8e3e5ab774b89399bf91e9ca110f270fa9bfffde /include
parentea3a851403a675c5b36daa77270aed0f8a3a5238 (diff)
Remove redundant battle constants
Diffstat (limited to 'include')
-rw-r--r--include/constants/battle_constants.h16
1 files changed, 8 insertions, 8 deletions
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)