Apple-2-SW/flapple
1
0
Fork 0
mirror of https://github.com/digarok/flapple.git synced 2024-06-08 20:29:44 +00:00
Code Issues Projects Releases Wiki Activity

optimization passes... with some versions i've tried

Browse Source
This commit is contained in:
Dagen Brock 2014-05-04 16:34:05 -05:00
parent 31c0fc17dc
commit 6036d76c59
3 changed files with 117 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bird.s
View File

@ -179,7 +179,7 @@ UndrawBird lda BIRD_Y
iny
dex
bne :wipe2
rts
jmp UndrawBirdDone
@ -228,7 +228,7 @@ UndrawBird lda BIRD_Y
iny
dex
bne :wipe4
rts
jmp UndrawBirdDone
DrawBird
lda BIRD_X
@ -266,10 +266,6 @@ DrawBird
CopyPtr BIRD_WUP_O_AUX;SPRITE_AUX_P
CopyPtr BIRD_WUP_O_MASK;SPRITE_MASK_P
CopyPtr BIRD_WUP_O_IMASK;SPRITE_IMASK_P
:TEST1 CopyPtr BIRD_WDN_O_MAIN;SPRITE_MAIN_P
CopyPtr BIRD_WDN_O_AUX;SPRITE_AUX_P
CopyPtr BIRD_WDN_O_MASK;SPRITE_MASK_P
CopyPtr BIRD_WDN_O_IMASK;SPRITE_IMASK_P
jmp :drawSprite
:flapDownOdd CopyPtr BIRD_WDN_O_MAIN;SPRITE_MAIN_P
CopyPtr BIRD_WDN_O_AUX;SPRITE_AUX_P
@ -278,5 +274,5 @@ DrawBird
jmp :drawSprite
:drawSprite
jsr DrawSpriteBetter
rts
jmp DrawBirdDone

46
src/flapple.s
View File

@ -41,7 +41,28 @@ GameLoop
; update player / draw (w/collision)
; update score
jsr UndrawBird
jmp UndrawBird
UndrawBirdDone
jmp UpdatePipes
UpdatePipesDone
jmp DrawScore
DrawScoreDone
jmp HandleInput
HandleInputDone
jmp DrawBird
DrawBirdDone
jmp UpdateGrass
UpdateGrassDone
jsr FlapBird
jsr VBlank
;jsr WaitKey
lda QuitFlag
beq GameLoop
bne Quit
HandleInput
:kloop lda KEY
bpl :noKey
:key sta STROBE
@ -55,24 +76,7 @@ GameLoop
bpl :keyDone
:up dec BIRD_Y
:noKey
:keyDone
jsr UpdatePipes
;jsr BirdTest
jsr DrawBird
jsr VBlank
jsr DrawScore
jsr UpdateGrass
jsr FlapBird
jsr VBlank
;jsr WaitKey
clc
bcc GameLoop
:keyDone jmp HandleInputDone
QuitFlag db 0 ; set to 1 to quit
@ -113,7 +117,7 @@ DrawScore lda ScoreLo
ldx #18
sta Lo01,x
sta Lo02,x
rts
jmp DrawScoreDone
ScoreUp sed
lda ScoreLo
@ -221,7 +225,7 @@ UpdateGrass inc GrassState
inx
cpx #40
bcc :lp8
rts
jmp UpdateGrassDone
GrassState db 00
GrassTop hex CE,CE,4E,4E,CE,CE,4E,4E

127
src/pipes.s
View File

