diff --git a/res/ACTION.HGR.UNCOMPRESSED/FIGHT.NIGHT b/res/ACTION.HGR.UNCOMPRESSED/FIGHT.NIGHT new file mode 100644 index 000000000..b0a3220c7 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/FIGHT.NIGHT differ diff --git a/res/ACTION.HGR.UNCOMPRESSED/KUNG.FU.MASTER b/res/ACTION.HGR.UNCOMPRESSED/KUNG.FU.MASTER new file mode 100644 index 000000000..6c4859817 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/KUNG.FU.MASTER differ diff --git a/res/ACTION.HGR/FIGHT.NIGHT b/res/ACTION.HGR/FIGHT.NIGHT new file mode 100644 index 000000000..9be0a28cb Binary files /dev/null and b/res/ACTION.HGR/FIGHT.NIGHT differ diff --git a/res/ACTION.HGR/KUNG.FU.MASTER b/res/ACTION.HGR/KUNG.FU.MASTER new file mode 100644 index 000000000..fe718be6b Binary files /dev/null and b/res/ACTION.HGR/KUNG.FU.MASTER differ diff --git a/res/ACTION.HGR/_FileInformation.txt b/res/ACTION.HGR/_FileInformation.txt index 1815520d3..c4445beab 100644 --- a/res/ACTION.HGR/_FileInformation.txt +++ b/res/ACTION.HGR/_FileInformation.txt @@ -210,6 +210,7 @@ EGGS.IT=Type(06),AuxType(3FF8),Access(C3) EPOCH=Type(06),AuxType(3FF8),Access(C3) FALCONS=Type(06),AuxType(3FF8),Access(C3) FALCONS.SCORE=Type(06),AuxType(3FF8),Access(C3) +FIGHT.NIGHT=Type(06),AuxType(3FF8),Access(C3) FIREBIRD=Type(06),AuxType(3FF8),Access(C3) FIREBIRD2=Type(06),AuxType(3FF8),Access(C3) FLIP.OUT=Type(06),AuxType(3FF8),Access(C3) @@ -313,6 +314,7 @@ KID.NIKI509=Type(06),AuxType(3FF8),Access(C3) KID.NIKI510=Type(06),AuxType(3FF8),Access(C3) KID.NIKI609=Type(06),AuxType(3FF8),Access(C3) KID.NIKI709=Type(06),AuxType(3FF8),Access(C3) +KUNG.FU.MASTER=Type(06),AuxType(3FF8),Access(C3) LABYRINTH=Type(06),AuxType(3FF8),Access(C3) LADY.TUT=Type(06),AuxType(3FF8),Access(C3) LANCASTER=Type(06),AuxType(3FF8),Access(C3) diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/FIGHT.NIGHT b/res/ARTWORK.SHR.UNCOMPRESSED/FIGHT.NIGHT new file mode 100644 index 000000000..19830c4d8 Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/FIGHT.NIGHT differ diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/KUNG.FU.MASTER b/res/ARTWORK.SHR.UNCOMPRESSED/KUNG.FU.MASTER new file mode 100644 index 000000000..be6d6305c Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/KUNG.FU.MASTER differ diff --git a/res/ARTWORK.SHR/FIGHT.NIGHT b/res/ARTWORK.SHR/FIGHT.NIGHT new file mode 100644 index 000000000..923df084b Binary files /dev/null and b/res/ARTWORK.SHR/FIGHT.NIGHT differ diff --git a/res/ARTWORK.SHR/KUNG.FU.MASTER b/res/ARTWORK.SHR/KUNG.FU.MASTER new file mode 100644 index 000000000..a3916b699 Binary files /dev/null and b/res/ARTWORK.SHR/KUNG.FU.MASTER differ diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt index fc7fd6670..212ebc64f 100644 --- a/res/ARTWORK.SHR/_FileInformation.txt +++ b/res/ARTWORK.SHR/_FileInformation.txt @@ -47,6 +47,7 @@ DRELBS=Type(06),AuxType(1FF8),Access(C3) DROL=Type(06),AuxType(1FF8),Access(C3) EAGLES.NEST=Type(06),AuxType(1FF8),Access(C3) EGGS.IT=Type(06),AuxType(1FF8),Access(C3) +FIGHT.NIGHT=Type(06),AuxType(1FF8),Access(C3) FORCE.7=Type(06),AuxType(1FF8),Access(C3) FROGGER.II=Type(06),AuxType(1FF8),Access(C3) FS2=Type(06),AuxType(1FF8),Access(C3) @@ -68,6 +69,7 @@ JUMPMAN=Type(06),AuxType(1FF8),Access(C3) KARATE.CHAMP=Type(06),AuxType(1FF8),Access(C3) KARATEKA=Type(06),AuxType(1FF8),Access(C3) KID.NIKI=Type(06),AuxType(1FF8),Access(C3) +KUNG.FU.MASTER=Type(06),AuxType(1FF8),Access(C3) LADY.TUT=Type(06),AuxType(1FF8),Access(C3) LANCASTER=Type(06),AuxType(1FF8),Access(C3) LAZER.SILK=Type(06),AuxType(1FF8),Access(C3) diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF index 5df5740df..56d169d08 100644 --- a/res/ATTRACT.CONF +++ b/res/ATTRACT.CONF @@ -296,6 +296,7 @@ ACTIONBH.CONF=2 ACTIONBH2.CONF=2 ACTIONROM.CONF=2 ACTIONT4.CONF=2 +ACTIONEFG6.CONF=2 OTHER7.CONF=1 S4.CONF=1 ACCESS.CONF=1 diff --git a/res/ATTRACT/FIGHT.NIGHT b/res/ATTRACT/FIGHT.NIGHT index 0f234c1ac..3028b6e8c 100644 --- a/res/ATTRACT/FIGHT.NIGHT +++ b/res/ATTRACT/FIGHT.NIGHT @@ -3,5 +3,7 @@ # This file is automatically generated # +ARTWORK.SHR/FIGHT.NIGHT=C +ACTION.HGR/FIGHT.NIGHT=A [eof] diff --git a/res/ATTRACT/KUNG.FU.MASTER b/res/ATTRACT/KUNG.FU.MASTER index f849265f0..770e7ee93 100644 --- a/res/ATTRACT/KUNG.FU.MASTER +++ b/res/ATTRACT/KUNG.FU.MASTER @@ -3,5 +3,7 @@ # This file is automatically generated # +ARTWORK.SHR/KUNG.FU.MASTER=C +ACTION.HGR/KUNG.FU.MASTER=A [eof] diff --git a/res/SS/ACTIONEFG1.CONF b/res/SS/ACTIONEFG1.CONF index 09cb9606c..75fab693a 100644 --- a/res/SS/ACTIONEFG1.CONF +++ b/res/SS/ACTIONEFG1.CONF @@ -10,7 +10,6 @@ GAMMA.GOBLINS4=GAMMA.GOBLINS FALCONS.SCORE=FALCONS GENIUS.2 FIREBIRD2=FIREBIRD -GUMBALL FORCE.7 GHOSTBUSTERS diff --git a/res/SS/ACTIONEFG2.CONF b/res/SS/ACTIONEFG2.CONF index 86a24fc6c..9eee8efae 100644 --- a/res/SS/ACTIONEFG2.CONF +++ b/res/SS/ACTIONEFG2.CONF @@ -7,7 +7,6 @@ THE.GOONIES GAMMA.GOBLINS5=GAMMA.GOBLINS FROGGER FORCE.72=FORCE.7 -FREE.FALL THE.GOONIES5=THE.GOONIES EPOCH GAMMA.GOBLINS2=GAMMA.GOBLINS diff --git a/res/SS/ACTIONEFG3.CONF b/res/SS/ACTIONEFG3.CONF index 3765a056c..a62c2b336 100644 --- a/res/SS/ACTIONEFG3.CONF +++ b/res/SS/ACTIONEFG3.CONF @@ -6,7 +6,6 @@ GAUNTLET2=GAUNTLET THE.GOONIES6=THE.GOONIES G.I.JOE3=G.I.JOE GENIUSB=GENIUS -FORMULA.1.RACER GUARDIAN2=GUARDIAN FORCE.73=FORCE.7 GAMMA.GOBLINS diff --git a/res/SS/ACTIONEFG4.CONF b/res/SS/ACTIONEFG4.CONF index fc4487dbc..52156d7b6 100644 --- a/res/SS/ACTIONEFG4.CONF +++ b/res/SS/ACTIONEFG4.CONF @@ -6,7 +6,6 @@ GUMBALL2=GUMBALL FROGGER.II GALAXY.GATES G.I.JOE2=G.I.JOE -GUARDIAN THE.GOONIES2=THE.GOONIES FORCE.74=FORCE.7 GENIUS diff --git a/res/SS/ACTIONEFG5.CONF b/res/SS/ACTIONEFG5.CONF index 19d80b9ac..c2ef54b9c 100644 --- a/res/SS/ACTIONEFG5.CONF +++ b/res/SS/ACTIONEFG5.CONF @@ -7,7 +7,6 @@ THE.GOONIES4=THE.GOONIES FLIP.OUT GENIUS.2B=GENIUS.2 GENETIC.DRIFT -FALCONS FIREBIRD G.I.JOE FREE.FALL2=FREE.FALL diff --git a/res/SS/ACTIONEFG6.CONF b/res/SS/ACTIONEFG6.CONF new file mode 100644 index 000000000..16f24a7da --- /dev/null +++ b/res/SS/ACTIONEFG6.CONF @@ -0,0 +1,12 @@ +# +# action shots slideshow of games that begin with "E","F","G" +# + +GUMBALL +FIGHT.NIGHT +FREE.FALL +FORMULA.1.RACER +GUARDIAN +FALCONS + +[eof] diff --git a/res/SS/ACTIONHIJ3.CONF b/res/SS/ACTIONHIJ3.CONF index e79fba1ff..284eae238 100644 --- a/res/SS/ACTIONHIJ3.CONF +++ b/res/SS/ACTIONHIJ3.CONF @@ -10,5 +10,6 @@ HEAD.ON HUNGRYBOY2=HUNGRYBOY HORIZON.V JOUST +KUNG.FU.MASTER [eof] diff --git a/res/SS/DATAEAST.CONF b/res/SS/DATAEAST.CONF index e9b3b60b1..e6aec1bed 100644 --- a/res/SS/DATAEAST.CONF +++ b/res/SS/DATAEAST.CONF @@ -4,6 +4,7 @@ TAG.TEAM BUBBLE.BOBBLE +KUNG.FU.MASTER COMMANDO IKARI.WARRIORS KID.NIKI diff --git a/res/SS/HIJKL3.CONF b/res/SS/HIJKL3.CONF index b7817eddc..d9318b661 100644 --- a/res/SS/HIJKL3.CONF +++ b/res/SS/HIJKL3.CONF @@ -6,6 +6,7 @@ I.O.SILVER LASER.BOUNCE KAMIKAZE LABYRINTH +KUNG.FU.MASTER HORIZON.V INTL.GRAN.PRIX LITTLE.COMP.PPL diff --git a/res/SS/OTHER7.CONF b/res/SS/OTHER7.CONF index 42787f38a..e6b9015cb 100644 --- a/res/SS/OTHER7.CONF +++ b/res/SS/OTHER7.CONF @@ -6,5 +6,6 @@ CAVRNS.CALLISTO MANIC.MINER THUNDERHEAD OUTWORLD +FIGHT.NIGHT [eof] diff --git a/res/SS/SHR27.CONF b/res/SS/SHR27.CONF index d2c17e1a0..45b6000cd 100644 --- a/res/SS/SHR27.CONF +++ b/res/SS/SHR27.CONF @@ -7,5 +7,7 @@ SUPER.BUNNY BOULDER.DASH BEACH.HEAD.II RAID.OVR.MOSCOW +KUNG.FU.MASTER +FIGHT.NIGHT [eof] diff --git a/res/SS/_FileInformation.txt b/res/SS/_FileInformation.txt index 366b7d9ea..bbadbdee6 100644 --- a/res/SS/_FileInformation.txt +++ b/res/SS/_FileInformation.txt @@ -54,6 +54,7 @@ ACTIONEFG2.CONF=Type(04),AuxType(4000),Access(C3) ACTIONEFG3.CONF=Type(04),AuxType(4000),Access(C3) ACTIONEFG4.CONF=Type(04),AuxType(4000),Access(C3) ACTIONEFG5.CONF=Type(04),AuxType(4000),Access(C3) +ACTIONEFG6.CONF=Type(04),AuxType(4000),Access(C3) ACTIONHERO.CONF=Type(04),AuxType(4000),Access(C3) ACTIONHIJ1.CONF=Type(04),AuxType(4000),Access(C3) ACTIONHIJ2.CONF=Type(04),AuxType(4000),Access(C3)