diff --git a/res/ACTION.HGR.UNCOMPRESSED/MAXWELL.MANOR b/res/ACTION.HGR.UNCOMPRESSED/MAXWELL.MANOR new file mode 100644 index 000000000..a1fa73e80 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/MAXWELL.MANOR differ diff --git a/res/ACTION.HGR.UNCOMPRESSED/MAXWELL.MANOR2 b/res/ACTION.HGR.UNCOMPRESSED/MAXWELL.MANOR2 new file mode 100644 index 000000000..39e6e2805 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/MAXWELL.MANOR2 differ diff --git a/res/ACTION.HGR/MAXWELL.MANOR b/res/ACTION.HGR/MAXWELL.MANOR new file mode 100644 index 000000000..ef1f45a6f Binary files /dev/null and b/res/ACTION.HGR/MAXWELL.MANOR differ diff --git a/res/ACTION.HGR/MAXWELL.MANOR2 b/res/ACTION.HGR/MAXWELL.MANOR2 new file mode 100644 index 000000000..0ac57c15b Binary files /dev/null and b/res/ACTION.HGR/MAXWELL.MANOR2 differ diff --git a/res/ACTION.HGR/_FileInformation.txt b/res/ACTION.HGR/_FileInformation.txt index e2d28917b..d5895fcea 100644 --- a/res/ACTION.HGR/_FileInformation.txt +++ b/res/ACTION.HGR/_FileInformation.txt @@ -336,6 +336,8 @@ MATTERHORN5=Type(06),AuxType(3FF8),Access(C3) MATTERHORN6=Type(06),AuxType(3FF8),Access(C3) MATTERHORN7=Type(06),AuxType(3FF8),Access(C3) MATTERHORN8=Type(06),AuxType(3FF8),Access(C3) +MAXWELL.MANOR=Type(06),AuxType(3FF8),Access(C3) +MAXWELL.MANOR2=Type(06),AuxType(3FF8),Access(C3) MINER.2049.II01=Type(06),AuxType(3FF8),Access(C3) MINER.2049.II02=Type(06),AuxType(3FF8),Access(C3) MINER.2049.II03=Type(06),AuxType(3FF8),Access(C3) diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/MAXWELL.MANOR b/res/ARTWORK.SHR.UNCOMPRESSED/MAXWELL.MANOR new file mode 100644 index 000000000..4b104c6d5 Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/MAXWELL.MANOR differ diff --git a/res/ARTWORK.SHR/MAXWELL.MANOR b/res/ARTWORK.SHR/MAXWELL.MANOR new file mode 100644 index 000000000..55282b849 Binary files /dev/null and b/res/ARTWORK.SHR/MAXWELL.MANOR differ diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt index c24e43de5..9db01d6ab 100644 --- a/res/ARTWORK.SHR/_FileInformation.txt +++ b/res/ARTWORK.SHR/_FileInformation.txt @@ -71,6 +71,7 @@ LOST.TOMB=Type(06),AuxType(1FF8),Access(C3) MARBLE.MADNESS=Type(06),AuxType(1FF8),Access(C3) MARIO.BROS=Type(06),AuxType(1FF8),Access(C3) MATTERHORN=Type(06),AuxType(1FF8),Access(C3) +MAXWELL.MANOR=Type(06),AuxType(1FF8),Access(C3) MINER.2049ER=Type(06),AuxType(1FF8),Access(C3) MR.COOL=Type(06),AuxType(1FF8),Access(C3) MR.ROBOT=Type(06),AuxType(1FF8),Access(C3) diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF index fbe7906a6..6443287ff 100644 --- a/res/ATTRACT.CONF +++ b/res/ATTRACT.CONF @@ -283,6 +283,7 @@ SHR21.CONF=5 SHR22.CONF=5 SHR23.CONF=5 SHR24.CONF=5 +SHR25.CONF=5 ACTIONAB4.CONF=2 LASER.BOUNCE=0 ACTIONCD5.CONF=2 diff --git a/res/ATTRACT/MAXWELL.MANOR b/res/ATTRACT/MAXWELL.MANOR index ac013f243..5029cc51c 100644 --- a/res/ATTRACT/MAXWELL.MANOR +++ b/res/ATTRACT/MAXWELL.MANOR @@ -3,5 +3,8 @@ # This file is automatically generated # +ARTWORK.SHR/MAXWELL.MANOR=C +ACTION.HGR/MAXWELL.MANOR2=A +ACTION.HGR/MAXWELL.MANOR=A [eof] diff --git a/res/SS/ACTIONMNO2.CONF b/res/SS/ACTIONMNO2.CONF index fc9ecb135..d65a0812e 100644 --- a/res/SS/ACTIONMNO2.CONF +++ b/res/SS/ACTIONMNO2.CONF @@ -6,6 +6,7 @@ MR.DO.L03=MR.DO MARIO.BROS1=MARIO.BROS MOON.PATROL ONE.ON.ONE2=ONE.ON.ONE +MAXWELL.MANOR NIBBLER NIGHTMARE N.O.R.A.D2=N.O.R.A.D diff --git a/res/SS/ACTIONMNO3.CONF b/res/SS/ACTIONMNO3.CONF index dcffc6f40..ffae55e4f 100644 --- a/res/SS/ACTIONMNO3.CONF +++ b/res/SS/ACTIONMNO3.CONF @@ -7,6 +7,7 @@ NIGHT.STALKER MARIO.BROS2=MARIO.BROS MR.DO.L02=MR.DO MINER.2049ER2=MINER.2049ER +MAXWELL.MANOR2=MAXWELL.MANOR MATING.ZONE MAD.BOMBER MINGS.CHALLENGE diff --git a/res/SS/MNO3.CONF b/res/SS/MNO3.CONF index cf4d4187f..7093405f2 100644 --- a/res/SS/MNO3.CONF +++ b/res/SS/MNO3.CONF @@ -12,5 +12,6 @@ MINGS.CHALLENGE ONE.ON.ONE MINER.2049.II MANIC.MINER +MAXWELL.MANOR [eof] diff --git a/res/SS/OTHER6.CONF b/res/SS/OTHER6.CONF index fb16840c4..7450e3945 100644 --- a/res/SS/OTHER6.CONF +++ b/res/SS/OTHER6.CONF @@ -3,6 +3,7 @@ # GAUNTLET +MAXWELL.MANOR BATTLE.CRUISER GENIUS PENETRATOR diff --git a/res/SS/SHR24.CONF b/res/SS/SHR24.CONF index f92eb3be8..7289531b1 100644 --- a/res/SS/SHR24.CONF +++ b/res/SS/SHR24.CONF @@ -7,9 +7,5 @@ LITTLE.COMP.PPL JAWBREAKER.II CAVRNS.CALLISTO BATTLE.CHESS -G.I.JOE -SPINDIZZY -COUNTY.FAIR -GHOSTBUSTERS [eof] diff --git a/res/SS/SHR25.CONF b/res/SS/SHR25.CONF new file mode 100644 index 000000000..284630097 --- /dev/null +++ b/res/SS/SHR25.CONF @@ -0,0 +1,11 @@ +# +# super hi-res slideshow +# + +G.I.JOE +SPINDIZZY +COUNTY.FAIR +GHOSTBUSTERS +MAXWELL.MANOR + +[eof] diff --git a/res/SS/_FileInformation.txt b/res/SS/_FileInformation.txt index b21da2224..24fdc447a 100644 --- a/res/SS/_FileInformation.txt +++ b/res/SS/_FileInformation.txt @@ -159,6 +159,7 @@ SHR21.CONF=Type(04),AuxType(4000),Access(C3) SHR22.CONF=Type(04),AuxType(4000),Access(C3) SHR23.CONF=Type(04),AuxType(4000),Access(C3) SHR24.CONF=Type(04),AuxType(4000),Access(C3) +SHR25.CONF=Type(04),AuxType(4000),Access(C3) SHR3.CONF=Type(04),AuxType(4000),Access(C3) SHR4.CONF=Type(04),AuxType(4000),Access(C3) SHR5.CONF=Type(04),AuxType(4000),Access(C3)