diff --git a/Cocoa/Document.m b/Cocoa/Document.m index a9b31017..9e52214f 100644 --- a/Cocoa/Document.m +++ b/Cocoa/Document.m @@ -237,8 +237,13 @@ static void infraredStateChanged(GB_gameboy_t *gb, bool on) case MODEL_CGB: return (GB_model_t)[[NSUserDefaults standardUserDefaults] integerForKey:@"GBCGBModel"]; - case MODEL_SGB: - return (GB_model_t)[[NSUserDefaults standardUserDefaults] integerForKey:@"GBSGBModel"]; + case MODEL_SGB: { + GB_model_t model = (GB_model_t)[[NSUserDefaults standardUserDefaults] integerForKey:@"GBSGBModel"]; + if (model == (GB_MODEL_SGB | GB_MODEL_PAL_BIT_OLD)) { + model = GB_MODEL_SGB_PAL; + } + return model; + } case MODEL_AGB: return GB_MODEL_AGB; diff --git a/Cocoa/Preferences.xib b/Cocoa/Preferences.xib index 58b5ddbd..ce3cb7c7 100644 --- a/Cocoa/Preferences.xib +++ b/Cocoa/Preferences.xib @@ -396,7 +396,7 @@ - + diff --git a/Core/gb.h b/Core/gb.h index 40a20a25..7210e7a6 100644 --- a/Core/gb.h +++ b/Core/gb.h @@ -34,10 +34,8 @@ #define GB_MODEL_PAL_BIT 0x40 #define GB_MODEL_NO_SFC_BIT 0x80 -#ifdef GB_INTERNAL #define GB_MODEL_PAL_BIT_OLD 0x1000 #define GB_MODEL_NO_SFC_BIT_OLD 0x2000 -#endif #ifdef GB_INTERNAL #if __clang__