summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-06-03 17:54:53 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-06-03 17:54:53 -0400
commit8cdf73265f95e9a55112f373804867244512878d (patch)
tree64f4263b86839e1eb9770688ad890683fa89c503 /constants.asm
parent5c86071351aefd9ac0d15eeb7894da4160cfc761 (diff)
parent12b2aba4c3e112628a904e7336d8b2413c56da74 (diff)
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/constants.asm b/constants.asm
index ba2d76c6..554f89ca 100644
--- a/constants.asm
+++ b/constants.asm
@@ -27,7 +27,7 @@ INCLUDE "constants/credits_constants.asm"
INCLUDE "constants/music_constants.asm"
INCLUDE "constants/tilesets.asm"
INCLUDE "constants/starter_mons.asm"
-INCLUDE "constants/predef_constants.asm"
INCLUDE "constants/event_constants.asm"
INCLUDE "constants/event_macros.asm"
-INCLUDE "constants/pikachu_emotion_constants.asm" \ No newline at end of file
+INCLUDE "constants/pikachu_emotion_constants.asm"
+INCLUDE "constants/text_constants.asm"