diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-09 15:47:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-09 15:47:34 -0500 |
| commit | f3019aa045a2caaff8fee39a81c0dc2f75233837 (patch) | |
| tree | 87cff8607c4017080d979c8f1b566fdd1dc722f0 /src/constants.asm | |
| parent | 86d8cfb0fd86326e4534fc33c7bb384d515bbe0e (diff) | |
| parent | 53bab0a246719227b1558dfce636e7d0b21d6db0 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/constants.asm')
| -rw-r--r-- | src/constants.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/constants.asm b/src/constants.asm index 6e6f0b3..5049fa9 100644 --- a/src/constants.asm +++ b/src/constants.asm @@ -5,7 +5,6 @@ INCLUDE "constants/deck_ai_constants.asm" INCLUDE "constants/deck_constants.asm" INCLUDE "constants/duel_constants.asm" INCLUDE "constants/duel_interface_constants.asm" -INCLUDE "constants/event_constants.asm" INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/map_constants.asm" @@ -13,9 +12,10 @@ INCLUDE "constants/misc_constants.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/name_constants.asm" INCLUDE "constants/npc_constants.asm" +INCLUDE "constants/script_constants.asm" INCLUDE "constants/sgb_constants.asm" INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/text_constants.asm" +INCLUDE "constants/animation_constants.asm" INCLUDE "constants/charmaps.asm" -INCLUDE "constants/animation_constants.asm"
\ No newline at end of file |