diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | pokemontools/__init__.py | 2 | ||||
| -rw-r--r-- | pokemontools/configuration.py (renamed from pokemontools/config.py) | 0 | ||||
| -rw-r--r-- | pokemontools/gbz80disasm.py | 4 |
4 files changed, 5 insertions, 5 deletions
@@ -23,8 +23,8 @@ # swap files for gedit *~ -# no data from extras/ -*.json +# labels.json is auto-generated by gbz80disasm +labels.json # for vim configuration # url: http://www.vim.org/scripts/script.php?script_id=441 diff --git a/pokemontools/__init__.py b/pokemontools/__init__.py index 09331af..293e2f2 100644 --- a/pokemontools/__init__.py +++ b/pokemontools/__init__.py @@ -1,3 +1,3 @@ -import config +import configuration as config import crystal import preprocessor diff --git a/pokemontools/config.py b/pokemontools/configuration.py index cbf230c..cbf230c 100644 --- a/pokemontools/config.py +++ b/pokemontools/configuration.py 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() |