fixes pointers to flash menu data and f_close() was hanging on non-opened file

Author: technobly

code/veccart/main.c

@@ -50,8 +50,8 @@
 
 // Externs
 extern GameFileRecord* pActiveGameData;
-extern char* multicart_start;
-extern char* multicart_end;
+extern char multicart_start;
+extern char multicart_end;
 
 //Memory for the menu ROM and the running cartridge.
 //We keep both in memory so we can quickly exchange them when a reset has been detected.
@@ -117,7 +117,7 @@ void loadRom(char *fn) {
 
 void loadRomWithHighScore(char *fn, bool load_hs_mode, bool use_embedded_menu) {
 	FIL f;
-	FRESULT fr;
+	FRESULT fr = FR_NO_FILE; // assume no file, so we can test if we ever opened the file later
 	UINT r = 0;
 	int n;
 	UINT x;
@@ -129,7 +129,9 @@ void loadRomWithHighScore(char *fn, bool load_hs_mode, bool use_embedded_menu) {
 		n = sizeof(menuData);
 	}
 	if (romData == menuData && use_embedded_menu == true) {
-		memcpy(menuData, multicart_start, multicart_start-multicart_end);
+		xprintf("Copying %lu bytes of menu data... ", &multicart_end - &multicart_start);
+		memcpy(menuData, &multicart_start, &multicart_end - &multicart_start);
+		xprintf("OK!\n");
 	} else {
 		fr = f_open(&f, fn, FA_READ);
 		if (fr) {
@@ -207,7 +209,9 @@ void loadRomWithHighScore(char *fn, bool load_hs_mode, bool use_embedded_menu) {
 			parmRam[0xe0] = 0x66; // High Score flag (IDLE:0x66, LOAD2VEC:0x77, SAVE2STM:0x88)
 		}
 	}
-	f_close(&f);
+	if (fr != FR_NO_FILE) {
+		f_close(&f);
+	}
 }
 
 //Stream data, for the Bad Apple demo