From 35e6903395f8d6e3dc91d1e5bd71bfb138f012c8 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 20 May 2012 03:20:01 -0500 Subject: better asm output for TrainerHeader and TrainerGroupHeader --- extras/crystal.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'extras/crystal.py') diff --git a/extras/crystal.py b/extras/crystal.py index ab58a19cd..26f9add54 100644 --- a/extras/crystal.py +++ b/extras/crystal.py @@ -3611,7 +3611,7 @@ class TrainerGroupHeader: self.size = size def to_asm(self): - output = "\n\n".join(["; "+header.make_name()+" at "+hex(header.address)+"\n"+header.to_asm() for header in self.individual_trainer_headers]) + output = "\n\n".join(["; "+header.make_constant_name()+" ("+str(header.trainer_id)+") at "+hex(header.address)+"\n"+header.to_asm() for header in self.individual_trainer_headers]) return output class TrainerHeader: @@ -3713,8 +3713,7 @@ class TrainerHeader: def to_asm(self): output = "db \""+self.name+"\"\n" - output += "; data type\n" - output += "db $%.2x\n"%(self.data_type) + output += "db $%.2x ; data type\n" % (self.data_type) output += self.party_mons.to_asm() output += "\n; last_address="+hex(self.last_address)+" size="+str(self.size) return output @@ -3768,7 +3767,8 @@ class TrainerPartyMonParser: return True def to_asm(self): - output = "; " + ", ".join([param_type["name"] for (key, param_type) in self.param_types.items()]) + "\n" + output = "" + #output = "; " + ", ".join([param_type["name"] for (key, param_type) in self.param_types.items()]) + "\n" for mon in self.mons: output += "db " + ", ".join([param.to_asm() for (name, param) in self.mons[mon].items()]) output += "\n" -- cgit v1.2.3