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

Joystick labels, deadzone

Browse Source 
Updated the deadzone and used labels not addresses for Joystick ports
This commit is contained in:
StewBC 2020-01-16 08:48:12 -08:00
parent 0b599da677
commit 3c4b4df6c0
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/apple2/defs.inc
View File

@ -11,8 +11,12 @@
ram_layer0 = $2000 ; HGR Pages ram_layer0 = $2000 ; HGR Pages
ram_layer1 = $4000 ram_layer1 = $4000
speaker_toggle = $C030 speaker_toggle = $C030
PADDL0 = $C064
PTRIG = $C070
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; self-modifying address marker ; self-modifying address marker
PLACEHOLDER = $FFFF PLACEHOLDER = $FFFF

39
src/apple2/input.inc
View File

@ -15,53 +15,59 @@
lda #0 ; assume no buttons lda #0 ; assume no buttons
sta joyMask ; init the mask sta joyMask ; init the mask
lda $c061 ; check RDBTN0 lda BUTN0 ; check RDBTN0
cmp #$80 ; fully active cmp #$80 ; fully active
bne :+ ; no, ignore bne :+ ; no, ignore
lda #KEY_FIRE ; RDBTN0 maps to fire lda #KEY_FIRE ; RDBTN0 maps to fire
sta joyMask ; init the mask sta joyMask ; init the mask
: :
lda $c062 ; check BUTN1 lda BUTN1 ; check BUTN1
cmp #$80 ; fully active cmp #$80 ; fully active
bne :+ ; no, ignore bne :+ ; no, ignore
lda joyMask lda joyMask
ora #KEY_BOMB ; BUTN1 maps to Bomb ora #KEY_BOMB ; BUTN1 maps to Bomb
sta joyMask ; update the mask sta joyMask ; update the mask
: :
lda $c070 ; Reset the input lda PTRIG ; Reset the input
ldy #0 ; zero the direction counters ldy #0 ; zero the direction counters
ldx #0 ldx #0
xchk: ; get bit 8 clear in c064 and c065 xchk: ; get bit 8 clear in c064 and c065
lda $c064 ; load left/right lda PADDL0 ; load left/right
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
bne :+ ; overflow? bne :+ ; overflow?
dex ; keep $ff dex ; keep $ff
: lda $c065 ; load up/down :
lda PADDL0 + 1 ; load up/down
bmi ychk ; bmi ychk ;
bpl xchk ; bpl xchk ;
ychk: ychk:
iny ; inc y counter iny ; inc y counter
bne :+ ; overflow? bne :+ ; overflow?
dey ; keep $ff dey ; keep $ff
: jmp xchk ; goX :
jmp xchk ; goX
goY: goY:
lda $c065 ; load up/down lda PADDL0 + 1 ; 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 #$60 ; >= $60 is down cmp #$60 ; >= $60 is down
bcs down bcs down
cmp #$10 ; < $10 is up, rest is deadzone cmp #$20 ; < $20 is up, rest is deadzone
bcs doX bcs doX
lda #KEY_UP ; < $10 is KEY_UP digital lda #KEY_UP ; < $20 is KEY_UP digital
bne :+ bne :+
down: down:
lda #KEY_DOWN ; >= $60 is KEY_DOWN digital lda #KEY_DOWN ; >= $60 is KEY_DOWN digital
: :
@ -72,10 +78,11 @@ doX:
txa ; turn x into digital txa ; turn x into digital
cmp #$60 ; >= $60 is right cmp #$60 ; >= $60 is right
bcs right bcs right
cmp #$10 ; < $10 is left, rest is deadzone cmp #$20 ; < $20 is left, rest is deadzone
bcs leave bcs leave
lda #KEY_LEFT ; < $10 is KEY_LEFT digital lda #KEY_LEFT ; < $20 is KEY_LEFT digital
bne :+ bne :+
right: right:
lda #KEY_RIGHT ; > $60 is KEY_RIGHT lda #KEY_RIGHT ; > $60 is KEY_RIGHT
: :
@ -388,7 +395,7 @@ joyDone:
bit Bit7Mask ; FIRE should eq 1 player bit Bit7Mask ; FIRE should eq 1 player
beq :+ beq :+
lda #KEY_RIGHT lda #KEY_RIGHT
bne check ; JuMP bne check ; JuMP
: :
bit Bit8Mask ; BOMB should eq 2 player bit Bit8Mask ; BOMB should eq 2 player
@ -408,11 +415,13 @@ check:
done: done:
and #$7f and #$7f
beq :+ beq :+
pha
lda #AUDIO_UI_TICK pha ; Save the "key"
lda #AUDIO_UI_TICK ; make a sound
sta audioFrame sta audioFrame
jsr serviceAudio jsr serviceAudio
pla pla ; restore the "key"
: :
rts ; upon return 0 means no interaction, anything else is a user input rts ; upon return 0 means no interaction, anything else is a user input