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

ootw: initial laser stance

Browse Source
This commit is contained in:
Vince Weaver 2019-08-09 00:37:07 -04:00
parent cec8ff9412
commit 381661a3d0
5 changed files with 108 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ootw/TODO
View File

@ -12,6 +12,11 @@ BEHAVIOR DIFFERENCES:
- earthquake can happen while on rope?
- sometimes falling rocks can follow you to next screen
+ L2
- gun movement: gun is held by head when running
- separate left facing vs right facing sprites
KNOWN BUGS:
+ ootw: pool monster grabs you a edge of pool (glitch)
+ intro: there's still a bit of a pause when the elevator door finishes opening
@ -31,9 +36,7 @@ General:
+ physicist crouch-kicking
+ physicist run+jumping
+ physicist swimming
+ physicist getting out of pool
+ beast tripping
+ physicist holding gun
+ physicist shot
+ alien shot
+ alien running
@ -113,6 +116,5 @@ Level/Checkpoint #4:
Level/Checkpoint #5:
+ Falling as enter level
+ Add rock sprites (so can walk behind them)
+ Allow falling into first pit
+ Detect X and adjust Y so we stay on ground surface

20
ootw/keyboard.s
View File

@ -78,6 +78,8 @@ left_going_left:
lda PHYSICIST_STATE
cmp #P_STANDING
beq walk_left
cmp #P_SHOOTING
beq walk_left
cmp #P_WALKING
beq run_left
cmp #P_CROUCHING
@ -95,6 +97,9 @@ left_going_right:
beq stand_right
cmp #P_STANDING
beq stand_left
cmp #P_SHOOTING
beq stand_left
cmp #P_CROUCHING
beq stand_left
@ -126,6 +131,8 @@ right_going_right:
lda PHYSICIST_STATE
cmp #P_STANDING
beq walk_right
cmp #P_SHOOTING
beq walk_right
cmp #P_WALKING
beq run_right
cmp #P_CROUCHING
@ -143,6 +150,8 @@ right_going_left:
beq stand_left
cmp #P_STANDING
beq stand_right
cmp #P_SHOOTING
beq stand_right
cmp #P_CROUCHING
beq stand_left
@ -263,9 +272,18 @@ check_space:
bne unknown
;======================
; Kick
; Kick or shoot
;======================
space:
lda HAVE_GUN
beq kick
shoot:
lda #P_SHOOTING
sta PHYSICIST_STATE
jmp done_keypress
kick:
lda #P_KICKING
sta PHYSICIST_STATE
lda #15

147
ootw/ootw_graphics/sprites/physicist.inc
View File

