diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-12-28 23:56:34 -0800 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-12-28 23:56:34 -0800 |
| commit | 983ef29fd0e3645cb6335ee8bb172312790a56e2 (patch) | |
| tree | 93d198b963f6142ac35a99c503cff21680065b49 /home/joypad.asm | |
| parent | 0fdbdb43a794358b5ed484114486e2992d520338 (diff) | |
| parent | a8cb73b654af67bb3caad2c6d45edce7436032b1 (diff) | |
Merge pull request #221 from yenatch/more-objects
analyze the bytes
Diffstat (limited to 'home/joypad.asm')
| -rw-r--r-- | home/joypad.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/joypad.asm b/home/joypad.asm index efe70e809..a55bb204b 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -6,7 +6,7 @@ JoypadInt: ; 92e reti ; 92f -ClearJoypadPublic: ; 92f +ClearJoypad: ; 92f xor a ; Pressed this frame (delta) ld [hJoyPressed], a @@ -109,7 +109,7 @@ Joypad: ; 935 ; 984 -GetJoypadPublic: ; 984 +GetJoypad: ; 984 ; Update mirror joypad input from hJoypadDown (real input) ; hJoyReleased: released this frame (delta) @@ -304,7 +304,7 @@ Functiona1b: ; a1b Functiona36: ; a36 call DelayFrame - call GetJoypadPublic + call GetJoypad ld a, [hJoyPressed] and A_BUTTON | B_BUTTON ret nz @@ -325,7 +325,7 @@ Functiona46: ; a46 ; a57 Functiona57: ; a57 - call GetJoypadPublic + call GetJoypad ld a, [$ffaa] and a ld a, [hJoyPressed] |