summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-01-22 12:38:19 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-01-22 12:38:19 -0500
commit2d4be89ee590792bcbcfdcfac17bc2827ca17151 (patch)
tree592b831e50d1d98f3842751335278e782f9274c7 /include/battle.h
parent0495cce90418b84dc53b5d5c9f3b2bfe46f0ed62 (diff)
parente97d3532d4d72a1fe9aec755cd2a3c6527484e27 (diff)
Merge branch 'master' of github.com:pret/pokefirered into union_room
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h
index bed12204f..c9534745d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -45,7 +45,6 @@
#define B_ACTION_NONE 0xFF
#define MAX_TRAINER_ITEMS 4
-#define MAX_MON_MOVES 4
// array entries for battle communication
#define MULTIUSE_STATE 0x0