Merge pull request #259 from Rangi42/master

Port pokecrystal's formatting of text commands and special characters

1 files changed, 17 insertions, 17 deletions

diff --git a/scripts/FuchsiaGoodRodHouse.asm b/scripts/FuchsiaGoodRodHouse.asm
index 93a20e80..848f744c 100755
--- a/scripts/FuchsiaGoodRodHouse.asm
+++ b/scripts/FuchsiaGoodRodHouse.asm
@@ -5,7 +5,7 @@ FuchsiaGoodRodHouse_TextPointers:
 	dw FuchsiaHouse3Text1
 
 FuchsiaHouse3Text1:
-	TX_ASM
+	text_asm
 	ld a, [wd728]
 	bit 4, a
 	jr nz, .after
@@ -44,32 +44,32 @@ FuchsiaHouse3Text1:
 	jp TextScriptEnd
 
 FuchsiaHouse3Text_561bd:
-	TX_FAR _FuchsiaHouse3Text_561bd
-	db "@"
+	text_far _FuchsiaHouse3Text_561bd
+	text_end
 
 FuchsiaHouse3Text_561c2:
-	TX_FAR _FuchsiaHouse3Text_561c2
-	TX_SFX_ITEM_1
-	db "@"
+	text_far _FuchsiaHouse3Text_561c2
+	sound_get_item_1
+	text_end
 
 UnusedText_561c8:
-	para "つり こそ"
-	line "おとこの ロマン だ!"
+	para "つり　こそ"
+	line "おとこの　ロマン　だ！"
 
 	para "へぼいつりざおは"
-	line "コイキングしか つれ なんだが"
-	line "この いいつりざおなら"
-	line "もっと いいもんが つれるんじゃ!"
+	line "コイキングしか　つれ　なんだが"
+	line "この　いいつりざおなら"
+	line "もっと　いいもんが　つれるんじゃ！"
 	done
 
 FuchsiaHouse3Text_56212:
-	TX_FAR _FuchsiaHouse3Text_56212
-	db "@"
+	text_far _FuchsiaHouse3Text_56212
+	text_end
 
 FuchsiaHouse3Text_56217:
-	TX_FAR _FuchsiaHouse3Text_56217
-	db "@"
+	text_far _FuchsiaHouse3Text_56217
+	text_end
 
 FuchsiaHouse3Text_5621c:
-	TX_FAR _FuchsiaHouse3Text_5621c
-	db "@"
+	text_far _FuchsiaHouse3Text_5621c
+	text_end