diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-28 16:34:06 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-28 16:34:06 -0500 |
| commit | d46d1901c2214505ceab544c8f62555b3608deed (patch) | |
| tree | c2e1b34821a860d918e95df06e0930c0df1d8a4a | |
| parent | 16f6619ac8cff1f5a64112e7df4648bea9a007c8 (diff) | |
| parent | 6d612c8828861998644635352a6b7c479e1efa04 (diff) | |
Merge branch 'remove-another-moneybyteparam-special-case' into master
| -rw-r--r-- | preprocessor.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/preprocessor.py b/preprocessor.py index 105b6100e..c4b843e1b 100644 --- a/preprocessor.py +++ b/preprocessor.py @@ -12,7 +12,6 @@ from extras.pokemontools.crystal import ( DataByteWordMacro, PointerLabelBeforeBank, PointerLabelAfterBank, - MoneyByteParam, ItemFragment, TextEndingCommand, text_command_classes, @@ -555,8 +554,8 @@ def macro_translator(macro, token, line): 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 " + \ |