Bug fixes for 0.65 release - as reported by Justin De Lucia

1) Atari ST - TOS file error. Was due to the emulator save state storing physical TOS file path rather than taking relative install path from the command line arguments. As a consequence, the save states are removed and the load screens appear. 2) Remove DK Junior 2 game from Atari ST. As this now shows a demo on start-up. 3) ZX80 Kong - This was moved to DKWolf emulation under ZX81 and fully working. 4) The double ladders on the Crazy Kong board were lowered in height to match the ones present on the other floors. A lives counter was also added to the Crazy Kong board. 5) Add ? to Can you reach the infamous killscreen at 22-1 text
10yard · Jul 31, 2024 · 262d395 · 262d395
1 parent 7c862c0
commit 262d395
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 55 deletions.
diff --git a/artwork/about/crt_rgb.jpg b/artwork/about/crt_rgb.jpg
diff --git a/artwork/about/crt_rgb.png b/artwork/about/crt_rgb.png
diff --git a/artwork/background4.png b/artwork/background4.png
diff --git a/build64.bat b/build64.bat
@@ -88,6 +88,6 @@ echo **** Bonus roms includes with the addon pack
 copy roms\logger.zip dist\console_addon\roms\ /Y
 copy roms\congo.zip dist\console_addon\roms\ /Y
 
-del releases\add-ons\dkafe_console_addon_pack_v3.zip
+del releases\add-ons\dkafe_console_addon_pack_v4.zip
 %zip_path% a releases\add-ons\dkafe_console_addon_pack_v4.zip .\dist\console_addon\*
 rmdir dist\console_addon /s /Q
diff --git a/dk_config.py b/dk_config.py
@@ -506,7 +506,7 @@
 • Use practice modes to get 
   better at each stage.  
   Can you reach the infamous 
