diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
| commit | 8cdf73265f95e9a55112f373804867244512878d (patch) | |
| tree | 64f4263b86839e1eb9770688ad890683fa89c503 /constants.asm | |
| parent | Update extras with fixed gbz80disasm.py (diff) | |
| parent | Fix tileset incbin statement alignment (diff) | |
| download | pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.gz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.xz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.zip | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 4 |
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" |