Index: tools/autogen.py
===================================================================
--- tools/autogen.py	(revision 0f2a9be80568190323c7447075247545df38fdff)
+++ tools/autogen.py	(revision da5ba3aa0a1b0c162a872b399b26e50601ef7c32)
@@ -128,5 +128,5 @@
 
 def filter_pairs(lines):
-	pattern = re.compile("^\tEMITTED_CONSTANT ([A-Z_][A-Z0-9_]*) = \$?([0-9]+)$");
+	pattern = re.compile("^\tEMITTED_CONSTANT ([A-Z_][A-Z0-9_]*) = (\$|#)?([0-9]+)$");
 	pairs = []
 	for line in lines:
@@ -134,5 +134,5 @@
 		if res == None:
 			continue
-		pairs = pairs + [res.group(1, 2)]
+		pairs = pairs + [res.group(1, 3)]
 	return pairs