diff --git a/meka/compat.txt b/meka/compat.txt index ab16dc0f..e8a9b3a9 100644 --- a/meka/compat.txt +++ b/meka/compat.txt @@ -1136,6 +1136,7 @@ Garou Densetsu Special (JP) Ok Ganbare Gorby! (JP) Ok Garfield: Caught in the Act Ok + Gear 6 in 1 [Alien Syndrome] *Ok Gear Stadium (JP) Ok Gear Stadium Heiseiban (JP) Ok Gear Works Ok @@ -1498,7 +1499,7 @@ Zoop (US) Ok Zoop [Proto] (US) Ok ----------------------------------------------------------------------------- - 517 games tested - 506 are "Ok" - Compatibility rate: 97.63% + 518 games tested - 507 are "Ok" - Compatibility rate: 97.88% ----------------------------------------------------------------------------- ----------------------------------------------------------------------------- diff --git a/meka/meka.nam b/meka/meka.nam index 77c032bf..64843b79 100644 --- a/meka/meka.nam +++ b/meka/meka.nam @@ -1031,6 +1031,7 @@ GG 0593ba24 905D6D377D1F9D36 Galaga '91/COUNTRY=JP/PRODUCT_NO=T-14057/COMMENT GG 95ecece2 432C080C09AD5275 Galaga 2/COUNTRY=EU/PRODUCT_NO=2322/COMMENT=Export version of "Galaga '91". GG cd53f3af 5434506F49A77C4D Garfield: Caught in the Act/COUNTRY=US,EU/PRODUCT_NO=2560,2560-50 GG 9afb6f33 CE07E49360532BD6 Garou Densetsu Special/COUNTRY=JP/PRODUCT_NO=T-103017/COMMENT=Japanese version of "Fatal Fury Special". +GG 983ffa6c 380E4248BE33AC93 Gear 6 in 1 [Alien Syndrome]/EMU_MAPPER=42 GG 0e300223 27BA4F0E3A5DBF6C Gear Stadium/COUNTRY=JP/PRODUCT_NO=T-14037/COMMENT=Japanese version of "Batter Up". GG a0530664 08ADE585B8DA024D Gear Stadium Heiseiban/COUNTRY=JP/PRODUCT_NO=T-14077 GG e9a2efb4 F9F734AF23CDB28B Gear Works/COUNTRY=US/PRODUCT_NO=T-93058 diff --git a/meka/srcs/machine.cpp b/meka/srcs/machine.cpp index f23e934f..df915096 100644 --- a/meka/srcs/machine.cpp +++ b/meka/srcs/machine.cpp @@ -196,6 +196,9 @@ void Machine_Set_Handler_MemRW(void) case MAPPER_SMS_Korean_MSX_32KB_2000: WrZ80 = WrZ80_NoHook = Write_Mapper_SMS_Korean_MSX_32KB_2000; break; + case MAPPER_GG_Gear_6_in_1_FFFE_FFF7_FFFF: + WrZ80 = WrZ80_NoHook = Write_Mapper_GG_Gear_6_in_1_FFFE_FFF7_FFFF; + break; } } @@ -485,6 +488,20 @@ void Machine_Set_Mapping (void) g_machine.mapper_regs[0] = 0; break; + case MAPPER_GG_Gear_6_in_1_FFFE_FFF7_FFFF: + Map_8k_ROM(0, 0 & tsms.Pages_Mask_8k); + Map_8k_ROM(1, 1 & tsms.Pages_Mask_8k); + Map_8k_ROM(2, 0 & tsms.Pages_Mask_8k); + Map_8k_ROM(3, 1 & tsms.Pages_Mask_8k); + Map_8k_ROM(4, 0 & tsms.Pages_Mask_8k); + Map_8k_ROM(5, 1 & tsms.Pages_Mask_8k); + Map_8k_RAM(6, 0); + Map_8k_RAM(7, 0); + g_machine.mapper_regs_count = 3; + for (int i = 0; i != MAPPER_REGS_MAX; i++) + g_machine.mapper_regs[i] = 0; + break; + case MAPPER_SC3000_Survivors_Multicart: g_machine.mapper_regs_count = 1; for (int i = 0; i != MAPPER_REGS_MAX; i++) diff --git a/meka/srcs/mappers.cpp b/meka/srcs/mappers.cpp index 00bf3386..c4babc39 100644 --- a/meka/srcs/mappers.cpp +++ b/meka/srcs/mappers.cpp @@ -952,6 +952,47 @@ WRITE_FUNC (Write_Mapper_SMS_Korean_MSX_32KB_2000) Write_Error (Addr, Value); } +// Mapper #42 +// Gear 6 in 1 [Alien Syndrome] +WRITE_FUNC(Write_Mapper_GG_Gear_6_in_1_FFFE_FFF7_FFFF) +{ + if ((Addr == 0xFFF7) || (Addr == 0xFFFE) || (Addr == 0xFFFF)) // Configurable segment ----------------------------------------------- + { + if (Addr == 0xFFF7) + { + if (! (g_machine.mapper_regs[0] & 0x80)) { + // switch from "menu" mapper mode to "Sega" mapper mode + g_machine.mapper_regs[0] = 0x80 | ((Value & 0x01) << 4) | (g_machine.mapper_regs[2] & 0x0F); + g_machine.mapper_regs[2] = 1; + } + } + else if (Addr == 0xFFFF) + { + g_machine.mapper_regs[1] = Value; + } + else if (Addr == 0xFFFE) + { + g_machine.mapper_regs[2] = Value; + } + int mask = (g_machine.mapper_regs[0] & 0x80) ? 0x07 : 0x01; + Map_8k_ROM(0, ((g_machine.mapper_regs[0] & 0x1F) * 2) & tsms.Pages_Mask_8k); + Map_8k_ROM(1, (((g_machine.mapper_regs[0] & 0x1F) * 2) | 1) & tsms.Pages_Mask_8k); + Map_8k_ROM(2, (((g_machine.mapper_regs[0] & 0x1F) * 2) | ((g_machine.mapper_regs[2] & mask) * 2)) & tsms.Pages_Mask_8k); + Map_8k_ROM(3, (((g_machine.mapper_regs[0] & 0x1F) * 2) | ((g_machine.mapper_regs[2] & mask) * 2) | 1) & tsms.Pages_Mask_8k); + Map_8k_ROM(4, (((g_machine.mapper_regs[0] & 0x1F) * 2) | ((g_machine.mapper_regs[1] & mask) * 2)) & tsms.Pages_Mask_8k); + Map_8k_ROM(5, (((g_machine.mapper_regs[0] & 0x1F) * 2) | ((g_machine.mapper_regs[1] & mask) * 2) | 1) & tsms.Pages_Mask_8k); + } + + switch (Addr >> 13) + { + // RAM [0xC000] = [0xE000] ------------------------------------------------ + case 6: Mem_Pages[6][Addr] = Value; return; + case 7: Mem_Pages[7][Addr] = Value; return; + } + + Write_Error(Addr, Value); +} + // Based on MSX ASCII 8KB mapper? http://bifi.msxnet.org/msxnet/tech/megaroms.html#ascii8 // - This mapper requires 4 registers to save bank switching state. // However, all other mappers so far used only 3 registers, stored as 3 bytes. diff --git a/meka/srcs/mappers.h b/meka/srcs/mappers.h index 3711266f..3009a0d3 100644 --- a/meka/srcs/mappers.h +++ b/meka/srcs/mappers.h @@ -50,6 +50,7 @@ #define MAPPER_SMS_Korean_MD_FFF5 (25) // Registers at 0xFFF5 and 0xFFFF (Jaemiissneun Game Mo-eumjip 42/65 Hap [SMS-MD], Pigu Wang Hap ~ Jaemiiss-neun Game Mo-eumjip [SMS-MD]) #define MAPPER_SMS_Korean_MD_FFFA (26) // Registers at 0xFFFA and 0xFFFF (Game Jiphap 30 Hap [SMS-MD]) #define MAPPER_SMS_Korean_MSX_32KB_2000 (27) // Register at 0x2000 (2 Hap in 1 (Moai-ui bomul, David-2)) +#define MAPPER_GG_Gear_6_in_1_FFFE_FFF7_FFFF (42) // Registers at 0xFFFE, 0xFFF7, and 0xFFFF (Gear 6 in 1 [Alien Syndrome]) #define READ_FUNC(_NAME) u8 _NAME(register u16 Addr) #define WRITE_FUNC(_NAME) void _NAME(register u16 Addr, register u8 Value) @@ -96,6 +97,7 @@ WRITE_FUNC (Write_Mapper_SMS_Korean_MD_FFF0); WRITE_FUNC (Write_Mapper_SMS_Korean_MD_FFF5); WRITE_FUNC (Write_Mapper_SMS_Korean_MD_FFFA); WRITE_FUNC (Write_Mapper_SMS_Korean_MSX_32KB_2000); +WRITE_FUNC (Write_Mapper_GG_Gear_6_in_1_FFFE_FFF7_FFFF); //----------------------------------------------------------------------------- void Out_SC3000_SurvivorsMulticarts_DataWrite(u8 v); diff --git a/meka/srcs/saves.cpp b/meka/srcs/saves.cpp index 09bb14b8..a456ed52 100644 --- a/meka/srcs/saves.cpp +++ b/meka/srcs/saves.cpp @@ -144,6 +144,11 @@ void Load_Game_Fixup(void) case MAPPER_SMS_Korean_MSX_32KB_2000: WrZ80_NoHook(0x2000, g_machine.mapper_regs[0]); break; + case MAPPER_GG_Gear_6_in_1_FFFE_FFF7_FFFF: + // rewriting these will automatically read and apply the hidden register's state + WrZ80_NoHook(0xFFFF, g_machine.mapper_regs[1]); + WrZ80_NoHook(0xFFFE, g_machine.mapper_regs[2]); + break; } } @@ -339,6 +344,7 @@ int Save_Game_MSV(FILE *f) case MAPPER_SMS_Korean_MD_FFF5: case MAPPER_SMS_Korean_MD_FFFA: case MAPPER_SMS_Korean_MSX_32KB_2000: + case MAPPER_GG_Gear_6_in_1_FFFE_FFF7_FFFF: default: fwrite (RAM, 0x2000, 1, f); // Do not use g_driver->ram because of g_driver video mode change break; @@ -518,6 +524,7 @@ int Load_Game_MSV(FILE *f) case MAPPER_SMS_Korean_MD_FFF5: case MAPPER_SMS_Korean_MD_FFFA: case MAPPER_SMS_Korean_MSX_32KB_2000: + case MAPPER_GG_Gear_6_in_1_FFFE_FFF7_FFFF: default: fread (RAM, 0x2000, 1, f); // Do not use g_driver->ram because of g_driver video mode change break;