add COVERFADE, GR.FIZZLE, and SHR.FIZZLE to TOTAL.DATA

This commit is contained in:
4am 2021-11-17 14:21:41 -05:00
parent bf745a4b66
commit 4f24c24963
17 changed files with 51 additions and 29 deletions

View File

@ -200,6 +200,9 @@ index: md asmfx asmprelaunch compress
# #
# add additional miscellaneous files # 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/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 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/DECRUNCH build/TOTAL.DATA > src/index/decrunch.idx.a

View File

@ -201,7 +201,7 @@ PRELAUNCH_STANDARD_SIZE = 61 ; LoadStandardPrelaunch, eventually to be d
iCurBlockLo = $D601 ; constant iCurBlockLo = $D601 ; constant
iCurBlockHi = $D603 ; constant iCurBlockHi = $D603 ; constant
launchpatch = $D853 ; glue.launch.a 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 itraverse = $DB31 ; Roger Rabbit, avoid, use Infiltrator 2 style instead
ldrlo = $55 ; constant ldrlo = $55 ; constant
ldrhi = $56 ; constant ldrhi = $56 ; constant

View File

@ -6,7 +6,7 @@
; ;
!cpu 6502 !cpu 6502
!to "build/FX/COVERFADE",plain !to "build/COVERFADE",plain
*=$6000 *=$6000
!source "src/fx/macros.a" !source "src/fx/macros.a"

View File

@ -2,7 +2,7 @@
;(c) 2019 by qkumba ;(c) 2019 by qkumba
!cpu 6502 !cpu 6502
!to "build/FX/GR.FIZZLE",plain !to "build/GR.FIZZLE",plain
*=$6000 *=$6000
;init RNG ;init RNG

View File

@ -2,7 +2,7 @@
;(c) 2019-2020 by qkumba/4am/John Brooks ;(c) 2019-2020 by qkumba/4am/John Brooks
!cpu 6502 !cpu 6502
!to "build/FX/SHR.FIZZLE",plain !to "build/SHR.FIZZLE",plain
*=$A000 *=$A000
addrs=$80 ; [128 bytes] addrs=$80 ; [128 bytes]

View File

@ -211,7 +211,5 @@ Joystick
LoadStandardPrelaunch LoadStandardPrelaunch
jsr LoadIndexedFile ; load standard prelaunch code at $0106 jsr LoadIndexedFile ; load standard prelaunch code at $0106
!word $0106 !word $0106
!word + !word kStandardPrelaunchRecord
rts rts
+
!source "src/index/standard.prelaunch.a"

View File

@ -0,0 +1,8 @@
;
; Index record for build/COVERFADE
;
; This file is automatically generated
;
!byte 0
!be24 9910988
!le16 410

View File

@ -4,5 +4,5 @@
; This file is automatically generated ; This file is automatically generated
; ;
!byte 0 !byte 0
!be24 9911189 !be24 9911794
!le16 448 !le16 448

View File

@ -4,5 +4,5 @@
; This file is automatically generated ; This file is automatically generated
; ;
!byte 0 !byte 0
!be24 9911637 !be24 9912242
!le16 303 !le16 303

View File

@ -0,0 +1,8 @@
;
; Index record for build/GR.FIZZLE
;
; This file is automatically generated
;
!byte 0
!be24 9911486
!le16 107

View File

@ -4,5 +4,5 @@
; This file is automatically generated ; This file is automatically generated
; ;
!byte 0 !byte 0
!be24 9910988 !be24 9911593
!le16 201 !le16 201

View File

@ -4,5 +4,5 @@
; This file is automatically generated ; This file is automatically generated
; ;
!byte 0 !byte 0
!be24 9911940 !be24 9912545
!le16 2370 !le16 2370

View File

@ -0,0 +1,8 @@
;
; Index record for build/SHR.FIZZLE
;
; This file is automatically generated
;
!byte 0
!be24 9911398
!le16 88

View File

@ -167,17 +167,17 @@ kGlobalPrefsFilename
!byte 10 !byte 10
!raw "PREFS.CONF" !raw "PREFS.CONF"
kCoverFadeFile kStandardPrelaunchRecord
!byte 9 !source "src/index/standard.prelaunch.a"
!raw "COVERFADE"
kGRFizzleFile kCoverFadeRecord
!byte 9 !source "src/index/coverfade.idx.a"
!raw "GR.FIZZLE"
kSFXFizzleFile kGRFizzleRecord
!byte 10 !source "src/index/gr.fizzle.idx.a"
!raw "SHR.FIZZLE"
kSFXFizzleRecord
!source "src/index/shr.fizzle.idx.a"
kHelpBackgroundRecord kHelpBackgroundRecord
!source "src/index/res.help.idx.a" !source "src/index/res.help.idx.a"

View File

@ -68,10 +68,9 @@ BlankGR
; of that, but no promises) ; of that, but no promises)
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
LoadGRTransition LoadGRTransition
jsr LoadFile jsr LoadIndexedFile
!word kFXDirectory
!word kGRFizzleFile
!word $6000 !word $6000
!word kGRFizzleRecord
GRRTS rts GRRTS rts
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------

View File

@ -62,10 +62,9 @@ jmpblank
; $A000..$BFFF/main contains transition effect code ; $A000..$BFFF/main contains transition effect code
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
LoadSHRTransition LoadSHRTransition
jsr LoadFile jsr LoadIndexedFile
!word kFXDirectory
!word kSFXFizzleFile
!word $A000 !word $A000
!word kSFXFizzleRecord
SHRRTS rts SHRRTS rts
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------

View File

@ -81,10 +81,9 @@ CoverFade
jsr ShowOtherPage jsr ShowOtherPage
lda OffscreenPage lda OffscreenPage
beq CoverFade beq CoverFade
jsr LoadFile ; load transition effect code at $6000 jsr LoadIndexedFile ; load transition effect code at $6000
!word kFXDirectory
!word kCoverFadeFile
!word $6000 !word $6000
!word kCoverFadeRecord
jsr $6000 ; call transition effect jsr $6000 ; call transition effect
jmp MegaAttractMode ; exit via mega attract mode jmp MegaAttractMode ; exit via mega attract mode
!if (RELBASE != $2000) and (>WaitForKeyFor30Seconds != >*) { !if (RELBASE != $2000) and (>WaitForKeyFor30Seconds != >*) {