From 10711880e6ba3a387687b24dcf1601b6f8bc7682 Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Wed, 19 Mar 2025 21:14:25 +0100
Subject: [PATCH] Random clouds shapes

---
 lumber.asm |  85 ++++++++++++++++++++++++++++++++++-------------------
 lumber.xex | Bin 25243 -> 25281 bytes
 2 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/lumber.asm b/lumber.asm
index 8d8e9d9..6501a29 100644
--- a/lumber.asm
+++ b/lumber.asm
@@ -1023,19 +1023,9 @@ make_cloud1
     dex
     bpl @-
     randomize 0 (28-5-datalines_clouds)
-    adc #(datalines_clouds-1)
+    adc #(datalines_clouds-1+5)
     tay
-    ldx #datalines_clouds-1
-@   lda cloud2_P2,x
-    sta PMmemory+$300+5,y
-    lda cloud2_P3,x
-    sta PMmemory+$380+5,y
-    lda cloud2_M,x
-    sta PMmemory+$180+5,y
-    dey
-    dex
-    bpl @-
-    rts
+    bne fill_cloud
 make_cloud2
     ; clear cloud 2 PMG memory 
     ldx #(52-29)
@@ -1046,19 +1036,9 @@ make_cloud2
     dex
     bpl @-
     randomize 0 (52-29-datalines_clouds)
-    adc #(datalines_clouds-1)
+    adc #(datalines_clouds-1+29)
     tay
-    ldx #datalines_clouds-1
-@   lda cloud3_P2,x
-    sta PMmemory+$300+29,y
-    lda cloud3_P3,x
-    sta PMmemory+$380+29,y
-    lda cloud3_M,x
-    sta PMmemory+$180+29,y
-    dey
-    dex
-    bpl @-
-    rts
+    bne fill_cloud
 make_cloud3
     ; clear cloud 3 PMG memory 
     ldx #(84-53)
@@ -1069,15 +1049,61 @@ make_cloud3
     dex
     bpl @-
     randomize 0 (70-53-datalines_clouds)
-    adc #(datalines_clouds-1)
+    adc #(datalines_clouds-1+53)
     tay
+    ; fill cloud PMG memory
+fill_cloud
     ldx #datalines_clouds-1
+    lda RANDOM
+    and #%00000011
+    bne not_shape_1
+    ; shape1
+@   lda cloud1_P2,x
+    sta PMmemory+$300,y
+    lda cloud1_P3,x
+    sta PMmemory+$380,y
+    lda cloud1_M,x
+    sta PMmemory+$180,y
+    dey
+    dex
+    bpl @-
+    rts
+not_shape_1
+    cmp #1
+    bne not_shape_2
+    ; shape 2
+@   lda cloud2_P2,x
+    sta PMmemory+$300,y
+    lda cloud2_P3,x
+    sta PMmemory+$380,y
+    lda cloud2_M,x
+    sta PMmemory+$180,y
+    dey
+    dex
+    bpl @-
+    rts
+not_shape_2
+    cmp #2
+    bne not_shape_3
+    ; shape 3
+@   lda cloud3_P2,x
+    sta PMmemory+$300,y
+    lda cloud3_P3,x
+    sta PMmemory+$380,y
+    lda cloud3_M,x
+    sta PMmemory+$180,y
+    dey
+    dex
+    bpl @-
+    rts
+not_shape_3
+    ; shape 4
 @   lda cloud4_P2,x
-    sta PMmemory+$300+53,y
+    sta PMmemory+$300,y
     lda cloud4_P3,x
-    sta PMmemory+$380+53,y
+    sta PMmemory+$380,y
     lda cloud4_M,x
-    sta PMmemory+$180+53,y
+    sta PMmemory+$180,y
     dey
     dex
     bpl @-
@@ -1112,9 +1138,6 @@ cloud4_P3
 cloud4_M
     .by $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$90
 datalines_clouds=12
-Hoffset_cloud1=8
-Hoffset_cloud2=30
-Hoffset_cloud3=54
 .endp
 ;--------------------------------------------------
 .proc SetPMl1
