diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-09 15:56:49 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-09 15:56:49 -0500 |
| commit | 37e1aa4e8ec2400ba97db4c767bd3a9fcd43a1ac (patch) | |
| tree | 68cb6273ed885d69512c4ba099298aad1534c6e4 /constants.asm | |
| parent | 35324ae43f845f4ce8346ef05fdf1bed8bed1e28 (diff) | |
| parent | 705e6824687ed247a28cfbaedd47bf33bd1da32a (diff) | |
Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/constants.asm b/constants.asm index 70405446e..84d93f9dd 100644 --- a/constants.asm +++ b/constants.asm @@ -170,8 +170,8 @@ BUTTONS EQU %00010000 D_PAD EQU %00100000 NO_INPUT EQU %00000000 -BUTTON_A EQU %00000001 -BUTTON_B EQU %00000010 +A_BUTTON EQU %00000001 +B_BUTTON EQU %00000010 SELECT EQU %00000100 START EQU %00001000 D_RIGHT EQU %00010000 |