diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-04-06 08:52:55 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-04-06 08:52:55 -0600 |
| commit | 7f8974dab5c6c307a8e15e139dfab9264fcc639f (patch) | |
| tree | 0e23869f299671f7c9bb2f4ab2d486071e4e44c3 /constants.asm | |
| parent | combine audio and music folders (diff) | |
| parent | "Fix" name indentation in credits. (diff) | |
| download | pokeyellow-7f8974dab5c6c307a8e15e139dfab9264fcc639f.tar.gz pokeyellow-7f8974dab5c6c307a8e15e139dfab9264fcc639f.tar.xz pokeyellow-7f8974dab5c6c307a8e15e139dfab9264fcc639f.zip | |
Merge https://github.com/yenatch/pokered
Conflicts:
main.asm
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index 85990c48..9c386c81 100644 --- a/constants.asm +++ b/constants.asm @@ -27,3 +27,5 @@ INCLUDE "constants/map_dimensions.asm" INCLUDE "constants/connection_constants.asm" INCLUDE "constants/credits_constants.asm" INCLUDE "constants/music_constants.asm" +INCLUDE "constants/tilesets.asm" + |