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/CeladonMansion3F.asm | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'scripts/CeladonMansion3F.asm')

diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm
index 43832f63..c9085b32 100755
--- a/scripts/CeladonMansion3F.asm
+++ b/scripts/CeladonMansion3F.asm
@@ -12,19 +12,19 @@ CeladonMansion3F_TextPointers:
 	dw GameFreakSignText
 
 ProgrammerText:
-	TX_FAR _ProgrammerText
-	db "@"
+	text_far _ProgrammerText
+	text_end
 
 GraphicArtistText:
-	TX_FAR _GraphicArtistText
-	db "@"
+	text_far _GraphicArtistText
+	text_end
 
 WriterText:
-	TX_FAR _WriterText
-	db "@"
+	text_far _WriterText
+	text_end
 
 DirectorText:
-	TX_ASM
+	text_asm
 
 	; check pokédex
 	ld hl, wPokedexOwned
@@ -42,30 +42,30 @@ DirectorText:
 	jp TextScriptEnd
 
 .GameDesigner
-	TX_FAR _GameDesignerText
-	db "@"
+	text_far _GameDesignerText
+	text_end
 
 .CompletedDexText
-	TX_FAR _CompletedDexText
-	TX_BLINK
-	TX_ASM
+	text_far _CompletedDexText
+	text_promptbutton
+	text_asm
 	callab DisplayDiploma
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	jp TextScriptEnd
 
 GameFreakPCText1:
-	TX_FAR _CeladonMansion3Text5
-	db "@"
+	text_far _CeladonMansion3Text5
+	text_end
 
 GameFreakPCText2:
-	TX_FAR _CeladonMansion3Text6
-	db "@"
+	text_far _CeladonMansion3Text6
+	text_end
 
 GameFreakPCText3:
-	TX_FAR _CeladonMansion3Text7
-	db "@"
+	text_far _CeladonMansion3Text7
+	text_end
 
 GameFreakSignText:
-	TX_FAR _CeladonMansion3Text8
-	db "@"
+	text_far _CeladonMansion3Text8
+	text_end
-- 
cgit v1.3.1-sl0p