diff options
| -rw-r--r-- | gbz80disasm.py | 5 | ||||
| -rw-r--r-- | romstr.py | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/gbz80disasm.py b/gbz80disasm.py index 088a32f..d22f152 100644 --- a/gbz80disasm.py +++ b/gbz80disasm.py @@ -14,11 +14,8 @@ if not hasattr(json, "read"): from romstr import RomStr def load_rom(filename="../baserom.gbc"): - """loads bytes into memory""" global rom - file_handler = open(filename, "rb") - rom = RomStr(file_handler.read()) - file_handler.close() + rom = RomStr.load(filename=filename) return rom spacing = "\t" @@ -46,15 +46,17 @@ class RomStr(str): return "RomStr(too long)" @classmethod - def load(cls, crystal=True, red=False): + def load(cls, filename=None, crystal=True, red=False): """ Loads a ROM into a RomStr. """ - if crystal and not red: + if crystal and not red and not filename: file_handler = open("../baserom.gbc", "r") - elif red and not crystal: + elif red and not crystal and not filename: file_handler = open("../pokered-baserom.gbc", "r") + elif filename not in ["", None]: + file_handler = open(filename, "rb") else: - raise Exception, "not sure which rom to load?" + raise Exception("not sure which rom to load?") bytes = file_handler.read() file_handler.close() return RomStr(bytes) |