Merge branch 'main' of https://github.com/a2-4am/4cade into main

2023-04-15 10:13:18 -07:00 · 2023-04-15 10:13:18 -07:00 · 79b6cd7066
parent 01f5176544 98afd50f6c
commit 79b6cd7066
160 changed files with 191 additions and 76 deletions
--- a/res/ACTION.GR/LITTLE.BRK.OUT
+++ b/res/ACTION.GR/LITTLE.BRK.OUT
--- a/res/ACTION.HGR.UNCOMPRESSED/AERIAL
+++ b/res/ACTION.HGR.UNCOMPRESSED/AERIAL
--- a/res/ACTION.HGR.UNCOMPRESSED/AERIAL2
+++ b/res/ACTION.HGR.UNCOMPRESSED/AERIAL2
--- a/res/ACTION.HGR.UNCOMPRESSED/ASCEND
+++ b/res/ACTION.HGR.UNCOMPRESSED/ASCEND
--- a/res/ACTION.HGR.UNCOMPRESSED/ASCEND2
+++ b/res/ACTION.HGR.UNCOMPRESSED/ASCEND2
--- a/res/ACTION.HGR.UNCOMPRESSED/BATTLOT
+++ b/res/ACTION.HGR.UNCOMPRESSED/BATTLOT
--- a/res/ACTION.HGR.UNCOMPRESSED/BATTLOT2
+++ b/res/ACTION.HGR.UNCOMPRESSED/BATTLOT2
--- a/res/ACTION.HGR.UNCOMPRESSED/BOOTSKELL
+++ b/res/ACTION.HGR.UNCOMPRESSED/BOOTSKELL
--- a/res/ACTION.HGR.UNCOMPRESSED/BOOTSKELL2
+++ b/res/ACTION.HGR.UNCOMPRESSED/BOOTSKELL2
--- a/res/ACTION.HGR.UNCOMPRESSED/CACORM
+++ b/res/ACTION.HGR.UNCOMPRESSED/CACORM
--- a/res/ACTION.HGR.UNCOMPRESSED/CACORM2
+++ b/res/ACTION.HGR.UNCOMPRESSED/CACORM2
--- a/res/ACTION.HGR.UNCOMPRESSED/CAVIT
+++ b/res/ACTION.HGR.UNCOMPRESSED/CAVIT
--- a/res/ACTION.HGR.UNCOMPRESSED/CAVIT2
+++ b/res/ACTION.HGR.UNCOMPRESSED/CAVIT2
--- a/res/ACTION.HGR.UNCOMPRESSED/CRACKY
+++ b/res/ACTION.HGR.UNCOMPRESSED/CRACKY
--- a/res/ACTION.HGR.UNCOMPRESSED/CRACKY2
+++ b/res/ACTION.HGR.UNCOMPRESSED/CRACKY2
--- a/res/ACTION.HGR.UNCOMPRESSED/GUNTUS
+++ b/res/ACTION.HGR.UNCOMPRESSED/GUNTUS
--- a/res/ACTION.HGR.UNCOMPRESSED/GUNTUS2
+++ b/res/ACTION.HGR.UNCOMPRESSED/GUNTUS2
--- a/res/ACTION.HGR.UNCOMPRESSED/IMPETUS
+++ b/res/ACTION.HGR.UNCOMPRESSED/IMPETUS
--- a/res/ACTION.HGR.UNCOMPRESSED/IMPETUS2
+++ b/res/ACTION.HGR.UNCOMPRESSED/IMPETUS2
--- a/res/ACTION.HGR.UNCOMPRESSED/LIFT
+++ b/res/ACTION.HGR.UNCOMPRESSED/LIFT
--- a/res/ACTION.HGR.UNCOMPRESSED/LIFT2
+++ b/res/ACTION.HGR.UNCOMPRESSED/LIFT2
--- a/res/ACTION.HGR.UNCOMPRESSED/MAZY
+++ b/res/ACTION.HGR.UNCOMPRESSED/MAZY
--- a/res/ACTION.HGR.UNCOMPRESSED/MAZY2
+++ b/res/ACTION.HGR.UNCOMPRESSED/MAZY2
--- a/res/ACTION.HGR.UNCOMPRESSED/NEURAS
+++ b/res/ACTION.HGR.UNCOMPRESSED/NEURAS
--- a/res/ACTION.HGR.UNCOMPRESSED/NEURAS2
+++ b/res/ACTION.HGR.UNCOMPRESSED/NEURAS2
--- a/res/ACTION.HGR.UNCOMPRESSED/RUPTUS
+++ b/res/ACTION.HGR.UNCOMPRESSED/RUPTUS
--- a/res/ACTION.HGR.UNCOMPRESSED/RUPTUS2
+++ b/res/ACTION.HGR.UNCOMPRESSED/RUPTUS2
--- a/res/ACTION.HGR/AERIAL
+++ b/res/ACTION.HGR/AERIAL
--- a/res/ACTION.HGR/AERIAL2
+++ b/res/ACTION.HGR/AERIAL2
--- a/res/ACTION.HGR/ASCEND
+++ b/res/ACTION.HGR/ASCEND
--- a/res/ACTION.HGR/ASCEND2
+++ b/res/ACTION.HGR/ASCEND2
--- a/res/ACTION.HGR/BATTLOT
+++ b/res/ACTION.HGR/BATTLOT
--- a/res/ACTION.HGR/BATTLOT2
+++ b/res/ACTION.HGR/BATTLOT2
--- a/res/ACTION.HGR/BOOTSKELL
+++ b/res/ACTION.HGR/BOOTSKELL
--- a/res/ACTION.HGR/BOOTSKELL2
+++ b/res/ACTION.HGR/BOOTSKELL2
--- a/res/ACTION.HGR/CACORM
+++ b/res/ACTION.HGR/CACORM
--- a/res/ACTION.HGR/CACORM2
+++ b/res/ACTION.HGR/CACORM2
--- a/res/ACTION.HGR/CAVIT
+++ b/res/ACTION.HGR/CAVIT
--- a/res/ACTION.HGR/CAVIT2
+++ b/res/ACTION.HGR/CAVIT2
--- a/res/ACTION.HGR/CRACKY
+++ b/res/ACTION.HGR/CRACKY
--- a/res/ACTION.HGR/CRACKY2
+++ b/res/ACTION.HGR/CRACKY2
--- a/res/ACTION.HGR/GUNTUS
+++ b/res/ACTION.HGR/GUNTUS
--- a/res/ACTION.HGR/GUNTUS2
+++ b/res/ACTION.HGR/GUNTUS2
--- a/res/ACTION.HGR/IMPETUS
+++ b/res/ACTION.HGR/IMPETUS
--- a/res/ACTION.HGR/IMPETUS2
+++ b/res/ACTION.HGR/IMPETUS2
--- a/res/ACTION.HGR/LIFT
+++ b/res/ACTION.HGR/LIFT
--- a/res/ACTION.HGR/LIFT2
+++ b/res/ACTION.HGR/LIFT2
--- a/res/ACTION.HGR/MAZY
+++ b/res/ACTION.HGR/MAZY
--- a/res/ACTION.HGR/MAZY2
+++ b/res/ACTION.HGR/MAZY2
--- a/res/ACTION.HGR/NEURAS
+++ b/res/ACTION.HGR/NEURAS
--- a/res/ACTION.HGR/NEURAS2
+++ b/res/ACTION.HGR/NEURAS2
--- a/res/ACTION.HGR/RUPTUS
+++ b/res/ACTION.HGR/RUPTUS
--- a/res/ACTION.HGR/RUPTUS2
+++ b/res/ACTION.HGR/RUPTUS2
--- a/res/ATTRACT.CONF
+++ b/res/ATTRACT.CONF
@ -240,6 +240,7 @@ SHR11.CONF=5
 # set 12
 SEGA.CONF=1
 LOST.TOMB=0
