summaryrefslogtreecommitdiff
path: root/extras/crystal.py
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-04-27 16:48:25 -0500
committerBryan Bishop <kanzure@gmail.com>2012-04-27 16:48:25 -0500
commitd9a2680c71f06bd4c9134b02b1aaaa0286c0567c (patch)
tree2a412ba4404b2fdf4bb6051b31f1b24ef078374d /extras/crystal.py
parent45c41795f517f420bc0b6cef4d061f767d90915c (diff)
fix MoneyByteParam formatting
Diffstat (limited to 'extras/crystal.py')
-rw-r--r--extras/crystal.py6
1 files 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