From 1508ab4b04a20b373ed4dab804eedaee53b8603f Mon Sep 17 00:00:00 2001
From: bocianu <bocianu@gmail.com>
Date: Thu, 12 Oct 2023 23:13:22 +0200
Subject: [PATCH] new cartloader vectors updated

---
 .gitignore                       |   1 +
 Atari/lib/cartloader_vectors.inc |   9 +++++++++
 Manuals/manual.asm               |  12 +++++-------
 Manuals/manual_en.xex            | Bin 36451 -> 36451 bytes
 Manuals/manual_pl.xex            | Bin 36632 -> 36632 bytes
 artwork/CartMenu/cart_reset.asm  |   8 ++++----
 artwork/CartMenu/menu.asm        |  25 +++++++++++--------------
 artwork/CartMenu/menu.xex        | Bin 2779 -> 2783 bytes
 8 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 Atari/lib/cartloader_vectors.inc

diff --git a/.gitignore b/.gitignore
index 8cb7caf..4bfc2a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.lab
 *.lst
 artwork/talk.as_
+Manuals/build.bat
\ No newline at end of file
diff --git a/Atari/lib/cartloader_vectors.inc b/Atari/lib/cartloader_vectors.inc
new file mode 100644
index 0000000..ed2813c
--- /dev/null
+++ b/Atari/lib/cartloader_vectors.inc
@@ -0,0 +1,9 @@
+X_LOADER_START = $0700;
+X_BANK = $073D;
+X_SRC = $07B9;
+X_CLRSTART = $0725;
+X_CLREND = $0730;
+X_PORTB = $0707;
+X_EXITBANK = $07A6;
+X_NMIEN = $07AF;
+X_BOOT_START = $BFD6;
diff --git a/Manuals/manual.asm b/Manuals/manual.asm
index 2ef806f..7d90de5 100644
--- a/Manuals/manual.asm
+++ b/Manuals/manual.asm
@@ -1,5 +1,6 @@
     icl '../Atari/lib/ATARISYS.ASM'
     icl '../Atari/lib/MACRO.ASM'
+    icl '../Atari/lib/cartloader_vectors.inc'
 
 .IFNDEF LANG
     .def LANG = "PL"
@@ -87,14 +88,11 @@ main_loop
     sta escflag
     jsr WaitOneFrame
     ; exit to cart loader
-    XSRC   = $7FE ; -$7FF) - adres początku pliku do załadowania z carta (zakres $a000-$bffff)
-    XBANK  = $7FD ;) - bank w którym sie znajduje powyższy początek
-    XCLEAR = $7FC ;) - numer strony od której czyścimy pamięć (jak jest zero to nie czyścimy) czyszczenie zatrzymuje sie na $cfff
     
-    mva #0 XBANK
-    mwa #$a000 XSRC
-    mva #$10 XCLEAR
-    jmp $700
+    mva #0 X_BANK
+    mwa #$a000 X_SRC
+    mva #$10 X_CLRSTART
+    jmp X_LOADER_START
 NoEscape    
     jsr MakeScreenCopy
     ; save the current end of the printed text source
diff --git a/Manuals/manual_en.xex b/Manuals/manual_en.xex
index 72dfa29fde98ad3c56c97d24facb62c5d5018be9..c8af9cb4dc4ad9a93b4bf6d902fbf2f51d503657 100644
GIT binary patch
delta 29
ncmV+&0OJ4SoC4#V0+68)JqM`(jkyP@ppCi*sSu4Nv9Yp^!3+%{

delta 29
ncmV+&0OJ4SoC4#V0+68){RgQ4js6FzppE|rsSu6)v9Yp^+WZef

