diff options
author | Bryan Bishop <kanzure@gmail.com> | 2012-12-26 19:15:05 -0600 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2012-12-26 19:15:05 -0600 |
commit | 9ed07bd3a912823a1c55dcc305f08326ff83dcc2 (patch) | |
tree | 060b73897fee1435e27e3362dd9d0b5078d9ff01 /constants.asm | |
parent | 3b20ea29160760a85db9d84f61a92a957d14efb3 (diff) | |
parent | a2b7d31878bd4d3d17696c8dc44dd2beafc8426f (diff) |
Merge remote branch 'remotes/yenatch/master'
Oops, missed a few commits last time.
Diffstat (limited to 'constants.asm')
-rw-r--r-- | constants.asm | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/constants.asm b/constants.asm index ef360ebcd..4d1fe2ef3 100644 --- a/constants.asm +++ b/constants.asm @@ -3292,4 +3292,25 @@ BATTLETYPE_ROAMING EQU $05 BATTLETYPE_SHINY EQU $07 BATTLETYPE_TREE EQU $08 BATTLETYPE_FORCEITEM EQU $0a -BATTLETYPE_SUICUNE EQU $0c
\ No newline at end of file +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 + +; mbc +NUM_SRAM_BANKS EQU 4 + +; provisional wram bank 5 labels +Unkn1Pals EQU $d000 ; 8 4-color palettes little endian) +Unkn2Pals EQU $d040 ; 8 4-color palettes little endian) +BGPals EQU $d080 ; 8 4-color palettes little endian) +OBPals EQU $d0c0 ; 8 4-color palettes little endian)
\ No newline at end of file |