move gFXStore and gDFXStore to 0x6000

res/attract.conf

@@ -1 +1 @@
-#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

#SPIDER.RAID=3
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1
EA.CONF=1
SYNERGIST.CONF=1
SEGA.CONF=1
SYNAPSE.CONF=1
EPYX.CONF=1
PENGUIN.CONF=1
BALLY.CONF=1
DATAEAST.CONF=1
MATTEL.CONF=1
SUBLOGIC.CONF=1
TAITO.CONF=1
IDSI.CONF=1
OTHER.CONF=1
TRACK.AND.FIELD=3
STELLAR.7=3
GOONIES=3
ALIEN.DOWNPOUR=3
BOUNCING.KMNGAS=3
CEILING.ZERO=3
DHGR.CONF=2
ORILEYS.MINE=3
FORMULA.1=3
FIREBIRD=3
BUZZARD.BAIT=3
SNAKE.BYTE=3
HIGH.RISE=3
THUNDERBOMBS=3
ROBOTRON=3
NIBBLER=3
LADY.TUT=3
STARGATE=3
FLIP.OUT=3
AGENT.USA=3
GUMBALL=3
TUBEWAY=3
CIDER.SPIDER=3
CONAN=3
MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=3
PACMAN=3
SERPENTINE=3
KARATEKA=3
WARP.DESTROYER=3
LOST.TOMB=3
VINDICATOR=3
REPTON=3
SAMMY.LIGHTFOOT=3
DUNG.BEETLES=3
GAMMA.GOBLINS=3
PIEMAN=3
ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3

[eof]
+#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

#SPIDER.RAID=3
FAVORITES.CONF=1
DHGR.CONF=2
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1
EA.CONF=1
SYNERGIST.CONF=1
SEGA.CONF=1
SYNAPSE.CONF=1
EPYX.CONF=1
PENGUIN.CONF=1
BALLY.CONF=1
DATAEAST.CONF=1
MATTEL.CONF=1
SUBLOGIC.CONF=1
TAITO.CONF=1
IDSI.CONF=1
OTHER.CONF=1
TRACK.AND.FIELD=3
STELLAR.7=3
GOONIES=3
ALIEN.DOWNPOUR=3
BOUNCING.KMNGAS=3
CEILING.ZERO=3
ORILEYS.MINE=3
FORMULA.1=3
FIREBIRD=3
BUZZARD.BAIT=3
SNAKE.BYTE=3
HIGH.RISE=3
THUNDERBOMBS=3
ROBOTRON=3
NIBBLER=3
LADY.TUT=3
STARGATE=3
FLIP.OUT=3
AGENT.USA=3
GUMBALL=3
TUBEWAY=3
CIDER.SPIDER=3
CONAN=3
MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=3
PACMAN=3
SERPENTINE=3
KARATEKA=3
WARP.DESTROYER=3
LOST.TOMB=3
VINDICATOR=3
REPTON=3
SAMMY.LIGHTFOOT=3
DUNG.BEETLES=3
GAMMA.GOBLINS=3
PIEMAN=3
ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3

[eof]

src/4cade.init.a

@@ -76,24 +76,6 @@ OneTimeSetup
          !word gGamesListStore
          !word ldrlo2                ; (ldrlo2) points to last load address
          +LDAY SRC
-         +STAY gFXStore              ; save pointer to free space for next store
-
-         jsr   LoadFile              ; load HGR transition effects list
-         !word kFXConfFile
-         jsr   ParseKeyValueList     ; parse HGR transition effects list
-         !word gFXStore
-         !word ldrlo2                ; (ldrlo2) points to last load address
-         !byte 0
-         +LDAY SRC
-         +STAY gDFXStore             ; save pointer to free space for next store
-
-         jsr   LoadFile              ; load DHGR transition effects list
-         !word kDFXConfFile
-         jsr   ParseKeyValueList     ; parse DHGR transition effects list
-         !word gDFXStore
-         !word ldrlo2                ; (ldrlo2) points to last load address
-         !byte 0
-         +LDAY SRC
          +STAY gAttractModeStore     ; save pointer to free space for next store
 
          jsr   LoadFile              ; load attract-mode configuration
@@ -146,16 +128,6 @@ kGameListConfFile
 @kGameListConfFile_b
          !text "GAMES.CONF"
 @kGameListConfFile_e
-kFXConfFile
-         !byte @kFXConfFile_e-@kFXConfFile_b
-@kFXConfFile_b
-         !text "FX.CONF"
-@kFXConfFile_e
-kDFXConfFile
-         !byte @kDFXConfFile_e-@kDFXConfFile_b
-@kDFXConfFile_b
-         !text "DFX.CONF"
-@kDFXConfFile_e
 kAttractModeConfFile
          !byte @kAttractModeConfFile_e-@kAttractModeConfFile_b
 @kAttractModeConfFile_b

src/parse.common.a

@@ -6,13 +6,19 @@
 ; Public functions:
 ; - ParseKeyValueList
 ;
+; Public variables:
+; - gAttractModeStore
+; - gFXStore
+; - gDFXStore
+; - gSlideshowStore
+;
 
 gAttractModeStore
          !word $FDFD
 gFXStore
-         !word $FDFD
+         !word $6000
 gDFXStore
-         !word $FDFD
+         !word $6000
 gSlideshowStore
          !word $0800
 

src/ui.attract.mode.a

@@ -177,6 +177,13 @@ WaitOnScreenshot
 +        rts
 
 LoadTransition
+         jsr   LoadFile              ; load HGR transition effects list
+         !word kFXConfFile
+         jsr   ParseKeyValueList     ; parse HGR transition effects list
+         !word gFXStore
+         !word ldrlo2                ; (ldrlo2) points to last load address
+         !byte 0
+
          jsr   okvs_nth              ; get filename of transition effect code
          !word gFXStore
 gFXIndex
@@ -209,8 +216,20 @@ gFXIndex
          +LOAD_FILE kFXDirectory, @fxkey
          rts
 @fxkey   !word $FDFD
+kFXConfFile
+         !byte @kFXConfFile_e-@kFXConfFile_b
+@kFXConfFile_b
+         !text "FX.CONF"
+@kFXConfFile_e
 
 LoadDHGRTransition
+         jsr   LoadFile              ; load DHGR transition effects list
+         !word kDFXConfFile
+         jsr   ParseKeyValueList     ; parse DHGR transition effects list
+         !word gDFXStore
+         !word ldrlo2                ; (ldrlo2) points to last load address
+         !byte 0
+
          jsr   okvs_nth              ; get filename of DHGR transition effect code
          !word gDFXStore
 gDFXIndex
@@ -243,6 +262,11 @@ gDFXIndex
          +LOAD_FILE kFXDirectory, @dfxkey
          rts
 @dfxkey   !word $FDFD
+kDFXConfFile
+         !byte @kDFXConfFile_e-@kDFXConfFile_b
+@kDFXConfFile_b
+         !text "DFX.CONF"
+@kDFXConfFile_e
 
 BlankHGR
          jsr   Home