-  killscreen at level 22-1.
+  killscreen at level 22-1?
 
 Good luck!
 """
@@ -554,7 +554,7 @@
    Vic20 George
    Kirai Shouen & 125scratch
 
-Donkey Kong hacking resource:
+Donkey Kong hack resource:
    furrykef
 
 Feedback and feature ideas:
@@ -633,8 +633,7 @@
     "vic20":"Commodore VIC-20",
     "vic20_se":"Commodore VIC-20",
     "x1":"Sharp X1",
-    "zx80":"Sinclair ZX80",
-    "zx81":"Sinclair ZX81"}
+    "zx81":"Sinclair ZX80/81"}
 
 # System specific media switches when not simply "-cart"
 SYSTEM_MEDIA = {
@@ -707,7 +706,7 @@
     "pc_arduboy_kong2":"ctrl>a|alt>b|p>s|1>a|2>b|esc>forcequit:projectabe.exe",
     "pc_arduboy_dkjr":"ctrl>a|alt>b|p>s|1>a|2>b|esc>forcequit:projectabe.exe",
     "pc_atarist_mb":"ctrl>space",
-    "pc_atarist_junior":"num 1>a|num 2>b",
+    "pc_atarist_junior":"ctrl>ctrl,space|num 1>a|num 2>b",
     "pc_atom_kong":"left>z|right>c|up>s|down>x|ctrl>shift,space|esc>forcequit:atomulator.exe",
     "pc_dk_aa": "1>enter|2>enter|ctrl>x",
     "pc_dk_craze": "esc>forcequit:stdrt.exe",
@@ -743,8 +742,7 @@
     "pc_trs80_dk":"ctrl>space|num 1>enter,1",
     "pc_trs80_killergorilla":"ctrl>space",
     "pc_trs80_skyscraper":"ctrl>space|1>1,n,\\,enter",
-    "pc_spectrum_dkjr2":"left>o|right>p|up>q|down>a|ctrl>m|num 2>num 1|num 3>num 1|alt>n|esc>forcequit:zesarux.exe",
-    "pc_zx80_kong":"ctrl>num 0|esc>forcequit:zesarux.exe"}
+    "pc_spectrum_dkjr2":"left>o|right>p|up>q|down>a|ctrl>m|num 2>num 1|num 3>num 1|alt>n|esc>forcequit:zesarux.exe"}
 
 # Sound setup
 pygame.mixer.init(frequency=48000)

diff --git a/dkwolf/cfg/spec128.cfg b/dkwolf/cfg/spec128.cfg
@@ -2,9 +2,6 @@
 <!-- This file is autogenerated; comments and unknown tags will be stripped -->
 <mameconfig version="10">
     <system name="spec128">
-        <video>
-            <target index="0" view="Screen 0 Pixel Aspect (44:37)" />
-        </video>
         <input>
             <keyboard tag=":" enabled="1" />
             <port tag=":LINE1" type="KEYBOARD" mask="1" defvalue="1">
@@ -17,16 +14,6 @@
                     KEYCODE_Q OR KEYCODE_UP
                 </newseq>
             </port>
-            <port tag=":LINE3" type="KEYBOARD" mask="1" defvalue="1">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":LINE4" type="KEYBOARD" mask="1" defvalue="1">
-                <newseq type="standard">
-                    KEYCODE_0 OR KEYCODE_1
-                </newseq>
-            </port>
             <port tag=":LINE5" type="KEYBOARD" mask="1" defvalue="1">
                 <newseq type="standard">
                     KEYCODE_P OR KEYCODE_RIGHT
@@ -37,9 +24,9 @@
                     KEYCODE_O OR KEYCODE_LEFT
                 </newseq>
             </port>
-            <port tag=":LINE7" type="KEYBOARD" mask="1" defvalue="1">
+            <port tag=":LINE7" type="KEYBOARD" mask="4" defvalue="4">
                 <newseq type="standard">
-                    KEYCODE_SPACE OR KEYCODE_LCONTROL
+                    KEYCODE_M OR KEYCODE_LCONTROL
                 </newseq>
             </port>
         </input>

diff --git a/dkwolf/cfg/spectrum.cfg b/dkwolf/cfg/spectrum.cfg
@@ -4,31 +4,6 @@
     <system name="spectrum">
         <input>
             <keyboard tag=":" enabled="1" />
-            <port tag=":exp:kempjoy:JOY" type="P1_JOYSTICK_RIGHT" mask="1" defvalue="0">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":exp:kempjoy:JOY" type="P1_JOYSTICK_LEFT" mask="2" defvalue="0">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":exp:kempjoy:JOY" type="P1_JOYSTICK_DOWN" mask="4" defvalue="0">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":exp:kempjoy:JOY" type="P1_JOYSTICK_UP" mask="8" defvalue="0">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
-            <port tag=":exp:kempjoy:JOY" type="P1_BUTTON1" mask="16" defvalue="0">
-                <newseq type="standard">
-                    NONE
-                </newseq>
-            </port>
         </input>
         <image_directories>
             <device instance="snapshot" directory="C:\dkafe\roms\spectrum\spectrum_krazykong.zip\" />

diff --git a/dkwolf/cfg/zx81.cfg b/dkwolf/cfg/zx81.cfg
@@ -19,6 +19,31 @@
                     NONE
                 </newseq>
             </port>
+            <port tag=":ROW3" type="KEYBOARD" mask="16" defvalue="16">
+                <newseq type="standard">
+                    KEYCODE_5 OR KEYCODE_LEFT
+                </newseq>
+            </port>
+            <port tag=":ROW4" type="KEYBOARD" mask="1" defvalue="1">
+                <newseq type="standard">
+                    KEYCODE_0 OR KEYCODE_LCONTROL
+                </newseq>
+            </port>
+            <port tag=":ROW4" type="KEYBOARD" mask="4" defvalue="4">
+                <newseq type="standard">
+                    KEYCODE_8 OR KEYCODE_RIGHT
+                </newseq>
+            </port>
+            <port tag=":ROW4" type="KEYBOARD" mask="8" defvalue="8">
+                <newseq type="standard">
+                    KEYCODE_7 OR KEYCODE_UP
+                </newseq>
+            </port>
+            <port tag=":ROW4" type="KEYBOARD" mask="16" defvalue="16">
+                <newseq type="standard">
+                    KEYCODE_6 OR KEYCODE_DOWN
+                </newseq>
+            </port>
             <port tag=":ROW5" type="KEYBOARD" mask="8" defvalue="8">
                 <newseq type="standard">
                     KEYCODE_U OR KEYCODE_UP OR KEYCODE_LCONTROL

diff --git a/interface/shell.lua b/interface/shell.lua
@@ -181,6 +181,8 @@ rom_table["vic20_krazykong_nufecop"] = {"P1",          true,  550,   {360,"RUN\n
 rom_table["vic20-se_logger"]         = {"P1",          false, 4600,  {360,"LOAD\n",420,"{PLAY}",4100,"RUN\n",
 													 5000,"{SHIFT}",5000,"{HOME}"},   1.33,  2,   0,   0 }
 rom_table["x1"]                      = {"",            false,  2100,  {},                                               9,     4,   0,   0 }
+rom_table["zx81"]                    = {"",            false, 0,     {360,'J""\n',420,"{PLAY}"},                        2,     4,   0,   0 }
+rom_table["zx81_kong"]               = {"",            true,  19500, {360,'J""\n',420,"{PLAY}"},                        2,     4,   0,   0 }
 rom_table["zx81_crazykong"]          = {"",            true,  10750, {360,'J""\n',420,"{PLAY}",10400,"\n",10500,"1\n"}, 2,     4,   0,   0 }
 rom_table["zx81_kongsrevenge"]       = {"",            false, 20200, {360,'J""\n',420,"{PLAY}",20100, "n\n"},           2,     4,   0,   0 }
 rom_table["zx81_krazykong_pss"]      = {"JJ",          true,  11660, {360,'J""\n',420,"{PLAY}",11500," ",11600," "},    2,     4,   0,   0 }

diff --git a/launch.py b/launch.py
@@ -145,7 +145,7 @@ def check_patches_available():
                 clear_screen()
                 write_text(f"INSTALLING ADD-ONS...       ", font=dk_font, y=0, fg=RED)
             _, _count = _s.read_romlist("romlist_addon.csv")
-            write_text(f"** {str(_count)} DK VARIANTS WERE INSTALLED WITH THE ADD-ON PACK**", font=pl_font, x=0, y=239, fg=PINK)
+            write_text(f"+ {str(_count)} DK VARIANTS WERE INSTALLED WITH THE ADD-ON PACK", font=pl_font, x=0, y=239, fg=PINK)
         if applied_patches or installed_addons:
             jump_to_continue(0)
     else:
@@ -358,6 +358,7 @@ def play_sound_effect(effect=None, stop=False):
 def play_intro_animation():
     play_sound_effect("jump.wav")
     if SHOW_SPLASHSCREEN:
+        _delay = int(CLOCK_RATE * 0.88)
         for _key in _s.intro_frames():
             check_for_input()
             if _g.jump or _g.start or _g.skip:
@@ -378,6 +379,7 @@ def play_intro_animation():
 
                 if 480 < current < 840:
                     write_text(f"{str(_g.romcount)} versions of DK detected!", x=108, y=38, bg=MAGENTA, fg=PINK, bubble=True)
+                    _delay = int(CLOCK_RATE * 0.8)
 
                 # display nearby icons as girders are broken
                 for from_scene, to_scene, below_y, above_y, smash_scene in SCENE_ICONS:
@@ -393,7 +395,7 @@ def play_intro_animation():
                 write_text(" FRONT END ", font=dk_font, x=69, y=8, bg=BLACK)
 
             show_score()
-            update_screen(delay_ms=int(CLOCK_RATE * 0.875))
+            update_screen(delay_ms=_delay)
 
 
 def display_slots(version_only=False, logo_scene=False):

diff --git a/readme.md b/readme.md
@@ -386,7 +386,7 @@ If rotating your monitor then you may want to add the OPTION `-nokeepaspect` to
 
 For Raspberry Pi,  refer to [Raspberry Pi Notes](rpi4/rpi4_notes.md) for information on connecting to a CRT TV via RGB Scart or Composite AV.
 
-![CRT goodness](https://github.com/10yard/dkafe/blob/master/artwork/about/crt_rgb.png)
+![CRT goodness](https://github.com/10yard/dkafe/blob/master/artwork/about/crt_rgb.jpg)
 
 
 ### Frontend Settings

diff --git a/romlist_addon.csv b/romlist_addon.csv
@@ -104,14 +104,14 @@ pc_trs80_kong,shell,Kong,TRS80: Kong,197,,,213000,2,4,8
 pc_trs80_dk,shell,TRS,TRS80: Donkey Kong,198,,,214000,2,4,8
 pc_atarist_mb,shell,Monkey,ST: Monkey Business,199,,,215000,2,4,8
 pc_atarist_kidkong,shell,STDK,ST: Kid Kong,200,,,216000,2,4,8
-pc_zx80_kong,shell,ZX80,ZX80: Kong,201,,,217000,2,4,8
+zx81_kong,shell,ZX80,ZX80: Kong,201,,,217000,2,4,8
 pc_dkme_gremlins,shell,PC Gremlins,PC: Donkey Kong Gremlins,202,,,218000,2,4,8
 pc_dkme_flashgordon,shell,FG,PC: Donkey Kong Flash Gordon,203,,,219000,2,4,8
 pc_dkme_bigtrouble,shell,BT,PC: Donkey Kong Big Trouble,204,,,220000,2,4,8
 pc_dkme_conan,shell,Conan,PC: Donkey Kong Conan,205,,,221000,2,4,8
 pc_dkme_firstblood,shell,Rambo,PC: Donkey Kong First Blood,207,,,222000,2,4,8
 pc_dkme_totalrecall,shell,Recall,PC: Donkey Kong Total Recall,209,,,223000,2,4,8
-spec128_dk_arcade,shell,SPEC Arcade,SPEC128K: Donkey Kong Arcade,210,,,224000,2,4,8
+spec128_dk_arcade,shell,SPEC Arcade,SPEC128K: DK Arcade,210,,,224000,2,4,8
 pc_a2600_arcade_easy,shell,2600 Arcade,2600: Arcade Demo (Easy),212,,,225000,2,4,8
 cgenie_colourkong32,shell,EGCK,EG2000: Colour Kong 32,213,,,226000,2,4,8
 pc_fixitfelix,shell,PC FIFJR,PC: Fix-It Felix Classic,214,,,227000,2,4,8
@@ -240,7 +240,6 @@ pc_a2600_arcade_hard,shell,VCS(Hard),2600: Arcade Demo (Hard),9999,,,221000,2,4,
 pc_arduboy_dkjr,shell,DK JR,ARDUBOY: DK Junior,9999,,,220000,2,4,8
 pc_arduboy_kong,shell,Kong,ARDUBOY: Kong,9999,,,220000,2,4,8
 pc_arduboy_kong2,shell,Kong 2,ARDUBOY: Kong 2,9999,,,220000,2,4,8
-pc_atarist_junior,shell,JR,ST: Donkey JR (G&W),9999,,,186000,2,4,8
 pc_atom_kong,shell,AcornKong,ATOM: Acorn Kong,9999,,,208000,2,4,8
 pc_dk_jr_remake,shell,JR,PC: Donkey Kong JR Remake,9999,,,197000,2,4,8
 pc_dk_plus,shell,PC DK+,PC: Donkey Kong Plus,9999,,,197000,2,4,8
@@ -306,11 +305,12 @@ zx81_zonkeykong,shell,ZonkeyKong,ZX81: Zonkey Kong,9999,,,160000,2,4,8
 ##hbf900a_congo,shell,**Controls not working,MSX: Congo,####,,,0,2,4,8
 ##mz700_building_hopper,shell,**Not DK enough,SHARP: Building Hopper,####,,,0,2,4,8
 ##mz700_jumpman,shell,**Crashes,SHARP: Jumpman,####,,,0,2,4,8
+##pc_atarist_junior,shell,**Need to skip demo,ST: Donkey JR (G&W),####,,,0,2,4,8
 ##plus4_larrymonkey,shell,**Graphics issues,C16/+4: Larry Monkey,####,,,0,2,4,8
 ##spectrum_spec_kong,shell,**jump not working,SPEC48K: Spec Kong,####,,,0,2,4,8
 ##vic20_cannonball,shell,**Doesnt start,VIC20: Cannonball Blitz,####,,,0,2,4,8
 ##vic20_dk,shell,**Start up trouble,VIC20: Donkey Kong,####,,,0,2,4,8
-##vic20_fast_eddie,shell,**Not DK enough,VIC20: Fast Eddie,####,,,188000,2,4,8
+##vic20_fast_eddie,shell,**Not DK enough,VIC20: Fast Eddie,####,,,0,2,4,8
 ##vic20_vic_kong,shell,**Similar to nufecop,VIC20: Vic Kong,####,,,0,2,4,8
 ##vic20-se_logger,shell,**Multi stage loading,VIC20: Logger,####,,,0,2,4,8
 ##vic20-se_mickybricky,shell,**tape speed issue,VIC20: Micky The Bricky,####,,,0,2,4,8