diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2012-01-05 19:26:18 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2012-01-05 19:26:18 -0600 |
| commit | 6d1870ea95389297da64e8f43612e66b3ae852ba (patch) | |
| tree | 358fb72016a43f8bec2ca30d0f1774ed98034eef | |
| parent | d6553b205c9e6deb58afabf175cdd570dd732d09 (diff) | |
switch around old amber sprite constants
hg-commit-id: cb128c47380e
| -rw-r--r-- | constants.asm | 4 | ||||
| -rw-r--r-- | extras/sprite_helper.py | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/constants.asm b/constants.asm index 63e80259..0ab0dd8c 100644 --- a/constants.asm +++ b/constants.asm @@ -1257,8 +1257,8 @@ SPRITE_PAPER_SHEET EQU $40 SPRITE_BOOK_MAP_DEX EQU $41 SPRITE_CLIPBOARD EQU $42 SPRITE_SNORLAX EQU $43 -SPRITE_OLD_AMBER EQU $44 -SPRITE_OLD_AMBER_COPY EQU $45 +SPRITE_OLD_AMBER_COPY EQU $44 +SPRITE_OLD_AMBER EQU $45 SPRITE_LYING_OLD_MAN_UNUSED_1 EQU $46 SPRITE_LYING_OLD_MAN_UNUSED_2 EQU $47 SPRITE_LYING_OLD_MAN EQU $48 diff --git a/extras/sprite_helper.py b/extras/sprite_helper.py index f5ba1b13..4dec622f 100644 --- a/extras/sprite_helper.py +++ b/extras/sprite_helper.py @@ -73,7 +73,7 @@ constants = { 0x41: ["book/map/dex", ""], 0x42: ["clipboard", ""], 0x43: ["snorlax", ""], -0x44: ["old amber", ""], +0x44: ["old amber copy", ""], 0x45: ["old amber", ""], 0x46: ["lying old man unused 1", ""], 0x47: ["lying old man unused 2", ""], @@ -83,6 +83,7 @@ constants = { icons = {} unique_icons = set() todo_sprites = {} +sprites = {} def load_icons(): for map_id in map_headers: @@ -146,7 +147,6 @@ def sprite_name_cleaner(badname): def sprite_namer(): "makes up better constant names for each sprite" insert_todo_sprites() - sprites = {} for sprite_id in constants: suggestions = constants[sprite_id] @@ -160,6 +160,7 @@ def sprite_namer(): result = sprite_name_cleaner(original) sprites[sprite_id] = result +def sprite_printer(): for key in sprites: line_length = len(sprites[key]) + len(" EQU $") + 2 @@ -172,8 +173,9 @@ def sprite_namer(): print sprites[key] + extra + " EQU $" + value +sprite_namer() if __name__ == "__main__": #load_icons() #print_appearances() - sprite_namer() + sprite_printer() |