giz menu works

[libpicofe.git] / gp2x / 940ctl.c

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index 8b3c7fe..075b827 100644 (file)
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -14,8 +14,9 @@
 #include "gp2x.h"\r
 #include "emu.h"\r
 #include "menu.h"\r
-#include "asmutils.h"\r
 #include "mp3.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/menu.h"\r
 #include "../../Pico/PicoInt.h"\r
 #include "../../Pico/sound/mix.h"\r
 \r
@@ -30,6 +31,7 @@ _940_ctl_t *shared_ctl = 0;
 unsigned char *mp3_mem = 0;\r
 \r
 #define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M\r
+#define CODE940_FILE "pico940.bin"\r
 \r
 int crashed_940 = 0;\r
 \r
@@ -409,15 +411,15 @@ void YM2612Init_940(int baseclock, int rate)
                binpath[1023] = 0;\r
                for (i = strlen(binpath); i > 0; i--)\r
                        if (binpath[i] == '/') { binpath[i] = 0; break; }\r
-               strcat(binpath, "/code940.bin");\r
+               strcat(binpath, "/" CODE940_FILE);\r
 \r
                fp = fopen(binpath, "rb");\r
                if(!fp)\r
                {\r
-                       memset(gp2x_screen, 0, 320*240);\r
-                       gp2x_text_out8(10, 100, "failed to open required file:");\r
-                       gp2x_text_out8(10, 110, "code940.bin");\r
-                       gp2x_video_flip();\r
+                       memset(gp2x_screen, 0, 320*240*2);\r
+                       text_out16(10, 100, "failed to open required file:");\r
+                       text_out16(10, 110, CODE940_FILE);\r
+                       gp2x_video_flip2();\r
                        printf("failed to open %s\n", binpath);\r
                        exit(1);\r
                }\r