summaryrefslogtreecommitdiff
path: root/pokemontools/gbz80disasm.py
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-12 00:34:43 -0500
committerBryan Bishop <kanzure@gmail.com>2013-09-12 00:34:43 -0500
commita4849db2658a14deebb6620fac50e9d8e9f8a0ad (patch)
tree6a753e136986640400e3dffd04b0ff99bb1e2bce /pokemontools/gbz80disasm.py
parent0ce2555a1939ebbd97c2539e46af7d5c30480deb (diff)
rename config.py -> configuration.py
This should help cut down on the confusion between the "config" module and the "config" variable that everyone likes to use. The config variable should refer to an instance of Config, whereas before it was being shared as both the name of the module and the name of an instance. "configuration" is always the module. "config" should always be a Config instance. TODO: avoid passing around a Config instance everywhere.
Diffstat (limited to 'pokemontools/gbz80disasm.py')
-rw-r--r--pokemontools/gbz80disasm.py4
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()