summaryrefslogtreecommitdiff
path: root/hram.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-03-26 15:12:38 -0700
committerYamaArashi <shadow962@live.com>2016-03-26 15:12:38 -0700
commit268c5e5bdaf2dc11f66ef4cf87d88eb1dbad44e9 (patch)
treed060f3f19878ebe592af6103d5ec5241a206bffd /hram.asm
parent48426f71c39c4b89ff5fc4d1cab9f271bdfe8230 (diff)
parentd8975211f543432565270379a0b4ebf277318b38 (diff)
Merge pull request #7 from YamaArashi/master
GBC palette code
Diffstat (limited to 'hram.asm')
-rw-r--r--hram.asm3
1 files changed, 1 insertions, 2 deletions
diff --git a/hram.asm b/hram.asm
index 2d1a49e1..21dbee05 100644
--- a/hram.asm
+++ b/hram.asm
@@ -315,8 +315,7 @@ hLCDCPointer EQU $FFF4
hJoyInput EQU $FFF5
-hReadJoypad EQU $FFF8 ; 0 to read joypad, anything else skips joypad check
- ; written to in palettes.asm
+hDisableJoypadPolling EQU $FFF8 ; non-zero value disables polling of joypad
; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
; bit 1: menu is double spaced