diff --git a/src/minarch/main.c b/src/minarch/main.c index a405324..c8a39bf 100644 --- a/src/minarch/main.c +++ b/src/minarch/main.c @@ -2694,7 +2694,9 @@ static MenuList options_save_menu = { {NULL}, } }; +static void update_save_option_desc(void); static int options_save_open(MenuList* list, int i) { + update_save_option_desc(); options_save_menu.desc = getSaveDesc(); Menu_options(&options_save_menu); return MENU_CALLBACK_NOP; @@ -2712,6 +2714,10 @@ static MenuList options_menu = { } }; +static void update_save_option_desc(void) { + options_menu.items[4].desc = getSaveDesc(); +} + static int Menu_options(MenuList* list) { MenuItem* items = list->items; int type = list->type; @@ -2726,7 +2732,9 @@ static int Menu_options(MenuList* list) { int start = 0; int end = MIN(count,MAX_VISIBLE_OPTIONS); int visible_rows = end; - + + update_save_option_desc(); + while (show_options) { if (await_input) { list->on_confirm(list, selected); diff --git a/src/minarch/overrides/fceumm.h b/src/minarch/overrides/fceumm.h index f51c1ca..c7ad965 100644 --- a/src/minarch/overrides/fceumm.h +++ b/src/minarch/overrides/fceumm.h @@ -22,7 +22,7 @@ static CoreOverrides fceumm_overrides = { {"Change Disk", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_NONE}, {"Insert Disk", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_NONE}, {"Insert Coin", RETRO_DEVICE_ID_JOYPAD_R2, BTN_ID_NONE}, - {NULL,0,0}, + {NULL}, }, }; diff --git a/src/minarch/overrides/gambatte.h b/src/minarch/overrides/gambatte.h index ea4e460..4b3c06f 100644 --- a/src/minarch/overrides/gambatte.h +++ b/src/minarch/overrides/gambatte.h @@ -22,6 +22,6 @@ CoreOverrides gambatte_overrides = { {"B Turbo", RETRO_DEVICE_ID_JOYPAD_Y, BTN_ID_NONE}, {"Prev. Palette", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_NONE}, {"Next Palette", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_NONE}, - {NULL,0,0}, + {NULL}, }, }; \ No newline at end of file diff --git a/src/minarch/overrides/gpsp.h b/src/minarch/overrides/gpsp.h index 2fa2345..5dd7ffe 100644 --- a/src/minarch/overrides/gpsp.h +++ b/src/minarch/overrides/gpsp.h @@ -19,6 +19,6 @@ static CoreOverrides gpsp_overrides = { {"B Turbo", RETRO_DEVICE_ID_JOYPAD_Y, BTN_ID_NONE}, {"L Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1}, {"R Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, - {NULL,0,0}, + {NULL}, }, }; \ No newline at end of file diff --git a/src/minarch/overrides/pcsx_rearmed.h b/src/minarch/overrides/pcsx_rearmed.h index f1d8adf..6d7f8d3 100644 --- a/src/minarch/overrides/pcsx_rearmed.h +++ b/src/minarch/overrides/pcsx_rearmed.h @@ -17,6 +17,6 @@ static CoreOverrides pcsx_rearmed_overrides = { {"R1 Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, {"L2 Button", RETRO_DEVICE_ID_JOYPAD_L2, BTN_ID_L2}, {"R2 Button", RETRO_DEVICE_ID_JOYPAD_R2, BTN_ID_R2}, - {NULL,0,0}, + {NULL}, }, }; \ No newline at end of file diff --git a/src/minarch/overrides/picodrive.h b/src/minarch/overrides/picodrive.h index bfabfd6..f2eadf2 100644 --- a/src/minarch/overrides/picodrive.h +++ b/src/minarch/overrides/picodrive.h @@ -19,6 +19,6 @@ static CoreOverrides picodrive_overrides = { {"X Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_B}, {"Y Button", RETRO_DEVICE_ID_JOYPAD_X, BTN_ID_L1}, {"Z Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, - {NULL,0,0}, + {NULL}, }, }; \ No newline at end of file diff --git a/src/minarch/overrides/pokemini.h b/src/minarch/overrides/pokemini.h index ba51974..451594b 100644 --- a/src/minarch/overrides/pokemini.h +++ b/src/minarch/overrides/pokemini.h @@ -20,6 +20,6 @@ static CoreOverrides pokemini_overrides = { {"C Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, {"Shake", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1}, {"Power", RETRO_DEVICE_ID_JOYPAD_SELECT, BTN_ID_SELECT}, - {NULL,0,0}, + {NULL}, }, }; \ No newline at end of file diff --git a/src/minarch/overrides/snes9x2005_plus.h b/src/minarch/overrides/snes9x2005_plus.h index 808ab13..9224acc 100644 --- a/src/minarch/overrides/snes9x2005_plus.h +++ b/src/minarch/overrides/snes9x2005_plus.h @@ -15,6 +15,6 @@ static CoreOverrides snes9x2005_plus_overrides = { {"A Button", RETRO_DEVICE_ID_JOYPAD_A, BTN_ID_A}, {"L Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1}, {"R Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1}, - {NULL,0,0}, + {NULL}, }, }; \ No newline at end of file