ref: 7d9552b5fa9be937f39dbe03c7f5f369c3886a7a
parent: d48ce599970d3d7077477ed000dfb38e146d3448
author: Bryan Bishop <[email protected]>
date: Sun May 27 16:02:34 EDT 2012
fix typo in strip destination pointer (north) calculations
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -5483,7 +5483,7 @@
# 0xc703 + (current_map_height + 3) * (current_map_width + 6) + x_movement_of_the_connection_strip_in_blocks
x_movement_of_the_connection_strip_in_blocks = strip_destination - (0xc703 + (current_map_height + 3) * (current_map_width + 6))
xmov = x_movement_of_the_connection_strip_in_blocks
- output += "($C703 + (((" + self_constant_label + "_HEIGHT * 3) * (" + self_constant_label + "_WIDTH + 6)) + " + str(xmov) + "))"
+ output += "($C703 + (((" + self_constant_label + "_HEIGHT + 3) * (" + self_constant_label + "_WIDTH + 6)) + " + str(xmov) + "))"
elif ldirection == "east":
# strip_destination =
# 0xc700 + (current_map_width + 6) * (y_movement_of_the_connection_strip_in_blocks + 3)
@@ -5530,23 +5530,25 @@
#elif not ((xoffset % -2) == 0):
# raise Exception, "tauwasser was wrong about xoffset for north/south? it's not divisible by -2: " + str(xoffset)
+ output += "db "
+
if ldirection == "south":
- output += "db 0"
+ output += "0"
elif ldirection == "north":
- output += "db ((" + map_constant_label + "_HEIGHT * 2) - 1)"
+ output += "((" + map_constant_label + "_HEIGHT * 2) - 1)"
else:
- output += "db "+str(yoffset)
+ output += str(yoffset)
- output += " ; yoffset\n"
+ output += ", "
if ldirection == "east":
- output += "db 0"
+ output += "0"
elif ldirection == "west":
- output += "db ((" + map_constant_label + "_WIDTH * 2) - 1)"
+ output += "((" + map_constant_label + "_WIDTH * 2) - 1)"
else:
- output += "db "+str(xoffset)
+ output += str(xoffset)
- output += " ; xoffset\n"
+ output += " ; yoffset, xoffset\n"
window = self.window