Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-02-11 01:30:53 +00:00
Code Issues Projects Releases Wiki Activity

ootw: fix up the keyboard handler a bit

Browse Source 
can now use up to stand from a crouch w/o jumping.

also fixed a bug when turning right when crouching left
This commit is contained in:
Vince Weaver 2019-08-16 11:13:51 -04:00
parent 4419a7e0d8
commit f1cf10b0b8
2 changed files with 61 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
ootw/keyboard.s
View File

@ -72,10 +72,13 @@ check_left:
;==================== ;====================
; Left Pressed ;====================
; Left/A Pressed
;====================
;==================== ;====================
left_pressed: left_pressed:
inc GUN_FIRE inc GUN_FIRE ; fire gun if charging
; left==0 ; left==0
lda DIRECTION ; if facing right, turn to face left lda DIRECTION ; if facing right, turn to face left
bne left_going_right bne left_going_right
@ -122,15 +125,16 @@ check_right:
cmp #$15 cmp #$15
bne check_up bne check_up
;=================== ;===================
; Right Pressed ;===================
; Right/D Pressed
;===================
;=================== ;===================
right_pressed: right_pressed:
inc GUN_FIRE inc GUN_FIRE ; fire if charging
; right==1 ; right==1
lda DIRECTION ; if facing right, turn to face left lda DIRECTION ; if facing left, turn to face right
beq right_going_left beq right_going_left
@ -160,7 +164,7 @@ right_going_left:
cmp #P_SHOOTING cmp #P_SHOOTING
beq stand_right beq stand_right
cmp #P_CROUCHING cmp #P_CROUCHING
beq stand_left beq stand_right
;=========================== ;===========================
; otherwise? ; otherwise?
@ -220,9 +224,11 @@ check_up:
cmp #$0B cmp #$0B
bne check_down bne check_down
up: up:
;======================== ;=============================
; UP -- Jump ;=============================
;======================== ; Up/W Pressed -- Jump, Get up
;=============================
;=============================
inc GUN_FIRE inc GUN_FIRE
@ -231,29 +237,41 @@ up:
up_on_elevator: up_on_elevator:
lda #P_ELEVATING_UP lda #P_ELEVATING_UP
sta PHYSICIST_STATE jmp change_state_clear_gait
lda #0
sta GAIT
jmp done_keypress
up_not_elevator: up_not_elevator:
lda PHYSICIST_STATE
cmp #P_CROUCHING
beq stand_up
cmp #P_CROUCH_SHOOTING
beq stand_up_shoot
up_jump:
lda #P_JUMPING lda #P_JUMPING
sta PHYSICIST_STATE jmp change_state_clear_gait
lda #0
sta GAIT
jmp done_keypress stand_up:
lda #P_STANDING
jmp change_state_clear_gait
stand_up_shoot:
lda #P_SHOOTING
jmp change_state_clear_gait
;==========================
check_down: check_down:
cmp #'S' cmp #'S'
beq down beq down
cmp #$0A cmp #$0A
bne check_gun bne check_gun
;====================== ;==========================
; DOWN -- Crouch ;==========================
;====================== ; Down/S Pressed -- Crouch
;==========================
;==========================
down: down:
lda ON_ELEVATOR lda ON_ELEVATOR
@ -261,18 +279,22 @@ down:
down_on_elevator: down_on_elevator:
lda #P_ELEVATING_DOWN lda #P_ELEVATING_DOWN
sta PHYSICIST_STATE jmp change_state_clear_gait
lda #0
sta GAIT
jmp done_keypress
down_not_elevator: down_not_elevator:
lda #P_CROUCHING lda PHYSICIST_STATE
sta PHYSICIST_STATE cmp #P_SHOOTING
lda #0 bne start_crouch
sta GAIT
jmp done_keypress lda #P_CROUCH_SHOOTING
jmp change_state_clear_gait
start_crouch:
lda #P_CROUCHING
jmp change_state_clear_gait
;==========================
check_gun: check_gun:
cmp #'L' cmp #'L'
@ -324,9 +346,7 @@ shoot:
no_stance: no_stance:
lda #P_SHOOTING lda #P_SHOOTING
sta PHYSICIST_STATE jmp change_state_clear_gait
jmp done_keypress
kick: kick:
lda #P_KICKING lda #P_KICKING
@ -338,3 +358,10 @@ done_keypress:
bit KEYRESET ; clear the keyboard strobe ; 4 bit KEYRESET ; clear the keyboard strobe ; 4
rts ; 6 rts ; 6
change_state_clear_gait:
sta PHYSICIST_STATE
lda #0
sta GAIT
jmp done_keypress

1
ootw/zp.inc
View File

@ -210,6 +210,7 @@ PHYSICIST_STATE = $EA
P_SHOOTING = $0B P_SHOOTING = $0B
P_FALLING_DOWN = $0C P_FALLING_DOWN = $0C
P_IMPALED = $0D P_IMPALED = $0D
P_CROUCH_SHOOTING = $0E
BUBBLES_Y = $EB ; C1 underwater BUBBLES_Y = $EB ; C1 underwater
BEFORE_SWING = $EB ; C1 BEFORE_SWING = $EB ; C1