ref: 1ae8e7e41e5fa184ec30498defb6ebc873178da8
parent: 7e35470fb18cb4d0ab144bb0b336294da53ba9ea
author: Bryan Bishop <kanzure@gmail.com>
date: Thu Jan 12 07:55:54 EST 2012
insert $8 asm for NameRaterText1 hg-commit-id: dd9f5126d4a5
--- a/extras/insert_texts.py
+++ b/extras/insert_texts.py
@@ -459,7 +459,7 @@
#insert_08_asm(83, 1)
#insert_all_08s()
- #insert_asm(0x758df, "CinnabarGymText1")
+ insert_asm(0x1da56, "NameRaterText1")
#insert_text_label_tx_far(91, 1)
missed_17s = [] #[[95, 1], [95, 2], [96, 1], [97, 1], [99, 1], [99, 2], [99, 3], [100, 1], [100, 2], [100, 3], [100, 4], [100, 5], [100, 6], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [133, 3], [139, 1], [139, 2], [139, 3], [141, 2], [141, 3], [154, 2], [154, 3], [169, 4], [171, 2], [171, 3], [174, 2], [174, 3], [176, 4], [176, 5], [182, 3], [215, 5], [91, 2], [91, 3], [124, 8], [124, 10], [124, 12], [124, 16], [124, 17], [139, 1], [139, 2], [139, 3], [141, 2], [169, 4], [171, 2], [174, 2], [176, 4], [176, 5]]
@@ -479,7 +479,7 @@
#insert_text(0x44276, "ViridianPokeCenterText4")
#insert_texts_label(4)
- insert_all_texts_labels()
+ #insert_all_texts_labels()
if len(failed_attempts) > 0:
print "-- FAILED ATTEMPTS --"
--- a/pokered.asm
+++ b/pokered.asm
@@ -8582,8 +8582,51 @@
dw $5ad6 ; objects
-INCBIN "baserom.gbc",$1da12,$1dad6 - $1da12
+INCBIN "baserom.gbc",$1da12,$1da56 - $1da12
+NameRaterText1: ; 0x1da56
+ db $8
+ call $36f4
+ ld hl, $5ab3
+ call $5a15
+ jr nz, .asm_1daae ; 0x1da60 $4c
+ ld hl, $5ab8
+ call PrintText
+ xor a
+ ld [$d07d], a
+ ld [$cfcb], a
+ ld [$cc35], a
+ call $13fc
+ push af
+ call $3dd4
+ call $3dbe
+ call $20ba
+ pop af
+ jr c, .asm_1daae ; 0x1da80 $2c
+ call $15b4
+ call $5a20
+ ld hl, $5ad1
+ jr c, .asm_1daa8 ; 0x1da8b $1b
+ ld hl, $5abd
+ call $5a15
+ jr nz, .asm_1daae ; 0x1da93 $19
+ ld hl, $5ac2
+ call PrintText
+ ld b, $1
+ ld hl, $655c
+ call Bankswitch
+ jr c, .asm_1daae ; 0x1daa3 $9
+ ld hl, $5ac7
+.asm_1daa8
+ call PrintText
+ jp $24d7
+.asm_1daae
+ ld hl, $5acc
+ jr .asm_1daa8 ; 0x1dab1 $f5
+; 0x1dab3
+
+INCBIN "baserom.gbc",$1dab3,$23
+
NameRaterObject: ; 0x1dad6 (size=26)
db $a ; border tile
@@ -9538,6 +9581,7 @@
ld hl, $68da
call PrintText
jp $24d7
+; 0x1e8da
INCBIN "baserom.gbc",$1e8da,$5