summaryrefslogtreecommitdiff
path: root/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
commit91609594510e5a0a291d37377c2e574e837ef506 (patch)
tree662f19fe097936d8c23d1c7ac4e2c51a13e5c159 /crystal.py
parent368b3b843dbdaa03747cea6f222f0e4f1d61aa20 (diff)
fix MoneyByteParam formatting
original-commit-id: d9a2680c71f06bd4c9134b02b1aaaa0286c0567c
Diffstat (limited to 'crystal.py')
-rw-r--r--crystal.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/crystal.py b/crystal.py
index b2ae2e0..7be1aa9 100644
--- a/crystal.py
+++ b/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