Add DK JR L22 to romlist with patch/dkongjrl22.ips

10yard · Nov 28, 2024 · 1e738f5 · 1e738f5
1 parent 5a1a2fb
commit 1e738f5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/dk_config.py b/dk_config.py
@@ -257,6 +257,7 @@ def is_pi():
     ("dkongjrvines", "dkstart5:2"),
     ("dkongjrchains", "dkstart5:3"),
     ("dkongjrhideout", "dkstart5:4"),
+    ("dkongjrl22", "dklevel22"),
     ("ckongpt2_barrels", "dkstart5:1"),
     ("ckongpt2_pies", "dkstart5:2"),
     ("ckongpt2_springs", "dkstart5:3"),

diff --git a/dkwolf/cfg/dkong.cfg b/dkwolf/cfg/dkong.cfg
@@ -3,7 +3,7 @@
 <mameconfig version="10">
     <system name="dkong">
         <counters>
-            <coins index="0" number="165" />
+            <coins index="0" number="181" />
         </counters>
     </system>
 </mameconfig>
diff --git a/launch.py b/launch.py
@@ -42,7 +42,7 @@ def exit_program(confirm=False):
             for attempt in 1, 2, 3:
                 try:
                     with open('save.p', 'wb') as f:
-                        pickle.dump([_g.score, _g.timer_adjust, _g.last_selected, _g.achievements], f)
+                        pickle.dump([_g.score, _g.timer_adjust, _g.achievements], f)
                     break
                 except (EOFError, FileNotFoundError, IOError):
                     pygame.time.delay(250 * attempt)
@@ -130,9 +130,9 @@ def update_screen(delay_ms=0):
 def load_frontend_state():
     try:
         with open('save.p', "rb") as f:
-            _g.score, _g.timer_adjust, _g.last_selected, _g.achievements = pickle.load(f)
+            _g.score, _g.timer_adjust, _g.achievements = pickle.load(f)
     except (EOFError, FileNotFoundError, IOError, ValueError):
-        _g.score, _g.timer_adjust, _g.last_selected, _g.achievements = SCORE_START, 0, None, {}
+        _g.score, _g.timer_adjust, _g.achievements = SCORE_START, 0, {}
 
 
 def check_patches_available():
@@ -145,7 +145,7 @@ def check_patches_available():
             for i, patch in enumerate(applied_patches):
                 write_text(patch.upper().replace("_","-"), font=pl_font7, x=x_offset, y=y_offset)
                 update_screen(delay_ms=20)
-                y_offset += 7
+                y_offset += 6
                 if y_offset > 232:
                     x_offset += 75
                     y_offset = 11
@@ -684,7 +684,7 @@ def build_menus(initial=False):
                             write_text(f"Generating game list..", x=108 + _g.psx, y=38 + _g.psy, bg=MAGENTA, fg=PINK, bubble=True)
                             #_percent = ceil(_count / len(_g.romlist) * 100)
                             # write_text(f"Generating game list..{str(_percent)}%", x=108 + _g.psx, y=38 + _g.psy, bg=MAGENTA, fg=PINK, bubble=True)
-                            # update_screen()
+                            #update_screen()
                         try:
                            widget = _g.menu.add_button(alt, launch_rom, (sub, name, alt, emu, rec, unlock, st3, st2, st1), button_id=sub+name)
                         except (IndexError, ValueError) as error:
@@ -1019,6 +1019,7 @@ def open_menu(menu, remember_selection=False):
                 pass
         _g.current_menu_title = menu.get_title()
         menu.enable()
+
         menu.mainloop(_g.screen, bgfun=menu_callback)
         reset_all_inputs()
 

diff --git a/patch/dkongjrl22.ips b/patch/dkongjrl22.ips
diff --git a/romlist.csv b/romlist.csv
@@ -102,4 +102,5 @@ dkongjr,dkongjrspringboard,JR Springboard,Junior Springboard,9999,1,2,,10000,150
 dkongjr,dkongjrvines,JR Vines,Junior Vines ,9999,1,2,,10000,15000,30000
 dkongjr,dkongjrchains,JR Chains,Junior Chains,9999,1,2,,10000,15000,30000
 dkongjr,dkongjrhideout,JR Hideout,Junior Hideout,9999,1,2,,10000,15000,30000
+dkongjr,dkongjrl22,JR Killscreen,Junior Killscreen 22,9999,1,2,,1500,2500,4000
 bigkong,bigkong_barrels,BigKong Barrels,Big Kong Barrels Only,9999,1,2,38000,4000,10000,20000