From 4f24c249639fd501870ee97e51c97017c1c96c30 Mon Sep 17 00:00:00 2001 From: 4am Date: Wed, 17 Nov 2021 14:21:41 -0500 Subject: [PATCH] add COVERFADE, GR.FIZZLE, and SHR.FIZZLE to TOTAL.DATA --- Makefile | 3 +++ src/constants.a | 2 +- src/fx/fx.cover.fade.a | 2 +- src/fx/fx.gr.fizzle.a | 2 +- src/fx/fx.shr.fizzle.a | 2 +- src/glue.launch.a | 4 +--- src/index/coverfade.idx.a | 8 ++++++++ src/index/credits.idx.a | 2 +- src/index/decrunch.idx.a | 2 +- src/index/gr.fizzle.idx.a | 8 ++++++++ src/index/helptext.idx.a | 2 +- src/index/joystick.idx.a | 2 +- src/index/shr.fizzle.idx.a | 8 ++++++++ src/prodos.path.a | 18 +++++++++--------- src/ui.attract.gr.a | 5 ++--- src/ui.attract.shr.a | 5 ++--- src/ui.wait.a | 5 ++--- 17 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 src/index/coverfade.idx.a create mode 100644 src/index/gr.fizzle.idx.a create mode 100644 src/index/shr.fizzle.idx.a diff --git a/Makefile b/Makefile index 67972eced..26b66a069 100644 --- a/Makefile +++ b/Makefile @@ -200,6 +200,9 @@ index: md asmfx asmprelaunch compress # # add additional miscellaneous files # + [ -f build/index ] || bin/addfile.sh build/COVERFADE build/TOTAL.DATA > src/index/coverfade.idx.a + [ -f build/index ] || bin/addfile.sh build/SHR.FIZZLE build/TOTAL.DATA > src/index/shr.fizzle.idx.a + [ -f build/index ] || bin/addfile.sh build/GR.FIZZLE build/TOTAL.DATA > src/index/gr.fizzle.idx.a [ -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 diff --git a/src/constants.a b/src/constants.a index 6cee1b9d5..ee1217e72 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 = $FEC4 ; Roger Rabbit, avoid, use Infiltrator 2 style instead +iAddToPath = $FECB ; 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/fx/fx.cover.fade.a b/src/fx/fx.cover.fade.a index a5d51a3ad..08d40e46d 100755 --- a/src/fx/fx.cover.fade.a +++ b/src/fx/fx.cover.fade.a @@ -6,7 +6,7 @@ ; !cpu 6502 -!to "build/FX/COVERFADE",plain +!to "build/COVERFADE",plain *=$6000 !source "src/fx/macros.a" diff --git a/src/fx/fx.gr.fizzle.a b/src/fx/fx.gr.fizzle.a index bcbfdae70..fc030fa00 100644 --- a/src/fx/fx.gr.fizzle.a +++ b/src/fx/fx.gr.fizzle.a @@ -2,7 +2,7 @@ ;(c) 2019 by qkumba !cpu 6502 -!to "build/FX/GR.FIZZLE",plain +!to "build/GR.FIZZLE",plain *=$6000 ;init RNG diff --git a/src/fx/fx.shr.fizzle.a b/src/fx/fx.shr.fizzle.a index be7487607..b8efeb26b 100644 --- a/src/fx/fx.shr.fizzle.a +++ b/src/fx/fx.shr.fizzle.a @@ -2,7 +2,7 @@ ;(c) 2019-2020 by qkumba/4am/John Brooks !cpu 6502 -!to "build/FX/SHR.FIZZLE",plain +!to "build/SHR.FIZZLE",plain *=$A000 addrs=$80 ; [128 bytes] diff --git a/src/glue.launch.a b/src/glue.launch.a index 8a5a1d74b..33fc83395 100644 --- a/src/glue.launch.a +++ b/src/glue.launch.a @@ -211,7 +211,5 @@ Joystick LoadStandardPrelaunch jsr LoadIndexedFile ; load standard prelaunch code at $0106 !word $0106 - !word + + !word kStandardPrelaunchRecord rts -+ - !source "src/index/standard.prelaunch.a" diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a new file mode 100644 index 000000000..247484d25 --- /dev/null +++ b/src/index/coverfade.idx.a @@ -0,0 +1,8 @@ +; +; Index record for build/COVERFADE +; +; This file is automatically generated +; + !byte 0 + !be24 9910988 + !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 5d5f4994c..0f30754f5 100644 --- a/src/index/credits.idx.a +++ b/src/index/credits.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 9911189 + !be24 9911794 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index b023b8615..decd606cc 100644 --- a/src/index/decrunch.idx.a +++ b/src/index/decrunch.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 9911637 + !be24 9912242 !le16 303 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a new file mode 100644 index 000000000..c0b44281f --- /dev/null +++ b/src/index/gr.fizzle.idx.a @@ -0,0 +1,8 @@ +; +; Index record for build/GR.FIZZLE +; +; This file is automatically generated +; + !byte 0 + !be24 9911486 + !le16 107 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 453e946b8..9816c7343 100644 --- a/src/index/helptext.idx.a +++ b/src/index/helptext.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 9910988 + !be24 9911593 !le16 201 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index aae6aebaa..ecfb1bd31 100644 --- a/src/index/joystick.idx.a +++ b/src/index/joystick.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 9911940 + !be24 9912545 !le16 2370 diff --git a/src/index/shr.fizzle.idx.a b/src/index/shr.fizzle.idx.a new file mode 100644 index 000000000..455695444 --- /dev/null +++ b/src/index/shr.fizzle.idx.a @@ -0,0 +1,8 @@ +; +; Index record for build/SHR.FIZZLE +; +; This file is automatically generated +; + !byte 0 + !be24 9911398 + !le16 88 diff --git a/src/prodos.path.a b/src/prodos.path.a index c507382c5..f9ef89f32 100644 --- a/src/prodos.path.a +++ b/src/prodos.path.a @@ -167,17 +167,17 @@ kGlobalPrefsFilename !byte 10 !raw "PREFS.CONF" -kCoverFadeFile - !byte 9 - !raw "COVERFADE" +kStandardPrelaunchRecord + !source "src/index/standard.prelaunch.a" -kGRFizzleFile - !byte 9 - !raw "GR.FIZZLE" +kCoverFadeRecord + !source "src/index/coverfade.idx.a" -kSFXFizzleFile - !byte 10 - !raw "SHR.FIZZLE" +kGRFizzleRecord + !source "src/index/gr.fizzle.idx.a" + +kSFXFizzleRecord + !source "src/index/shr.fizzle.idx.a" kHelpBackgroundRecord !source "src/index/res.help.idx.a" diff --git a/src/ui.attract.gr.a b/src/ui.attract.gr.a index f08ce7574..bdc00d4d4 100644 --- a/src/ui.attract.gr.a +++ b/src/ui.attract.gr.a @@ -68,10 +68,9 @@ BlankGR ; of that, but no promises) ;------------------------------------------------------------------------------ LoadGRTransition - jsr LoadFile - !word kFXDirectory - !word kGRFizzleFile + jsr LoadIndexedFile !word $6000 + !word kGRFizzleRecord GRRTS rts ;------------------------------------------------------------------------------ diff --git a/src/ui.attract.shr.a b/src/ui.attract.shr.a index d9a611b32..fc46ea55b 100644 --- a/src/ui.attract.shr.a +++ b/src/ui.attract.shr.a @@ -62,10 +62,9 @@ jmpblank ; $A000..$BFFF/main contains transition effect code ;------------------------------------------------------------------------------ LoadSHRTransition - jsr LoadFile - !word kFXDirectory - !word kSFXFizzleFile + jsr LoadIndexedFile !word $A000 + !word kSFXFizzleRecord SHRRTS rts ;------------------------------------------------------------------------------ diff --git a/src/ui.wait.a b/src/ui.wait.a index e08530753..96fb0967c 100644 --- a/src/ui.wait.a +++ b/src/ui.wait.a @@ -81,10 +81,9 @@ CoverFade jsr ShowOtherPage lda OffscreenPage beq CoverFade - jsr LoadFile ; load transition effect code at $6000 - !word kFXDirectory - !word kCoverFadeFile + jsr LoadIndexedFile ; load transition effect code at $6000 !word $6000 + !word kCoverFadeRecord jsr $6000 ; call transition effect jmp MegaAttractMode ; exit via mega attract mode !if (RELBASE != $2000) and (>WaitForKeyFor30Seconds != >*) {