diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2012-01-11 13:57:19 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2012-01-11 13:57:19 -0600 |
| commit | 981000457caf654c3f64de30bec86204cf0c3f77 (patch) | |
| tree | ee509772ad7b5892fc716bfbc81ade43ab8a9d6b | |
| parent | 691aa8e157c0f74f745a6e2501d68a6d6438888a (diff) | |
minor formatting
hg-commit-id: b6dfe0dfccd2
| -rw-r--r-- | extras/insert_texts.py | 2 | ||||
| -rw-r--r-- | extras/pretty_map_headers.py | 2 | ||||
| -rw-r--r-- | pokered.asm | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/extras/insert_texts.py b/extras/insert_texts.py index cdb09417..6166bc9f 100644 --- a/extras/insert_texts.py +++ b/extras/insert_texts.py @@ -426,7 +426,7 @@ if __name__ == "__main__": #insert_08_asm(83, 1) #insert_all_08s() - insert_asm(0x19926, "VermilionCityText5_2") + insert_asm(0x1e37a, "PowerPlantText2") if len(failed_attempts) > 0: print "-- FAILED ATTEMPTS --" diff --git a/extras/pretty_map_headers.py b/extras/pretty_map_headers.py index a67d0b55..952d6fd2 100644 --- a/extras/pretty_map_headers.py +++ b/extras/pretty_map_headers.py @@ -8,7 +8,7 @@ import extract_maps import sprite_helper import random import string -#import analyze_texts #hopefully not a dependency loop +import analyze_texts #hopefully not a dependency loop base = 16 spacing = " " diff --git a/pokered.asm b/pokered.asm index 7e7f06f5..37bb8f81 100644 --- a/pokered.asm +++ b/pokered.asm @@ -8963,6 +8963,7 @@ PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83) dw $63bf ; objects INCBIN "baserom.gbc",$1e2c6,$1e3bf - $1e2c6 + PowerPlantObject: ; 0x1e3bf (size=135) db $2e ; border tile |