aboutsummaryrefslogtreecommitdiff
path: root/scroll/toggle.s
diff options
context:
space:
mode:
authorMiquel Sabaté Solà <mikisabate@gmail.com>2025-03-11 17:00:47 +0100
committerMiquel Sabaté Solà <mikisabate@gmail.com>2025-03-11 17:00:47 +0100
commit428c301a80641361f51af8102628b545cf9ae63e (patch)
treee8888ec3a369bb617e892ff783334ae4f46ce355 /scroll/toggle.s
parenteb9544cb3df7158f7fba5ed346997989102d0155 (diff)
downloadcode.nes-428c301a80641361f51af8102628b545cf9ae63e.tar.gz
code.nes-428c301a80641361f51af8102628b545cf9ae63e.zip
shared: Bring joypad into a proper style
Put functions inside of the scope, avoid useless fallthroughs and be more realistic on what is needed from elsewhere. Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
Diffstat (limited to 'scroll/toggle.s')
-rw-r--r--scroll/toggle.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/scroll/toggle.s b/scroll/toggle.s
index b9214b4..32fc39f 100644
--- a/scroll/toggle.s
+++ b/scroll/toggle.s
@@ -70,11 +70,11 @@
bne @end
;; Read the joypad.
- jsr joypad_read
+ READ_JOYPAD1
;; Is the player pressing left? If so then the direction is to the left.
lda #Joypad::BUTTON_LEFT
- and Joypad::m_buttons1
+ and Joypad::zp_buttons1
beq @check_right
inc Vars::zp_scrolling
lda #0
@@ -84,7 +84,7 @@
@check_right:
;; Is the player pressing right? If so then the direction is to the right.
lda #Joypad::BUTTON_RIGHT
- and Joypad::m_buttons1
+ and Joypad::zp_buttons1
beq @check_select
inc Vars::zp_scrolling
lda #1
@@ -95,7 +95,7 @@
;; Is the player pressing Select? Then the direction depends on the current
;; nametable.
lda #Joypad::BUTTON_SELECT
- and Joypad::m_buttons1
+ and Joypad::zp_buttons1
beq @end
inc Vars::zp_scrolling
ldx #0