From 41bc724ebd2edbdded2a0e0b8c6aa144586d6ebd Mon Sep 17 00:00:00 2001
From: neonloop
Date: Sun, 15 Jan 2023 18:33:44 +0000
Subject: Fixes mame2000 vector games, changes mame2000 default to aspect

---
 README.funkey-s.md                                 |  1 +
 main.c                                             |  3 ++-
 patches/mame2000/1002-reduce-vector-game-res.patch | 31 +++++++++++-----------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/README.funkey-s.md b/README.funkey-s.md
index b5a7154..8a8410e 100644
--- a/README.funkey-s.md
+++ b/README.funkey-s.md
@@ -25,6 +25,7 @@ All emulators have:
 - FunKey menu
 - fast-forward
 - soft scaling options
+- START+button combo keybindings
 - per-game config
 - screenshots
 
diff --git a/main.c b/main.c
index c4792d8..6625133 100644
--- a/main.c
+++ b/main.c
@@ -222,7 +222,8 @@ void set_defaults(void)
 		scale_size = SCALE_SIZE_CROP;
 		scale_filter = SCALE_FILTER_SMOOTH;
 
-		if (!strcmp(core_name, "gambatte")) {
+		if (!strcmp(core_name, "gambatte") ||
+		    !strcmp(core_name, "mame2000")) {
 			scale_size = SCALE_SIZE_ASPECT;
 			scale_filter = SCALE_FILTER_SMOOTH;
 		}
diff --git a/patches/mame2000/1002-reduce-vector-game-res.patch b/patches/mame2000/1002-reduce-vector-game-res.patch
index 03103dc..cea7ecc 100644
--- a/patches/mame2000/1002-reduce-vector-game-res.patch
+++ b/patches/mame2000/1002-reduce-vector-game-res.patch
@@ -1,19 +1,5 @@
-diff --git a/src/libretro/libretro.c b/src/libretro/libretro.c
-index 2f37f52..c58fceb 100644
---- a/src/libretro/libretro.c
-+++ b/src/libretro/libretro.c
-@@ -948,6 +948,9 @@ bool retro_load_game(const struct retro_game_info *info)
-    /* skip disclaimer - skips 'nag screen' */
-    options.skip_disclaimer = skip_disclaimer;
- 
-+   options.vector_width = 320;
-+   options.vector_height = 240;
-+
- #if (HAS_CYCLONE || HAS_DRZ80)
-    int use_cyclone = 1;
-    int use_drz80 = 1;
 diff --git a/src/libretro/video.c b/src/libretro/video.c
-index f97ac05..d947468 100644
+index bb42a8e..c0f6755 100644
 --- a/src/libretro/video.c
 +++ b/src/libretro/video.c
 @@ -366,23 +366,13 @@ static void select_display_mode(int width,int height,int depth,int attributes,in
@@ -45,3 +31,18 @@ index f97ac05..d947468 100644
  	}
  
  	gp2x_set_video_mode(16,gfx_width,gfx_height);
+diff --git a/src/mame.c b/src/mame.c
+index 4d0cc3c..333a457 100644
+--- a/src/mame.c
++++ b/src/mame.c
+@@ -64,8 +64,8 @@ int run_game(int game)
+ 
+     if(!iOS_fixedRes)
+     {
+-	  options.vector_width = 640;
+-	  options.vector_height = 480;
++	  options.vector_width = 320;
++	  options.vector_height = 240;
+     }
+     else
+     {
-- 
cgit v1.2.3