Merge pull request #3 from kanzure/proposed-yenatch-master

Proposed merge of kanzure/master into yenatch/master

2 files changed, 0 insertions, 100 deletions

diff --git a/extras b/extras
new file mode 160000
+Subproject 016f0206b5029fc83a6200be29b0f980c76dfd9
diff --git a/extras/sym.py b/extras/sym.py
deleted file mode 100644
index b866ec87f..000000000
--- a/extras/sym.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# coding: utf-8
-
-import os
-import sys
-import json
-
-
-def make_sym_from_json(filename = '../pokecrystal.sym', j = 'labels.json'):
-	output = ''
-	labels = json.load(open(j))
-	for label in labels:
-		output += '{0:x}:{1:x} {2}\n'.format(label['bank'], label['address'], label['label'])
-	with open(filename, 'w') as sym:
-		sym.write(output)
-
-
-def make_json_from_mapfile(filename = 'labels.json', mapfile = '../pokecrystal.map'):
-	output = []
-	labels = filter_wram_addresses(read_mapfile(mapfile))
-	with open(filename, 'w') as out:
-		out.write(json.dumps(labels))
-
-
-def read_mapfile(filename = '../pokecrystal.map'):
-	"""
-	Scrape label addresses from an rgbds mapfile.
-	"""
-
-	labels = []
-
-	with open(filename,'r') as map:
-		lines = map.readlines()
-
-	for line in lines:
-		# bank #
-		if 'Bank #' in line:
-			cur_bank = int(line.lstrip('Bank #').strip(':\n').strip(' (HOME)'))
-
-		# label definition
-		elif '=' in line:
-			address, label = line.split('=')
-			address = int(address.lstrip().replace('$','0x'), 16)
-			label = label.strip()
-
-			# rgbds doesn't support ram banks yet
-			bank = cur_bank
-			offset = address
-			if 0x8000 <= address < 0xa000:
-				bank = 0
-			elif 0xa000 <= address < 0xc000:
-				bank = 0
-			elif 0xc000 <= address < 0xd000:
-				bank = 0
-			elif 0xd000 <= address < 0xe000:
-				bank = 0
-			else:
-				offset += (bank * 0x4000 - 0x4000) if bank > 0 else 0
-
-			labels += [{
-				'label': label,
-				'bank': bank,
-				'address': offset,
-				'offset': offset,
-				'local_address': address,
-			}]
-
-	return labels
-
-def filter_wram_addresses(labels):
-	filtered_labels = []
-	for label in labels:
-		if label['local_address'] < 0x8000:
-			filtered_labels += [label]
-	return filtered_labels
-
-
-def make_sym_from_mapfile(filename = '../pokecrystal.sym'):
-	# todo: sort label definitions by address
-
-	output = ''
-	labels = read_mapfile()
-
-	# convert to sym format (bank:addr label)
-	for label in labels:
-		output += '%.2x:%.4x %s\n' % (label['bank'], label['address'], label['label'])
-
-	# dump contents to symfile
-	with open(filename, 'w') as sym:
-		sym.write(output)
-
-
-if __name__ == "__main__":
-	#if os.path.exists('../pokecrystal.sym'):
-	#	sys.exit()
-	#elif os.path.exists('../pokecrystal.map'):
-	#	make_sym_from_mapfile()
-	#elif os.path.exists('labels.json'):
-	#	make_sym_from_json()
-	make_json_from_mapfile()
-