From bf745a4b66cfdb8cc526d0b9698b55f15db4defd Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Wed, 17 Nov 2021 00:25:17 -0500
Subject: [PATCH] add even more files to TOTAL.DATA

---
 Makefile                 |  4 ++--
 res/_FileInformation.txt |  4 ----
 src/constants.a          |  2 +-
 src/glue.decompress.a    |  7 +++----
 src/glue.launch.a        |  7 +++----
 src/glue.prorwts2.a      |  3 +++
 src/index/decrunch.idx.a |  8 ++++++++
 src/index/joystick.idx.a |  8 ++++++++
 src/prodos.path.a        | 14 ++++++--------
 9 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 src/index/decrunch.idx.a
 create mode 100644 src/index/joystick.idx.a

diff --git a/Makefile b/Makefile
index 5f93913fc..67972eced 100644
--- a/Makefile
+++ b/Makefile
@@ -45,8 +45,6 @@ dsk: index asmproboot asmlauncher
 	for f in \
 		build/TOTAL.DATA \
 		build/PREFS.CONF \
-		res/DECRUNCH \
-		res/JOYSTICK \
 		res/Finder.Data \
 		res/Finder.Root; do \
 	    $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; \
@@ -204,6 +202,8 @@ index: md asmfx asmprelaunch compress
 #
 	[ -f build/index ] || bin/addfile.sh build/HELPTEXT build/TOTAL.DATA > src/index/helptext.idx.a
 	[ -f build/index ] || bin/addfile.sh build/CREDITS build/TOTAL.DATA > src/index/credits.idx.a
+	[ -f build/index ] || bin/addfile.sh res/DECRUNCH build/TOTAL.DATA > src/index/decrunch.idx.a
+	[ -f build/index ] || bin/addfile.sh res/JOYSTICK build/TOTAL.DATA > src/index/joystick.idx.a
 	touch build/index
 
 asmlauncher: md
diff --git a/res/_FileInformation.txt b/res/_FileInformation.txt
index ae64b522c..e2a0301b0 100644
--- a/res/_FileInformation.txt
+++ b/res/_FileInformation.txt
@@ -3,9 +3,5 @@
 LAUNCHER.SYSTEM=Type(FF),AuxType(2000),Access(C3)
 TOTAL.DATA=Type(06),AuxType(0000),Access(C3)
 PREFS.CONF=Type(04),AuxType(0000),Access(C3)
-CREDITS=Type(06),AuxType(0800),Access(C3)
-HELPTEXT=Type(06),AuxType(0800),Access(C3)
-DECRUNCH=Type(06),AuxType(0200),Access(C3)
-JOYSTICK=Type(06),AuxType(0800),Access(C3)
 Finder.Data=Type(C9),AuxType(0000),Access(E7)
 Finder.Root=Type(C9),AuxType(0000),Access(E7)
diff --git a/src/constants.a b/src/constants.a
index 40f1a302f..6cee1b9d5 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -201,7 +201,7 @@ PRELAUNCH_STANDARD_SIZE = 61         ; LoadStandardPrelaunch, eventually to be d
 iCurBlockLo    = $D601               ; constant
 iCurBlockHi    = $D603               ; constant
 launchpatch    = $D853               ; glue.launch.a
-iAddToPath     = $FEBE               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
+iAddToPath     = $FEC4               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
 itraverse      = $DB31               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
 ldrlo          = $55                 ; constant
 ldrhi          = $56                 ; constant
diff --git a/src/glue.decompress.a b/src/glue.decompress.a
index 4f781d387..c9fa018f9 100644
--- a/src/glue.decompress.a
+++ b/src/glue.decompress.a
@@ -53,12 +53,11 @@ DecompressHGR
          pha
          lda   auxreq
          bne   +
-         jmp   LoadFile              ; load decompression code to $200
-+        jmp   LoadAuxFile           ; load decompression code to $200/aux
+         jmp   LoadIndexedFile       ; load decompression code to $200
++        jmp   LoadAuxIndexedFile    ; load decompression code to $200/aux
 @loaddecrunch
-         !word kRootDirectory
-         !word kDecrunchFile
          !word $200
+         !word kDecrunchRecord
          ldx   auxreq
          sta   READMAINMEM,x         ; X = 0 or 1, so this will be READMAINMEM or READAUXMEM
          sta   WRITEMAINMEM,x        ; X = 0 or 1, so this will be WRITEMAINMEM or WRITEAUXMEM
diff --git a/src/glue.launch.a b/src/glue.launch.a
index 532cfc301..8a5a1d74b 100644
--- a/src/glue.launch.a
+++ b/src/glue.launch.a
@@ -202,10 +202,9 @@ Launch
 Joystick
          jsr   LoadStandardPrelaunch
 
-         jsr   LoadFile
-         !word kRootDirectory
-         !word kJoystickFile
-         !word 0
+         jsr   LoadIndexedFile
+         !word $800
+         !word kJoystickRecord
 
          jmp   Launch
 
diff --git a/src/glue.prorwts2.a b/src/glue.prorwts2.a
index aea0b3484..97efa235f 100644
--- a/src/glue.prorwts2.a
+++ b/src/glue.prorwts2.a
@@ -152,6 +152,9 @@ LoadIndexedFile
          !word @cc_parms
          jsr   swap_zpg              ; restore sizelo2/hi2
          dec   $BF0E                 ; re-enable ROM mapping on return
+         +LD16 @address
+         sta   ldrlo2                ; support Launch of what we just loaded
+         sty   ldrhi2
          jmp   SwitchToBank1
 
 @c8_parms
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
new file mode 100644
index 000000000..b023b8615
--- /dev/null
+++ b/src/index/decrunch.idx.a
@@ -0,0 +1,8 @@
+;
+; Index record for res/DECRUNCH
+;
+; This file is automatically generated
+;
+         !byte 0
+         !be24  9911637
+         !le16      303
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
new file mode 100644
index 000000000..aae6aebaa
--- /dev/null
+++ b/src/index/joystick.idx.a
@@ -0,0 +1,8 @@
+;
+; Index record for res/JOYSTICK
+;
+; This file is automatically generated
+;
+         !byte 0
+         !be24  9911940
+         !le16     2370
diff --git a/src/prodos.path.a b/src/prodos.path.a
index 8f0444a60..c507382c5 100644
--- a/src/prodos.path.a
+++ b/src/prodos.path.a
@@ -136,6 +136,12 @@ kCreditsRecord
 kHelpTextRecord
          !source "src/index/helptext.idx.a"
 
+kDecrunchRecord
+         !source "src/index/decrunch.idx.a"
+
+kJoystickRecord
+         !source "src/index/joystick.idx.a"
+
 kTotalDataFile
          !byte 10
          !raw  "TOTAL.DATA"
@@ -173,14 +179,6 @@ kSFXFizzleFile
          !byte 10
          !raw  "SHR.FIZZLE"
 
-kDecrunchFile
-         !byte 8
-         !raw  "DECRUNCH"
-
-kJoystickFile
-         !byte 8
-         !raw  "JOYSTICK"
-
 kHelpBackgroundRecord
          !source "src/index/res.help.idx.a"