diff options
| -rw-r--r-- | Cart_Reader/N64.ino | 33 | ||||
| -rw-r--r-- | sd/loopy.txt | 3 |
2 files changed, 19 insertions, 17 deletions
diff --git a/Cart_Reader/N64.ino b/Cart_Reader/N64.ino index 8627793..2aac5bd 100644 --- a/Cart_Reader/N64.ino +++ b/Cart_Reader/N64.ino @@ -44,6 +44,10 @@ String CRC1 = ""; String CRC2 = "";
#endif
+#if !defined(enable_FLASH)
+unsigned long flashSize;
+#endif
+
static const char N64_EEP_FILENAME_FMT[] PROGMEM = "%s.eep";
static const char N64_SAVE_DIRNAME_FMT[] PROGMEM = "N64/SAVE/%s/%d";
@@ -4050,7 +4054,6 @@ unsigned long verifyFlashrom_N64() { N64 Gameshark Flash Functions
*****************************************/
void flashGameshark_N64() {
- int flashSize = 0;
// Check flashrom ID's
unlockGSAddressRanges();
idGameshark_N64();
@@ -4182,15 +4185,15 @@ void idGameshark_N64() { } else if (flashid == 0x0404) {
//Set SST 28LF040 flashrom size
flashSize = 1048574;
- } else {
- println_Msg(F("Check cart connection"));
- println_Msg(F("Unknown Flash ID"));
- sprintf(flashid_str, "%04X", flashid);
- print_STR(press_button_STR, 1);
- display_Update();
- wait();
- mainMenu();
- }
+ } else {
+ println_Msg(F("Check cart connection"));
+ println_Msg(F("Unknown Flash ID"));
+ sprintf(flashid_str, "%04X", flashid);
+ print_STR(press_button_STR, 1);
+ display_Update();
+ wait();
+ mainMenu();
+ }
sprintf(flashid_str, "%04X", flashid);
// Reset flashrom
resetGameshark_N64();
@@ -4384,7 +4387,6 @@ void writeGameshark_N64() { uint32_t processedProgressBar = 0;
uint32_t totalProgressBar = (uint32_t)(fileSize);
draw_progressbar(0, totalProgressBar);
- bool toggle = true;
myFile.seek(0);
for (unsigned long currSector = 0; currSector < fileSize; currSector += 16384) {
for (unsigned long currSdBuffer = 0; currSdBuffer < 16384; currSdBuffer += 256) {
@@ -4542,8 +4544,7 @@ void flashXplorer_N64() { println_Msg(F(""));
println_Msg(F("Turn Cart Reader off now"));
display_Update();
- while (1)
- ;
+ while (1);
} else {
display_Clear();
display_Update();
@@ -4580,9 +4581,7 @@ void idXplorer_N64() { setAddress_N64(0x10740000);
readWord_N64();
- if (flashid == 0x0808) {
- flashSize = 262144;
- } else {
+ if (flashid != 0x0808) {
println_Msg(F("Check cart connection"));
println_Msg(F("Unknown Flash ID"));
sprintf(flashid_str, "%04X", flashid);
@@ -4708,7 +4707,7 @@ void eraseXplorer_N64() { println_Msg(F("Erasing..."));
display_Update();
- // Send chip erase to SST 29LE010 / AMTEL AT29LV010A / SST 29EE010
+ // Send chip erase to SST 29LE010
oddXPaddrWrite(0x1040AAAA, 0xAAAA);
evenXPaddrWrite(0x10405555, 0x5555);
oddXPaddrWrite(0x1040AAAA, 0x8080);
diff --git a/sd/loopy.txt b/sd/loopy.txt index a48948a..33c40e8 100644 --- a/sd/loopy.txt +++ b/sd/loopy.txt @@ -1,6 +1,9 @@ Anime Land.bin 98A0597D +Chakrakun no Omajinai Paradise.bin +A5341F72 + HARIHARI Seal Paradise.bin 7CB100B3 |