summaryrefslogtreecommitdiff
path: root/common.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-14 21:49:55 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-14 21:49:55 -0600
commit07016dcf455f0da3a6de4857b6de46801dd5a79f (patch)
tree5735ee1d062497d40973df0f0d046e7112095a23 /common.asm
parent52661e4a44c068a86b2423eb920515d02238a460 (diff)
insert _VermilionCityText14 machop text
hg-commit-id: 22d36f8bc08e
Diffstat (limited to 'common.asm')
-rw-r--r--common.asm11
1 files changed, 8 insertions, 3 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