+INDIE4.CONF=1
 ACTIONMNO6.CONF=2
 HIJKL.CONF=1
 LABYRINTH=0
@ -422,6 +423,7 @@ SHR20.CONF=5
 # set 21
 CD4.CONF=1
 LASER.BOUNCE=0
+ACTIONCD10.CONF=2
 DATAMOST2.CONF=1
 LAZER.SILK=0
 ACTIONCD7.CONF=2
@ -441,6 +443,7 @@ SHR21.CONF=5
 # set 22
 SIERRA2.CONF=1
 DUNG.BEETLES=0
+ACTIONCD11.CONF=2
 MNO5.CONF=1
 SPIDER.RAID=0
 ACTIONPOP3.CONF=2
--- a/res/ATTRACT/AERIAL
+++ b/res/ATTRACT/AERIAL
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+AERIAL2=A
+AERIAL=A

 [eof]
--- a/res/ATTRACT/ASCEND
+++ b/res/ATTRACT/ASCEND
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+ASCEND2=A
+ASCEND=A

 [eof]
--- a/res/ATTRACT/BATTLOT
+++ b/res/ATTRACT/BATTLOT
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+BATTLOT2=A
+BATTLOT=A

 [eof]
--- a/res/ATTRACT/BOOTSKELL
+++ b/res/ATTRACT/BOOTSKELL
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+BOOTSKELL2=A
+BOOTSKELL=A

 [eof]