diff --git a/Manuals/manual_pl.xex b/Manuals/manual_pl.xex
index bbaf9a8bda0ddbf6b819bd7fdbaf215c521c8d29..cc993af23e38135c930cb92c4ae56631ab1aa98d 100644
GIT binary patch
delta 29
lcmbO+k7>p{rU?rLY}r>b^zLL|xuAC!`$~ac)r}j|`v9=S3`GC{

delta 29
ncmV+&0OJ3co&uPj0+68){RgQ4js6FzppE|rsSu6)v9V{4%Crt<

diff --git a/artwork/CartMenu/cart_reset.asm b/artwork/CartMenu/cart_reset.asm
index 1299450..a45ff72 100644
--- a/artwork/CartMenu/cart_reset.asm
+++ b/artwork/CartMenu/cart_reset.asm
@@ -1,14 +1,14 @@
 
-BankNr = $D500
+Bank0 = $D500
 ; ---	
 	org $0100
 reset_proc
     ; set cartridge bank to 0
-    mva #$0 BankNr
+    sta Bank0
     ; and reset
-    jmp ($fffd)
+    jmp ($fffc)
 initialization
-    mwa #reset_proc $0A ; set DOSVEC
+    mwa #reset_proc $0C ; set DOSINI
     mva #$01 $09
     rts
 ;    
diff --git a/artwork/CartMenu/menu.asm b/artwork/CartMenu/menu.asm
index 9d87fdc..fdf5586 100644
--- a/artwork/CartMenu/menu.asm
+++ b/artwork/CartMenu/menu.asm
@@ -1,7 +1,7 @@
 
-      icl '../../Atari/lib/ATARISYS.ASM'
-      icl '../../Atari/lib/MACRO.ASM'
-
+    icl '../../Atari/lib/ATARISYS.ASM'
+    icl '../../Atari/lib/MACRO.ASM'
+    icl '../../Atari/lib/cartloader_vectors.inc'
     icl 'cart_reset.asm'
 
     .zpvar dliCounter        .byte = $80
@@ -10,10 +10,7 @@
 
 ; ------- constans --------
 ; start addr of loader
-Loader_Start    =   $0700
-Clear_Set    = $07fc
-Bank_Set    = $07Fd 
-Addr_Set    = $07fe
+
 ; cart banks numbers
 LoaderBank  = 0
 ScorchBank  = 1
@@ -59,19 +56,19 @@ WaitForKey
     jsr GetKey
     cmp #@kbcode._space
     bne @+
-    mva #ScorchBank Bank_Set
+    mva #ScorchBank X_BANK
     bne GoLoader
 @   cmp #@kbcode._E
     bne @+
-    mva #MenuENBank Bank_Set
+    mva #MenuENBank X_BANK
     bne GoLoader
 @   cmp #@kbcode._P
     bne @+
-    mva #MenuPLBank Bank_Set
+    mva #MenuPLBank X_BANK
     bne GoLoader
 @   cmp #@kbcode._T
     bne WaitForKey
-    mva #TetryxBank Bank_Set
+    mva #TetryxBank X_BANK
     bne GoLoader
 
 GoLoader
@@ -83,11 +80,11 @@ GoLoader
     lda #0 ; DL off, P/M off
     sta dmactls
     jsr WaitOneFrame
-    mwa #$a000 Addr_Set
-    mva #$10 Clear_Set
+    mwa #$a000 X_SRC
+    mva #$10 X_CLRSTART
     ;cli
     ;jmp main
-    jmp Loader_Start
+    jmp X_LOADER_START
 stop
     jmp stop
 
diff --git a/artwork/CartMenu/menu.xex b/artwork/CartMenu/menu.xex
index dc2cddee359b6ba81f6c5f9312bf0c2b3be383fc..389174484b399c25eba6f86a00a1c5515ee98283 100644
GIT binary patch
delta 297
zcmcaDdS6uO|9=KXA;w;Yt2uxEuViTDS;^SS3&flWkC+}au`x0zY~85K&QUL|36yMX
zZCcB9N%O-6*0o18TN_t0EMlH}nCX<juazpjUzk=Z^%^j()a*56TEMYLb0xb%%##K0
z7HKH(Ypzu6)n`(W)>PQ20V2z^PAXntU&+{O%YH%eq!y6L1!9Vw<N`AJK}_zGx)*M&
z6ag_AKsqjYXe>xt^aO0?N{3#)D=QfwCIac5>?;@a?qXjl(5uSs!@%ydPGbT8BIdn^
zneHCa{J{JV<i1Z!n~pYqV0zZ1AU*jFhcu(~WDZVSX(vq<7M2B0$21EH+@EP06gYj;
d6krlyn!x0!G&zBD*JKH<Y9@sRlc#gJ006I;ZZZG>

delta 295
zcmcaFdRtWY|9=KXS;n<omwKfx_%JZ8WawqMn)CPnN`_Xhm5i<2K+Ku&i0LttAR~jq
zvW-gY9Q8b!K*`3|CZHb84;NV1Zq;mUT*<JAdG2ARQv$zMs`P$gS}ELXz_e1c*N|z!
z&qW$5*%e}*EV#c&LxDkarDCr>lLC*X0+0tJ)3r`2USMCz(ksAzLGh#(kjV^Uik;*F
zGMPY3?vuI~ZmeVlF&RKQ4qIw0NLus+Z01UbUcM_p7lTdoVbJiIud#rC5%b=|Om{bH
zeqjCwa?q!xO-CC)Fg<Hh;F<h^Lz<CiG7qP%w6P`&3(Eqh?V1Gz?$<R93Y?y63NQ&U
aO<-~qo}9wDYqA1YB?|+C!o<n5xm*A@{A(!y