ref: 37b4b0c9881eba0aa94ec43fa20be112015b13e9
parent: e61417016ea9a60db8d461e4bcc1a3a1f38699af
author: Bryan Bishop <kanzure@gmail.com>
date: Thu Jan 19 01:05:30 EST 2012
miscellaneous texts hg-commit-id: 36fafd06df3f
--- a/common.asm
+++ b/common.asm
@@ -2648,10 +2648,11 @@
db $50
; 0x699f + 5 bytes
-INCBIN "baserom.gbc",$69a4,$3
+; 0x69a4
+ call Unnamed_6a12 ; 0x69a4 call 0x6a12
+ ld de, DefaultNamesRival
+; 0x69aa
-ld de,DefaultNamesRival
-
INCBIN "baserom.gbc",$69AA,$69B3 - $69AA
ld hl,DefaultNamesRivalList
@@ -2663,7 +2664,9 @@
db $50
; 0x69e7 + 5 bytes
-INCBIN "baserom.gbc",$69ec,$bc
+INCBIN "baserom.gbc",$69ec,$6a12 - $69ec
+Unnamed_6a12: ; 0x6a12
+INCBIN "baserom.gbc",$6a12,$6aa8 - $6a12
IF _RED
DefaultNamesPlayer:
@@ -2791,7 +2794,8 @@
db $50
; 0x705d + 5 bytes
-INCBIN "baserom.gbc",$7062,$7063 - $7062
+; 0x7062
+db $a
UnnamedText_7063: ; 0x7063
TX_FAR _UnnamedText_7063
@@ -2808,7 +2812,7 @@
db $50
; 0x706d + 5 bytes
-INCBIN "baserom.gbc",$7072,$7073 - $7072
+db $a
UnnamedText_7073: ; 0x7073
TX_FAR _UnnamedText_7073
@@ -2832,7 +2836,9 @@
db $50
; 0x72bd + 5 bytes
-INCBIN "baserom.gbc",$72c2,$72c8 - $72c2
+UnnamedText_72c2: ; 0x72c2
+ TX_FAR UnnamedText_a29cc
+ db $a, $50
UnnamedText_72c8: ; 0x72c8
TX_FAR _UnnamedText_72c8