--- a/res/ATTRACT/CACORM
+++ b/res/ATTRACT/CACORM
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+CACORM2=A
+CACORM=A

 [eof]
--- a/res/ATTRACT/CAVIT
+++ b/res/ATTRACT/CAVIT
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+CAVIT2=A
+CAVIT=A

 [eof]
--- a/res/ATTRACT/CRACKY
+++ b/res/ATTRACT/CRACKY
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+CRACKY2=A
+CRACKY=A

 [eof]
--- a/res/ATTRACT/GUNTUS
+++ b/res/ATTRACT/GUNTUS
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+GUNTUS2=A
+GUNTUS=A

 [eof]
--- a/res/ATTRACT/IMPETUS
+++ b/res/ATTRACT/IMPETUS
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+IMPETUS2=A
+IMPETUS=A

 [eof]
--- a/res/ATTRACT/LIFT
+++ b/res/ATTRACT/LIFT
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+LIFT2=A
+LIFT=A

 [eof]
--- a/res/ATTRACT/LITTLE.BRK.OUT
+++ b/res/ATTRACT/LITTLE.BRK.OUT
@ -3,5 +3,6 @@
 # This file is automatically generated
 #

+LITTLE.BRK.OUT=D

 [eof]
--- a/res/ATTRACT/MAZY
+++ b/res/ATTRACT/MAZY
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+MAZY2=A
+MAZY=A

 [eof]
--- a/res/ATTRACT/NEURAS
+++ b/res/ATTRACT/NEURAS
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+NEURAS2=A
+NEURAS=A

 [eof]
--- a/res/ATTRACT/RUPTUS
+++ b/res/ATTRACT/RUPTUS
@ -3,5 +3,7 @@
 # This file is automatically generated
 #

+RUPTUS2=A
+RUPTUS=A

 [eof]
--- a/res/SS/AB2.CONF
+++ b/res/SS/AB2.CONF
@ -6,6 +6,7 @@ ALCAZAR
 ARGOS
 BELLHOP
 BB
+ASCEND
 BEER.RUN
 BLOODSUCKERS
 ALIEN.AMBUSH
--- a/res/SS/AB3.CONF
+++ b/res/SS/AB3.CONF
@ -8,6 +8,7 @@ BOLO
 ALIEN.MUNCHIES
 BLISTER.BALL
 BT
