summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-14 12:19:46 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-14 12:19:46 -0600
commit1113f19b183ec8c72e81379f4c80b11a12c4a551 (patch)
tree7770fe6c50923f10cf6848cabb2a2b1c7ddfd634 /constants.asm
parent6c64fa8acc80b1fe78e8c63bece0db4cf21ea2a4 (diff)
parentfd8bfbd633376445efe501870a6ddbf3684af99f (diff)
Merge.
hg-commit-id: 261be761c726
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm8
1 files changed, 5 insertions, 3 deletions
diff --git a/constants.asm b/constants.asm
index b8600c3a..d205f46f 100644
--- a/constants.asm
+++ b/constants.asm
@@ -1,6 +1,8 @@
-RED EQU 1
-BLUE EQU 0
-GREEN EQU 0
+_JAPAN EQU 0
+_RED EQU 1
+_BLUE EQU 0
+_GREEN EQU 0
+_YELLOW EQU 0
;\1 = X
;\2 = Y