summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2018-01-23 00:02:56 -0500
committersurskitty <surskitty@gmail.com>2018-01-23 00:02:56 -0500
commitfbc6fe4722f3faa69f4126ea3d2fe3a41fcba16d (patch)
tree98c4ff39e6cb5a310c8184ba7634ef5eb7cfd19e /constants.asm
parent4162705db909da94a62f30b5e2caee048b3bc107 (diff)
parentc60f1331fef22b886adf3472d2b4f348832cfaf7 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm5
1 files changed, 4 insertions, 1 deletions
diff --git a/constants.asm b/constants.asm
index 7de20dfe2..4931bdd5f 100644
--- a/constants.asm
+++ b/constants.asm
@@ -1,3 +1,5 @@
+INCLUDE "charmap.asm"
+
INCLUDE "macros.asm"
INCLUDE "hram.asm"
@@ -42,8 +44,9 @@ INCLUDE "constants/sprite_data_constants.asm"
INCLUDE "constants/sprite_anim_constants.asm"
INCLUDE "constants/tileset_constants.asm"
INCLUDE "constants/collision_constants.asm"
-INCLUDE "constants/cgb_constants.asm"
+INCLUDE "constants/scgb_constants.asm"
INCLUDE "constants/battle_tower_constants.asm"
INCLUDE "constants/cry_constants.asm"
INCLUDE "constants/audio_constants.asm"
INCLUDE "constants/printer_constants.asm"
+INCLUDE "constants/menu_constants.asm"