From 0f6a0186cd39ce89eb9e517ede8e90cad3084bd7 Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Sat, 30 Oct 2021 16:09:13 +0300 Subject: [PATCH] Cherry picking conflicts --- Core/save_state.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/Core/save_state.c b/Core/save_state.c index 715baa9..b4780e8 100644 --- a/Core/save_state.c +++ b/Core/save_state.c @@ -344,11 +344,9 @@ static bool verify_and_update_state_compatibility(GB_gameboy_t *gb, GB_gameboy_t case GB_MODEL_SGB_PAL: return true; case GB_MODEL_SGB_NTSC_NO_SFC: return true; case GB_MODEL_SGB_PAL_NO_SFC: return true; - case GB_MODEL_MGB: return true; case GB_MODEL_SGB2: return true; case GB_MODEL_SGB2_NO_SFC: return true; case GB_MODEL_CGB_C: return true; - case GB_MODEL_CGB_D: return true; case GB_MODEL_CGB_E: return true; case GB_MODEL_AGB: return true; }