X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2F940ctl.c;h=7d7a400d174484b7e6d6c6f9cb01aa25d7de7f21;hb=82abf46f3db8ade517881c03327bdbc0de848eb2;hp=f01ffa3329b3950eda59f87f2492ce0eab3781f0;hpb=6e507f764b95d5f6088ea7f174586cfb0360a236;p=libpicofe.git

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index f01ffa3..7d7a400 100644
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -13,14 +13,13 @@
 #include "code940/940shared.h"
 #include "gp2x.h"
 #include "emu.h"
-#include "menu.h"
 #include "../common/mp3.h"
 #include "../common/arm_utils.h"
 #include "../common/menu.h"
 #include "../common/emu.h"
-#include "../../Pico/PicoInt.h"
-#include "../../Pico/sound/ym2612.h"
-#include "../../Pico/sound/mix.h"
+#include "../../pico/pico_int.h"
+#include "../../pico/sound/ym2612.h"
+#include "../../pico/sound/mix.h"
 
 /* we will need some gp2x internals here */
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
@@ -150,7 +149,7 @@ static void wait_busy_940(int job)
 		gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]);
 	printf("last lr: %08x, lastjob: %i\n", shared_ctl->last_lr, shared_ctl->lastjob);
 
-	strcpy(menuErrorMsg, "940 crashed, too much overclock?");
+	me_update_msg("940 crashed, too much overclock?");
 	engineState = PGS_Menu;
 	crashed_940 = 1;
 }
@@ -313,7 +312,7 @@ void YM2612Init_940(int baseclock, int rate)
 		fp = fopen(binpath, "rb");
 		if(!fp)
 		{
-			memset(gp2x_screen, 0, 320*240*2);
+			memset(g_screen_ptr, 0, 320*240*2);
 			text_out16(10, 100, "failed to open required file:");
 			text_out16(10, 110, CODE940_FILE);
 			gp2x_video_flip2();