diff --git a/lumber.xex b/lumber.xex
index 209417a01a0babe2ebcfd81c3a2c1117427e17a6..855ae369c936ce4ae9276e4fe044bb1a953b1b01 100644
GIT binary patch
delta 2649
zcmbVOTTC2f6y6(@(iAobEwXL=fsz6muw_XQwXK!bOHt&ir9g*jt6QxQp9Hnb?aU6B
zX+q|~(1zHoS;G*=wjr%Hx<;d*!$UK%+@a7XVm0DCG{O3!|Cxb>pH+)&CNq1!^UZfI
z|IB~p!l3orLF?tKaW;GVz~^zWFF|jWXQ5}PCvaYiQKEm!_(R)FVx;2Y_~>(dpj-V*
z-$F8_y5c*DAdo!`WWHIpkefhmzbkLT>n>iZFDY{rfImX|y=0p-Tar;Z34>jly)doO
zxZkG5lT1O4)K9CM^as=!Edsj9aX#QPD1}80)SL&>z>@+{CP2?pty+RI33{|@(;|ug
zgTm5A((yh$E0a=fX?$78_0D_fs%)g^kjCyM4coGYm1<<2MdCJ8GKCSWX+rR@*8nB8
z)b+4SP?NQLv?NNR6-3AuaT3VMW>Un<iQpsWdD#Ly&6t1`Tjn}*7RWV$-0)Fel3RX4
zbh%gC&!PPVLwO#d+s&(4Pa?z$?K6c;)yL2%peoX(@+9xeXw@>BubAvm8Yj`dz)(&h
z#D+Z@E>vj>nPJP(*o`W(4Z1iv9nQ(^qLf&+)w>^EY{m!7TSGY<L7OeT5Fs{)b(b#4
zR?OiMnu9D#UzNvs*%nl-3I96UYzy8955KV%>~hO_qO`MY>zdU+v?hmQwAmJvgy(P=
zA-0##m_qAZ{aTY9>iikB+0x%ei0%9dgxDUwY6@*+^`A9w4dqaZHd}fbLTnD}F8zM1
z|Js`Hb!f9Ks1Fanu@?N>>OZw6hZoRhTkv9d4hIopSN~~K$XteeH2&+|uQu7C&U?^i
zOFxYe+xZ%V*wsI73YlRm&{+4oUtr!E%Ap8tw)B?}Vslt`>GxZGZcX?%(PmrlR(SaT
z*#g|Kmk%3m#gz%sbPDCuN#&wL=|*LebyB)h>2_Tc0$r+A&!X*H+OCWzCe2M*dB=9d
z6~NL?x&og%=1VE!Nxwi;W6IFIPQXb+w>;9@LW*0-N3En_Ahzm=)uFf2(Ogq~$l>hM
z@};k<lf3DD+7ACivZXgSwf8DLl82pl=@eHZFW>W6JO}#xTX3e^we7(V+j=ai!H?T|
zno@(8=s8&!cK*WA3bqHoG+aLzuA3_^8+FYYu3rt;V#pP=1B%5$6sozPr)eOiro!r-
z1!Wf0BrQjFinFkA3zS=+CTMn2$5V7CMQ;K9PpALF3@9^5jiTTTEKCC@JN@?FX&83?
z$@%TUY3N;a4?7pRKxd-IDOTnBBZ70#Tak;H-^zCm^BqA|fOhgY&&_uRI@M@xuS4Dp
zod(eHiRtC!{o;^q-WTwxdo+jqs4>O4A)nJhM>(D7QU<rzI|X`9zZ{YG+Z06Oudl<n
zc-o;!&hc2F`LhuSekVXna7cjGD=pnkKYnvjTU3_lo(#%!Bk$8uxQ@K*$h&9>XR0CQ
z*a|a#HI-!Zv;bvFTHss{j<1lGIp4QoU@4_G?exSyd%1-vpsA@5wC{61`c!fBwWiPn
z(61R~9K;Dw#y}hgWfa6QP)0x;1)cUokHu%jsz(`@{+~O<5#R`Y8Z)IUwW(X~3R=3-
bX48{Ny);*wZKdBpC$b$up=U%oc;e{atkq~_

delta 2674
zcmbVOYfKzf6y8~Op@4-ALM0%0aV06yP+OLyt+n;lN?R)Ow51dVw3V&aHbxVRkL59E
zc6f{_PK;U2M%-o%(>T1AXW}L`5#sQp8TsF)zZx-$`@;t759>WUu=KKO5i*(KeD^!w
zJ&&Dx=DS($i&<`DBEx!J3Qc9e{;VWHy#c;CU+{AyO-orQ`ol;j`;^Mc%#>C!*stG>
zq!OEQzH%|UNg_Khl3N|Bg=j!-zNaSP^Dj^?RMpt>Az)X2tJ<dAs4A)t!EB$AP+r&;
z^|u<C#3t#9k+XVI<Uu{nutPuDBL=-uN_oXaYF-6WEs}iD#voFxb4HdHf=G&PH4;hS
z!}97j((?hmYayk%I<qFW^!EF>RNqGLF%51-!@8=$QH|n{khl$%Oko5Y+YvnEiGqq=
zo%{H0uU=r>p(#-k&A_f&<Peb49i&K9v%yQ=5mgI_G-A@Eq}Sx0I}YTML<YT-m*Z0R
z$+@n3?Zaq)!cdMNbhG1L*3$^FLi<f2Q*{p-`BX(2uFdhhg4R=v=5do93*$7}?=qA#
z2(jCqh!?6ih0JYh(cn-;wL%}SZikQ6Zdu8$+3GofOKil?n69xHj-t(`UXBnO!-i9r
zR1RZ!g2tfA%D1%{9<~Gx>$ZO#ZMFoh@!M~%1dqAY-LjHbvvpnf53Y-$5^c5wRq-(#
zLWr&9i>A;9yWecGW0gOLHk<le2(guKL5Qv4tESLqx?g6x#$u>On@zn2AvT5$r+&Zg
zzqW4s^JudrxDdbn=1TBy-G6pn49C!BOYl;B49_9NcK>-($ZW%2H2&+|KV`CGm3O1f
zrhXP7w(^Y#vE6Snh0Ja1(Ae<1|AOfni=hH-HuaYgVq@5F>i6qDzi#_C&}K{UX8iX5
zvjlixuU=L>itDpd=oH#ZCsi&TO4sUhxRA0~@5;R-1^aX^QcTOYa$H4!F@-M5+I{lj
zjC@!*N!Q>rC%umriA0dd<>-{5XPtzTh8}su-$^RF$d_FtKa}2Zl(QuXbTl`fI_OCq
z45WrX6?}GQ_$$E&&ag)B1=76ZXFl+dYVqee{eF5C%sYOkGhKgR<c{0ojylZ<zC34m
zR`B_q;UDRJ#px01RO<9k&}-Exan0$v;45{87X{yhGklxgLuHM1oM#%eY0z_w64fD3
z!_pLJQ=n%V3FNRy(L9Py0sWuO`lU(GCXu>@f|IZ`0lex6B={#_-ti|NNC;1Wf7vzf
zSmuMh*=~p2P#Um@XTV=qidcXXd*{WT@MQ_QNtVdp>J9elDaJ0Fnhd>Bpyz9Il~)hQ
zbJknlpjY2%*wiPZGn=3DI&5@s)A_Ab@Vh+Y5GlE$+IRmt4k`FI*b{xYyP;hzaa*8c
zXb8f72|B|A5_FAr_P76Vb--BGR_N{`%5x#_n_-wi-VE{vEb&Y|#vEB=mfcGw$s$dF
zN(TmXn_&&Ki-H-9o4S@pHyK@XUG@B4z;KkZ=0eZdKd<sj<3Lq)JMG4dm;SPN`f5{X
z4Coh)HVX0>Xd@txf;J5D2xvnf4?~1jDUy!gfLvrt^l{~<9(f3OLO=cJ7u?;*odJt*
xjMvf^ifl%bmb{=Vzci<%UXzUNnqZ9-kRyt{We3-!l(y`!eJ1&al-8CLe*<--N}>P&