shithub: pokecrystal

Info  •  Files  •  Log  •  Branches

Merge branch 'remove-another-moneybyteparam-special-case' into master

--- a/preprocessor.py

+++ b/preprocessor.py

@@ -12,7 +12,6 @@

     DataByteWordMacro,

     PointerLabelBeforeBank,

     PointerLabelAfterBank,

-    MoneyByteParam,

     ItemFragment,

     TextEndingCommand,

     text_command_classes,

@@ -555,8 +554,8 @@

                 output += ("db " + params[index+1].strip() + "\n")

                 index += 2

                 correction += 1

-            elif size == 3 and issubclass(param_klass, MoneyByteParam):

-                output += ("db " + MoneyByteParam.from_asm(param) + "\n")

+            elif size == 3 and "from_asm" in dir(param_klass):

+                output += ("db " + param_klass.from_asm(param) + "\n")

                 index += 1

             else:

                 raise Exception, "dunno what to do with this macro " + \