a8xd: print correct hex value in -a mode.

3 files changed, 14 insertions, 6 deletions

diff --git a/a8xd.1 b/a8xd.1
index a2678c6..69d3534 100644
--- a/a8xd.1
+++ b/a8xd.1
@@ -70,8 +70,12 @@ ANTIC mode: treat the input as screen bytes (aka "internal codes")
 rather than ATASCII. Can usefully be combined with \fB\-g\fP\&.
 .TP
 .B  \-g
-Graphics mode. Changes the colorization so it looks like \fIGRAPHICS 1\fP (or 2)
-on the Atari.
+Graphics mode. Changes the character codes and colorization so it
+looks like \fIGRAPHICS 1\fP (or 2) on the Atari.
+.TP
+.B  \-G
+\fINot yet implemeted\fP\&. Like \fB\-g\fP, but using the top half of the character set. This is
+what you\(aqd see on the Atari with \fIGRAPHICS 1:POKE 756,226\fP\&.
 .TP
 .B  \-i
 Print XL/XE International Character Set conversions instead of ATASCII.
diff --git a/a8xd.c b/a8xd.c
index 534267c..f887d05 100644
--- a/a8xd.c
+++ b/a8xd.c
@@ -244,12 +244,12 @@ void dump_line(const unsigned char *buf, int len) {
 
 	while(len) {
 		c = *buf;
-		if(screencodes) c = screen2ata(c);
 		inv = !graphics && (c & 0x80);
+		if(screencodes) c = screen2ata(c);
 
 		if(color) hpos += sprintf(hex + hpos, "%s", get_color(c));
 		if(inv) hpos += sprintf(hex + hpos, "%s", inverse_on);
-		hpos += sprintf(hex + hpos, byte_format, c);
+		hpos += sprintf(hex + hpos, byte_format, *buf); /* *buf here, not c! */
 		if(color || inv) hpos += sprintf(hex + hpos, "%s", color_off);
 		hex[hpos++] = ' ';
 		if(count - len == 7) hex[hpos++] = ' ';
diff --git a/a8xd.rst b/a8xd.rst
index 30d187b..c8730c6 100644
--- a/a8xd.rst
+++ b/a8xd.rst
@@ -46,8 +46,12 @@ OPTIONS
   rather than ATASCII. Can usefully be combined with **-g**.
 
 -g
-  Graphics mode. Changes the colorization so it looks like *GRAPHICS 1* (or 2)
-  on the Atari.
+  Graphics mode. Changes the character codes and colorization so it
+  looks like *GRAPHICS 1* (or 2) on the Atari.
+
+-G
+  *Not yet implemeted*. Like **-g**, but using the top half of the character set. This is
+  what you'd see on the Atari with *GRAPHICS 1:POKE 756,226*.
 
 -i
   Print XL/XE International Character Set conversions instead of ATASCII.