Merge pull request #727 from PsyK0p4T/master

Various fixes
This commit is contained in:
sanni 2023-03-07 15:23:55 +01:00 committed by GitHub
commit e7b2ee094e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 14 deletions

View File

@ -996,7 +996,7 @@ static const char modeItem6[] PROGMEM = "SMS/GG/MIII/SG-1000";
static const char modeItem7[] PROGMEM = "PC Engine/TG16"; static const char modeItem7[] PROGMEM = "PC Engine/TG16";
static const char modeItem8[] PROGMEM = "WonderSwan"; static const char modeItem8[] PROGMEM = "WonderSwan";
static const char modeItem9[] PROGMEM = "NeoGeo Pocket"; static const char modeItem9[] PROGMEM = "NeoGeo Pocket";
static const char modeItem10[] PROGMEM = "Intellvision"; static const char modeItem10[] PROGMEM = "Intellivision";
static const char modeItem11[] PROGMEM = "Colecovision"; static const char modeItem11[] PROGMEM = "Colecovision";
static const char modeItem12[] PROGMEM = "Virtual Boy"; static const char modeItem12[] PROGMEM = "Virtual Boy";
static const char modeItem13[] PROGMEM = "Watara Supervision"; static const char modeItem13[] PROGMEM = "Watara Supervision";
@ -3586,4 +3586,4 @@ void loop() {
//****************************************** //******************************************
// End of File // End of File
//****************************************** //******************************************

View File

@ -61,7 +61,7 @@ static const char menuOptionspceCart_1[] PROGMEM = "Read RAM Bank %d";
static const char menuOptionspceCart_2[] PROGMEM = "Write RAM Bank %d"; static const char menuOptionspceCart_2[] PROGMEM = "Write RAM Bank %d";
static const char menuOptionspceCart_3[] PROGMEM = "Inc Bank Number"; static const char menuOptionspceCart_3[] PROGMEM = "Inc Bank Number";
static const char menuOptionspceCart_4[] PROGMEM = "Dec Bank Number"; static const char menuOptionspceCart_4[] PROGMEM = "Dec Bank Number";
static const char menuOptionspceCart_5[] PROGMEM = "Force 1MB ROM size"; static const char menuOptionspceCart_5[] PROGMEM = "Set %dK ROM size";
static const char menuOptionspceCart_5_fmt[] PROGMEM = "ROM size now %dK"; static const char menuOptionspceCart_5_fmt[] PROGMEM = "ROM size now %dK";
// Turbochip menu items // Turbochip menu items
@ -607,6 +607,11 @@ void read_tennokoe_bank_PCE(int bank_index) {
//Close the file: //Close the file:
myFile.close(); myFile.close();
println_Msg(F(""));
print_STR(press_button_STR, 1);
display_Update();
wait();
} }
void write_tennokoe_bank_PCE(int bank_index) { void write_tennokoe_bank_PCE(int bank_index) {
@ -698,11 +703,15 @@ void write_tennokoe_bank_PCE(int bank_index) {
// Close the file: // Close the file:
myFile.close(); myFile.close();
println_Msg(F("Finished")); println_Msg(F("Finished"));
display_Update();
wait();
} else { } else {
print_Error(F("File doesn't exist")); print_Error(F("File doesn't exist"));
} }
println_Msg(F(""));
print_STR(press_button_STR, 1);
display_Update();
wait();
} }
void read_rom_PCE(void) { void read_rom_PCE(void) {
@ -788,6 +797,11 @@ void read_rom_PCE(void) {
//CRC search and rename ROM //CRC search and rename ROM
crc_search(fileName, folder, rom_size, crc); crc_search(fileName, folder, rom_size, crc);
println_Msg(F(""));
print_STR(press_button_STR, 1);
display_Update();
wait();
} }
// PC Engine Menu // PC Engine Menu
@ -827,19 +841,16 @@ void pceMenu() {
if (tennokoe_bank_index < 3) { if (tennokoe_bank_index < 3) {
tennokoe_bank_index++; tennokoe_bank_index++;
} }
pceMenu();
break; break;
case 4: case 4:
if (tennokoe_bank_index > 0) { if (tennokoe_bank_index > 0) {
tennokoe_bank_index--; tennokoe_bank_index--;
} }
pceMenu();
break; break;
case 5: case 5:
pce_force_rom_size = FORCED_SIZE; pce_force_rom_size = FORCED_SIZE;
pceMenu();
break; break;
case 6: case 6:
@ -862,12 +873,6 @@ void pceMenu() {
break; break;
} }
} }
println_Msg(F(""));
// Prints string out of the common strings array either with or without newline
print_STR(press_button_STR, 1);
display_Update();
wait();
} }
#endif #endif