diff --git a/c64/,,config_custom.s b/c64/,,config_custom.s index e023c716..1e03bdff 100644 --- a/c64/,,config_custom.s +++ b/c64/,,config_custom.s @@ -54,9 +54,9 @@ // #define CONFIG_IEC_BURST_CIA2 // please keep disabled for now // #define CONFIG_IEC_BURST_SOFT // please keep disabled for now -// #define CONFIG_TAPE_NORMAL +#define CONFIG_TAPE_NORMAL #define CONFIG_TAPE_TURBO -// #define CONFIG_TAPE_AUTODETECT +#define CONFIG_TAPE_AUTODETECT // #define CONFIG_TAPE_NO_KEY_SENSE // #define CONFIG_TAPE_NO_MOTOR_CONTROL // #define CONFIG_TAPE_NO_ERROR_CORRECTION diff --git a/c64/basic/engine/do_error.s b/c64/basic/engine/do_error.s index 6458b90c..47a893f2 100644 --- a/c64/basic/engine/do_error.s +++ b/c64/basic/engine/do_error.s @@ -38,12 +38,12 @@ do_NOT_IMPLEMENTED_error: - ldx #36 + ldx #IDX__EV7_28 bpl do_basic_error // branch always do_MEMORY_CORRUPT_error: - ldx #35 + ldx #IDX__EOR_2A bpl do_basic_error // branch always do_kernal_error: // .A = KERNAL error code, also almost matches BASIC error codes @@ -144,10 +144,9 @@ do_basic_error: // error code in .X // "?" phx_trash_a - jsr print_return - lda #$3F - jsr JCHROUT - pla + ldx #IDX__STR_RET_QM + jsr print_packed_misc_str + plx_trash_a // Error message text + " ERROR" diff --git a/tools/generate_strings.cc b/tools/generate_strings.cc index e0c9da64..f381b616 100644 --- a/tools/generate_strings.cc +++ b/tools/generate_strings.cc @@ -306,6 +306,7 @@ const StringEntryList GLOBAL_Errors = { ListType::STRINGS_BASIC, "errors", const StringEntryList GLOBAL_MiscStrings = { ListType::STRINGS_BASIC, "misc", { // STD M65 X16 --- misc strings as on CBM machines + { true, true, true, "STR_RET_QM", "\r?" }, { true, true, true, "STR_BYTES", " BASIC BYTES FREE" }, // https://github.com/stefanhaustein/expressionparser { true, true, true, "STR_READY", "\rREADY.\r" }, // https://www.ibm.com/support/knowledgecenter/zosbasics/com.ibm.zos.zconcepts/zconc_whatistsonative.htm https://github.com/stefanhaustein/expressionparser { true, true, true, "STR_ERROR", " ERROR" }, // simply the word error that is attached to the other parts of messages https://fjkraan.home.xs4all.nl/comp/apple2faq/app2asoftfaq.html