From 9db4de4155bcde7096b0591867528104ded58e8e Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Thu, 3 Aug 2023 21:44:52 +0200
Subject: [PATCH] More beauty

---
 artwork/CartMenu/menu.asm |  44 ++++++++++++++++++++++++++++++++++----
 artwork/CartMenu/menu.xex | Bin 2303 -> 2364 bytes
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/artwork/CartMenu/menu.asm b/artwork/CartMenu/menu.asm
index 62b3d37..51dd0b6 100644
--- a/artwork/CartMenu/menu.asm
+++ b/artwork/CartMenu/menu.asm
@@ -4,6 +4,7 @@
 
     .zpvar dliCounter        .byte = $80
     .zpvar TetryxColor       .byte
+    .zpvar TetryxColorS      .byte
 
     org $2000
 
@@ -11,16 +12,20 @@ WeaponFont
     ins '../weapons_AW6_mod.fnt'  ; 'artwork/weapons.fnt'
 
 main
+    lda #0
+    sta dmactls
+    jsr WaitOneFrame
     lda #0
     sta TetryxColor
+    sta TetryxColorS
     lda RANDOM
     bmi TnotVisible
     lda #10
     sta TetryxColor
 TnotVisible
+    lda #0
     ldx #3
-@   lda colors,x
-    sta COLOR0-1,x
+@   sta COLOR0-1,x
     dex
     bpl @-
     mva #>WeaponFont chbas
@@ -29,10 +34,35 @@ TnotVisible
     SetDLI DLIinterrupt
     lda #@dmactl(narrow|dma) ; narrow screen width, DL on, P/M off
     sta dmactls
-
+    jsr WaitOneFrame
+    jsr MakeColors
+    jsr WaitOneFrame
 stop
     jmp stop
 
+;--------------------------------------------------
+.proc MakeColors
+    ldy #15
+FirstLoop
+    ldx #3
+@   lda COLOR0-1,x
+    cmp colors,x
+    beq ColorOK
+    inc COLOR0-1,x
+ColorOK
+    dex
+    bpl @-
+    lda TetryxColorS
+    cmp TetryxColor
+    beq TcolorOK
+    inc TetryxColorS
+TcolorOK
+    jsr WaitOneFrame
+    jsr WaitOneFrame
+    dey
+    bpl FirstLoop
+    rts
+.endp
 ;--------------------------------------------------
 .proc DLIinterrupt
     pha
@@ -44,7 +74,7 @@ FirstDLI
     sta COLPF2
     beq EndOfDLI
 SecondDLI
-    lda TetryxColor
+    lda TetryxColorS
     sta COLPF1
 EndOfDLI
     inc dliCounter
@@ -73,6 +103,12 @@ DLIinterruptNone
     rts
 .endp
 ;--------------------------------------------------
+.proc WaitOneFrame
+;--------------------------------------------------
+    waitRTC    ; or wait ?
+    rts
+.endp
+;--------------------------------------------------
 
 ; DL for menu
 MenuDL
diff --git a/artwork/CartMenu/menu.xex b/artwork/CartMenu/menu.xex
index 1aee0e0694ccdb4a440807ef2ffc7b31cd2d0001..3feae55d9e5ec5820e2eb9bd3c092d740e81519b 100644
GIT binary patch
delta 210
zcmew_xJQWX|9=Jrea($*Of2=i`b-LQRaP>zHnujc<+^0RvXZN{aV5hd=DCNNP6_;4
zsnGj{Y2}h$1E!TKy@pH+x)!OdWLJoJvY>R4io!&dm5LDk3V|v>Q+)hX7Vs}(-g}to
z?i`H|%>O_pd|KLcwDAMevnHTC5OoOLPw-gUaDja#L$Abz53HI?n|j4BJZs2s06L+;
zC+W$`13e5(eT+=Kd{+{diX0XB@F$@F2>fnOE@n~WU!Y-7;Iu(QfJuO90+ZvC&5K!L
FSOAa}R0#k8

delta 148
zcmV;F0Bire68{kf|Nj6W@+h$e0t9P?fvpPCFa)Uzg@K|2y<aGu!ve|>_o*O_^a818
zjW7bKB#kiwpj4tHsRtlj<e)#IBp_QPsUeLo0!%z4NTq<#2dMy!7|`$qrGbqX(B^<>
zK&b$QfJ|cKslbc?0*(O!jSkdcaBy&NPM(vn1R)P&C@^qBb0`o35CV__L1(kz1Y87A
CQaIfJ