summaryrefslogtreecommitdiff
path: root/macros.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 /macros.asm
parent4162705db909da94a62f30b5e2caee048b3bc107 (diff)
parentc60f1331fef22b886adf3472d2b4f348832cfaf7 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm3
1 files changed, 0 insertions, 3 deletions
diff --git a/macros.asm b/macros.asm
index b6598c933..7036b6419 100644
--- a/macros.asm
+++ b/macros.asm
@@ -1,13 +1,10 @@
INCLUDE "macros/enum.asm"
-INCLUDE "macros/charmap.asm"
INCLUDE "macros/predef.asm"
INCLUDE "macros/rst.asm"
INCLUDE "macros/data.asm"
INCLUDE "macros/code.asm"
INCLUDE "macros/coords.asm"
INCLUDE "macros/color.asm"
-INCLUDE "macros/base_stats.asm"
-INCLUDE "macros/tilesets.asm"
INCLUDE "macros/scripts/audio.asm"
INCLUDE "macros/scripts/maps.asm"