work on 'vblank on line start' problem, var changes, mask defines

[picodrive.git] / platform / gp2x / menu.c

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index 06c0afb..432a41a 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -553,7 +553,7 @@ static void draw_savestate_bg(int slot)
        }\r
 \r
        if (file) {\r
-               if (PicoMCD & 1) {\r
+               if (PicoAHW & PAHW_MCD) {\r
                        PicoCdLoadStateGfx(file);\r
                } else {\r
                        areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file\r
@@ -878,7 +878,7 @@ static void kc_sel_loop(void)
 {\r
        int menu_sel = 3, menu_sel_max = 3;\r
        unsigned long inp = 0;\r
-       int is_6button = PicoOpt & 0x020;\r
+       int is_6button = PicoOpt & POPT_6BTN_PAD;\r
 \r
        while (1)\r
        {\r
@@ -1174,7 +1174,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
        switch (entry->id)\r
        {\r
                case MA_OPT_RENDERER:\r
-                       if (PicoOpt&0x10)\r
+                       if (PicoOpt & POPT_ALT_RENDERER)\r
                                str = " 8bit fast";\r
                        else if (currentConfig.EmuOpt&0x80)\r
                                str = "16bit accurate";\r
@@ -1198,7 +1198,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
                        text_out16(x, y, "Frameskip                  %s", str24);\r
                        break;\r
                case MA_OPT_SOUND_QUALITY:\r
-                       str = (PicoOpt&0x08)?"stereo":"mono";\r
+                       str = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";\r
                        text_out16(x, y, "Sound Quality:     %5iHz %s", PsndRate, str);\r
                        break;\r
                case MA_OPT_REGION:\r
@@ -1288,7 +1288,7 @@ static void menu_options_save(void)
                // force setting possibly changed..\r
                Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
        }\r
-       if (!(PicoOpt & 0x20)) {\r
+       if (!(PicoOpt & POPT_6BTN_PAD)) {\r
                // unbind XYZ MODE, just in case\r
                unbind_action(0xf00, -1, -1);\r
        }\r