Merge pull request #259 from Rangi42/master

Port pokecrystal's formatting of text commands and special characters

1 files changed, 60 insertions, 60 deletions

diff --git a/scripts/Route3.asm b/scripts/Route3.asm
index d55831bf..91fcadc2 100755
--- a/scripts/Route3.asm
+++ b/scripts/Route3.asm
@@ -99,153 +99,153 @@ Route3TrainerHeader7:
 	db $ff
 
 Route3Text1:
-	TX_FAR _Route3Text1
-	db "@"
+	text_far _Route3Text1
+	text_end
 
 Route3Text2:
-	TX_ASM
+	text_asm
 	ld hl, Route3TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route3BattleText1:
-	TX_FAR _Route3BattleText1
-	db "@"
+	text_far _Route3BattleText1
+	text_end
 
 Route3EndBattleText1:
-	TX_FAR _Route3EndBattleText1
-	db "@"
+	text_far _Route3EndBattleText1
+	text_end
 
 Route3AfterBattleText1:
-	TX_FAR _Route3AfterBattleText1
-	db "@"
+	text_far _Route3AfterBattleText1
+	text_end
 
 Route3Text3:
-	TX_ASM
+	text_asm
 	ld hl, Route3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route3BattleText2:
-	TX_FAR _Route3BattleText2
-	db "@"
+	text_far _Route3BattleText2
+	text_end
 
 Route3EndBattleText2:
-	TX_FAR _Route3EndBattleText2
-	db "@"
+	text_far _Route3EndBattleText2
+	text_end
 
 Route3AfterBattleText2:
-	TX_FAR _Route3AfterBattleText2
-	db "@"
+	text_far _Route3AfterBattleText2
+	text_end
 
 Route3Text4:
-	TX_ASM
+	text_asm
 	ld hl, Route3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route3BattleText3:
-	TX_FAR _Route3BattleText3
-	db "@"
+	text_far _Route3BattleText3
+	text_end
 
 Route3EndBattleText3:
-	TX_FAR _Route3EndBattleText3
-	db "@"
+	text_far _Route3EndBattleText3
+	text_end
 
 Route3AfterBattleText3:
-	TX_FAR _Route3AfterBattleText3
-	db "@"
+	text_far _Route3AfterBattleText3
+	text_end
 
 Route3Text5:
-	TX_ASM
+	text_asm
 	ld hl, Route3TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route3BattleText4:
-	TX_FAR _Route3BattleText4
-	db "@"
+	text_far _Route3BattleText4
+	text_end
 
 Route3EndBattleText4:
-	TX_FAR _Route3EndBattleText4
-	db "@"
+	text_far _Route3EndBattleText4
+	text_end
 
 Route3AfterBattleText4:
-	TX_FAR _Route3AfterBattleText4
-	db "@"
+	text_far _Route3AfterBattleText4
+	text_end
 
 Route3Text6:
-	TX_ASM
+	text_asm
 	ld hl, Route3TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route3BattleText5:
-	TX_FAR _Route3BattleText5
-	db "@"
+	text_far _Route3BattleText5
+	text_end
 
 Route3EndBattleText5:
-	TX_FAR _Route3EndBattleText5
-	db "@"
+	text_far _Route3EndBattleText5
+	text_end
 
 Route3AfterBattleText5:
-	TX_FAR _Route3AfterBattleText5
-	db "@"
+	text_far _Route3AfterBattleText5
+	text_end
 
 Route3Text7:
-	TX_ASM
+	text_asm
 	ld hl, Route3TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route3BattleText6:
-	TX_FAR _Route3BattleText6
-	db "@"
+	text_far _Route3BattleText6
+	text_end
 
 Route3EndBattleText6:
-	TX_FAR _Route3EndBattleText6
-	db "@"
+	text_far _Route3EndBattleText6
+	text_end
 
 Route3AfterBattleText6:
-	TX_FAR _Route3AfterBattleText6
-	db "@"
+	text_far _Route3AfterBattleText6
+	text_end
 
 Route3Text8:
-	TX_ASM
+	text_asm
 	ld hl, Route3TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route3BattleText7:
-	TX_FAR _Route3BattleText7
-	db "@"
+	text_far _Route3BattleText7
+	text_end
 
 Route3EndBattleText7:
-	TX_FAR _Route3EndBattleText7
-	db "@"
+	text_far _Route3EndBattleText7
+	text_end
 
 Route3AfterBattleText7:
-	TX_FAR _Route3AfterBattleText7
-	db "@"
+	text_far _Route3AfterBattleText7
+	text_end
 
 Route3Text9:
-	TX_ASM
+	text_asm
 	ld hl, Route3TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route3BattleText8:
-	TX_FAR _Route3BattleText8
-	db "@"
+	text_far _Route3BattleText8
+	text_end
 
 Route3EndBattleText8:
-	TX_FAR _Route3EndBattleText8
-	db "@"
+	text_far _Route3EndBattleText8
+	text_end
 
 Route3AfterBattleText8:
-	TX_FAR _Route3AfterBattleText8
-	db "@"
+	text_far _Route3AfterBattleText8
+	text_end
 
 Route3Text10:
-	TX_FAR _Route3Text10
-	db "@"
+	text_far _Route3Text10
+	text_end