summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-06-28 21:49:50 -0400
committeryenatch <yenatch@gmail.com>2013-06-28 21:49:50 -0400
commit5ee3ead5fadc4bc39cd6f556bbda63eb217efafd (patch)
treefcb4e583db6b5192110efd776f2746a21ca1b675
parent3c2125a7fc37c0bebfec65f8b231c1e5f7c66c69 (diff)
crystal: wram label finding
original-commit-id: daf3930984690e8ce44b375dda35a9d725c0c1d2
-rw-r--r--crystal.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/crystal.py b/crystal.py
index 0b72397..7d607f7 100644
--- a/crystal.py
+++ b/crystal.py
@@ -7353,15 +7353,15 @@ def write_all_labels(all_labels, filename="labels.json"):
fh.close()
return True
-# TODO: implement get_ram_label
-# wram.asm integration would be nice
+from wram import wram_labels
def get_ram_label(address):
- """not implemented yet.. supposed to get a label for a particular RAM location
- like W_PARTYPOKE1HP"""
+ """returns a label assigned to a particular ram address"""
+ if address in wram_labels.keys():
+ return wram_labels[address][-1]
return None
def get_label_for(address):
- """returns a label assigned to a particular address"""
+ """returns a label assigned to a particular rom address"""
global all_labels
if address == None: