diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2012-03-12 03:17:39 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2012-03-12 03:17:39 -0500 |
| commit | 8cfa4bee12b21f7af94bd368165b3b599d18997c (patch) | |
| tree | 30632fedb3dc514adb8b565e216957ff4f36ac1c /extras/crystal.py | |
| parent | ad0f365a372d227cf050b2c1016bda5f9b9f80c6 (diff) | |
fix calculate_pointer again
Diffstat (limited to 'extras/crystal.py')
| -rw-r--r-- | extras/crystal.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/crystal.py b/extras/crystal.py index 095aec3cf..d778d339d 100644 --- a/extras/crystal.py +++ b/extras/crystal.py @@ -366,7 +366,7 @@ def calculate_bank(address): def calculate_pointer(short_pointer, bank=None): """calculates the full address given a 4-byte pointer and bank byte""" short_pointer = int(short_pointer) - if short_pointer > 0x4000: + if 0x4000 <= short_pointer <= 0x7fff: short_pointer -= 0x4000 bank = int(bank) else: @@ -2885,7 +2885,7 @@ def parse_people_event_bytes(some_bytes, address=None, map_group=None, map_id=No script = parse_script_engine_script_at(ptr_address, map_group=map_group, map_id=map_id) extra_portion = { "script_address": ptr_address, - #"script": script, + "script": script, "event_type": "script", } if is_give_item: |