@ -25,11 +25,16 @@ PipeSpr_Main
hex 55,e5,e5,c5,e5,c5,c5,c5,c5,45,c5,45,45,55,77
hex 55,5e,5e,5c,5e,5c,5c,5c,5c,54,5c,54,54,55,77
hex 77,55,ee,ee,cc,ee,cc,cc,44,cc,44,44,55,77,77
PipeBody_Main_E hex 55,ee,ee,cc,cc,44,77
PipeBody_Main_O hex 77,ee,cc,cc,44,44,55,77
PipeSpr_Aux
hex aa,7a,7a,6a,7a,6a,6a,6a,6a,2a,6a,2a,2a,aa,bb
hex aa,a7,a7,a6,a7,a6,a6,a6,a6,a2,a6,a2,a2,aa,bb
hex bb,aa,77,77,66,77,66,66,22,66,22,22,aa,bb,bb
PipeBody_Aux_E hex bb,77,66,66,22,22,aa,bb
PipeBody_Aux_O hex aa,77,77,66,66,22,bb
PipeInterval equ #60 ; game ticks to spawn new pipe
PipeSpawn db 0 ; our counter
@ -73,8 +78,12 @@ UpdatePipes inc PipeSpawn
jsr SpawnPipe
lda #0
sta PipeSpawn
:noSpawn jsr MoveDrawPipes
rts
:noSpawn
MoveDrawPipes
jsr DrawPipes
jsr MovePipes
jmp UpdatePipesDone
SpawnPipe lda PipeSpawnSema
asl ; convert to word index
@ -97,26 +106,20 @@ SpawnPipe lda PipeSpawnSema
sta PipeSpawnSema
:done rts
MoveDrawPipes
jsr DrawPipes
jsr MovePipes
rts
MovePipes
ldx #0
ldx #2 ;MaxPipes*2?
:loop lda BotPipes,x
beq :noPipe
dec BotPipes,x
dec TopPipes,x
lda TopPipes,x
cmp #PipeXScore
cmp #PipeXScore+1 ; A should still be set
bne :noScore
jsr ScoreUp
:noScore
:noPipe inx
inx
cpx #4
bcc :loop
:noPipe dex
dex
bpl :loop
rts
@ -224,6 +227,9 @@ DrawPipe
DrawPipeOdd jsr SetPipeCapPtrs
sta TXTPAGE1
ldy PIPE_X_IDX ; y= the x offset... yay dp indexing on 6502
ldx #0
:l1_loop lda PipeSpr_Main,x
sta (PIPE_DP),y
@ -287,49 +293,94 @@ DrawPipeOddB
*** Draw Body - Odd Full & Right version
DrawPipeBodyOdd
:loop lda PIPE_Y_IDX
tay
lsr ; /2
cmp PIPE_BODY_BOT
bcs :done
ldy PIPE_Y_IDX ; revert to table-lookup form
;ldy PIPE_Y_IDX ; revert to table-lookup form
lda LoLineTable,y
sta PIPE_DP
lda LoLineTable+1,y
sta PIPE_DP+1 ; pointer to line on screen
sta TXTPAGE1
ldy PIPE_X_IDX
ldx #0
:l1_loop cpy #PIPE_RCLIP
beq :l1_clip_break
lda 2*PIPE_WIDTH+PipeSpr_Main,x ; line 2
*** Version1
* ldy PIPE_X_IDX
* ldx #0
*:l1_loop cpy #PIPE_RCLIP
* beq :l1_clip_break
* lda 2*PIPE_WIDTH+PipeSpr_Main,x ; line 2
* sta (PIPE_DP),y
* iny
* inx
* inx
* cpx #PIPE_WIDTH
* bcc :l1_loop
*:l1_clip_break
*** Version 2
* ldy PIPE_X_IDX
* ldx #0
*:testloop cpy #PIPE_RCLIP
* beq :test_break
* lda PipeBody_Main_O,x
* sta (PIPE_DP),y
* iny
* inx
* cpx #PIPE_WIDTH/2
* bcc :testloop
*** Version 2.1
lda PIPE_X_IDX
clc
adc #PIPE_WIDTH/2
pha ;PHA for below loop
tay
ldx #PIPE_WIDTH/2
:oddLoop cpy #PIPE_RCLIP
bcs :oddBreak
lda PipeBody_Main_O,x
sta (PIPE_DP),y
iny
inx
inx
cpx #PIPE_WIDTH
bcc :l1_loop
:l1_clip_break
:oddBreak
dey
dex
bne :oddLoop ; we can skip the first pixel, transparent
sta TXTPAGE2
ldy PIPE_X_IDX
iny ; THE MOST IMPORTANT INY EVAR!!! :P
ldx #1
:l2_loop cpy #PIPE_RCLIP
beq :l2_clip_break
lda 2*PIPE_WIDTH+PipeSpr_Aux,x ; line 2
*** Version 1
* ldy PIPE_X_IDX
* iny ; THE MOST IMPORTANT INY EVAR!!! :P
* ldx #1
*:l2_loop cpy #PIPE_RCLIP
* beq :l2_clip_break
* lda 2*PIPE_WIDTH+PipeSpr_Aux,x ; line 2
* sta (PIPE_DP),y
* iny
* inx
* inx
* cpx #PIPE_WIDTH
* bcc :l2_loop
*:l2_clip_break
*** Version 2.1
pla
tay ;PHA from above
ldx #PIPE_WIDTH/2-1
:evenLoop cpy #PIPE_RCLIP
bcs :evenBreak
lda PipeBody_Aux_O,x
sta (PIPE_DP),y
iny
inx
inx
cpx #PIPE_WIDTH
bcc :l2_loop
:l2_clip_break
:evenBreak
dey
dex
bpl :evenLoop
inc PIPE_Y_IDX
inc PIPE_Y_IDX
sec
bcs :loop
:done rts