From 431499d41a9dc62d0e5f824ae024678b7680b6ac Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Fri, 18 Jun 2021 21:13:59 -0400
Subject: [PATCH] simplify build and wrapper code

---
 Makefile       |  2 ++
 src/passport.a | 18 +++---------------
 src/wrapper.a  | 29 +++++++++++++++++------------
 winmake.bat    |  2 ++
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 3eed691..02db8f5 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,8 @@ asm:
 	grep "PREFSFILE=" build/vars.log | cut -d":" -f3 | cut -d"(" -f1 >> build/vars.a
 	grep "SLOT=" build/vars.log | cut -d":" -f3 | cut -d"(" -f1 >> build/vars.a
 	grep "DRIVE=" build/vars.log | cut -d":" -f3 | cut -d"(" -f1 >> build/vars.a
+	grep "MainMenu=" build/vars.log | cut -d":" -f3 | cut -d"(" -f1 >> build/vars.a
+	grep "CheckCache=" build/vars.log | cut -d":" -f3 | cut -d"(" -f1 >> build/vars.a
 	$(EXOMIZER) -b build/passport.tmp -o build/passport.pak
 	cd src && $(ACME) -DFORWARD_DECRUNCHING=0 wrapper.a
 	cp res/work.po "$(BUILDDISK)".po
diff --git a/src/passport.a b/src/passport.a
index 41c88dc..c5606c7 100755
--- a/src/passport.a
+++ b/src/passport.a
@@ -41,8 +41,6 @@ VERBOSE  = $00       ; set to $01 to display API label addresses
 !ct "lcase.ct"
 
 Relocatable
-         jmp   MainMenu
-
          !bin "../build/t00only.pak"
 
 NonRelocatable
@@ -100,25 +98,13 @@ NonRelocatable
          !source "cffa.a"
          !source "progress.a"
          !source "rwts.a"
-         !source "wholetrack.a"
          !source "standarddelivery.a"
+         !source "wholetrack.a"
          !source "adstyle.a"
          !source "universalstyle.a"
          !source "crackme.a"
 
 MainMenu
-         ldx   #$FF
-         txs
-         lda   #<MainMenu            ; set reset vector
-         sta   $03F2
-         lda   #>MainMenu
-         sta   $03F3
-         eor   #$A5
-         sta   $03F4
-         lda   #<CheckCache          ; set up output hook used to store log messages before they scroll off
-         sta   $36
-         lda   #>CheckCache
-         sta   $37
          jsr   Cleanup               ; RAM/HD files might be left open after Ctrl-Reset
          jsr   ClearScreen
          jsr   MoveT00PakLow
@@ -519,4 +505,6 @@ _byte_skip_hi:
   !warn "PREFSFILE=",PREFSFILE
   !warn "SLOT=",SLOT
   !warn "DRIVE=",DRIVE
+  !warn "MainMenu=",MainMenu
+  !warn "CheckCache=",CheckCache
 }
diff --git a/src/wrapper.a b/src/wrapper.a
index 23fcc0e..f0a1cd4 100644
--- a/src/wrapper.a
+++ b/src/wrapper.a
@@ -52,25 +52,30 @@ OneTimeSetup
          jsr   ScanForRAMAndHardDisks; scan for things that look like RAM disks or hard disks
          +LoadPrefs                  ; load preferences (if available)
          jsr   ThisSlot              ; get information about selected drive and set gTargetType for main menu
-         lda   $FE
-         sta   $F0
-         lda   $FF
-         sta   $F1
-         lda   #$FD
-         sta   $F2
-         lda   #$31
-         sta   $F3
          ldx   #$0D
+         ldy   #$32
+         sty   $F1
          ldy   #$00
--        lda   ($F0), y
-         sta   ($F2), y
+         sty   $F0
+-        lda   ($FE), y
+         sta   ($F0), y
          iny
          bne   -
+         inc   $FF
          inc   $F1
-         inc   $F3
          dex
          bne   -
-         jmp   ($FE)
+         lda   #<MainMenu            ; set reset vector
+         sta   $03F2
+         lda   #>MainMenu
+         sta   $03F3
+         eor   #$A5
+         sta   $03F4
+         lda   #<CheckCache          ; set up output hook used to store log messages before they scroll off
+         sta   $36
+         lda   #>CheckCache
+         sta   $37
+         jmp   MainMenu
 
          !source "initscan.a"
 
diff --git a/winmake.bat b/winmake.bat
index 61da4cd..64e797b 100644
--- a/winmake.bat
+++ b/winmake.bat
@@ -37,6 +37,8 @@ for /f "tokens=4,* delims=:(" %%q in ('find "PREFSVER=" ..\build\out.txt') do ec
 for /f "tokens=4,* delims=:(" %%q in ('find "PREFSFILE=" ..\build\out.txt') do echo %%q >> ..\build\vars.a
 for /f "tokens=4,* delims=:(" %%q in ('find "SLOT=" ..\build\out.txt') do echo %%q >> ..\build\vars.a
 for /f "tokens=4,* delims=:(" %%q in ('find "DRIVE=" ..\build\out.txt') do echo %%q >> ..\build\vars.a
+for /f "tokens=4,* delims=:(" %%q in ('find "MainMenu=" ..\build\out.txt') do echo %%q >> ..\build\vars.a
+for /f "tokens=4,* delims=:(" %%q in ('find "CheckCache=" ..\build\out.txt') do echo %%q >> ..\build\vars.a
 cd ..\build
 %EXOMIZER% raw -q -P23 -T4 -b passport.tmp -o passport.pak
 cd ..\src