summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-02-28 23:58:29 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-02-28 23:58:29 +0100
commita28dfd6da4d74e093297c998a887741d1562e64d (patch)
tree8155f4ce85e1ba928b0a4bcf69d6bf07bf74a6c7 /constants
parentfed5f03097aef2dd39e33abdece1daaaf27da39f (diff)
parentbcef4e7d1c20bad3d4631c5a8314a8de8da80e49 (diff)
Merge branch 'master' into clear_battle_files
Diffstat (limited to 'constants')
-rw-r--r--constants/battle_move_constants.inc15
-rw-r--r--constants/constants.inc1
2 files changed, 0 insertions, 16 deletions
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 10d582eb1..28f2b2658 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -3,7 +3,6 @@
.include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc"
.include "constants/item_data_constants.inc"
- .include "constants/battle_move_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/berry_constants.inc"