diff options
| author | Jonas Höglund <firefly@firefly.nu> | 2014-07-26 12:02:57 +0200 |
|---|---|---|
| committer | Jonas Höglund <firefly@firefly.nu> | 2014-07-26 12:04:02 +0200 |
| commit | 7819cfecca89160914984544ec9c20e7247c94e2 (patch) | |
| tree | 3933e93a0feeb58c7ce0549cf3f8910f0d623087 /constants.asm | |
| parent | 125bc94a0542a6948aef485aa10fd73ff3f95fe6 (diff) | |
| parent | ba5c5e4e62c68bef335685d15d967ff3044eb82f (diff) | |
Merge http://github.com/dannye/tcg
Conflicts:
wram.asm
Diffstat (limited to 'constants.asm')
| -rwxr-xr-x | constants.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index bb678d8..5985ff1 100755 --- a/constants.asm +++ b/constants.asm @@ -1,6 +1,7 @@ INCLUDE "constants/map_constants.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/text_constants.asm" +INCLUDE "constants/duelist_constants.asm" INCLUDE "constants/card_constants.asm" INCLUDE "constants/deck_constants.asm" INCLUDE "constants/type_constants.asm" |