+AERIAL
 ANKH
 ALIEN.TYPHOON

--- a/res/SS/AB4.CONF
+++ b/res/SS/AB4.CONF
@ -7,6 +7,7 @@ BUG.ATTACK
 AB
 AXIS.ASSASSIN
 BR
+BATTLOT
 BUBBLE.HEAD
 BLACK.MAGIC
 BW
--- a/res/SS/AB5.CONF
+++ b/res/SS/AB5.CONF
@ -12,5 +12,6 @@ ARCHON.II
 BOA
 BOULDER.DASH.II
 APPLE.ZAP
+BOOTSKELL

 [eof]
--- a/res/SS/ACTGR1.CONF
+++ b/res/SS/ACTGR1.CONF
@ -9,5 +9,6 @@ BC
 POLLYWOG
 FIREBUG2=FIREBUG
 MAZEBLOX
+LITTLE.BRK.OUT

 [eof]
--- a/res/SS/ACTIONAB10.CONF
+++ b/res/SS/ACTIONAB10.CONF
@ -4,6 +4,7 @@

 BLACK.MAGIC
 ARCHON2=ARCHON
+AERIAL
 BATTLEZONE
 BOULDER.DASH3=BOULDER.DASH
 AZTEC3=AZTEC
--- a/res/SS/ACTIONAB3.CONF
+++ b/res/SS/ACTIONAB3.CONF
@ -7,6 +7,7 @@ BUZZARD.BAIT
 ALIEN.MUNCHIES
 B13=B1
 BB
+BOOTSKELL2=BOOTSKELL
 ALIEN.AMBUSH
 BR2=BR
 BW
--- a/res/SS/ACTIONAB4.CONF
+++ b/res/SS/ACTIONAB4.CONF
@ -6,6 +6,7 @@ BUL1=BU
 BH
 BLISTER.BALL
 AXIS.ASSASSIN5=AXIS.ASSASSIN
+BOOTSKELL
 B22=B2
 BLITZKRIEG
 ALIEN.TYPHOON3=ALIEN.TYPHOON
--- a/res/SS/ACTIONAB5.CONF
+++ b/res/SS/ACTIONAB5.CONF
@ -4,6 +4,7 @@

 BUL2=BU
 ARCHON.II
+BATTLOT2=BATTLOT
 AXIS.ASSASSIN
 BUTCHERBOB.86
 B15=B1
--- a/res/SS/ACTIONAB6.CONF
+++ b/res/SS/ACTIONAB6.CONF
@ -9,6 +9,7 @@ B16=B1
 BEZOFF
 AA
 BANDITS
+BATTLOT
 BLACK.MAGIC3=BLACK.MAGIC
 ARTESIANS2=ARTESIANS
 APPLE.ZAP
--- a/res/SS/ACTIONAB7.CONF
+++ b/res/SS/ACTIONAB7.CONF
@ -4,6 +4,7 @@

 BANDITS2=BANDITS
 BATTLE.CRUISER
+ASCEND2=ASCEND
 BOUNCING.KMNGA2=BK
 BEER.RUN
 AO
--- a/res/SS/ACTIONAB8.CONF
+++ b/res/SS/ACTIONAB8.CONF
@ -8,6 +8,7 @@ ALIEN.LANDER2=ALIEN.LANDER
 AB
 ALF
 BUG.BATTLE
+ASCEND
 ARCTIC.FOX
 BOA
 APPLE.INVADER
--- a/res/SS/ACTIONAB9.CONF
+++ b/res/SS/ACTIONAB9.CONF
@ -7,6 +7,7 @@ ARENA
 BEZARE2=BEZARE
 B23=B2
 ALF2=ALF
+AERIAL2=AERIAL
 ALIEN.LANDER
 AXIS.ASSASSIN4=AXIS.ASSASSIN
 ARTESIANS