@ -1,4 +1,14 @@
; note, for some reason these are all facing left
; also note: too lazy to make separate sprites for running w/ gun
; don't think it would work well at this resolution anyway
; also technically should have separate sprites for facing left/right
; rather than cheating and just mirror-flipping it
; TODO:
; crouch-kick
; crouch-shoot
; zapped by laser
;=====================
;=====================
@ -10,7 +20,7 @@
; Going Left
phys_stand:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -42,7 +52,7 @@ phys_walk_progression:
phys_walk_left1:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -53,7 +63,7 @@ phys_walk_left1:
.byte $af,$af,$7a,$7c,$aa
phys_walk_left2:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -64,7 +74,7 @@ phys_walk_left2:
.byte $af,$f4,$7a,$7c,$aa
phys_walk_left3:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -75,7 +85,7 @@ phys_walk_left3:
.byte $fa,$f4,$7a,$7c,$aa
phys_walk_left4:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -86,7 +96,7 @@ phys_walk_left4:
.byte $fa,$f4,$aa,$7c,$a7
phys_walk_left5:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -97,7 +107,7 @@ phys_walk_left5:
.byte $aa,$f7,$f4,$aa,$aa
phys_walk_left6:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -108,7 +118,7 @@ phys_walk_left6:
.byte $aa,$a7,$fa,$f4,$aa
phys_walk_left7:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -119,7 +129,7 @@ phys_walk_left7:
.byte $a7,$7c,$fa,$f4,$aa
phys_walk_left8:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -130,7 +140,7 @@ phys_walk_left8:
.byte $7a,$7c,$aa,$fa,$af
phys_walk_left9:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -141,7 +151,7 @@ phys_walk_left9:
.byte $aa,$7a,$7c,$af,$aa
phys_walk_left10:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -171,7 +181,7 @@ phys_run_progression:
.word phys_run_left9
phys_run_left1:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -182,7 +192,7 @@ phys_run_left1:
.byte $aa,$fa,$f4,$aa,$aa
phys_run_left2:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -193,7 +203,7 @@ phys_run_left2:
.byte $aa,$aa,$fa,$f4,$aa
phys_run_left3:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -204,7 +214,7 @@ phys_run_left3:
.byte $a7,$a7,$fa,$af,$aa
phys_run_left4:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -215,7 +225,7 @@ phys_run_left4:
.byte $7a,$a7,$aa,$fa,$af
phys_run_left5:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -226,7 +236,7 @@ phys_run_left5:
.byte $7a,$7c,$aa,$aa,$aa
phys_run_left6:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -237,7 +247,7 @@ phys_run_left6:
.byte $aa,$7a,$7c,$aa,$aa
phys_run_left7:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -248,7 +258,7 @@ phys_run_left7:
.byte $aa,$7a,$7c,$aa,$aa
phys_run_left8:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -259,7 +269,7 @@ phys_run_left8:
.byte $af,$af,$7a,$7c,$aa
phys_run_left9:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -284,7 +294,7 @@ phys_run_left9:
; note: he needs to be facing left by default
kick1:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -294,6 +304,24 @@ kick1:
.byte $aa,$44,$a4,$ca,$aa
.byte $af,$f4,$5a,$5c,$aa
;=====================
;=====================
; SHOOTING
;=====================
;=====================
shooting1:
.byte 5,8
.byte $AA,$AA,$9A,$9A,$AA
.byte $AA,$AA,$bb,$99,$AA
.byte $0A,$0A,$AA,$0B,$AA
.byte $AA,$A0,$AB,$B0,$AA
.byte $AA,$AA,$AA,$00,$AA
.byte $AA,$AA,$AA,$44,$AA
.byte $AA,$AA,$44,$c4,$AA
.byte $AA,$fA,$f4,$7A,$7C
;=====================
;=====================
; FALLING
@ -303,7 +331,7 @@ kick1:
; note: he falls into a crouch
phys_falling:
.byte $5,$8
.byte 5,8
.byte $aa,$aa,$aa,$aa,$aa
.byte $aa,$aa,$9a,$9a,$aa
.byte $aa,$aa,$bb,$99,$aa
@ -326,7 +354,7 @@ crouch_progression:
.word crouch2
crouch1:
.byte $3,$8
.byte 3,8
.byte $aa,$aa,$aa
.byte $9a,$9a,$aa
.byte $bb,$99,$aa
@ -337,7 +365,7 @@ crouch1:
.byte $5a,$fc,$f4
crouch2:
.byte $3,$8
.byte 3,8
.byte $aa,$aa,$aa
.byte $aa,$aa,$aa
.byte $9a,$9a,$aa
@ -376,16 +404,7 @@ collapse_progression:
.word collapse5 ; 16
collapse1:
.byte $4,$8
; .byte $aa,$aa,$9a,$9a
; .byte $aa,$aa,$99,$ab
; .byte $aa,$aa,$0b,$aa
; .byte $aa,$aa,$bb,$aa
; .byte $aa,$aa,$bb,$aa
; .byte $aa,$aa,$44,$aa
; .byte $aa,$4a,$a4,$aa
; .byte $aa,$f4,$fa,$aa
.byte 4,8
.byte $9a,$9a,$aa,$aa
.byte $ab,$99,$aa,$aa
.byte $aa,$0b,$aa,$aa
@ -397,16 +416,7 @@ collapse1:
collapse2:
.byte $5,$8
; .byte $aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$99,$b9
; .byte $aa,$aa,$aa,$b9,$ab
; .byte $aa,$aa,$aa,$b0,$aa
; .byte $aa,$aa,$00,$bb,$aa
; .byte $aa,$4a,$44,$bb,$aa
; .byte $4a,$a4,$aa,$ab,$aa
; .byte $f4,$fa,$aa,$aa,$aa
.byte 5,8
.byte $aa,$aa,$aa,$aa,$aa
.byte $b9,$99,$aa,$aa,$aa
.byte $ab,$b9,$aa,$aa,$aa
@ -419,16 +429,7 @@ collapse2:
collapse3:
.byte $6,$8
; .byte $aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$9a,$9a
; .byte $aa,$aa,$aa,$aa,$99,$bb
; .byte $aa,$aa,$aa,$0a,$0b,$aa
; .byte $aa,$aa,$4a,$00,$bb,$aa
; .byte $fa,$44,$44,$a0,$bb,$aa
; .byte $ff,$a4,$aa,$aa,$ab,$aa
.byte 6,8
.byte $aa,$aa,$aa,$aa,$aa,$aa
.byte $aa,$aa,$aa,$aa,$aa,$aa
.byte $9a,$9a,$aa,$aa,$aa,$aa
@ -439,16 +440,7 @@ collapse3:
.byte $aa,$ab,$aa,$aa,$a4,$ff
collapse4:
.byte $7,$8
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$9a,$9a
; .byte $aa,$aa,$aa,$0a,$00,$bb,$99
; .byte $fa,$4a,$44,$00,$bb,$aa,$aa
; .byte $ff,$a4,$aa,$bb,$aa,$aa,$aa
.byte 7,8
.byte $aa,$aa,$aa,$aa,$aa,$aa,$aa
.byte $aa,$aa,$aa,$aa,$aa,$aa,$aa
.byte $aa,$aa,$aa,$aa,$aa,$aa,$aa
@ -460,16 +452,7 @@ collapse4:
collapse5:
.byte $8,$8
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
; .byte $aa,$4a,$bb,$00,$b0,$00,$b9,$99
; .byte $ff,$44,$b4,$bb,$aa,$aa,$ab,$a9
.byte 8,8
.byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
.byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
.byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa
@ -500,7 +483,7 @@ phys_jump_progression:
jump1:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa
@ -511,7 +494,7 @@ jump1:
.byte $fa,$f4,$5c,$aa,$aa
jump2:
.byte $5,$8
.byte 5,8
.byte $9a,$9a,$aa,$aa,$aa
.byte $bb,$99,$aa,$aa,$aa
.byte $aa,$0b,$00,$aa,$aa
@ -522,7 +505,7 @@ jump2:
.byte $fa,$f4,$5c,$aa,$aa
jump3:
.byte $5,$8
.byte 5,8
.byte $9a,$9a,$aa,$aa,$aa
.byte $bb,$99,$aa,$aa,$aa
.byte $aa,$0b,$00,$aa,$aa
@ -533,7 +516,7 @@ jump3:
.byte $fa,$f4,$5a,$a5,$aa
jump4:
.byte $5,$8
.byte 5,8
.byte $9a,$9a,$aa,$aa,$aa
.byte $bb,$99,$aa,$aa,$aa
.byte $aa,$0b,$00,$aa,$aa
@ -544,7 +527,7 @@ jump4:
.byte $aa,$aa,$f4,$f4,$aa
jump5:
.byte $5,$8
.byte 5,8
.byte $b9,$99,$aa,$aa,$aa
.byte $ab,$b9,$aa,$aa,$aa
.byte $ba,$b0,$0b,$aa,$aa
@ -555,7 +538,7 @@ jump5:
.byte $aa,$aa,$aa,$aa,$af
jump6:
.byte $5,$8
.byte 5,8
.byte $aa,$b9,$99,$aa,$aa
.byte $aa,$ab,$b9,$aa,$aa
.byte $ab,$ba,$b0,$aa,$aa
@ -566,7 +549,7 @@ jump6:
.byte $a5,$a5,$aa,$aa,$aa
jump7:
.byte $5,$8
.byte 5,8
.byte $aa,$b9,$99,$aa,$aa
.byte $aa,$ab,$b9,$aa,$aa
.byte $aa,$aa,$b0,$aa,$aa
@ -577,7 +560,7 @@ jump7:
.byte $a5,$a5,$aa,$aa,$aa
jump8:
.byte $5,$8
.byte 5,8
.byte $aa,$9a,$9a,$aa,$aa
.byte $aa,$bb,$99,$aa,$aa
.byte $aa,$aa,$0b,$aa,$aa

