diff options
| author | YamaArashi <shadow962@live.com> | 2016-03-26 15:12:38 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-03-26 15:12:38 -0700 |
| commit | 268c5e5bdaf2dc11f66ef4cf87d88eb1dbad44e9 (patch) | |
| tree | d060f3f19878ebe592af6103d5ec5241a206bffd /engine/joypad.asm | |
| parent | 48426f71c39c4b89ff5fc4d1cab9f271bdfe8230 (diff) | |
| parent | d8975211f543432565270379a0b4ebf277318b38 (diff) | |
Merge pull request #7 from YamaArashi/master
GBC palette code
Diffstat (limited to 'engine/joypad.asm')
| -rw-r--r-- | engine/joypad.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/joypad.asm b/engine/joypad.asm index f73d77b2..2b85cb61 100644 --- a/engine/joypad.asm +++ b/engine/joypad.asm @@ -2,10 +2,10 @@ ReadJoypad_:: ; c000 (3:4000) ; Poll joypad input. ; Unlike the hardware register, button ; presses are indicated by a set bit. - ld a, [hReadJoypad] + ld a, [hDisableJoypadPolling] and a ret nz - + ld a, 1 << 5 ; select direction keys ;ld c, 0 |