Index: tools/autogen.py
===================================================================
--- tools/autogen.py	(revision ec07933bcaf1e2c3538953158113c19310061b54)
+++ tools/autogen.py	(revision 75751db6c5c6834a6695072a6087289dd2c538f6)
@@ -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