Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Bryan Bishop 2013-08-28 16:34:06 -05:00
parent 16f6619ac8 6d612c8828
commit d46d1901c2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
preprocessor.py
View File

@ -12,7 +12,6 @@ from extras.pokemontools.crystal import (
DataByteWordMacro, DataByteWordMacro,
PointerLabelBeforeBank, PointerLabelBeforeBank,
PointerLabelAfterBank, PointerLabelAfterBank,
MoneyByteParam,
ItemFragment, ItemFragment,
TextEndingCommand, TextEndingCommand,
text_command_classes, text_command_classes,
@ -555,8 +554,8 @@ def macro_translator(macro, token, line):
output += ("db " + params[index+1].strip() + "\n") output += ("db " + params[index+1].strip() + "\n")
index += 2 index += 2
correction += 1 correction += 1
elif size == 3 and issubclass(param_klass, MoneyByteParam): elif size == 3 and "from_asm" in dir(param_klass):
output += ("db " + MoneyByteParam.from_asm(param) + "\n") output += ("db " + param_klass.from_asm(param) + "\n")
index += 1 index += 1
else: else:
raise Exception, "dunno what to do with this macro " + \ raise Exception, "dunno what to do with this macro " + \