diff options
| author | yenatch <yenatch@gmail.com> | 2013-11-05 14:11:04 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-11-05 14:11:04 -0500 |
| commit | da7b863b8e20d5d8da07d9eb44e0fd4f5f0848d0 (patch) | |
| tree | 09a02add28a0d34589fce85ec2fde3da81c8eb05 /pokemontools/gbz80disasm.py | |
| parent | 4a7373d8e79d17f10ebafa3ccef7b822a5b139af (diff) | |
| parent | dafb5518df768f93ac94c59d4bf5981e95f7aba0 (diff) | |
Merge branch 'master' of github.com:kanzure/pokemon-reverse-engineering-tools
Diffstat (limited to 'pokemontools/gbz80disasm.py')
| -rw-r--r-- | pokemontools/gbz80disasm.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pokemontools/gbz80disasm.py b/pokemontools/gbz80disasm.py index 1fb9d85..a77e433 100644 --- a/pokemontools/gbz80disasm.py +++ b/pokemontools/gbz80disasm.py @@ -10,7 +10,7 @@ from ctypes import c_int8 import random import json -import config +import configuration import crystal import labels import wram @@ -929,7 +929,7 @@ class Disassembler(object): return (output, offset, last_hl_address, last_a_address, used_3d97) if __name__ == "__main__": - conf = config.Config() + conf = configuration.Config() disasm = Disassembler(conf) disasm.initialize() |