From a4235e11bfe379f410f07aaab3b8a887a5d917ed Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 16 Jun 2013 01:22:15 -0400 Subject: [PATCH] symfile: fix address handling --- extras/sym.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/sym.py b/extras/sym.py index 445abb155..cc580fa67 100644 --- a/extras/sym.py +++ b/extras/sym.py @@ -10,7 +10,7 @@ def make_sym_from_json(filename = '../pokecrystal.sym', j = 'labels.json'): # todo: delete and remake labels.json at runtime with open(filename, 'w') as sym: for label in json.load(open(j)): - sym.write('{0:x}:{1:x} {2}\n'.format(label['bank'], label['address']&0x3fff, label['label'])) + sym.write('{0:x}:{1:x} {2}\n'.format(label['bank'], label['address']%0x4000 + (0x4000 if label['bank'] else 0), label['label'])) def make_sym_from_mapfile(filename = '../pokecrystal.sym', mapfile = '../mapfile.txt'):