From 139a28ff9906d728a6820fe678a2a616eb309421 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 4 Jul 2020 17:09:35 -0400
Subject: Port pokecrystal's formatting of text commands and special characters

---
 scripts/PokemonMansion2F.asm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'scripts/PokemonMansion2F.asm')

diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm
index f5643dad..3ddc28a5 100755
--- a/scripts/PokemonMansion2F.asm
+++ b/scripts/PokemonMansion2F.asm
@@ -75,34 +75,34 @@ Mansion2TrainerHeader0:
 	db $ff
 
 Mansion2Text1:
-	TX_ASM
+	text_asm
 	ld hl, Mansion2TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Mansion2BattleText1:
-	TX_FAR _Mansion2BattleText1
-	db "@"
+	text_far _Mansion2BattleText1
+	text_end
 
 Mansion2EndBattleText1:
-	TX_FAR _Mansion2EndBattleText1
-	db "@"
+	text_far _Mansion2EndBattleText1
+	text_end
 
 Mansion2AfterBattleText1:
-	TX_FAR _Mansion2AfterBattleText1
-	db "@"
+	text_far _Mansion2AfterBattleText1
+	text_end
 
 Mansion2Text3:
-	TX_FAR _Mansion2Text3
-	db "@"
+	text_far _Mansion2Text3
+	text_end
 
 Mansion2Text4:
-	TX_FAR _Mansion2Text4
-	db "@"
+	text_far _Mansion2Text4
+	text_end
 
 Mansion3Text6:
 Mansion2Text5:
-	TX_ASM
+	text_asm
 	ld hl, Mansion2Text_520c2
 	call PrintText
 	call YesNoChoice
@@ -128,13 +128,13 @@ Mansion2Text5:
 	jp TextScriptEnd
 
 Mansion2Text_520c2:
-	TX_FAR _Mansion2Text_520c2
-	db "@"
+	text_far _Mansion2Text_520c2
+	text_end
 
 Mansion2Text_520c7:
-	TX_FAR _Mansion2Text_520c7
-	db "@"
+	text_far _Mansion2Text_520c7
+	text_end
 
 Mansion2Text_520cc:
-	TX_FAR _Mansion2Text_520cc
-	db "@"
+	text_far _Mansion2Text_520cc
+	text_end
-- 
cgit v1.3.1-sl0p