From 91609594510e5a0a291d37377c2e574e837ef506 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Fri, 27 Apr 2012 16:48:25 -0500
Subject: fix MoneyByteParam formatting

original-commit-id: d9a2680c71f06bd4c9134b02b1aaaa0286c0567c
---
 crystal.py | 6 +++---
 1 file 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
-- 
cgit v1.2.3