From a544cb9621317493775bf545317369613b8d2511 Mon Sep 17 00:00:00 2001 From: 4am Date: Tue, 8 Oct 2019 14:47:47 -0400 Subject: [PATCH] . --- src/4cade.a | 12 +++++------- src/glue.prorwts2.a | 21 --------------------- src/parse.prefs.a | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/4cade.a b/src/4cade.a index deb338a53..8d858f17a 100644 --- a/src/4cade.a +++ b/src/4cade.a @@ -88,6 +88,9 @@ ResetVector ; 6 bytes, copied to $100 !source "src/ui.credits.a" ; \__ execution falls through !source "src/ui.browse.mode.a" ; / + !source "src/ui.attract.hgr.a" ; \__ execution falls through + !source "src/glue.font.a" ; / + !source "src/prodos.path.a" !source "src/ui.overlay.a" !source "src/ui.offscreen.a" @@ -95,19 +98,14 @@ ResetVector ; 6 bytes, copied to $100 !source "src/ui.attract.shr.a" !source "src/ui.attract.gr.a" - !source "src/ui.attract.hgr.a" ; \__ execution falls through - !source "src/glue.font.a" ; / - !source "src/ui.cheats.a" !source "src/glue.launch.a" !source "src/okvs.a" !source "src/wait.a" !source "src/textrank.a" !source "src/parse.common.a" - - !source "src/parse.prefs.a" ; \__ execution falls through - !source "src/glue.prorwts2.a" ; / - + !source "src/parse.prefs.a" + !source "src/glue.prorwts2.a" !source "src/ui.common.a" ; add new files above here so ui.wait stays last diff --git a/src/glue.prorwts2.a b/src/glue.prorwts2.a index 9f0b02789..7df0babdd 100644 --- a/src/glue.prorwts2.a +++ b/src/glue.prorwts2.a @@ -4,7 +4,6 @@ ; ProRWTS2 glue functions ; ; Public functions -; - SaveSmallFile ; - LoadFile ; - LoadDHRFile ; @@ -33,26 +32,6 @@ ; 'FX/RIPPLE' points to a file named 'RIPPLE' in a directory named 'FX' in the ; PROGRAM ROOT DIRECTORY. - ; /!\ execution falls through from parse.perfs/pref_set -;------------------------------------------------------------------------------ -; SaveSmallFile -; Save a file into memory all at once, using ProRWTS2. -; /!\ Only first block (512 bytes) is written. Keep those files small. /!\ -; /!\ All 512 bytes are written to disk. Clear buffer before calling. /!\ -; -; supports paths, see note -; -; in: A/Y points to data buffer -; gPathname contains path+filename to write -; out: all flags clobbered -; all registers clobbered -;------------------------------------------------------------------------------ -SaveSmallFile - +STAY ldrlo ; set data buffer address for ProRWTS2 - jsr SwitchToBank2 - jsr SaveSmallFileInternal - jmp SwitchToBank1 - ;------------------------------------------------------------------------------ ; LoadFile ; Load a file into memory all at once, using ProRWTS2 diff --git a/src/parse.prefs.a b/src/parse.prefs.a index a1d277def..6f048dea5 100644 --- a/src/parse.prefs.a +++ b/src/parse.prefs.a @@ -6,6 +6,7 @@ ; Public functions ; - pref_get ; - pref_set +; - SaveSmallFile ; ; Public constants (all length-prefixed strings) ; - kNextAttract @@ -205,3 +206,21 @@ pref_set jsr SetPath +LDAY kGlobalPrefsBuffer ; /!\ execution falls through here to glue.prorwts/SaveSmallFile +;------------------------------------------------------------------------------ +; SaveSmallFile +; Save a file into memory all at once, using ProRWTS2. +; /!\ Only first block (512 bytes) is written. Keep those files small. /!\ +; /!\ All 512 bytes are written to disk. Clear buffer before calling. /!\ +; +; supports paths, see note +; +; in: A/Y points to data buffer +; gPathname contains path+filename to write +; out: all flags clobbered +; all registers clobbered +;------------------------------------------------------------------------------ +SaveSmallFile + +STAY ldrlo ; set data buffer address for ProRWTS2 + jsr SwitchToBank2 + jsr SaveSmallFileInternal + jmp SwitchToBank1