summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pokemontools/__init__.py2
-rw-r--r--pokemontools/configuration.py (renamed from pokemontools/config.py)0
-rw-r--r--pokemontools/gbz80disasm.py4
3 files changed, 3 insertions, 3 deletions
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()