X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2F940ctl.c;h=075b82783793ac2e445033f4ce277d397afcd068;hb=c7a4ff64287b12487c7e9cc13ce3b7d2aa6e1f06;hp=8b3c7fe6694acc0fdfeadb5787be671d4c9ba88b;hpb=60b4b403b38cf661e34c8739df69e6418f63220f;p=libpicofe.git

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