--- a/res/SS/ACTIONCD1.CONF
+++ b/res/SS/ACTIONCD1.CONF
@ -7,11 +7,10 @@ CALI.RAISINS2=CALI.RAISINS
 COMMANDO
 CS
 CROSSFIRE
+CAVIT2=CAVIT
 DAWN.TREADER2=DAWN.TREADER
 DONKEY.KONG2=DONKEY.KONG
 DUNG.BEETLES2=DUNG.BEETLES
 DJ3=DJ
-CHIVALRY
-DIAMOND.MINE

 [eof]
--- a/res/SS/ACTIONCD10.CONF
+++ b/res/SS/ACTIONCD10.CONF
@ -0,0 +1,16 @@
+#
+# action shots slideshow of games that begin with "C","D"
+#
+
+CHIVALRY
+DIAMOND.MINE
+DEFENDER
+CW2=CW
+CG
+CYCLOD
+CHIVALRY4=CHIVALRY
+CRIME.WAVE
+COLUMNS2=COLUMNS
+CV2=CV
+
+[eof]
--- a/res/SS/ACTIONCD11.CONF
+++ b/res/SS/ACTIONCD11.CONF
@ -0,0 +1,15 @@
+#
+# action shots slideshow of games that begin with "C","D"
+#
+
+CV
+CR
+CENTIPEDE
+CREEPY.CRRIDORS
+CUBIT
+CACORM
+COUNTY.FAIR
+CHIVALRY6=CHIVALRY
+CAVIT
+
+[eof]
--- a/res/SS/ACTIONCD2.CONF
+++ b/res/SS/ACTIONCD2.CONF
@ -11,7 +11,5 @@ CRICKATEER2=CRICKATEER
 CRYSTAL.CASTLE2=CRYSTAL.CASTLES
 CS3=CS
 DIAMOND.MINE2=DIAMOND.MINE
-DEFENDER
-CW2=CW

 [eof]
--- a/res/SS/ACTIONCD3.CONF
+++ b/res/SS/ACTIONCD3.CONF
@ -11,7 +11,5 @@ DINO.EGGS
 DAWN.TREADER
 CYBER.STRIKE
 CALI.RAISINS
-CG
-CYCLOD

 [eof]
--- a/res/SS/ACTIONCD4.CONF
+++ b/res/SS/ACTIONCD4.CONF
@ -11,7 +11,5 @@ DONKEY.KONG
 COLUMNS
 DEMONIC.DECKS2=DEMONIC.DECKS
 CHRONO.WARRIOR5=CHRONO.WARRIOR
-CHIVALRY4=CHIVALRY
-CRIME.WAVE

 [eof]
--- a/res/SS/ACTIONCD5.CONF
+++ b/res/SS/ACTIONCD5.CONF
@ -7,11 +7,10 @@ DU
 DEEP.SPACE3=DEEP.SPACE
 DOUBLE.TROUBLE
 DINO.SMURF
+CRACKY2=CRACKY
 CHRONO.WARRIOR4=CHRONO.WARRIOR
 DEPTH.CHARGE
 CHIVALRY5=CHIVALRY
 CUBIT2=CUBIT
-COLUMNS2=COLUMNS
-CV2=CV

 [eof]
--- a/res/SS/ACTIONCD6.CONF
+++ b/res/SS/ACTIONCD6.CONF
@ -8,10 +8,9 @@ CONGO
 CQ2=CQ
 DJ
 CYCLOTRON
+CRACKY
 CR2=CR
 DEEP.SPACE2=DEEP.SPACE
 DRELBS
-COUNTY.FAIR
-CHIVALRY6=CHIVALRY

 [eof]
--- a/res/SS/ACTIONCD7.CONF
+++ b/res/SS/ACTIONCD7.CONF
@ -10,8 +10,7 @@ COSMIC.COMBAT
 CHRONO.WARRIOR
 COLLECT
 DEEP.SPACE
+CACORM2=CACORM
 DJ2=DJ
