diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-12 21:39:24 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-12 21:39:24 -0700 |
| commit | 9830c9dc0a20a3fb567bc8b4ed554d3b0de043d4 (patch) | |
| tree | 6a753e136986640400e3dffd04b0ff99bb1e2bce | |
| parent | 0ce2555a1939ebbd97c2539e46af7d5c30480deb (diff) | |
| parent | a4849db2658a14deebb6620fac50e9d8e9f8a0ad (diff) | |
Merge pull request #28 from kanzure/config-cleanup
Rename config.py -> configuration.py
| -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 |
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() |