From 6b9ff174c4cc9c9cdc5fe004f494023aec2121f5 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Tue, 24 Jun 2025 18:44:56 +0200 Subject: [PATCH] New clouds --- art/credits.asm | 1 + lumber.asm | 96 +++++++++++++++++++++++++++++++----------------- lumber.xex | Bin 38096 -> 38262 bytes 3 files changed, 63 insertions(+), 34 deletions(-) diff --git a/art/credits.asm b/art/credits.asm index 0b56f88..a6c7aef 100644 --- a/art/credits.asm +++ b/art/credits.asm @@ -9,3 +9,4 @@ dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$46,$47,$26,$2F,$20,$21,$3A,$3B,$26,$35,$44,$45,$31,$00,$46,$47,$24,$3D,$08,$09,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 dta $00,$46,$47,$24,$3D,$38,$39,$26,$29,$26,$35,$31,$03,$46,$47,$26,$27,$24,$25,$02,$00,$24,$25,$30,$26,$29,$54,$55,$36,$37,$26,$29,$4C,$4D,$30,$24,$25,$52,$53,$31 dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$36,$37,$30,$24,$25,$26,$29,$3A,$3B,$24,$25,$26,$29,$26,$27,$31,$00,$22,$13,$50,$51,$31,$00,$00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$26,$27,$30,$24,$2D,$30,$46,$47,$20,$21,$36,$37,$58,$00,$38,$39,$26,$29,$36,$37,$24,$3D,$26,$27,$50,$51,$31,$00,$0E,$0F,$1E,$1F,$1C,$13,$14,$15,$31,$00 diff --git a/lumber.asm b/lumber.asm index 2c8345d..aeb6e33 100644 --- a/lumber.asm +++ b/lumber.asm @@ -12,7 +12,7 @@ ;--------------------------------------------------- .macro build - dta d"0.68" ; number of this build (4 bytes) + dta d"0.70" ; number of this build (4 bytes) .endm .macro RMTSong @@ -2615,7 +2615,7 @@ make_cloud1 lda RANDOM and #%00000011 clc - adc #4 ; (4 to 7 = shapes 5 to 8) + adc #6 ; (6 to 9 = shapes 7 to 10) bne fill_cloud make_cloud2 ; clear cloud 2 PMG memory @@ -2632,7 +2632,7 @@ make_cloud2 lda RANDOM and #%00000011 clc - adc #2 ; (2 to 5 = shapes 3 to 6) + adc #3 ; (3 to 6 = shapes 4 to 7) bne fill_cloud make_cloud3 ; clear cloud 3 PMG memory @@ -2651,7 +2651,7 @@ make_cloud3 ; fill cloud PMG memory fill_cloud ldx #datalines_clouds-1 - and #%00000111 + and #%00001111 bne not_shape_1 ; shape1 @ lda cloud1_P2,x @@ -2749,6 +2749,8 @@ not_shape_6 bpl @- rts not_shape_7 + cmp #7 + bne not_shape_8 ; shape 8 @ lda cloud8_P2,x sta PMmemory+$300,y @@ -2760,6 +2762,32 @@ not_shape_7 dex bpl @- rts +not_shape_8 + cmp #8 + bne not_shape_9 + ; shape 9 +@ lda cloud9_P2,x + sta PMmemory+$300,y + lda cloud9_P3,x + sta PMmemory+$380,y + lda cloud9_M,x + sta PMmemory+$180,y + dey + dex + bpl @- + rts +not_shape_9 + ; shape 10 +@ lda cloud10_P2,x + sta PMmemory+$300,y + lda cloud10_P3,x + sta PMmemory+$380,y + lda cloud10_M,x + sta PMmemory+$180,y + dey + dex + bpl @- + rts ; clouds data ; shapes 1 to 10 for clouds ; player 2 @@ -2767,63 +2795,63 @@ cloud1_P2 .by $00,$00,$00,$00,$08,$1D,$3F,$3F,$00,$00,$00,$00 cloud2_P2 .by $00,$00,$00,$00,$07,$1F,$3F,$FF,$00,$00,$00,$00 -;cloud3_P2 -; .by $00,$00,$00,$00,$39,$7D,$FF,$FF,$00,$00,$00,$00 -cloud3_P2 ; => cloud4_P2 +cloud3_P2 + .by $00,$00,$00,$00,$39,$7D,$FF,$FF,$00,$00,$00,$00 +cloud4_P2 .by $00,$00,$00,$38,$7D,$FF,$FF,$FF,$00,$00,$00,$00 -cloud4_P2 ; => cloud5_P2 +cloud5_P2 .by $00,$00,$00,$0E,$1F,$1F,$7F,$FF,$FF,$00,$00,$00 -;cloud6_P2 -; .by $00,$00,$00,$38,$7C,$7C,$FD,$FD,$FF,$FF,$00,$00 -cloud5_P2 ; => cloud7_P2 +cloud6_P2 + .by $00,$00,$00,$38,$7C,$7C,$FD,$FD,$FF,$FF,$00,$00 +cloud7_P2 .by $00,$00,$00,$00,$01,$73,$FF,$FF,$FF,$FF,$00,$00 -cloud6_P2 ; => cloud8_P2 +cloud8_P2 .by $00,$00,$00,$3E,$FF,$FF,$FF,$FF,$FF,$7C,$00,$00 -cloud7_P2 ; => cloud9_P2 +cloud9_P2 .by $00,$00,$01,$03,$77,$FF,$FF,$FF,$FF,$FF,$07,$01 -cloud8_P2 ; => cloud10_P2 +cloud10_P2 .by $00,$0F,$1F,$BF,$FF,$FF,$FF,$FF,$FF,$FF,$1F,$07 ; player 3 cloud1_P3 .by $00,$00,$00,$00,$00,$80,$E0,$F8,$00,$00,$00,$00 cloud2_P3 .by $00,$00,$00,$00,$80,$DC,$FE,$FF,$00,$00,$00,$00 -;cloud3_P3 -; .by $00,$00,$00,$F0,$F8,$FA,$FF,$FF,$00,$00,$00,$00 -cloud3_P3 ; => cloud4_P3 +cloud3_P3 + .by $00,$00,$00,$F0,$F8,$FA,$FF,$FF,$00,$00,$00,$00 +cloud4_P3 .by $00,$00,$00,$C0,$F0,$FC,$FE,$FF,$00,$00,$00,$00 -cloud4_P3 ; => cloud5_P3 +cloud5_P3 .by $00,$00,$00,$30,$78,$78,$FB,$FF,$FF,$00,$00,$00 -;cloud6_P3 -; .by $00,$00,$00,$00,$00,$E0,$F0,$F6,$FF,$FF,$00,$00 -cloud5_P3 ; => cloud7_P3 +cloud6_P3 + .by $00,$00,$00,$00,$00,$E0,$F0,$F6,$FF,$FF,$00,$00 +cloud7_P3 .by $00,$00,$00,$00,$C0,$F6,$FF,$FF,$FF,$FF,$00,$00 -cloud6_P3 ; => cloud8_P3 +cloud8_P3 .by $00,$00,$00,$00,$7C,$FF,$FF,$FF,$FF,$FF,$00,$00 -cloud7_P3 ; => cloud9_P3 +cloud9_P3 .by $00,$00,$F0,$FB,$FF,$FF,$FF,$FF,$FF,$FF,$FC,$F8 -cloud8_P3 ; => cloud10_P3 +cloud10_P3 .by $0F,$1F,$BF,$FF,$FF,$FF,$FF,$FF,$FF,$FC,$C0,$80 ; missiles cloud1_M .by $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 cloud2_M .by $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -;cloud3_M -; .by $00,$00,$00,$00,$00,$00,$00,$80,$00,$00,$00,$00 -cloud3_M ; => cloud4_M +cloud3_M + .by $00,$00,$00,$00,$00,$00,$00,$80,$00,$00,$00,$00 +cloud4_M .by $00,$00,$00,$00,$00,$00,$10,$30,$00,$00,$00,$00 -cloud4_M ; => cloud5_M +cloud5_M .by $00,$00,$00,$00,$00,$00,$00,$00,$90,$00,$00,$00 -;cloud6_M -; .by $00,$00,$00,$00,$00,$00,$00,$00,$10,$B0,$00,$00 -cloud5_M ; => cloud7_M +cloud6_M + .by $00,$00,$00,$00,$00,$00,$00,$00,$10,$B0,$00,$00 +cloud7_M .by $00,$00,$00,$00,$00,$00,$00,$10,$B0,$F0,$00,$00 -cloud6_M ; => cloud8_M +cloud8_M .by $00,$00,$00,$00,$10,$30,$B0,$B0,$90,$00,$00,$00 -cloud7_M ; => cloud9_M +cloud9_M .by $00,$00,$00,$80,$C0,$C0,$D0,$F0,$F0,$80,$00,$00 -cloud8_M ; => cloud10_M +cloud10_M .by $00,$80,$80,$D0,$F0,$F0,$F0,$F0,$B0,$10,$00,$00 diff --git a/lumber.xex b/lumber.xex index 7c0be7f339581b083fe5ab022501ee94eb6b0e83..0d0f710cf4d06bdb13962ac322d9727b438070d2 100644 GIT binary patch delta 4503 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 delta 4453 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