summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-05-05 01:40:28 -0500
committerBryan Bishop <kanzure@gmail.com>2012-05-05 01:40:28 -0500
commitda26805d73cf659959225450da6fc15f98bc1592 (patch)
treec735a4d663c6c52c8e404a9d79691136b035c982
parent939d6c24b0904aa22d7dfb108372a682a4e53bdc (diff)
fix MovementCommand.to_asm return value for id>$45
original-commit-id: a9a1e084a1aeb8235e93351d2ed5dbac66461fe6
-rw-r--r--crystal.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/crystal.py b/crystal.py
index b377ad9..a4b12f9 100644
--- a/crystal.py
+++ b/crystal.py
@@ -1908,7 +1908,9 @@ class MovementCommand(Command):
def to_asm(self):
if ord(rom[self.address]) < 0x45:
byte = ord(rom[self.address])
+
base = [0, 4, 8, 0x0C, 0x10, 0x14, 0x18, 0x1C, 0x20, 0x24, 0x28, 0x2C, 0x30, 0x34, 0x3A, 0x3B, 0x3D]
+
if byte in base:
modulator = "down"
elif byte in [x+1 for x in base]:
@@ -1922,7 +1924,7 @@ class MovementCommand(Command):
return self.macro_name+" "+modulator
else:
- Command.parse(self)
+ return Command.to_asm(self)
movement_command_classes = inspect.getmembers(sys.modules[__name__], \
lambda obj: inspect.isclass(obj) and \