From b7e739c3164525027abbfb24346d2fa3adcbdc3e Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Tue, 3 Dec 2024 20:44:16 +0100
Subject: [PATCH] Get brick number from level data

---
 averybreakout.asm |  41 ++++++++++++++++++++++++++++++++++++++---
 averybreakout.xex | Bin 5450 -> 5567 bytes
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/averybreakout.asm b/averybreakout.asm
index 69c6151..b377c58 100644
--- a/averybreakout.asm
+++ b/averybreakout.asm
@@ -1140,18 +1140,46 @@ randomStart
     mwa #Menu_data inlevel
     ;mwa #Level000_data inlevel
     ldy #0
+    sty BricksInLevel
+    sty BricksInLevel+1
 nextnumber
     lda (inlevel),y
     inw inlevel
     cmp #155
-    bne nextnumber
+    beq nextnumber2
+    ; check valid characters
+    ldx #9
+@   cmp Numbers,x
+    beq valid1
+    dex
+    bpl @-
+    jmp LevelDataError
+valid1  ; value in X register
+    ; now we must multiply BricksInLevel by 10
+    asl BricksInLevel
+    rol BricksInLevel+1
+    mwa BricksInLevel temp
+    asl BricksInLevel
+    rol BricksInLevel+1
+    asl BricksInLevel
+    rol BricksInLevel+1
+    adw temp BricksInLevel BricksInLevel
+    ; and add value
+    clc
+    txa
+    adc BricksInLevel
+    sta BricksInLevel
+    bcc @+
+    inc BricksInLevel+1
+@   jmp nextnumber
+
 nextnumber2
     lda (inlevel),y
     inw inlevel
     cmp #155
     bne nextnumber2
 ; make bricks
-
+    mwa #0 temp
 	mva #8 color
     mva #margin*2 ypos
 drawBricksLoopY
@@ -1167,6 +1195,7 @@ drawBricksLoop
     cmp #' '
     beq NoBrick     ; if no brick
     jsr fatplot
+    inw temp    ; real number of bricks
 NoBrick
     inc xpos
     lda xpos
@@ -1178,6 +1207,12 @@ EndOfLine
     cmp #maxBrickLines+margin*2
     bne drawBricksLoopY    
 LevelDataEnd
+    cpw BricksInLevel temp
+    bcc BricksOK    ; if defined bricks number is bigger tan real
+    mwa temp BricksInLevel  ; set to real brick number
+BricksOK
+    rts
+LevelDataError
     rts
 .endp
 ;--------------------------------------------------
@@ -1214,7 +1249,7 @@ LevelFileBuff
 BricksInLevel
     .word 0
 Numbers
-    .byte "0123456789"
+    .byte '0123456789'
 lineAdrL
     :margin .byte <marginLine ;8 lines of margin space
     :maxLines .byte <(display+40*#)
diff --git a/averybreakout.xex b/averybreakout.xex
index 055f2a8bf20343ba512b6144e7b1f2116c116a1c..d033c98f433a5d3b79ea717e41383014d609ef2e 100644
GIT binary patch
delta 1092
zcmc&xUr1A76u)zGHX{|AF&~V9p_@TXt;`4EcJKNK9aKaQy)DTHAJ#+Klg0jix_jrv
z&3m^A<H8vGmUrUA#R_`3MTiemuuDEg2tEx#h!H&`KCCkh6YMeQK75>W?m55nJHOw0
z&xgzAYL&9Pud3$z#<Q;x5uDAoahLE$95wd)_gLNNdE2FpusEPiusEn?SRB$;Ssd1u
z7(AnGF*vFnFqqRiS<Gu3vW*)`4SJnI$s8(bK7`}iB*F=83gLMzgs_;8sq;lOj`8rK
zmZY(yC2!#*!A?U_m4*~1A=yY^Yz7BNa4afXO<s%D9hoZv-k$i<G~9kXQizbC)1bGj
z5}tK7cVxvKlg*G8_e~%D9IYESd3uwhmpS?z51D7Ni$qEW9p&dL%sZ<)T7xvmdn^ga
zBP<EZ6D$eI8J2|QRd%`Yb4!C#mA4qZ9-6ioD9B3;gq^j2@&Qwb<zpn6h?8(){xrgc
zRhG=a0ExmZ;h>-JFe=_PKd7_1#k{%u(a9?Ua7Cjk)oy_6y%1G8(zS?yM1|?Ui{#Cj
zrxywfrvzTP)F2uBLxK+}ZebEB4}~eD+!jJ8N7<lx+#x?jV8}QnKSwq&1qv?^_yUD6
z+TAhhUvd-=x&VD357dD;C<OX|I-m`>y1V1hw}tcWbzW|RN8isnB6GhrwLfzz4lE8>
z2EhcyDDbrRP-eve2+BnOI4Niqz#%_iyvis}DLpuyrDi#LmZ#NJIi=T?)1^#hIA__8
z(G~N0%TLeao+ggI!q;rY(lSru<WYX~+KA-iXn~_i(#QL0SZ?Ew3UT8%p7y+Q{(;qh
zC=`}(QaOVoiV24x3uGxZRp~xn+*YzzEcW+ZWeJ!h%K;K7-P6C8LnKsc)jz@ZwWMAT
zOxC1$Basf**6#K8xm=mv%*wuH+tkX@-w{Q*di(mXUB5AKb8urr+-(~0Z~Wiy&c9l}
JQf_`y{|l4lL5%<a

delta 968
zcmc(cL1+^}6oz-Z>Bd%SYTeZBp%RP4#DWM)iwAL?HH(x|6`>$v31X34J@i(xNi%7h
zy0q!WwjgUu$%Iazg{2^P7{#0Ep$>ut4?+Y9y$CsYXfKT~MWs-Wf^!(&Jl^}~z3+e9
zyLmyb*M-1`i>`cEI)2?CR@kS;E?JuWNV*&!)44SGD#*4GHrYPH2^Q3Gk`3v2g7qOh
z$wm;)ur$I`Y#re&Qw%jGmc6`*3XWow*lq;RvU&vPm~7xV)@ES4FzwEj+*ynVR#`y9
zc^0^VpA#GwOK$$!6_m@X#2lT(CP|EDY{e68S<+K8CD0qQ$2|jGe_Dzuk_d~u%gy6w
zVPAKzUGb=5kG<!47gsbcZTYn=MO#y}Hb1-uSA!%~7P(QFsiD_PdZr;MI%7I9ooz%C
z&ORbZC#aJNXGmXb{n+lMb!P<eW+)m#kZ}4CgzE=k8WpDt(<G6bB@?;1qY9lvI+=t9
zl7U__<)jhGLaTjSzSp#*+Xeaj{li<ButlqzZ|nfuM<J?p_cS5`h>GdILyE4*>BZvW
z5x^Vgym>MH-r9{&-Ks}u#gYwr(`qwT1Qm*7A!jcFhQtI%FjO!F5?%v*fy4=8ry}#u
zD?%2y!1ypcj1GeXA>adafDO31Qwi}e)=Pae>ny{?_m)GcnO{r;Ps22X?f#alU;>pa
zzZN~fOhceR&w#*Tpmh+3cN#_McRWwScwt#^=d1I)sk%^p!G9c%=`oz59-O2CHXBv7
zv%l+VzH*=@1>OX!CNax*_}6NZB+F6<|FrR>^_!<d(Z&ryXg}F;O7VA|R=b9W?T5bp
S`0)QdxBk`l8xPtaH~$0%bDkXl