Apple-2-SW/Penetrator-apple2
1
0
Fork 0
mirror of https://github.com/StewBC/penetrator-apple2.git synced 2024-06-09 00:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from oliverschmidt/patch-1

Browse Source 
Fixed joystick read routine.
This commit is contained in:
StewBC 2020-01-02 01:41:26 +01:00 committed by GitHub
commit d785b58c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/apple2/input.inc
View File

@ -40,40 +40,44 @@ xchk: ; get bit 8 clear in c064 and c0
bpl goY ; bit 8 not set? bpl goY ; bit 8 not set?
nop ; wast time nop ; wast time
inx ; count the ticks inx ; count the ticks
lda $c065 ; load up/down bne :+ ; overflow?
dex ; keep $ff
: lda $c065 ; load up/down
bmi ychk ; bmi ychk ;
bpl xchk ; bpl xchk ;
ychk: ychk:
iny ; inc y counter iny ; inc y counter
jmp xchk ; goX bne :+ ; overflow?
dey ; keep $ff
: jmp xchk ; goX
goY: goY:
lda $c065 ; load up/down lda $c065 ; load up/down
bmi ychk ; bit 8 set? bmi ychk ; bit 8 set?
tya ; y is the direction analog tya ; y is the direction analog
cmp #$66 ; >= $66 is down cmp #$60 ; >= $60 is down
bcs down bcs down
cmp #$33 ; < $33 is up, $33-$65 is deadzone cmp #$10 ; < $10 is up, rest is deadzone
bcs doX bcs doX
lda #KEY_UP ; < $33 is KEY_UP digital lda #KEY_UP ; < $10 is KEY_UP digital
bne :+ bne :+
down: down:
lda #KEY_DOWN ; >= $66 is KEY_DOWN digital lda #KEY_DOWN ; >= $60 is KEY_DOWN digital
: :
ora joyMask ; update the mask ora joyMask ; update the mask
sta joyMask ; for the Y direction sta joyMask ; for the Y direction
doX: doX:
txa ; turn x into digital txa ; turn x into digital
cmp #$66 ; >= $66 is right cmp #$60 ; >= $60 is right
bcs right bcs right
cmp #$33 ; < $33 is left, rest is deadzone cmp #$10 ; < $10 is left, rest is deadzone
bcs leave bcs leave
lda #KEY_LEFT ; < $33 is KEY_LEFT digital lda #KEY_LEFT ; < $10 is KEY_LEFT digital
bne :+ bne :+
right: right:
lda #KEY_RIGHT ; > $66 is KEY_RIGHT lda #KEY_RIGHT ; > $60 is KEY_RIGHT
: :
ora joyMask ora joyMask
eor #$ff eor #$ff