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 | 2a44711fa7b96868048f39418a6095ea7013608d (patch) | |
| tree | ea7ffffcfb4c93f6ae6113fd09ca721ab7271d14 /extras | |
| parent | 0e47273378b1f7f010e4d3e6dbab2a14dcc781ce (diff) | |
| parent | 5a4098891ac52126c935311d891bab3fbd248c62 (diff) | |
Merge pull request #126 from yenatch/master
map scripts + ai + disabled line ending correction
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/chars.py | 1 | ||||
| -rw-r--r-- | extras/crystal.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/extras/chars.py b/extras/chars.py index 159a479a7..1bc25dbe7 100644 --- a/extras/chars.py +++ b/extras/chars.py @@ -99,6 +99,7 @@ chars = { 0xEA: "é", 0xEB: "→", 0xED: "▶", + 0xEE: "▼", 0xEF: "♂", 0xF0: "¥", 0xF1: "×", diff --git a/extras/crystal.py b/extras/crystal.py index 790125222..680a441e3 100644 --- a/extras/crystal.py +++ b/extras/crystal.py @@ -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) |