From b5b1c0f384d5c3c3ea119315aa9cac11f21d5a86 Mon Sep 17 00:00:00 2001 From: 4am Date: Thu, 17 Jan 2019 22:09:36 -0500 Subject: [PATCH] Robotron fixes, split SHR slideshows --- res/attract.conf | 2 +- res/games.conf | 2 +- res/hgr/{ROBOTRON.2084 => ROBOTRON} | Bin res/ss/ACTIONPQR1.CONF | 2 +- res/ss/ATARI.CONF | 2 +- res/ss/DEBUG.CONF | 1 + res/ss/PQR.CONF | 2 +- res/ss/SHR.CONF | 1 - res/ss/SHR1.CONF | 1 + res/ss/SHR2.CONF | 1 + res/ss/SHR3.CONF | 1 + res/ss/SHR4.CONF | 1 + src/ui.attract.mode.a | 17 ++++++++++------- src/ui.attract.shr.a | 2 +- 14 files changed, 21 insertions(+), 14 deletions(-) rename res/hgr/{ROBOTRON.2084 => ROBOTRON} (100%) create mode 100644 res/ss/DEBUG.CONF delete mode 100644 res/ss/SHR.CONF create mode 100644 res/ss/SHR1.CONF create mode 100644 res/ss/SHR2.CONF create mode 100644 res/ss/SHR3.CONF create mode 100644 res/ss/SHR4.CONF diff --git a/res/attract.conf b/res/attract.conf index 894e5f39d..3454fb5ed 100644 --- a/res/attract.conf +++ b/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 # 0 for self-running demo (|key| is an executable binary file in /demo/) # 1 for title slideshow (|key| is a file containing a list of HGR graphics in /hgr/) # 2 for action slideshow (|key| is a file containing a list of HGR graphics in /action/) # 3 for DHGR title slideshow (|key| is a file containing a list of DHGR graphics in /dhgr/) # 4 for SHR box art slideshow (|key| is a file containing a list of SHR graphics in /shr/) # # Blank lines and lines beginning with '#' are ignored (like this one!) # A line beginning with '[' terminates the parsing # SHR.CONF=4 FAVORITES1.CONF=1 BURGERTIME=0 ACTIONPOP.CONF=2 DHGR.CONF=3 STELLAR.7=0 ACTIONCD1.CONF=2 FAVORITES4.CONF=1 CONAN=0 SYNERGIST.CONF=1 ACTIONMNO1.CONF=2 HARD.HAT.MACK=0 ACTIONCLR1.CONF=2 IDSI.CONF=1 AQUATRON=0 BALLY.CONF=1 MR.DO.CONF=2 BOUNCING.KMNGAS=0 ACTIONS3.CONF=2 FAVORITES3.CONF=1 DUNG.BEETLES=0 BRODERBUND.CONF=1 ACTIONCLR2.CONF=2 JUNGLE.HUNT=0 ACTIONAB1.CONF=2 T.CONF=1 MR.COOL=0 SIRIUS.CONF=1 ACTIONCLR3.CONF=2 MATTEL.CONF=1 THUNDERBOMBS=0 FAVORITES2.CONF=1 ACTIONAB2.CONF=2 VINDICATOR=0 ACTIONBURG.CONF=2 ATARI.CONF=1 ROBOTRON=0 OTHER1.CONF=1 ACTIONEFG2.CONF=2 REPTON=0 ACTIONCLR4.CONF=2 DATAMOST.CONF=1 AGENT.USA=0 MNO.CONF=1 ACTIONPQR1.CONF=2 ALIEN.DOWNPOUR=0 ACTIONT1.CONF=2 SIERRA.CONF=1 POOYAN=0 CD.CONF=1 ACTIONCLR5.CONF=2 CEILING.ZERO=0 ACTIONPQR2.CONF=2 MICROFUN.CONF=1 GAMMA.GOBLINS=0 OTHER2.CONF=1 ACTIONT3.CONF=2 WAVY.NAVY=0 ACTIONT2.CONF=2 SYNAPSE.CONF=1 WARP.DESTROYER=0 PICCADILLY.CONF=1 ACTIONMNO2.CONF=2 CHOPLIFTER=0 ACTIONEFG1.CONF=2 DATAEAST.CONF=1 PEST.PATROL=0 EA.CONF=1 ACTIONEFG3.CONF=2 KARATEKA=0 ACTIONS2.CONF=2 SEGA.CONF=1 LOST.TOMB=0 HIJKL.CONF=1 ACTIONHIJ2.CONF=2 ALIEN.RAIN=0 ACTIONCD2.CONF=2 ACTIVISION.CONF=1 DINO.EGGS=0 TAITO.CONF=1 ACTIONAB3.CONF=2 FLIP.OUT=0 ACTIONHIJ1.CONF=2 PENGUIN.CONF=1 PACMAN=0 DATASOFT.CONF=1 ACTIONS1.CONF=2 ORILEYS.MINE=0 ACTIONCD3.CONF=2 SUBLOGIC.CONF=1 HIGH.RISE=0 EFG.CONF=1 ALIEN.AMBUSH=0 EPYX.CONF=1 BOLO=0 AB.CONF=1 CHAMP.LODERUN=0 PQR.CONF=1 GUMBALL=0 OTHER3.CONF=1 GOONIES=0 S.CONF=1 LADY.TUT=0 PIEMAN=0 SPYS.DEMISE=0 STARGATE=0 PLASMANIA=0 SPARE.CHANGE=0 SAMMY.LIGHTFOOT=0 SNEAKERS=0 LODE.RUNNER=0 SPY.HUNTER=0 NIBBLER=0 SERPENTINE=0 PITFALL.II=0 CIDER.SPIDER=0 FIREBIRD=0 TUBEWAY=0 BUZZARD.BAIT=0 SNAKE.BYTE=0 TRACK.AND.FIELD=0 #FORMULA.1=0 #SPIDER.RAID=0 [eof] \ No newline at end of file +# # 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 # 0 for self-running demo (|key| is an executable binary file in /demo/) # 1 for title slideshow (|key| is a file containing a list of HGR graphics in /hgr/) # 2 for action slideshow (|key| is a file containing a list of HGR graphics in /action/) # 3 for DHGR title slideshow (|key| is a file containing a list of DHGR graphics in /dhgr/) # 4 for SHR box art slideshow (|key| is a file containing a list of SHR graphics in /shr/) # # Blank lines and lines beginning with '#' are ignored (like this one!) # A line beginning with '[' terminates the parsing # SHR4.CONF=4 DEBUG.CONF=1 SHR1.CONF=4 SHR2.CONF=4 SHR3.CONF=4 FAVORITES1.CONF=1 ACTIONPOP.CONF=2 BURGERTIME=0 DHGR.CONF=3 STELLAR.7=0 ACTIONCD1.CONF=2 FAVORITES4.CONF=1 CONAN=0 SYNERGIST.CONF=1 ACTIONMNO1.CONF=2 HARD.HAT.MACK=0 ACTIONCLR1.CONF=2 IDSI.CONF=1 AQUATRON=0 BALLY.CONF=1 MR.DO.CONF=2 BOUNCING.KMNGAS=0 ACTIONS3.CONF=2 FAVORITES3.CONF=1 DUNG.BEETLES=0 BRODERBUND.CONF=1 ACTIONCLR2.CONF=2 JUNGLE.HUNT=0 ACTIONAB1.CONF=2 T.CONF=1 MR.COOL=0 SIRIUS.CONF=1 ACTIONCLR3.CONF=2 MATTEL.CONF=1 THUNDERBOMBS=0 FAVORITES2.CONF=1 ACTIONAB2.CONF=2 VINDICATOR=0 ACTIONBURG.CONF=2 ATARI.CONF=1 ROBOTRON=0 OTHER1.CONF=1 ACTIONEFG2.CONF=2 REPTON=0 ACTIONCLR4.CONF=2 DATAMOST.CONF=1 AGENT.USA=0 MNO.CONF=1 ACTIONPQR1.CONF=2 ALIEN.DOWNPOUR=0 ACTIONT1.CONF=2 SIERRA.CONF=1 POOYAN=0 CD.CONF=1 ACTIONCLR5.CONF=2 CEILING.ZERO=0 ACTIONPQR2.CONF=2 MICROFUN.CONF=1 GAMMA.GOBLINS=0 OTHER2.CONF=1 ACTIONT3.CONF=2 WAVY.NAVY=0 ACTIONT2.CONF=2 SYNAPSE.CONF=1 WARP.DESTROYER=0 PICCADILLY.CONF=1 ACTIONMNO2.CONF=2 CHOPLIFTER=0 ACTIONEFG1.CONF=2 DATAEAST.CONF=1 PEST.PATROL=0 EA.CONF=1 ACTIONEFG3.CONF=2 KARATEKA=0 ACTIONS2.CONF=2 SEGA.CONF=1 LOST.TOMB=0 HIJKL.CONF=1 ACTIONHIJ2.CONF=2 ALIEN.RAIN=0 ACTIONCD2.CONF=2 ACTIVISION.CONF=1 DINO.EGGS=0 TAITO.CONF=1 ACTIONAB3.CONF=2 FLIP.OUT=0 ACTIONHIJ1.CONF=2 PENGUIN.CONF=1 PACMAN=0 DATASOFT.CONF=1 ACTIONS1.CONF=2 ORILEYS.MINE=0 ACTIONCD3.CONF=2 SUBLOGIC.CONF=1 HIGH.RISE=0 EFG.CONF=1 ALIEN.AMBUSH=0 EPYX.CONF=1 BOLO=0 AB.CONF=1 CHAMP.LODERUN=0 PQR.CONF=1 GUMBALL=0 OTHER3.CONF=1 GOONIES=0 S.CONF=1 LADY.TUT=0 PIEMAN=0 SPYS.DEMISE=0 STARGATE=0 PLASMANIA=0 SPARE.CHANGE=0 SAMMY.LIGHTFOOT=0 SNEAKERS=0 LODE.RUNNER=0 SPY.HUNTER=0 NIBBLER=0 SERPENTINE=0 PITFALL.II=0 CIDER.SPIDER=0 FIREBIRD=0 TUBEWAY=0 BUZZARD.BAIT=0 SNAKE.BYTE=0 TRACK.AND.FIELD=0 #FORMULA.1=0 #SPIDER.RAID=0 [eof] \ No newline at end of file diff --git a/res/games.conf b/res/games.conf index 8d91c5bee..57544152f 100644 --- a/res/games.conf +++ b/res/games.conf @@ -1 +1 @@ -# # 4cade master game list # # Format: # AB,directory=name # # A=1 if game requires joystick, 0 if playable on keyboard # B=1 if game requires 128K, 0 if playable on 64K # # all other values for A or B -> ignore entire line (like this one!) # A line beginning with '[' terminates the parsing # 00,AGENT.USA=Agent U S A 11,AIRHEART=Airheart 00,ALCAZAR=Alcazar 10,ALIEN.AMBUSH=Alien Ambush 00,ALIEN.DOWNPOUR=Alien Downpour 00,ALIEN.RAIN=Alien Rain 00,ALIEN.MUNCHIES=Alien Munchies 00,ANKH=Ankh 00,CIDER.SPIDER=Apple Cider Spider 00,APPLE.PANIC=Apple Panic 00,AQUATRON=Aquatron 00,ARGOS=Argos 10,ARKANOID=Arkanoid 00,BATTLEZONE=Battlezone 10,BCS.QUEST=BC's Quest For Tires 00,BEER.RUN=Beer Run 00,BELLHOP=Bellhop 00,BERZAP=Berzap 00,BUDGETRILOGY=Bill Budge's Trilogy 00,BLISTER.BALL=Blister Ball 00,BOLO=Bolo 00,BOUNCING.KMNGAS=Bouncing Kamungas 00,BRAINTEASERBLVD=Brainteaser Boulevard 10,BRUCE.LEE=Bruce Lee 10,BUBBLE.BOBBLE=Bubble Bobble 00,BURGERTIME=BurgerTime 00,BUZZARD.BAIT=Buzzard Bait 00,CANNONBALL.BLTZ=Cannonball Blitz 00,CANYON.CLIMBER=Canyon Climber 10,CEILING.ZERO=Ceiling Zero 00,CENTIPEDE=Centipede 00,CHAMP.LODERUN=Championship Lode Runner 10,CHOPLIFTER=Choplifter 00,COMMANDO=Commando 00,CONAN=Conan 00,CRAZY.MAZY=Crazy Mazey 10,CRISIS.MOUNTAIN=Crisis Mountain 00,CRIME.WAVE=Crime Wave 00,CROSSFIRE=Crossfire 00,CYBERSTRIKE=Cyber Strike 01,D.GENERATION=D-Generation 10,DAVIDS.MAGIC=David's Midnight Magic 10,DEFENDER=Defender 00,DIG.DUG=Dig Dug 10,DINO.EGGS=Dino Eggs 10,DONKEY.KONG=Donkey Kong 10,DRELBS=Drelbs 00,DROL=Drol 00,DUNG.BEETLES=Dung Beetles 00,EPOCH=Epoch 00,FALCONS=Falcons 00,FS1=Flight Simulator I 00,FLIP.OUT=Flip Out 00,FIREBIRD=Firebird 10,FORMULA.1=Formula 1 Racer 00,FROGGER=Frogger 10,FUJI.SPEED.WAY=Fuji Crowded Speed Way 10,GALAXIAN=Galaxian 10,GAMMA.GOBLINS=Gamma Goblins 00,GORGON=Gorgon 00,GREMLINS=Gremlins 00,GUMBALL=Gumball 10,HERO=H.E.R.O. 00,HARD.HAT.MACK=Hard Hat Mack 00,HEAD.ON=Head On 00,HIGH.RISE=High Rise 00,HUNGRYBOY=Hungry Boy 10,IMPOSSIBLE.MISS=Impossible Mission 10,INTL.GRAN.PRIX=International Gran Prix 00,JOUST=Joust 00,JUGGLER=Juggler 00,JUMPMAN=Jumpman 00,JUNGLE.HUNT=Jungle Hunt 00,KARATEKA=Karateka 00,LADY.TUT=Lady Tut 00,LODE.RUNNER=Lode Runner 10,LOST.TOMB=Lost Tomb 10,MAD.BOMBER=Mad Bomber 10,MARBLE.MADNESS=Marble Madness 00,MARIO.BROS=Mario Bros 10,MINER.2049ER=Miner 2049er 00,MONTEZUMA=Montezuma's Revenge 00,MOON.PATROL=Moon Patrol 00,MR.COOL=Mr. Cool 10,MR.DO=Mr. Do 00,MR.ROBOT=Mr. Robot 00,MS.PACMAN=Ms. Pacman 00,NIBBLER=Nibbler 10,NIGHT.MISSION=Night Mission Pinball 00,NIGHT.STALKER=Night Stalker 00,NIGHTMARE=Nightmare Gallery 00,NORAD=NORAD 00,ORILEYS.MINE=O'Riley's Mine 00,ORBITRON=Orbitron 00,OUTPOST=Outpost 00,PAC.MAN=Pac-Man 00,PAPERBOY=Paperboy 00,PEST.PATROL=Pest Patrol 10,PHANTOMS.FIVE=Phantoms Five 00,PIEMAN=Pie-Man 00,PITSTOP.II=Pit Stop II 10,PITFALL.II=Pitfall II 00,PLASMANIA=Plasmania 00,POLLYWOG=Pollywog 00,POOYAN=Pooyan 01,PRINCEUNP=Prince of Persia 00,PUCK.MAN=Puckman 11,QIX=Qix 01,RADWARRIOR=Radwarrior 00,RASTER.BLASTER=Raster Blaster 10,RED.ALERT=Red Alert 00,REPTON=Repton 00,RESCUE.RAIDERS=Rescue Raiders 00,RIBBIT=Ribbit 00,ROBOTRON=Robotron 2084 00,SABOTAGE=Sabotage 00,SAMMY.LIGHTFOOT=Sammy Lightfoot 00,SERPENTINE=Serpentine 10,SHAMUS=Shamus 00,SHUFFLEBOARD=Shuffleboard 00,SNACK.ATTACK=Snack Attack 00,SNAKE.BYTE=Snake Byte 00,SNEAKERS=Sneakers 00,SNOGGLE=Snoggle 10,SPACE.EGGS=Space Eggs 00,SPACE.QUARKS=Space Quarks 00,SPACE.RAIDERS=Space Raiders 00,SPARE.CHANGE=Spare Change 00,SPIDER.RAID=Spider Raid 01,SPIDERBOT=Spiderbot 00,SPY.HUNTER=Spy Hunter 00,SPYS.DEMISE=Spy's Demise 10,STARBLASTER=Starblaster 10,STARGATE=Stargate 00,STELLAR.7=Stellar 7 00,SUCCESSION=Succession 00,SUICIDE=Suicide! 00,SWASHBUCKLER=Swashbuckler 00,TAG.TEAM=Tag Team Wrestling 00,TAPPER=Tapper 00,TETRIS=Tetris 01,TETRIS128K=Tetris (DHGR) 01,SUMMER.EDITION=The Games: Summer Edition 01,WINTER.EDITION=The Games: Winter Edition 10,GOONIES=The Goonies 00,THEXDER=Thexder 01,THEXDER128K=Thexder (DHGR) 00,THIEF=Thief 00,THRESHOLD=Threshold 00,THUNDERBOMBS=Thunder Bombs 10,TOMAHAWK=Tomahawk 00,TRACK.AND.FIELD=Track N Field 10,TUBEWAY=Tubeway ][ 00,TWERPS=Twerps 00,UP.N.DOWN=Up'n Down 01,VICTORY.ROAD=Victory Road 00,VINDICATOR=Vindicator 00,WARP.DESTROYER=Warp Destroyer 00,WAVY.NAVY=Wavy Navy [eof] \ No newline at end of file +# # 4cade master game list # # Format: # AB,directory=name # # A=1 if game requires joystick, 0 if playable on keyboard # B=1 if game requires 128K, 0 if playable on 64K # # all other values for A or B -> ignore entire line (like this one!) # A line beginning with '[' terminates the parsing # 00,AGENT.USA=Agent U S A 11,AIRHEART=Airheart 00,ALCAZAR=Alcazar 10,ALIEN.AMBUSH=Alien Ambush 00,ALIEN.DOWNPOUR=Alien Downpour 00,ALIEN.RAIN=Alien Rain 00,ALIEN.MUNCHIES=Alien Munchies 00,ANKH=Ankh 00,CIDER.SPIDER=Apple Cider Spider 00,APPLE.PANIC=Apple Panic 00,AQUATRON=Aquatron 00,ARGOS=Argos 10,ARKANOID=Arkanoid 00,BATTLEZONE=Battlezone 10,BCS.QUEST=BC's Quest For Tires 00,BEER.RUN=Beer Run 00,BELLHOP=Bellhop 00,BERZAP=Berzap 00,BUDGETRILOGY=Bill Budge's Trilogy 00,BLISTER.BALL=Blister Ball 00,BOLO=Bolo 00,BOUNCING.KMNGAS=Bouncing Kamungas 00,BRAINTEASERBLVD=Brainteaser Boulevard 10,BRUCE.LEE=Bruce Lee 10,BUBBLE.BOBBLE=Bubble Bobble 00,BURGERTIME=BurgerTime 00,BUZZARD.BAIT=Buzzard Bait 00,CANNONBALL.BLTZ=Cannonball Blitz 00,CANYON.CLIMBER=Canyon Climber 10,CEILING.ZERO=Ceiling Zero 00,CENTIPEDE=Centipede 00,CHAMP.LODERUN=Championship Lode Runner 10,CHOPLIFTER=Choplifter 00,COMMANDO=Commando 00,CONAN=Conan 00,CRAZY.MAZY=Crazy Mazey 10,CRISIS.MOUNTAIN=Crisis Mountain 00,CRIME.WAVE=Crime Wave 00,CROSSFIRE=Crossfire 00,CYBERSTRIKE=Cyber Strike 01,D.GENERATION=D-Generation 10,DAVIDS.MAGIC=David's Midnight Magic 10,DEFENDER=Defender 00,DIG.DUG=Dig Dug 10,DINO.EGGS=Dino Eggs 10,DONKEY.KONG=Donkey Kong 10,DRELBS=Drelbs 00,DROL=Drol 00,DUNG.BEETLES=Dung Beetles 00,EPOCH=Epoch 00,FALCONS=Falcons 00,FS1=Flight Simulator I 00,FLIP.OUT=Flip Out 00,FIREBIRD=Firebird 10,FORMULA.1=Formula 1 Racer 00,FROGGER=Frogger 10,FUJI.SPEED.WAY=Fuji Crowded Speed Way 10,GALAXIAN=Galaxian 10,GAMMA.GOBLINS=Gamma Goblins 00,GORGON=Gorgon 00,GREMLINS=Gremlins 00,GUMBALL=Gumball 10,HERO=H.E.R.O. 00,HARD.HAT.MACK=Hard Hat Mack 00,HEAD.ON=Head On 00,HIGH.RISE=High Rise 00,HUNGRYBOY=Hungry Boy 10,IMPOSSIBLE.MISS=Impossible Mission 10,INTL.GRAN.PRIX=International Gran Prix 00,JOUST=Joust 00,JUGGLER=Juggler 00,JUMPMAN=Jumpman 00,JUNGLE.HUNT=Jungle Hunt 00,KARATEKA=Karateka 00,LADY.TUT=Lady Tut 00,LODE.RUNNER=Lode Runner 10,LOST.TOMB=Lost Tomb 10,MAD.BOMBER=Mad Bomber 10,MARBLE.MADNESS=Marble Madness 00,MARIO.BROS=Mario Bros 10,MINER.2049ER=Miner 2049er 00,MONTEZUMA=Montezuma's Revenge 00,MOON.PATROL=Moon Patrol 00,MR.COOL=Mr. Cool 10,MR.DO=Mr. Do 00,MR.ROBOT=Mr. Robot 00,MS.PACMAN=Ms. Pacman 00,NIBBLER=Nibbler 10,NIGHT.MISSION=Night Mission Pinball 00,NIGHT.STALKER=Night Stalker 00,NIGHTMARE=Nightmare Gallery 00,NORAD=NORAD 00,ORILEYS.MINE=O'Riley's Mine 00,ORBITRON=Orbitron 00,OUTPOST=Outpost 00,PAC.MAN=Pac-Man 00,PAPERBOY=Paperboy 00,PEST.PATROL=Pest Patrol 10,PHANTOMS.FIVE=Phantoms Five 00,PIEMAN=Pie-Man 00,PITSTOP.II=Pit Stop II 10,PITFALL.II=Pitfall II 00,PLASMANIA=Plasmania 00,POLLYWOG=Pollywog 00,POOYAN=Pooyan 01,PRINCEUNP=Prince of Persia 00,PUCK.MAN=Puckman 11,QIX=Qix 01,RADWARRIOR=Radwarrior 00,RASTER.BLASTER=Raster Blaster 10,RED.ALERT=Red Alert 00,REPTON=Repton 00,RESCUE.RAIDERS=Rescue Raiders 00,RIBBIT=Ribbit 00,ROBOTRON=Robotron 2084 00,SABOTAGE=Sabotage 00,SAMMY.LIGHTFOOT=Sammy Lightfoot 00,SERPENTINE=Serpentine 10,SHAMUS=Shamus 00,SHUFFLEBOARD=Shuffleboard 00,SNACK.ATTACK=Snack Attack 00,SNAKE.BYTE=Snake Byte 00,SNEAKERS=Sneakers 00,SNOGGLE=Snoggle 10,SPACE.EGGS=Space Eggs 00,SPACE.QUARKS=Space Quarks 00,SPACE.RAIDERS=Space Raiders 00,SPARE.CHANGE=Spare Change 00,SPIDER.RAID=Spider Raid 01,SPIDERBOT=Spiderbot 00,SPY.HUNTER=Spy Hunter 00,SPYS.DEMISE=Spy's Demise 10,STARBLASTER=Starblaster 10,STARGATE=Stargate 00,STELLAR.7=Stellar 7 00,SUCCESSION=Succession 00,SUICIDE=Suicide! 00,SWASHBUCKLER=Swashbuckler 00,TAG.TEAM=Tag Team Wrestling 00,TAPPER=Tapper 00,TETRIS=Tetris 01,TETRIS128K=Tetris (DHGR) 01,SUMMER.EDITION=The Games: Summer Edition 01,WINTER.EDITION=The Games: Winter Edition 10,GOONIES=The Goonies 00,THEXDER=Thexder 01,THEXDER128K=Thexder (DHGR) 00,THIEF=Thief 00,THRESHOLD=Threshold 00,THUNDERBOMBS=Thunder Bombs 10,TOMAHAWK=Tomahawk 00,TRACK.AND.FIELD=Track & Field 10,TUBEWAY=Tubeway ][ 00,TWERPS=Twerps 00,UP.N.DOWN=Up'n Down 01,VICTORY.ROAD=Victory Road 00,VINDICATOR=Vindicator 00,WARP.DESTROYER=Warp Destroyer 00,WAVY.NAVY=Wavy Navy [eof] \ No newline at end of file diff --git a/res/hgr/ROBOTRON.2084 b/res/hgr/ROBOTRON similarity index 100% rename from res/hgr/ROBOTRON.2084 rename to res/hgr/ROBOTRON diff --git a/res/ss/ACTIONPQR1.CONF b/res/ss/ACTIONPQR1.CONF index 99cc683bc..57199ea45 100644 --- a/res/ss/ACTIONPQR1.CONF +++ b/res/ss/ACTIONPQR1.CONF @@ -1 +1 @@ -# # action shots slideshow of games that begin with "P","Q","R" # RESCUE.RAIDERS RASTER.BLASTER PAPERBOY PLASMANIA PHANTOMS.FIVE PEST.PATROL ROBOTRON.2084 REPTON PITFALL.II2=PITFALL.II RESCUE.RAIDERS2=RESCUE.RAIDERS [eof] \ No newline at end of file +# # action shots slideshow of games that begin with "P","Q","R" # RESCUE.RAIDERS RASTER.BLASTER PAPERBOY PLASMANIA PHANTOMS.FIVE PEST.PATROL ROBOTRON REPTON PITFALL.II2=PITFALL.II RESCUE.RAIDERS2=RESCUE.RAIDERS [eof] \ No newline at end of file diff --git a/res/ss/ATARI.CONF b/res/ss/ATARI.CONF index 8c7b6b766..71b9e6afe 100644 --- a/res/ss/ATARI.CONF +++ b/res/ss/ATARI.CONF @@ -1 +1 @@ -# # Atarisoft slideshow # BATTLEZONE DEFENDER JOUST TRACK.AND.FIELD DIG.DUG DONKEY.KONG STARGATE CENTIPEDE PAC.MAN ROBOTRON.2084 JUNGLE.HUNT MARIO.BROS MOON.PATROL GREMLINS MS.PACMAN [eof] \ No newline at end of file +# # Atarisoft slideshow # BATTLEZONE DEFENDER JOUST TRACK.AND.FIELD DIG.DUG DONKEY.KONG STARGATE CENTIPEDE PAC.MAN ROBOTRON JUNGLE.HUNT MARIO.BROS MOON.PATROL GREMLINS MS.PACMAN [eof] \ No newline at end of file diff --git a/res/ss/DEBUG.CONF b/res/ss/DEBUG.CONF new file mode 100644 index 000000000..3ae2e5d10 --- /dev/null +++ b/res/ss/DEBUG.CONF @@ -0,0 +1 @@ +PRINCEUNP [eof] \ No newline at end of file diff --git a/res/ss/PQR.CONF b/res/ss/PQR.CONF index e190918e1..1976d0555 100644 --- a/res/ss/PQR.CONF +++ b/res/ss/PQR.CONF @@ -1 +1 @@ -# # slideshow of games that begin with "P","Q","R" # RESCUE.RAIDERS PEST.PATROL PAPERBOY PIEMAN RED.ALERT PITFALL.II RASTER.BLASTER POLLYWOG PAC.MAN ROBOTRON.2084 PRINCEUNP PLASMANIA PITSTOP.II RIBBIT REPTON PHANTOMS.FIVE POOYAN PUCK.MAN [eof] \ No newline at end of file +# # slideshow of games that begin with "P","Q","R" # RESCUE.RAIDERS PEST.PATROL PAPERBOY PIEMAN RED.ALERT PITFALL.II RASTER.BLASTER POLLYWOG PAC.MAN ROBOTRON PRINCEUNP PLASMANIA PITSTOP.II RIBBIT REPTON PHANTOMS.FIVE POOYAN PUCK.MAN [eof] \ No newline at end of file diff --git a/res/ss/SHR.CONF b/res/ss/SHR.CONF deleted file mode 100644 index c53fb1455..000000000 --- a/res/ss/SHR.CONF +++ /dev/null @@ -1 +0,0 @@ -# # super hi-res slideshow # APPLE.PANIC BRUCE.LEE CHAMP.LODERUN CANYON.CLIMBER BOUNCING.KMNGAS PRINCEUNP SNAKE.BYTE AGENT.USA CANNONBALL.BLTZ ALCAZAR ALIEN.AMBUSH BCS.QUEST BOLO BRAINTEASERBLVD CHOPLIFTER CONAN CRISIS.MOUNTAIN CROSSFIRE [eof] \ No newline at end of file diff --git a/res/ss/SHR1.CONF b/res/ss/SHR1.CONF new file mode 100644 index 000000000..82915e1da --- /dev/null +++ b/res/ss/SHR1.CONF @@ -0,0 +1 @@ +# # super hi-res slideshow # APPLE.PANIC BRUCE.LEE CHAMP.LODERUN CANYON.CLIMBER BOUNCING.KMNGAS [eof] \ No newline at end of file diff --git a/res/ss/SHR2.CONF b/res/ss/SHR2.CONF new file mode 100644 index 000000000..117e147eb --- /dev/null +++ b/res/ss/SHR2.CONF @@ -0,0 +1 @@ +# # super hi-res slideshow # PRINCEUNP SNAKE.BYTE AGENT.USA CANNONBALL.BLTZ ALCAZAR [eof] \ No newline at end of file diff --git a/res/ss/SHR3.CONF b/res/ss/SHR3.CONF new file mode 100644 index 000000000..6b5c09150 --- /dev/null +++ b/res/ss/SHR3.CONF @@ -0,0 +1 @@ +# # super hi-res slideshow # ALIEN.AMBUSH BCS.QUEST BOLO BRAINTEASERBLVD CHOPLIFTER [eof] \ No newline at end of file diff --git a/res/ss/SHR4.CONF b/res/ss/SHR4.CONF new file mode 100644 index 000000000..7ed3137f6 --- /dev/null +++ b/res/ss/SHR4.CONF @@ -0,0 +1 @@ +# # super hi-res slideshow # CONAN CRISIS.MOUNTAIN CROSSFIRE [eof] \ No newline at end of file diff --git a/src/ui.attract.mode.a b/src/ui.attract.mode.a index d11c5fd69..4c848d2a7 100644 --- a/src/ui.attract.mode.a +++ b/src/ui.attract.mode.a @@ -154,6 +154,16 @@ kAttractModeConfFile ; out: $0106..$011F clobbered ;------------------------------------------------------------------------------ Home + lda MachineStatus + and #SUPPORTS_SHR + beq @noSHR + lda $C035 + ora #$08 + sta $C035 ; turn off auxmem-to-bank-E1 shadowing + lda $C029 + and #$7F + sta $C029 ; get out of SHR mode +@noSHR ldx #(@end-@start-1) - lda @start,x sta $106,x @@ -168,12 +178,5 @@ Home jsr $FB2F ; TEXT jsr $FC58 ; HOME +READ_RAM1_WRITE_RAM1 - lda MachineStatus - and #SUPPORTS_SHR - beq @noSHR - lda $C029 - and #$7F - sta $C029 ; get out of SHR mode -@noSHR rts @end diff --git a/src/ui.attract.shr.a b/src/ui.attract.shr.a index bc6193737..1643b3c00 100644 --- a/src/ui.attract.shr.a +++ b/src/ui.attract.shr.a @@ -90,7 +90,7 @@ SHRArtworkCallback BlankSHR jsr Home - lda $C029 ; set GS NEWVIDEO mode to turn off linearize + lda $C029 ; set GS NEWVIDEO mode to turn on linearize ora #$40 sta $C029