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

This commit is contained in:
Bryan Bishop 2013-08-28 16:32:15 -05:00
commit a4782d9b5a
1 changed files with 0 additions and 2 deletions

View File

@ -498,8 +498,6 @@ def macro_translator(macro, token, line):
elif param_klass.byte_type == "dw": elif param_klass.byte_type == "dw":
if param_klass.size == 2: if param_klass.size == 2:
allowed_length += 1 # just label allowed_length += 1 # just label
elif param_klass == MoneyByteParam:
allowed_length += 1
elif param_klass.size == 3: elif param_klass.size == 3:
allowed_length += 2 # bank and label allowed_length += 2 # bank and label
else: else: