From c8bfc64009a72bb8bbaa7296e02868f3754f14f9 Mon Sep 17 00:00:00 2001 From: sanni Date: Mon, 16 Jan 2023 12:35:48 +0100 Subject: Change 2022 to 2023 in about screen --- Cart_Reader/ARC.ino | 5 ++- Cart_Reader/ATARI.ino | 5 ++- Cart_Reader/Cart_Reader.ino | 6 ++-- Cart_Reader/FAIRCHILD.ino | 5 ++- Cart_Reader/MD.ino | 81 ++++++++++++++++++++------------------------- Cart_Reader/NES.ino | 2 +- Cart_Reader/ODY2.ino | 5 ++- Cart_Reader/PCE.ino | 24 +++++--------- Cart_Reader/VBOY.ino | 2 +- 9 files changed, 66 insertions(+), 69 deletions(-) diff --git a/Cart_Reader/ARC.ino b/Cart_Reader/ARC.ino index 946cb12..e699704 100644 --- a/Cart_Reader/ARC.ino +++ b/Cart_Reader/ARC.ino @@ -571,4 +571,7 @@ void setCart_ARC() { arccsvFile.close(); } -#endif \ No newline at end of file +#endif +//****************************************** +// End of File +//****************************************** \ No newline at end of file diff --git a/Cart_Reader/ATARI.ino b/Cart_Reader/ATARI.ino index 99974db..08c952c 100644 --- a/Cart_Reader/ATARI.ino +++ b/Cart_Reader/ATARI.ino @@ -976,4 +976,7 @@ void setCart_ATARI() { checkSize_ATARI(); } -#endif \ No newline at end of file +#endif +//****************************************** +// End of File +//****************************************** \ No newline at end of file diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino index 25f8fd6..8fdd0df 100644 --- a/Cart_Reader/Cart_Reader.ino +++ b/Cart_Reader/Cart_Reader.ino @@ -1512,7 +1512,7 @@ void aboutScreen() { display_Clear(); println_Msg(F("Cartridge Reader")); println_Msg(F("github.com/sanni")); - print_Msg(F("2022 Version ")); + print_Msg(F("2023 Version ")); println_Msg(ver); println_Msg(F("")); println_Msg(F("")); @@ -2012,7 +2012,7 @@ void setup() { Serial.begin(9600); Serial.println(""); Serial.println(F("Cartridge Reader")); - Serial.println(F("2022 github.com/sanni")); + Serial.println(F("2023 github.com/sanni")); // LED Error setColor_RGB(0, 0, 255); #endif @@ -3528,4 +3528,4 @@ void loop() { //****************************************** // End of File -//****************************************** +//****************************************** \ No newline at end of file diff --git a/Cart_Reader/FAIRCHILD.ino b/Cart_Reader/FAIRCHILD.ino index ae6379b..71e9057 100644 --- a/Cart_Reader/FAIRCHILD.ino +++ b/Cart_Reader/FAIRCHILD.ino @@ -899,4 +899,7 @@ void setCart_FAIRCHILD() { fairchildcsvFile.close(); } -#endif \ No newline at end of file +#endif +//****************************************** +// End of File +//****************************************** \ No newline at end of file diff --git a/Cart_Reader/MD.ino b/Cart_Reader/MD.ino index cac8ee0..aa534af 100644 --- a/Cart_Reader/MD.ino +++ b/Cart_Reader/MD.ino @@ -714,19 +714,19 @@ void getCartInfo_MD() { if (cartSize == 0x400000) { switch (chksum) { // Super Street Fighter 2 - case 0xCE25: // Super Street Fighter 2 (J) 40Mbit - case 0xE41D: // Super Street Fighter 2 (E) 40Mbit - case 0xE017: // Super Street Fighter 2 (U) 40Mbit + case 0xCE25: // Super Street Fighter 2 (J) 40Mbit + case 0xE41D: // Super Street Fighter 2 (E) 40Mbit + case 0xE017: // Super Street Fighter 2 (U) 40Mbit cartSize = 0x500000; break; // Demons of Asteborg - case 0x0000: // Demons of Asteborg v1.0 (W) 120Mbit + case 0x0000: // Demons of Asteborg v1.0 (W) 120Mbit cartSize = 0xEAF2F4; break; - case 0xBCBF: // Demons of Asteborg v1.1 (W) 120Mbit - case 0x6E1E: // Demons of Asteborg v1.11 (W) 120Mbit + case 0xBCBF: // Demons of Asteborg v1.1 (W) 120Mbit + case 0x6E1E: // Demons of Asteborg v1.11 (W) 120Mbit cartSize = 0xEA0000; break; } @@ -1220,56 +1220,47 @@ void readROM_MD() { writeSSF2Map(0x50987F, 9); // 0xA130FF offsetSSF2Bank = 1; } - + // Demons of Asteborg Additional Banks else if (currBuffer == 0x280000) { - writeSSF2Map(0x50987E, 10); // 0xA130FD - writeSSF2Map(0x50987F, 11); // 0xA130FF + writeSSF2Map(0x50987E, 10); // 0xA130FD + writeSSF2Map(0x50987F, 11); // 0xA130FF offsetSSF2Bank = 2; - } - else if (currBuffer == 0x300000) { - writeSSF2Map(0x50987E, 12); // 0xA130FD - writeSSF2Map(0x50987F, 13); // 0xA130FF + } else if (currBuffer == 0x300000) { + writeSSF2Map(0x50987E, 12); // 0xA130FD + writeSSF2Map(0x50987F, 13); // 0xA130FF offsetSSF2Bank = 3; - } - else if (currBuffer == 0x380000) { - writeSSF2Map(0x50987E, 14); // 0xA130FD - writeSSF2Map(0x50987F, 15); // 0xA130FF + } else if (currBuffer == 0x380000) { + writeSSF2Map(0x50987E, 14); // 0xA130FD + writeSSF2Map(0x50987F, 15); // 0xA130FF offsetSSF2Bank = 4; - } - else if (currBuffer == 0x400000) { - writeSSF2Map(0x50987E, 16); // 0xA130FD - writeSSF2Map(0x50987F, 17); // 0xA130FF + } else if (currBuffer == 0x400000) { + writeSSF2Map(0x50987E, 16); // 0xA130FD + writeSSF2Map(0x50987F, 17); // 0xA130FF offsetSSF2Bank = 5; - } - else if (currBuffer == 0x480000) { - writeSSF2Map(0x50987E, 18); // 0xA130FD - writeSSF2Map(0x50987F, 19); // 0xA130FF + } else if (currBuffer == 0x480000) { + writeSSF2Map(0x50987E, 18); // 0xA130FD + writeSSF2Map(0x50987F, 19); // 0xA130FF offsetSSF2Bank = 6; - } - else if (currBuffer == 0x500000) { - writeSSF2Map(0x50987E, 20); // 0xA130FD - writeSSF2Map(0x50987F, 21); // 0xA130FF + } else if (currBuffer == 0x500000) { + writeSSF2Map(0x50987E, 20); // 0xA130FD + writeSSF2Map(0x50987F, 21); // 0xA130FF offsetSSF2Bank = 7; - } - else if (currBuffer == 0x580000) { - writeSSF2Map(0x50987E, 22); // 0xA130FD - writeSSF2Map(0x50987F, 23); // 0xA130FF + } else if (currBuffer == 0x580000) { + writeSSF2Map(0x50987E, 22); // 0xA130FD + writeSSF2Map(0x50987F, 23); // 0xA130FF offsetSSF2Bank = 8; - } - else if (currBuffer == 0x600000) { - writeSSF2Map(0x50987E, 24); // 0xA130FD - writeSSF2Map(0x50987F, 25); // 0xA130FF + } else if (currBuffer == 0x600000) { + writeSSF2Map(0x50987E, 24); // 0xA130FD + writeSSF2Map(0x50987F, 25); // 0xA130FF offsetSSF2Bank = 9; - } - else if (currBuffer == 0x680000) { - writeSSF2Map(0x50987E, 26); // 0xA130FD - writeSSF2Map(0x50987F, 27); // 0xA130FF + } else if (currBuffer == 0x680000) { + writeSSF2Map(0x50987E, 26); // 0xA130FD + writeSSF2Map(0x50987F, 27); // 0xA130FF offsetSSF2Bank = 10; - } - else if (currBuffer == 0x700000) { - writeSSF2Map(0x50987E, 28); // 0xA130FD - writeSSF2Map(0x50987F, 29); // 0xA130FF + } else if (currBuffer == 0x700000) { + writeSSF2Map(0x50987E, 28); // 0xA130FD + writeSSF2Map(0x50987F, 29); // 0xA130FF offsetSSF2Bank = 11; } diff --git a/Cart_Reader/NES.ino b/Cart_Reader/NES.ino index 7fb552e..100ee0f 100644 --- a/Cart_Reader/NES.ino +++ b/Cart_Reader/NES.ino @@ -5400,4 +5400,4 @@ void writeFLASH() { #endif //****************************************** // End of File -//****************************************** +//****************************************** \ No newline at end of file diff --git a/Cart_Reader/ODY2.ino b/Cart_Reader/ODY2.ino index 95b6191..6ffde18 100644 --- a/Cart_Reader/ODY2.ino +++ b/Cart_Reader/ODY2.ino @@ -669,4 +669,7 @@ void setCart_ODY2() { ody2csvFile.close(); } -#endif \ No newline at end of file +#endif +//****************************************** +// End of File +//****************************************** \ No newline at end of file diff --git a/Cart_Reader/PCE.ino b/Cart_Reader/PCE.ino index edf3dad..12396e1 100644 --- a/Cart_Reader/PCE.ino +++ b/Cart_Reader/PCE.ino @@ -342,7 +342,7 @@ uint32_t detect_rom_size_PCE(void) { detect_32++; } } - + //128KB detection if (current_byte == detect_128) { if (read_byte_PCE(current_byte + 128UL * 1024UL) == read_byte) { @@ -380,27 +380,21 @@ uint32_t detect_rom_size_PCE(void) { //ROM size detection by result if (detect_32 == DETECTION_SIZE) { rom_size = 32; - } - else if (detect_128 == DETECTION_SIZE) { + } else if (detect_128 == DETECTION_SIZE) { rom_size = 128; - } - else if (detect_256 == DETECTION_SIZE) { + } else if (detect_256 == DETECTION_SIZE) { if (detect_512 == DETECTION_SIZE) { rom_size = 256; - } - else { + } else { //rom_size = 1024; //Another confirmation for 384KB because 384KB hucard has data in 0x0--0x40000 and 0x80000--0xA0000(0x40000 is mirror of 0x00000) rom_size = 384; } - } - else if (detect_512 == DETECTION_SIZE) { + } else if (detect_512 == DETECTION_SIZE) { rom_size = 512; - } - else if (detect_768 == DETECTION_SIZE) { + } else if (detect_768 == DETECTION_SIZE) { rom_size = 768; - } - else { + } else { rom_size = 1024; } @@ -411,7 +405,7 @@ uint32_t detect_rom_size_PCE(void) { rom_size = 2560; } //Populous (Japan) - if (read_byte_PCE(0x1F26) == 'P' && read_byte_PCE(0x1F27) == 'O' && read_byte_PCE(0x1F28) == 'P' && read_byte_PCE(0x1F29) == 'U' && read_byte_PCE(0x1F2A) == 'L' && read_byte_PCE(0x1F2B) == 'O' && read_byte_PCE(0x1F2C) == 'U' && read_byte_PCE(0x1F2D) == 'S') { + if (read_byte_PCE(0x1F26) == 'P' && read_byte_PCE(0x1F27) == 'O' && read_byte_PCE(0x1F28) == 'P' && read_byte_PCE(0x1F29) == 'U' && read_byte_PCE(0x1F2A) == 'L' && read_byte_PCE(0x1F2B) == 'O' && read_byte_PCE(0x1F2C) == 'U' && read_byte_PCE(0x1F2D) == 'S') { rom_size = 512; } } @@ -881,4 +875,4 @@ void pceMenu() { //****************************************** // End of File -//****************************************** +//****************************************** \ No newline at end of file diff --git a/Cart_Reader/VBOY.ino b/Cart_Reader/VBOY.ino index e81f006..d342aeb 100644 --- a/Cart_Reader/VBOY.ino +++ b/Cart_Reader/VBOY.ino @@ -569,4 +569,4 @@ unsigned long verifySRAM_VB() { #endif //****************************************** // End of File -//****************************************** +//****************************************** \ No newline at end of file -- cgit v1.2.3