diff --git a/bin/GWRAM.dbg.po b/bin/GWRAM.dbg.po index c8d2c7b..45f04a6 100644 Binary files a/bin/GWRAM.dbg.po and b/bin/GWRAM.dbg.po differ diff --git a/bin/GWRAM.po b/bin/GWRAM.po index 46fc65c..1b2dedc 100644 Binary files a/bin/GWRAM.po and b/bin/GWRAM.po differ diff --git a/gwconio.s b/gwconio.s index d00abd2..df337a1 100644 --- a/gwconio.s +++ b/gwconio.s @@ -1,6 +1,6 @@ ; ; Ullrich von Bassewitz, 06.08.1998 -; Modified Sep. 5, 2020 by Zane Kaminski, Engineer @ Garrett's Workshop +; Modified Sep. 6, 2020 by Zane Kaminski, Engineer @ Garrett's Workshop ; ; .ifdef __APPLE2ENH__ @@ -8,6 +8,7 @@ .endif .export _gwcputcxy, _gwcputc .export _gwcputsxy, _gwcputs + .import _gwconiomask .import gotoxy, VTABZ .importzp ptr1, tmp1 @@ -60,6 +61,12 @@ _gwcputc: cmp #$0A ; Test for \n = line feed beq newline eor #$80 ; Invert high bit + ; .ifndef __APPLE2ENH__ + cmp #$E0 ; Test for lowercase + bcc cputdirect +; and #$DF ; Convert to uppercase + and _gwconiomask ; Convert to uppercase using mask +; .endif cputdirect: jsr putchar diff --git a/main.c b/main.c index 5034880..03c3d52 100644 --- a/main.c +++ b/main.c @@ -4,9 +4,14 @@ #include "ram2e.h" #include "ram2gs.h" +#include "gwconio.h" + +char gwconiomask; int main(void) { + gwconiomask = 0xFF; + // First clear screen clrscr(); @@ -22,9 +27,10 @@ int main(void) ram2gs_main(); return EXIT_SUCCESS; default: + gwconiomask = 0xDF; // If not on IIe or IIgs, show an error message and quit - cputsxy(0, 8, " THIS PROGRAM REQUIRES APPLE IIE OR IIGS"); - cputsxy(0, 10, " PRESS ANY KEY TO QUIT."); + gwcputsxy(0, 8, " THIS PROGRAM REQUIRES APPLE IIE OR IIGS"); + gwcputsxy(0, 10, " PRESS ANY KEY TO QUIT."); cgetc(); // Wait for key clrscr(); // Clear screen before quitting return EXIT_SUCCESS;