diff --git a/res/ACTION.HGR.UNCOMPRESSED/BUTCHERBOB.86 b/res/ACTION.HGR.UNCOMPRESSED/BUTCHERBOB.86 new file mode 100644 index 000000000..6985a3435 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/BUTCHERBOB.86 differ diff --git a/res/ACTION.HGR/BUTCHERBOB.86 b/res/ACTION.HGR/BUTCHERBOB.86 new file mode 100644 index 000000000..d2b9ce893 Binary files /dev/null and b/res/ACTION.HGR/BUTCHERBOB.86 differ diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF index b3dc95f1e..965bc92e0 100644 --- a/res/ATTRACT.CONF +++ b/res/ATTRACT.CONF @@ -196,6 +196,7 @@ GALAXIAN=0 P2.CONF=1 ACTIONMNO4.CONF=2 ROBOTRON.2084=0 +AB7.CONF=1 ACTIONPOP5.CONF=2 SHR9.CONF=5 @@ -213,6 +214,7 @@ ACTIONT2.CONF=2 CD3.CONF=1 ACTIONBH.CONF=2 NI=0 +INDIE3.CONF=1 ACTION2049.CONF=2 SHR10.CONF=5 @@ -274,6 +276,7 @@ GEBELLI.CONF=1 #3 ACTIONS7.CONF=2 SERPENTINE=0 +SMURF.CONF=1 ACTIONT4.CONF=2 SHR13.CONF=5 diff --git a/res/ATTRACT/BUTCHERBOB.86 b/res/ATTRACT/BUTCHERBOB.86 index de4c7c253..66b287c58 100644 --- a/res/ATTRACT/BUTCHERBOB.86 +++ b/res/ATTRACT/BUTCHERBOB.86 @@ -3,5 +3,6 @@ # This file is automatically generated # +BUTCHERBOB.86=A [eof] diff --git a/res/SS/AB1.CONF b/res/SS/AB1.CONF index b76597114..7814a39e2 100644 --- a/res/SS/AB1.CONF +++ b/res/SS/AB1.CONF @@ -8,9 +8,8 @@ BUBBLE.BOBBLE AC BU BK +BUTCHERBOB.86 ALF -ARKANOID -ALIEN.DOWNPOUR AQUATRON [eof] diff --git a/res/SS/AB2.CONF b/res/SS/AB2.CONF index 665ef0599..f721c2d7f 100644 --- a/res/SS/AB2.CONF +++ b/res/SS/AB2.CONF @@ -11,7 +11,5 @@ BLOODSUCKERS ALIEN.AMBUSH BUZZARD.BAIT APPLE.PANIC -AGENT.U.S.A -B2 [eof] diff --git a/res/SS/AB3.CONF b/res/SS/AB3.CONF index d888eff63..9429fa1c3 100644 --- a/res/SS/AB3.CONF +++ b/res/SS/AB3.CONF @@ -10,7 +10,5 @@ BLISTER.BALL BT ANKH ALIEN.TYPHOON -BALLBLAZER -BH [eof] diff --git a/res/SS/AB4.CONF b/res/SS/AB4.CONF index 0812ffa28..07261ea45 100644 --- a/res/SS/AB4.CONF +++ b/res/SS/AB4.CONF @@ -11,7 +11,5 @@ BLACK.MAGIC BW AS A.E -BEZARE -BLITZKRIEG [eof] diff --git a/res/SS/AB5.CONF b/res/SS/AB5.CONF index 9990b4ba1..4d6a1322d 100644 --- a/res/SS/AB5.CONF +++ b/res/SS/AB5.CONF @@ -11,7 +11,6 @@ ARCTIC.FOX ARCHON.II BOA BOULDER.DASH.II -APPLE.INVADER -ANGEL.1 +APPLE.ZAP [eof] diff --git a/res/SS/AB6.CONF b/res/SS/AB6.CONF index e49ea6750..bf6fde605 100644 --- a/res/SS/AB6.CONF +++ b/res/SS/AB6.CONF @@ -12,6 +12,5 @@ AO ARTESIANS ALIEN.LANDER APE.ESCAPE -APPLE.ZAP [eof] diff --git a/res/SS/AB7.CONF b/res/SS/AB7.CONF new file mode 100644 index 000000000..3d62b4a00 --- /dev/null +++ b/res/SS/AB7.CONF @@ -0,0 +1,16 @@ +# +# slideshow of games that begin with "A","B" +# + +ARKANOID +ALIEN.DOWNPOUR +AGENT.U.S.A +B2 +BALLBLAZER +BH +BEZARE +BLITZKRIEG +APPLE.INVADER +ANGEL.1 + +[eof] diff --git a/res/SS/ACTIONAB5.CONF b/res/SS/ACTIONAB5.CONF index d0fedae70..d1097fc3e 100644 --- a/res/SS/ACTIONAB5.CONF +++ b/res/SS/ACTIONAB5.CONF @@ -5,6 +5,7 @@ BUL2=BU ARCHON.II AXIS.ASSASSIN +BUTCHERBOB.86 B15=B1 BR BEZOFF2=BEZOFF diff --git a/res/SS/INDIE.CONF b/res/SS/INDIE.CONF index 698c9e55b..6bdb43885 100644 --- a/res/SS/INDIE.CONF +++ b/res/SS/INDIE.CONF @@ -9,8 +9,5 @@ BERZAP CS GADGETZ DU -GENIUS.2 -OID.ZONE -FLOPPY [eof] diff --git a/res/SS/INDIE2.CONF b/res/SS/INDIE2.CONF index 2b7c89e10..347ec702e 100644 --- a/res/SS/INDIE2.CONF +++ b/res/SS/INDIE2.CONF @@ -10,8 +10,5 @@ FLOBYNOID RETRO.FEVER DEMONIC.DECKS DJ -LA -NT -WALL.DEFENCE [eof] diff --git a/res/SS/INDIE3.CONF b/res/SS/INDIE3.CONF new file mode 100644 index 000000000..ca7791b88 --- /dev/null +++ b/res/SS/INDIE3.CONF @@ -0,0 +1,13 @@ +# +# slideshow of independent titles (fan-made, self-published, parodies, &c.) +# + +BUTCHERBOB.86 +LA +NT +WALL.DEFENCE +GENIUS.2 +OID.ZONE +FLOPPY + +[eof] diff --git a/res/SS/SMURF.CONF b/res/SS/SMURF.CONF new file mode 100644 index 000000000..3fd30c04d --- /dev/null +++ b/res/SS/SMURF.CONF @@ -0,0 +1,9 @@ +# +# Smurf-themed spoofs title slideshow +# + +DINO.SMURF +CS +BUTCHERBOB.86 + +[eof] diff --git a/res/history.md b/res/history.md index ef9912449..161ee116f 100644 --- a/res/history.md +++ b/res/history.md @@ -23,6 +23,7 @@ - Bongo's Bash - Boulder Dash II - Bug Battle +- ButcherBob '86 - C'est La Vie - California Raisins - Captain Power diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 5e47b53cb..2c525f173 100644 --- a/src/index/artwork.idx.a +++ b/src/index/artwork.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14995329 + !be24 14996180 !le16 5108 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index eab3da05c..aa77280e0 100644 --- a/src/index/attract.idx.a +++ b/src/index/attract.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14943163 - !le16 5521 + !be24 14943903 + !le16 5562 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 714fc0547..bb7e00238 100644 --- a/src/index/cache00.idx.a +++ b/src/index/cache00.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14879143 + !be24 14879883 !le16 3932 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 5c258a147..b505fe8f6 100644 --- a/src/index/cache01.idx.a +++ b/src/index/cache01.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14892982 + !be24 14893722 !le16 4354 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 6e0e1f610..23d09802a 100644 --- a/src/index/cache10.idx.a +++ b/src/index/cache10.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14910272 + !be24 14911012 !le16 5527 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index c59fc14f7..b6503e194 100644 --- a/src/index/cache11.idx.a +++ b/src/index/cache11.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14930058 + !be24 14930798 !le16 6146 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 9c5e37539..d5d057393 100644 --- a/src/index/coverfade.idx.a +++ b/src/index/coverfade.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15000437 + !be24 15001288 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 20264cbab..2ccaf6254 100644 --- a/src/index/credits.idx.a +++ b/src/index/credits.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15001191 + !be24 15002042 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 7ff37573d..0faef95ac 100644 --- a/src/index/decrunch.idx.a +++ b/src/index/decrunch.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15001639 + !be24 15002490 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index f7fda0611..8b16950b2 100644 --- a/src/index/dfx.idx.a +++ b/src/index/dfx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14951324 + !be24 14952105 !le16 1640 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index de2de67de..ad29d4efd 100644 --- a/src/index/dgr.fizzle.idx.a +++ b/src/index/dgr.fizzle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15000923 + !be24 15001774 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index 147bc7449..d6a415c60 100644 --- a/src/index/dgr.idx.a +++ b/src/index/dgr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14995270 + !be24 14996121 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 744b50174..2b185bf42 100644 --- a/src/index/dhgr.idx.a +++ b/src/index/dhgr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14993736 + !be24 14994587 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index b5d1f12a8..9273d4304 100644 --- a/src/index/dtitle.idx.a +++ b/src/index/dtitle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14978915 + !be24 14979746 !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index e8b56992e..d628b39e2 100644 --- a/src/index/fx.idx.a +++ b/src/index/fx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14948684 + !be24 14949465 !le16 2640 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index 2b60cd43c..bf840f0ef 100644 --- a/src/index/gamehelp.idx.a +++ b/src/index/gamehelp.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14953322 + !be24 14954103 !le16 6959 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index acf35f17e..1fb1fac77 100644 --- a/src/index/gr.fizzle.idx.a +++ b/src/index/gr.fizzle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15000847 + !be24 15001698 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index e2bbf9b2a..40ad70f42 100644 --- a/src/index/gr.idx.a +++ b/src/index/gr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14995173 + !be24 14996024 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 3b8085c47..c497e06e9 100644 --- a/src/index/helptext.idx.a +++ b/src/index/helptext.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15000990 + !be24 15001841 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 054c98277..b3e296709 100644 --- a/src/index/hgr0.idx.a +++ b/src/index/hgr0.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14979452 - !le16 4625 + !be24 14980283 + !le16 4645 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 60aa75898..d92751adb 100644 --- a/src/index/hgr1.idx.a +++ b/src/index/hgr1.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14984077 + !be24 14984928 !le16 1702 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 90307018e..e4a955e9c 100644 --- a/src/index/hgr2.idx.a +++ b/src/index/hgr2.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14985779 + !be24 14986630 !le16 1087 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 525e2daa9..1f2a8421c 100644 --- a/src/index/hgr3.idx.a +++ b/src/index/hgr3.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14986866 + !be24 14987717 !le16 3279 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 08821b3fc..55527c081 100644 --- a/src/index/hgr4.idx.a +++ b/src/index/hgr4.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14990145 + !be24 14990996 !le16 2998 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index 4f9d66d92..afde70bcd 100644 --- a/src/index/hgr5.idx.a +++ b/src/index/hgr5.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14993143 + !be24 14993994 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index b3efc0a48..bb907db46 100644 --- a/src/index/hgr6.idx.a +++ b/src/index/hgr6.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14993622 + !be24 14994473 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index e481a2106..6b13660cc 100644 --- a/src/index/joystick.idx.a +++ b/src/index/joystick.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15001942 + !be24 15002793 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 47cee23c8..b566f7ff1 100644 --- a/src/index/miniattract0.idx.a +++ b/src/index/miniattract0.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14965448 + !be24 14966279 !le16 4692 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index ea8a9604e..774168a1d 100644 --- a/src/index/miniattract1.idx.a +++ b/src/index/miniattract1.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14970140 + !be24 14970971 !le16 2271 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index d7c437827..601319255 100644 --- a/src/index/prelaunch.idx.a +++ b/src/index/prelaunch.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14936204 + !be24 14936944 !le16 6959 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 7872ed773..1ad00485b 100644 --- a/src/index/search00.idx.a +++ b/src/index/search00.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14870110 + !be24 14870850 !le16 9033 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index 80c6a5ba5..24cb357e4 100644 --- a/src/index/search01.idx.a +++ b/src/index/search01.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14883075 + !be24 14883815 !le16 9907 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 02db07aaf..fda2a04fb 100644 --- a/src/index/search10.idx.a +++ b/src/index/search10.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14897336 + !be24 14898076 !le16 12936 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 81bbcee68..4c93c9d1e 100644 --- a/src/index/search11.idx.a +++ b/src/index/search11.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14915799 + !be24 14916539 !le16 14259 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index b9010543e..cfcb9f325 100644 --- a/src/index/sfx.idx.a +++ b/src/index/sfx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14952964 + !be24 14953745 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index bf0731b7e..356191a42 100644 --- a/src/index/slideshow.idx.a +++ b/src/index/slideshow.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14960281 - !le16 5167 + !be24 14961062 + !le16 5217 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index 9c6562a50..fd1198d5f 100644 --- a/src/index/title.idx.a +++ b/src/index/title.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14972411 + !be24 14973242 !le16 6504 diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a index b02aac5e4..00daa06b2 100644 --- a/src/index/xsingle.idx.a +++ b/src/index/xsingle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 14866245 + !be24 14866985 !le16 3865