From d9a2680c71f06bd4c9134b02b1aaaa0286c0567c Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Fri, 27 Apr 2012 16:48:25 -0500 Subject: [PATCH] fix MoneyByteParam formatting --- extras/crystal.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extras/crystal.py b/extras/crystal.py index b2ae2e08d..7be1aa93f 100644 --- a/extras/crystal.py +++ b/extras/crystal.py @@ -1410,11 +1410,11 @@ class MoneyByteParam(MultiByteParam): def parse(self): MultiByteParam.parse(self) # in the rom as xxyyzz - self.x = self.bytes[0] + self.x = self.bytes[2] self.y = self.bytes[1] - self.z = self.bytes[2] + self.z = self.bytes[0] def to_asm(self): - return str(self.x + self.y << 8 + self.z << 16) + return str(self.x + (self.y << 8) + (self.z << 16)) #this is used by the preprocessor @staticmethod