-CV
-CR

 [eof]
--- a/res/SS/ACTIONCD8.CONF
+++ b/res/SS/ACTIONCD8.CONF
@ -11,7 +11,5 @@ CHRONO.WARRIOR2=CHRONO.WARRIOR
 CHIVALRY2=CHIVALRY
 DJ4=DJ
 CW
-CUBIT
-FIRE.AND.ICE

 [eof]
--- a/res/SS/ACTIONCD9.CONF
+++ b/res/SS/ACTIONCD9.CONF
@ -11,7 +11,5 @@ DOGFIGHT.II
 CC
 CHRONO.WARRIOR3=CHRONO.WARRIOR
 CF
-CENTIPEDE
-CREEPY.CRRIDORS

 [eof]
--- a/res/SS/ACTIONEFG6.CONF
+++ b/res/SS/ACTIONEFG6.CONF
@ -7,6 +7,7 @@ FREE.FALL
 GENESIS
 GUARDIAN
 FALCONS
+GUNTUS2=GUNTUS
 FLOBYNOID
 FAT.CITY
 EXTERMINATOR
--- a/res/SS/ACTIONEFG7.CONF
+++ b/res/SS/ACTIONEFG7.CONF
@ -7,6 +7,7 @@ FLAK
 GALACTIC.ATTACK
 EARLY.BIRD
 GADGETZ3=GADGETZ
+GUNTUS
 FEDERATION
 GENIUS.3B=GENIUS.3
 FALCONS.SCORE=FALCONS
--- a/res/SS/ACTIONEFG8.CONF
+++ b/res/SS/ACTIONEFG8.CONF
@ -12,5 +12,6 @@ GOLD.RUSH
 GRAPPLE
 GENETIC.DRIFT
 GADGETZ2=GADGETZ
+FIRE.AND.ICE

 [eof]
--- a/res/SS/ACTIONHIJ2.CONF
+++ b/res/SS/ACTIONHIJ2.CONF
@ -6,6 +6,7 @@ LODE001=LODE.RUNNER
 HARD.HAT.MACK
 LOST.TOMB
 HORIZON.V2=HORIZON.V
+LIFT2=LIFT
 HANDY.DANDY
 HELLSTORM2=HELLSTORM
 INFILTRATOR
--- a/res/SS/ACTIONHIJ3.CONF
+++ b/res/SS/ACTIONHIJ3.CONF
@ -7,6 +7,7 @@ INFILTRATOR.2B=INFILTRATOR.2
 LANCASTER
 JOVIAN.ATTACK
 HADRON
+IMPETUS2=IMPETUS
 LAZER.SILK
 HELLSTORM
 HEAD.ON
--- a/res/SS/ACTIONHIJ4.CONF
+++ b/res/SS/ACTIONHIJ4.CONF
@ -5,10 +5,12 @@
 HARD.HAT.MACK3=HARD.HAT.MACK
 LABYRINTH
 HYPER.HEAD.ON
+LIFT
 INFILTRATOR3=INFILTRATOR
 LL
 LASER.BOUNCE
 IO
 LP
+IMPETUS

 [eof]
--- a/res/SS/ACTIONMNO1.CONF
+++ b/res/SS/ACTIONMNO1.CONF
@ -8,6 +8,7 @@ MARBLE.MADNESS
 MZ01=MZ
 MINER.2049ER
 NARNIA
+NEURAS
 N.O.R.A.D
 ORBITRON
 MB3=MB
--- a/res/SS/ACTIONMNO2.CONF
+++ b/res/SS/ACTIONMNO2.CONF
@ -7,6 +7,7 @@ NM
 MEGABOTS3=MEGABOTS
 MB1=MB
 MICROWAVE
+MAZY2=MAZY
 NARNIA2=NARNIA
 OUTWORLD2=OUTWORLD
 MD.L10=MD
--- a/Show More
+++ b/Show More