summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorPokeglitch <pokeglitchx@gmail.com>2018-06-04 19:44:23 -0400
committerPokeglitch <pokeglitchx@gmail.com>2018-06-04 19:44:23 -0400
commita02f7c334808b18570484d060fa758377a47d8cb (patch)
tree339d26596ea773c65daeae401ea3e23f7e016978 /constants.asm
parent96f14d6a3ab0db513f8330b9e30219c87af9b910 (diff)
parent4f87e62feddaed6b2ede988289abbf3fc43a8614 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm2
1 files changed, 2 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm
index dfdffc9..9312d05 100644
--- a/constants.asm
+++ b/constants.asm
@@ -24,3 +24,5 @@ INCLUDE "constants/music_constants.asm"
INCLUDE "constants/serial_constants.asm"
INCLUDE "constants/misc_constants.asm"
+
+INCLUDE "constants/battle_anim_constants.asm"