summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-04-16 09:55:28 -0500
committerBryan Bishop <kanzure@gmail.com>2012-04-16 09:55:28 -0500
commita1584535e74938c43de76ba03d5ccee415bb7612 (patch)
treec48ce830cea79daa4838e6de3d28b7f03097b2d3
parent33b5f439ac6a365af122e691a19469e4aaf6ada9 (diff)
to_asm adds a label and end text
Need to write more tools for injecting asm into main.asm from the python interpreter. original-commit-id: f3f2adb219594daf1c68058a247836ab4ffa81c6
-rw-r--r--crystal.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/crystal.py b/crystal.py
index 1b591ea..00e02a2 100644
--- a/crystal.py
+++ b/crystal.py
@@ -4970,7 +4970,7 @@ class TrainerFragmentParam(PointerLabelParam):
PointerLabelParam.parse(self)
class PeopleEvent(Command):
size = people_event_byte_size
- macro_name = "people_event_def"
+ macro_name = "person_event"
base_label = "PeopleEvent_"
override_byte_check = True
param_types = {
@@ -6751,6 +6751,7 @@ for map_group_id in map_names.keys():
#generate map constants (like 1=PALLET_TOWN)
generate_map_constant_labels()
+
#### asm utilities ####
#these are pulled in from pokered/extras/analyze_incbins.py
@@ -6763,6 +6764,14 @@ incbin_lines = []
#storage for processed incbin lines
processed_incbins = {}
+def to_asm(some_object):
+ """shows asm with labels and ending comments"""
+ #label: ; 0x10101
+ asm = some_object.label + ": ; " + hex(some_object.address) + "\n"
+ asm += spacing + some_object.to_asm().replace("\n", "\n"+spacing).replace("\n"+spacing+"\n"+spacing, "\n\n"+spacing)
+ asm += "\n; " + hex(some_object.last_address)
+ return asm
+
def isolate_incbins():
"find each incbin line"
global incbin_lines, asm