diff options
author | anmart <andrewrmartinek@gmail.com> | 2016-02-19 23:41:44 -0500 |
---|---|---|
committer | anmart <andrewrmartinek@gmail.com> | 2016-02-19 23:41:44 -0500 |
commit | 595988d101d7c7264099ee3b9f559214bfda436c (patch) | |
tree | 7acf01ef7fa41e056f98dda982f47fccaf3eddab /src/constants.asm | |
parent | dc06e764c0d0a4f56d01474c5397a8e47aa0aa13 (diff) | |
parent | 6fb06a07dace26443a064d56be25972c2cddd8ae (diff) |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'src/constants.asm')
-rwxr-xr-x | src/constants.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/constants.asm b/src/constants.asm index c3b9f2d..3cf9cd1 100755 --- a/src/constants.asm +++ b/src/constants.asm @@ -1,11 +1,11 @@ INCLUDE "constants/map_constants.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/text_constants.asm" +INCLUDE "constants/duel_constants.asm" INCLUDE "constants/duelist_constants.asm" INCLUDE "constants/card_constants.asm" INCLUDE "constants/deck_constants.asm" INCLUDE "constants/card_data_constants.asm" -INCLUDE "constants/set_constants.asm" INCLUDE "constants/misc_constants.asm" INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/sgb_constants.asm" |