From 663c556e935b3c1f56c01f8cef5ccb7f659e7984 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Wed, 28 Mar 2018 14:18:35 -0400
Subject: [PATCH] combine WEEGUI and PITCH.DARK binaries

---
 Makefile                 |  3 +--
 res/_FileInformation.txt |  2 +-
 src/grue.system.s        |  4 ++--
 src/pitchdark.a          | 14 +++-----------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 1c95fd8..7feada6 100644
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,9 @@ dsk: md asm
 	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "build/GRUE.SYSTEM"
 	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "build/ONBEYOND.SYSTEM"
 	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "build/PITCH.DARK"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "res/GAMES.CONF"
 	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "res/PITCH.DARK.CONF"
+	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/" "res/GAMES.CONF"
 	$(CADIUS) CREATEFOLDER build/"$(DISK)" "/PITCH.DARK/LIB/"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "res/WEEGUI"
 	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ1"
 	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ2"
 	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARK/LIB/" "build/ONBEYONDZ3"
diff --git a/res/_FileInformation.txt b/res/_FileInformation.txt
index 06d65c0..5174465 100644
--- a/res/_FileInformation.txt
+++ b/res/_FileInformation.txt
@@ -1,5 +1,5 @@
 GRUE.SYSTEM=Type(FF),AuxType(2000),Access(C3)
-PITCH.DARK=Type(06),AuxType(6000),Access(C3)
+PITCH.DARK=Type(06),AuxType(3FFD),Access(C3)
 PITCH.DARK.CONF=Type(04),AuxType(0000),Access(C3)
 GAMES.CONF=Type(04),AuxType(0000),Access(C3)
 ONBEYOND.SYSTEM=Type(FF),AuxType(2000),Access(C3)
diff --git a/src/grue.system.s b/src/grue.system.s
index 8121b32..9299dd1 100644
--- a/src/grue.system.s
+++ b/src/grue.system.s
@@ -90,7 +90,7 @@ reloc   cld
         jsr     $bf00
         !byte   $cc
         !word   cc_parms
-        jmp     $6000
+        jmp     $3FFD
 
 c7_parms
 c6_parms
@@ -106,7 +106,7 @@ c8_parms
 ca_parms
         !byte   4
         !byte   $d1
-        !word   $6000
+        !word   $3FFD
         !word   $ffff
         !word   $34d1
 
diff --git a/src/pitchdark.a b/src/pitchdark.a
index cea64bf..dc4035a 100644
--- a/src/pitchdark.a
+++ b/src/pitchdark.a
@@ -4,10 +4,12 @@
 !cpu 65c02
 !ct "src/lcase.ct"
 !to "build/PITCH.DARK",plain
-*=$6000
+*=$3FFD
 
          jmp   Start
 
+         !bin "res/WEEGUI"
+
          !source "src/macros.a"
          !source "src/constants.a"
          !source "src/WeeGUI_MLI.s"
@@ -36,12 +38,6 @@ Start
 +        inc                         ; 65C02-only INC instruction will clear Z flag
          beq   -                     ; if Z flag is still set, this is not a 65C02
 
-         jsr   LoadFile              ; load WEEGUI binary at $4000
-         !word .weeguiFilename
-         !word WGInit
-         !word $2000
-         !word kProDOSFileBuffer
-
          jsr   DisconnectRAM32       ; disconnect /RAM in S3,D2
          jsr   ClearInterpreterOptions ; clear options struct at $300
          jsr   WGInit                ; initialize WeeGUI
@@ -75,9 +71,5 @@ ExitWeeGUI
          ldx   #WGExit               ; clean up WeeGUI
          jmp   WeeGUI
 
-.weeguiFilename
-         !byte 10
-         !raw  "LIB/WEEGUI"
-
 gGamesListStore
          !word *+2                 ; address first okvs store