summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 11:51:28 -0700
committerGitHub <noreply@github.com>2016-06-12 11:51:28 -0700
commita0161ada5d90464e11be2469c6a2ee27533d2557 (patch)
treea93c42f00eec7d9f356c1e9e4b12ec0a46e419d1 /constants.asm
parentbcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (diff)
parentf978cc0cc9557581a4fa712b00f0f2ad321fa22b (diff)
Merge pull request #17 from YamaArashi/master
sync tileset WRAM labels
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/constants.asm b/constants.asm
index 554f89ca..cc636558 100644
--- a/constants.asm
+++ b/constants.asm
@@ -29,5 +29,5 @@ INCLUDE "constants/tilesets.asm"
INCLUDE "constants/starter_mons.asm"
INCLUDE "constants/event_constants.asm"
INCLUDE "constants/event_macros.asm"
-INCLUDE "constants/pikachu_emotion_constants.asm"
INCLUDE "constants/text_constants.asm"
+INCLUDE "constants/pikachu_emotion_constants.asm"