summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authorSanky <gsanky@gmail.com>2013-03-02 21:40:02 +0100
committerSanky <gsanky@gmail.com>2013-03-02 21:40:02 +0100
commitaec5a652c8ed7d482330dd9254b48e5a7141866d (patch)
tree06678a02f28e62a39b2c61fb576468afc335f634 /constants.asm
parent5af3f92d9080cb874b6c46aa5b52c2a6cdab24f0 (diff)
parent9ee0600524218d47ce2faa9b122a8e2b498e9b66 (diff)
Merge http://github.com/yenatch/pokecrystal
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm23
1 files changed, 14 insertions, 9 deletions
diff --git a/constants.asm b/constants.asm
index ec45875d6..8a3d4d080 100644
--- a/constants.asm
+++ b/constants.asm
@@ -3417,15 +3417,20 @@ BATTLETYPE_SUICUNE EQU $0c
; joypad
-NO_INPUT EQU %00000000
-BUTTON_A EQU %00000001
-BUTTON_B EQU %00000010
-SELECT EQU %00000100
-START EQU %00001000
-D_RIGHT EQU %00010000
-D_LEFT EQU %00100000
-D_UP EQU %01000000
-D_DOWN EQU %10000000
+BUTTONS EQU %00010000
+D_PAD EQU %00100000
+
+AUTO_INPUT EQU $ff
+
+NO_INPUT EQU %00000000
+BUTTON_A EQU %00000001
+BUTTON_B EQU %00000010
+SELECT EQU %00000100
+START EQU %00001000
+D_RIGHT EQU %00010000
+D_LEFT EQU %00100000
+D_UP EQU %01000000
+D_DOWN EQU %10000000
; mbc
NUM_SRAM_BANKS EQU 4