diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-05-06 22:15:41 -0700 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-05-06 22:15:41 -0700 |
commit | 4f3bb35e56f27c791c1d6e6adc12377104730ab5 (patch) | |
tree | 6b9911e4aa39f2d1b15d8d540d4aa11ba84f726f | |
parent | 7953d20fd5d1a3fdf8efb149f6e58c3bf27e9693 (diff) | |
parent | ffdf82fa4500a3527d46fe4ee78642e08671c653 (diff) |
Merge pull request #126 from yenatch/master
map scripts + ai + disabled line ending correction
original-commit-id: 2a44711fa7b96868048f39418a6095ea7013608d
-rw-r--r-- | chars.py | 1 | ||||
-rw-r--r-- | crystal.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -99,6 +99,7 @@ chars = { 0xEA: "é", 0xEB: "→", 0xED: "▶", + 0xEE: "▼", 0xEF: "♂", 0xF0: "¥", 0xF1: "×", @@ -1475,7 +1475,7 @@ ScriptPointerLabelAfterBank.parse = _parse_script_pointer_bytes class PointerLabelToScriptPointer(PointerLabelParam): def parse(self): PointerLabelParam.parse(self) - address = calculate_pointer_from_bytes_at(self.address, bank=self.bank) + address = calculate_pointer_from_bytes_at(self.parsed_address, bank=self.bank) address2 = calculate_pointer_from_bytes_at(address, bank="reverse") # maybe not "reverse"? self.script = parse_script_engine_script_at(address2, origin=False, map_group=self.map_group, map_id=self.map_id, force=self.force, debug=self.debug) |