summaryrefslogtreecommitdiff
path: root/asm/macros.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-17 04:54:28 -0700
committerGitHub <noreply@github.com>2016-06-17 04:54:28 -0700
commit49304ec33bb54592578059ec0da317f1bfc6d4ca (patch)
treef2a577679cdd5b20b58285afe3695587ceb84488 /asm/macros.s
parentf2654a380e46152f2624174e8087b6998cccb91b (diff)
parent8de49d722cbd21abff92ec384e5faaf1f0dde2d5 (diff)
Merge pull request #9 from yenatch/master
Dump the maps.
Diffstat (limited to 'asm/macros.s')
-rw-r--r--asm/macros.s2
1 files changed, 2 insertions, 0 deletions
diff --git a/asm/macros.s b/asm/macros.s
index 6dbc42190..8058ed6d7 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -1,4 +1,6 @@
+ .include "asm/macros/asm.s"
.include "asm/macros/function.s"
+ .include "asm/macros/movement.s"
.include "asm/macros/event.s"
.include "asm/macros/pokemon_data.s"
.include "asm/macros/ec.s"