summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.asm11
-rw-r--r--extras/analyze_texts.py1
-rw-r--r--extras/insert_texts.py3
3 files changed, 11 insertions, 4 deletions
diff --git a/common.asm b/common.asm
index 7efc721c..71041a1b 100644
--- a/common.asm
+++ b/common.asm
@@ -9465,8 +9465,9 @@ VermilionCityText5: ; 0x19922
ld hl, $5933
ret
-;db $17, $6b, $58, $29, $50
-INCBIN "baserom.gbc",$19933,$5
+VermilionCityText14: ; 0x19933
+ TX_FAR _VermilionCityText14
+ db $50
VermilionCityText6: ; 0x19938
TX_FAR _VermilionCityText6
@@ -41080,7 +41081,11 @@ _VermilionCityText5: ; 0xa5852
db $0, "MACHOP: Guoh!", $4f
db "Gogogoh!@@"
-INCBIN "baserom.gbc",$a586b,$a5891 - $a586b
+_VermilionCityText14: ; 0xa586b
+ db $0, $51
+ db "A MACHOP is", $4f
+ db "stomping the land", $55
+ db "flat.", $57
_VermilionCityText6: ; 0xa5891
db $0, "S.S.ANNE is a", $4f
diff --git a/extras/analyze_texts.py b/extras/analyze_texts.py
index cf25e687..b24a170a 100644
--- a/extras/analyze_texts.py
+++ b/extras/analyze_texts.py
@@ -403,6 +403,7 @@ def text_pretty_printer_at(start_address, label="SomeLabel"):
first_line = True
for this_command in commands.keys():
+ if not "lines" in commands[this_command].keys(): continue
lines = commands[this_command]["lines"]
#add the ending byte to the last line- always seems $57
diff --git a/extras/insert_texts.py b/extras/insert_texts.py
index b3ec4062..7a61e854 100644
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -600,7 +600,8 @@ if __name__ == "__main__":
#load incbins
reset_incbins()
- scan_for_map_scripts_pointer()
+ #scan_for_map_scripts_pointer()
+ insert_text(0xa586b, "_VermilionCityText14")
#insert _ViridianCityText10
#insert_tx_far(1, 10)