moparisthebest/altra64
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#18 DD game CIC corrected - DD Games now load

Browse Source 
as long as you change to the correct CIC from the menu
This commit is contained in:
Robin Jones 2017-10-13 14:10:54 +01:00
parent c2870c68f8
commit b25201a8ea
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/rom.h
View File

@ -151,9 +151,11 @@
#define CIC_6101 1 #define CIC_6101 1
#define CIC_6102 2 #define CIC_6102 2
#define CIC_6103 3 #define CIC_6103 3
#define CIC_6104 4 #define CIC_5101 4 //aleck64
//#define CIC_6104 6104 //Unused in any game so used for Aleck64 instead
#define CIC_6105 5 #define CIC_6105 5
#define CIC_6106 6 #define CIC_6106 6
#define CIC_5167 7 //64dd conv
//void romFill(...); //void romFill(...);
void pif_boot(); void pif_boot();

19
src/main.c
View File

@ -982,7 +982,7 @@ void romInfoScreen(display_context_t disp, u8 *buff, int silent)
printText(save_type_str, 11, -1, disp); printText(save_type_str, 11, -1, disp);
unsigned char cic_type_str[12]; unsigned char cic_type_str[12];
sprintf(cic_type_str, "CIC: CIC-610%i", cic); sprintf(cic_type_str, "CIC: CIC-610%i", cic); //TODO: need to take into account DD and Aleck CIC
if (silent != 1) if (silent != 1)
printText(cic_type_str, 11, -1, disp); printText(cic_type_str, 11, -1, disp);
@ -1121,7 +1121,7 @@ void loadmsx2rom(display_context_t disp, u8 *rom_path)
resp = fatReadFile(buffer + 0x2df48, file.sec_available); resp = fatReadFile(buffer + 0x2df48, file.sec_available);
dma_write_s(buffer, 0xb0000000, fsize); dma_write_s(buffer, 0xb0000000, fsize);
boot_cic = 2; //cic 6102 boot_cic = CIC_6102;
boot_save = 0; //save off/cpak boot_save = 0; //save off/cpak
force_tv = 0; //no force force_tv = 0; //no force
cheats_on = 0; //cheats off cheats_on = 0; //cheats off
@ -1169,7 +1169,7 @@ void loadggrom(display_context_t disp, u8 *rom_path)
resp = fatReadFile(buffer + 0x1b410, file.sec_available); resp = fatReadFile(buffer + 0x1b410, file.sec_available);
dma_write_s(buffer, 0xb0000000, fsize); dma_write_s(buffer, 0xb0000000, fsize);
boot_cic = 2; //cic 6102 boot_cic = CIC_6102;
boot_save = 0; //save off/cpak boot_save = 0; //save off/cpak
force_tv = 0; //no force force_tv = 0; //no force
cheats_on = 0; //cheats off cheats_on = 0; //cheats off
@ -1211,7 +1211,7 @@ void loadnesrom(display_context_t disp, u8 *rom_path)
resp = fatOpenFileByName(rom_path, 0); //err if not found ^^ resp = fatOpenFileByName(rom_path, 0); //err if not found ^^
resp = diskRead(file.sector, (void *)0xb0200000, file.sec_available); resp = diskRead(file.sector, (void *)0xb0200000, file.sec_available);
boot_cic = 2; //cic 6102 boot_cic = CIC_6102;
boot_save = 0; //save off/cpak boot_save = 0; //save off/cpak
force_tv = 0; //no force force_tv = 0; //no force
cheats_on = 0; //cheats off cheats_on = 0; //cheats off
@ -1328,7 +1328,7 @@ void loadrom(display_context_t disp, u8 *buff, int fast)
if (gbload == 1) if (gbload == 1)
boot_save = 1; boot_save = 1;
else if (resp) //todo: if response is certain ones we should show the error and stop the boot... else if (resp) //TODO: if response is certain ones we should show the error and stop the boot...
{ {
sprintf(tmp, "Response: %i", resp); sprintf(tmp, "Response: %i", resp);
printText(tmp, 3, -1, disp); printText(tmp, 3, -1, disp);
@ -2296,7 +2296,7 @@ void alterRomConfig(int type, int mode)
//cic //cic
u8 min_cic = 0; u8 min_cic = 0;
u8 max_cic = 5; u8 max_cic = 6;
//save //save
u8 min_save = 0; u8 min_save = 0;
@ -2629,14 +2629,17 @@ void drawRomConfigBox(display_context_t disp, int line)
printText(" CIC: 6103", 9, -1, disp); printText(" CIC: 6103", 9, -1, disp);
break; break;
case 3: case 3:
printText(" CIC: 6104", 9, -1, disp); printText(" CIC: 5101", 9, -1, disp);
break; //do i really need 6104 in that list? :D break;
case 4: case 4:
printText(" CIC: 6105", 9, -1, disp); printText(" CIC: 6105", 9, -1, disp);
break; break;
case 5: case 5:
printText(" CIC: 6106", 9, -1, disp); printText(" CIC: 6106", 9, -1, disp);
break; break;
case 6:
printText(" CIC: 5167", 9, -1, disp);
break;
default: default:
break; break;
} }

7
src/sys.c
View File

@ -17,13 +17,6 @@ Options_st options;
u32 native_tv_mode; u32 native_tv_mode;
#define CIC_6101 1
#define CIC_6102 2
#define CIC_6103 3
#define CIC_6104 4
#define CIC_6105 5
#define CIC_6106 6
void dma_read_s(void * ram_address, unsigned long pi_address, unsigned long len) { void dma_read_s(void * ram_address, unsigned long pi_address, unsigned long len) {
u32 buff[256]; u32 buff[256];