diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-06-17 16:56:00 -0700 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-06-17 16:56:00 -0700 |
commit | 2d5e2dcb19d02cec691a7bdbb807deab61eb8cf4 (patch) | |
tree | 6fc0fbb9b9ee40aff5058027e4d3cf94d58c3832 /sym.py | |
parent | 76b71fda33a8f6ac2ec3c26470c6d156fa1aaeca (diff) | |
parent | 1578452ebccfd44fac82bd01defa75455ef00a41 (diff) |
Merge pull request #147 from yenatch/master
gbz80disasm/sym fixes + odds and ends
original-commit-id: ac773a9dc1499f7070dc98236c66de6309885210
Diffstat (limited to 'sym.py')
-rw-r--r-- | sym.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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'): |