Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix calculate_pointer again

This commit is contained in:
Bryan Bishop 2012-03-12 03:17:39 -05:00
parent ad0f365a37
commit 8cfa4bee12
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extras/crystal.py
View File

@ -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: