fix PointerLabelParams in signposts

This commit is contained in:
Bryan Bishop 2012-05-14 00:51:16 -05:00
parent 984597d1aa
commit f43de05607

View File

@ -3833,7 +3833,7 @@ class Signpost(Command):
debug=self.debug) debug=self.debug)
self.remotes.append(r1) self.remotes.append(r1)
mb = PointerLabelParam(address=address, map_group=self.map_group, map_id=self.map_id, debug=self.debug) mb = PointerLabelParam(address=self.address+3, map_group=self.map_group, map_id=self.map_id, debug=self.debug)
self.params.append(mb) self.params.append(mb)
elif func == 7: elif func == 7:
#signpost's script pointer points to [Bit-Nr. (2byte)][Item no.] #signpost's script pointer points to [Bit-Nr. (2byte)][Item no.]
@ -3851,7 +3851,7 @@ class Signpost(Command):
debug=self.debug) debug=self.debug)
self.remotes.append(r1) self.remotes.append(r1)
mb = PointerLabelParam(address=address, map_group=self.map_group, map_id=self.map_id, debug=self.debug) mb = PointerLabelParam(address=self.address+3, map_group=self.map_group, map_id=self.map_id, debug=self.debug)
self.params.append(mb) self.params.append(mb)
#bit_table_byte1 = ord(rom[address]) #bit_table_byte1 = ord(rom[address])
@ -3873,7 +3873,7 @@ class Signpost(Command):
debug=self.debug) debug=self.debug)
self.remotes.append(r1) self.remotes.append(r1)
mb = PointerLabelParam(address=address, map_group=self.map_group, map_id=self.map_id, debug=self.debug) mb = PointerLabelParam(address=self.address+3, map_group=self.map_group, map_id=self.map_id, debug=self.debug)
self.params.append(mb) self.params.append(mb)
else: else:
raise Exception, "unknown signpost type byte="+hex(func) + " signpost@"+hex(self.address) raise Exception, "unknown signpost type byte="+hex(func) + " signpost@"+hex(self.address)