summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-12 00:51:48 -0500
committerBryan Bishop <kanzure@gmail.com>2013-09-12 00:51:48 -0500
commit01779ed10d33994a2c14c3639584317a9b4cd129 (patch)
tree7126ec01f805f70f49b1bad0b99a79e05ed895ce
parentd1343b58b47e1db419bb2bf0d2f8aa863692756d (diff)
move load_asm2 next to load_asm
-rw-r--r--pokemontools/crystal.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/pokemontools/crystal.py b/pokemontools/crystal.py
index 9f156c5..918232a 100644
--- a/pokemontools/crystal.py
+++ b/pokemontools/crystal.py
@@ -137,6 +137,11 @@ def load_asm(filename="../main.asm"):
asm = direct_load_asm(filename=filename)
return asm
+def load_asm2(filename="../main.asm"):
+ """loads the asm source code into memory"""
+ new_asm = Asm(filename=filename)
+ return new_asm
+
def is_valid_address(address):
"""is_valid_rom_address"""
if address == None:
@@ -7144,11 +7149,6 @@ class AsmSection:
def to_asm(self):
return self.line
-def load_asm2(filename="../main.asm"):
- """loads the asm source code into memory"""
- new_asm = Asm(filename=filename)
- return new_asm
-
class Asm:
"""controls the overall asm output"""
def __init__(self, filename="../main.asm", debug=True):