diff --git a/art/anim_exported.asm b/art/anim_exported.asm index aebb0b3..8f475d7 100644 --- a/art/anim_exported.asm +++ b/art/anim_exported.asm @@ -10,26 +10,26 @@ skyp1c7 = $1A skyp1c8 = $B4 skyp1c9 = $BA power_bar - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$02,$0B,$0B,$0B,$0B,$0B,$0B,$87,$87,$87,$87,$87,$87,$0C,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$02,$0B,$0B,$0B,$0B,$0B,$0B,$87,$87,$87,$87,$87,$87,$0C,$84,$8D,$01,$01,$01,$01,$01,$01,$85 branch0 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 branch1 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$B4,$C3,$C4,$C5,$C6,$C7,$C8,$C9,$CA,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$B5,$CB,$CC,$CD,$CE,$CF,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$B4,$C3,$C4,$C5,$C6,$C7,$C8,$C9,$CA,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$B5,$CB,$CC,$CD,$CE,$CF,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 branch2 - dta $84,$01,$01,$B6,$B7,$B8,$B9,$BA,$BB,$BC,$BD,$AB,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$BE,$BF,$C0,$C1,$C2,$AA,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$25,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$25,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 - dta $84,$01,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$1E,$9F,$A0,$A1,$A2,$A3,$A4,$25,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$B6,$B7,$B8,$B9,$BA,$BB,$BC,$BD,$AB,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$BE,$BF,$C0,$C1,$C2,$AA,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$A5,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$25,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$9E,$9F,$A0,$A1,$A2,$A3,$A4,$25,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 + dta $A8,$8D,$01,$01,$01,$01,$8E,$86,$01,$01,$01,$1D,$1E,$9F,$A0,$A1,$A2,$A3,$A4,$25,$26,$01,$01,$84,$8D,$01,$01,$01,$01,$01,$01,$85 last_line_r phase1rp1c0 = $CE diff --git a/lumber.asm b/lumber.asm index 69b5c60..8b48fb5 100644 --- a/lumber.asm +++ b/lumber.asm @@ -40,7 +40,7 @@ display = $a000 .zpvar DLI_A DLI_X dliCount .byte .zpvar RMT_blocked noSfx SFX_EFFECT .byte .zpvar AutoPlay .byte ; Auto Play flag ($80 - auto) - .zpvar birdsHpos .byte + .zpvar birdsHpos .byte ; 0 - no birds on screen ; PMG registers for sprites over horizon .zpvar HPOSP0_u .byte .zpvar HPOSP1_u .byte @@ -158,6 +158,13 @@ screen_level = gamescreen_middle+9*32+13 pla tax ; fly birds + lda birdsHpos + bne fly_birds + ; if no birds then randomize new birds start + lda RANDOM + and #%11111100 ; 1:64 + bne no_birds +fly_birds lda RTCLOK+2 and #%00000011 bne no_wings_change @@ -179,7 +186,7 @@ screen_level = gamescreen_middle+9*32+13 wings_phase_a jsr PrepareBirdsCloudsPM.bird_a no_wings_change - +no_birds lda StateFlag bne wait_for_timer ; only during game diff --git a/lumber.xex b/lumber.xex index 12ca874..d665c70 100644 Binary files a/lumber.xex and b/lumber.xex differ