17
ootw/physicist.s
View File

@ -72,6 +72,7 @@ pstate_table_lo:
.byte <physicist_standing ; 08 swinging
.byte <physicist_standing ; 09 elevator up
.byte <physicist_standing ; 0A elevator down
.byte <physicist_shooting ; 0B
pstate_table_hi:
.byte >physicist_standing
@ -85,6 +86,7 @@ pstate_table_hi:
.byte >physicist_standing ; 08 swinging
.byte >physicist_standing ; 09 elevator up
.byte >physicist_standing ; 0A elevator down
.byte >physicist_shooting ; 0B
; Urgh, make sure this doesn't end up at $FF or you hit the
; NMOS 6502 bug
@ -124,6 +126,21 @@ physicist_standing:
jmp finally_draw_him
;==================================
; SHOOTING
;==================================
physicist_shooting:
lda #<shooting1
sta INL
lda #>shooting1
sta INH
jmp finally_draw_him
;==================================
; KICKING
;==================================

2
ootw/zp.inc
View File

@ -180,7 +180,7 @@ PHYSICIST_STATE = $EA
P_SWINGING = $08 ; no keypress
P_ELEVATING_UP = $09
P_ELEVATING_DOWN = $0A
P_SHOOTING = $0B
BUBBLES_Y = $EB ; C1 underwater
BEFORE_SWING = $EB ; C1