Mappers: Fix a bug I introduced in 218c8ae by lacking attention. (#104)

+ Missing compat.txt entry.
ocornut · May 30, 2023 · 1566428 · 1566428
1 parent 218c8ae
commit 1566428
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/meka/compat.txt b/meka/compat.txt
@@ -591,6 +591,7 @@
  T2: The Arcade Game                            -       Ok
  Taito Chase H.Q.                               -       Ok
  Taito Chase H.Q. [Proto]                       -       Ok
+ Tank Battalion (KR)                            -      *Ok
  Taz in Escape From Mars (BR)                   -       Ok
  Taz-Mania                                      -       Ok
  Taz-Mania [Proto]                              -       Ok
@@ -675,7 +676,7 @@
  Zillion II: The Tri Formation [Proto]          FM      Ok
  Zool                                           -       Ok
 -----------------------------------------------------------------------------
- 654 games tested - 650 are "Ok"
+ 655 games tested - 651 are "Ok"
 -----------------------------------------------------------------------------
 
 -----------------------------------------------------------------------------

diff --git a/meka/history.txt b/meka/history.txt
@@ -51,6 +51,7 @@ They are usually of 2 kinds:
     - Added support for Korean xx-in-1 mapper at 0xFFF0,0xFFFE,0xFFFF for: 'Mega Mode Super Game 30 [SMS-MD]'. [bsittler]
     - Added support for Korean xx-in-1 mapper at 0xFFF5,0xFFFE,0xFFFF for 'Jaemiissneun Game Mo-eumjip 42 Hap [SMS-MD]'. [bsittler]
     - Added support for Korean xx-in-1 mapper at 0xFFFA,0xFFFE,0xFFFF for 'Game Jiphap 30 Hap [SMS-MD]'. [bsittler]
+    - Added support for Korean xx-in-1 mapper at 0x8000 for 'Zemina Best 88', 'Zemina Best 25' etc. [bsittler]
     - Added support for SC-3000 Survivors Multicart mapper. [Omar,Honestbob]
     - Fixed 32K "No Mapper" mapper from forwarding 3-D Glasses writes. Fixes '3D Gunner'. [Omar]
     - SMS/GG ROM images smaller than 48KB default to using no mapper. [Omar]

diff --git a/meka/srcs/saves.cpp b/meka/srcs/saves.cpp
@@ -145,8 +145,11 @@ void        Load_Game_Fixup(void)
             WrZ80_NoHook(0x2000, g_machine.mapper_regs[0]);
             break;
         case MAPPER_SMS_Korean_MSX_SMS_8000:
-            WrZ80_NoHook(0x8000, 0x00); // reset the mapper to avoid the 0xFF special case
-            WrZ80_NoHook(0x8000, g_machine.mapper_regs[0]);
+            {
+                int mapper_page = g_machine.mapper_regs[0];
+                WrZ80_NoHook(0x8000, 0x00); // reset the mapper to avoid the 0xFF special case
+                WrZ80_NoHook(0x8000, mapper_page);
+            }
             break;
         }
     }