# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1459125129 25200
# Node ID 9f575f77a157f58560707a72df858a75c7cb2736
# Parent  a3f14b00aeadb3b01871c55ad2b6dda4455ea5dc
Fix parsing of hex literals in assembler

diff -r a3f14b00aead -r 9f575f77a157 src/asm.c
--- a/src/asm.c	Sun Mar 27 16:15:46 2016 -0700
+++ b/src/asm.c	Sun Mar 27 17:32:09 2016 -0700
@@ -203,7 +203,7 @@
 	{
 		//TODO: actual error checking
 		if (arg[0] == '$' || (arg[0] == '0' && arg[1] == 'x')) {
-			value = strtol(arg, NULL, 16);
+			value = strtol(arg[0] == '$' ? arg+1 : arg+2, NULL, 16);
 		} else if (arg[0] >= '0' && arg[0] <= '9') {
 			value = strtol(arg, NULL, 10);
 		} else if (arg[0] == '"') {
@@ -321,7 +321,7 @@
 	
 	//TODO: actual error checking
 	if (arg[0] == '$' || (arg[0] == '0' && arg[1] == 'x')) {
-		value = strtol(arg, NULL, 16);
+		value = strtol(arg[0] == '$' ? arg+1 : arg+2, NULL, 16);
 	} else if (arg[0] >= '0' && arg[0] <= '9') {
 		value = strtol(arg, NULL, 10);
 	} else {