diff options
| author | yenatch <yenatch@gmail.com> | 2017-02-13 18:09:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 18:09:31 -0500 |
| commit | 979c98a7c0f67ad6b9685b2d532c66a1f76ffb22 (patch) | |
| tree | c67cc7b8500aac4e400d4e8bfdbef57a57b63eb1 /redtools/sprite_helper.py | |
| parent | 74c620d01ad59bfb09cf4111ace549b925fcb9ab (diff) | |
| parent | 766dea11bd63dee939db2b47198410e6c6e0fc7e (diff) | |
Merge pull request #103 from eevee/py3
Python 3 compatibility, sort of, maybe
Diffstat (limited to 'redtools/sprite_helper.py')
| -rw-r--r-- | redtools/sprite_helper.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/redtools/sprite_helper.py b/redtools/sprite_helper.py index ee7a5f4..9e4c804 100644 --- a/redtools/sprite_helper.py +++ b/redtools/sprite_helper.py @@ -1,4 +1,6 @@ -import extract_maps +from __future__ import print_function +from __future__ import absolute_import +from . import extract_maps spacing = "\t" #provided by sawakita @@ -172,7 +174,7 @@ def load_icons(): pic = thing["picture_number"] unique_icons.add(pic) - if not icons.has_key(pic): icons[pic] = [] + if pic not in icons: icons[pic] = [] alerter = None if int(thing["y"])-4 > int(map["y"], 16)*2: alerter = True @@ -199,7 +201,7 @@ def print_appearances(): output += spacing + ".. in " + appearance[0] + " at (" + str(appearance[1]) + ", " + str(appearance[2]) + ")" + outside_alert + "\n" output += "\n" - print output + print(output) def insert_todo_sprites(): load_icons() @@ -251,7 +253,7 @@ def sprite_printer(): value = hex(key)[2:] if len(value) == 1: value = "0" + value - print sprites[key] + extra + " EQU $" + value + print(sprites[key] + extra + " EQU $" + value) def parse_sprite_sheet_pointer_table(): """parses the bytes making up the pointer table @@ -321,7 +323,7 @@ def parse_sprite_sheet_pointer_table(): data_entry["byte_count"] += 64 setter3 = True - print ("$%.2x " % (sprite_id)) + sprite_name + " has $%.2x bytes" % (byte_count) + " pointing to 0x%.x" % (pointer) + " bank is $%.2x" % (bank) + " with pose_count=" + str(data_entry["poses"]) + print(("$%.2x " % (sprite_id)) + sprite_name + " has $%.2x bytes" % (byte_count) + " pointing to 0x%.x" % (pointer) + " bank is $%.2x" % (bank) + " with pose_count=" + str(data_entry["poses"])) ptable_sheet_data[sprite_id] = data_entry return ptable_sheet_data @@ -398,5 +400,5 @@ if __name__ == "__main__": #sprite_printer() ptable_sheet_data = parse_sprite_sheet_pointer_table() - print pretty_print_sheet_incbins(ptable_sheet_data) - print pretty_print_sheet_data(ptable_sheet_data) + print(pretty_print_sheet_incbins(ptable_sheet_data)) + print(pretty_print_sheet_data(ptable_sheet_data)) |