Port pokecrystal's formatting of text commands and special characters

1 files changed, 71 insertions, 71 deletions

diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
index 08bbbe8b..cde00d61 100755
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -205,7 +205,7 @@ CinnabarGymScript_758b7:
 	jp TextScriptEnd
 
 CinnabarGymText1:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_BEAT_BLAINE
 	jr z, .beginBattle
 	CheckEventReuseA EVENT_GOT_TM38
@@ -228,35 +228,35 @@ CinnabarGymText1:
 	jp CinnabarGymScript_758b7
 
 BlaineBattleText:
-	TX_FAR _BlaineBattleText
-	db "@"
+	text_far _BlaineBattleText
+	text_end
 
 BlaineEndBattleText:
-	TX_FAR _BlaineEndBattleText
-	TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
-	TX_WAIT
-	db "@"
+	text_far _BlaineEndBattleText
+	sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
+	text_linkpromptbutton
+	text_end
 
 BlaineFireBlastText:
-	TX_FAR _BlaineFireBlastText
-	db "@"
+	text_far _BlaineFireBlastText
+	text_end
 
 BlaineBadgeText:
-	TX_FAR _BlaineBadgeText
-	db "@"
+	text_far _BlaineBadgeText
+	text_end
 
 ReceivedTM38Text:
-	TX_FAR _ReceivedTM38Text
-	TX_SFX_ITEM_1
-	TX_FAR _TM38ExplanationText
-	db "@"
+	text_far _ReceivedTM38Text
+	sound_get_item_1
+	text_far _TM38ExplanationText
+	text_end
 
 TM38NoRoomText:
-	TX_FAR _TM38NoRoomText
-	db "@"
+	text_far _TM38NoRoomText
+	text_end
 
 CinnabarGymText2:
-	TX_ASM
+	text_asm
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0
 	jr nz, .asm_46bb4
@@ -272,19 +272,19 @@ CinnabarGymText2:
 	jp TextScriptEnd
 
 CinnabarGymText_7595f:
-	TX_FAR _CinnabarGymText_7595f
-	db "@"
+	text_far _CinnabarGymText_7595f
+	text_end
 
 CinnabarGymText_75964:
-	TX_FAR _CinnabarGymText_75964
-	db "@"
+	text_far _CinnabarGymText_75964
+	text_end
 
 CinnabarGymText_75969:
-	TX_FAR _CinnabarGymText_75969
-	db "@"
+	text_far _CinnabarGymText_75969
+	text_end
 
 CinnabarGymText3:
-	TX_ASM
+	text_asm
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1
 	jr nz, .asm_4b406
@@ -300,19 +300,19 @@ CinnabarGymText3:
 	jp TextScriptEnd
 
 CinnabarGymText_75994:
-	TX_FAR _CinnabarGymText_75994
-	db "@"
+	text_far _CinnabarGymText_75994
+	text_end
 
 CinnabarGymText_75999:
-	TX_FAR _CinnabarGymText_75999
-	db "@"
+	text_far _CinnabarGymText_75999
+	text_end
 
 CinnabarGymText_7599e:
-	TX_FAR _CinnabarGymText_7599e
-	db "@"
+	text_far _CinnabarGymText_7599e
+	text_end
 
 CinnabarGymText4:
-	TX_ASM
+	text_asm
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2
 	jr nz, .asm_c0673
@@ -328,19 +328,19 @@ CinnabarGymText4:
 	jp TextScriptEnd
 
 CinnabarGymText_759c9:
-	TX_FAR _CinnabarGymText_759c9
-	db "@"
+	text_far _CinnabarGymText_759c9
+	text_end
 
 CinnabarGymText_759ce:
-	TX_FAR _CinnabarGymText_759ce
-	db "@"
+	text_far _CinnabarGymText_759ce
+	text_end
 
 CinnabarGymText_759d3:
-	TX_FAR _CinnabarGymText_759d3
-	db "@"
+	text_far _CinnabarGymText_759d3
+	text_end
 
 CinnabarGymText5:
-	TX_ASM
+	text_asm
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3
 	jr nz, .asm_5cfd7
@@ -356,19 +356,19 @@ CinnabarGymText5:
 	jp TextScriptEnd
 
 CinnabarGymText_759fe:
-	TX_FAR _CinnabarGymText_759fe
-	db "@"
+	text_far _CinnabarGymText_759fe
+	text_end
 
 CinnabarGymText_75a03:
-	TX_FAR _CinnabarGymText_75a03
-	db "@"
+	text_far _CinnabarGymText_75a03
+	text_end
 
 CinnabarGymText_75a08:
-	TX_FAR _CinnabarGymText_75a08
-	db "@"
+	text_far _CinnabarGymText_75a08
+	text_end
 
 CinnabarGymText6:
-	TX_ASM
+	text_asm
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4
 	jr nz, .asm_776b4
@@ -384,19 +384,19 @@ CinnabarGymText6:
 	jp TextScriptEnd
 
 CinnabarGymText_75a33:
-	TX_FAR _CinnabarGymText_75a33
-	db "@"
+	text_far _CinnabarGymText_75a33
+	text_end
 
 CinnabarGymText_75a38:
-	TX_FAR _CinnabarGymText_75a38
-	db "@"
+	text_far _CinnabarGymText_75a38
+	text_end
 
 CinnabarGymText_75a3d:
-	TX_FAR _CinnabarGymText_75a3d
-	db "@"
+	text_far _CinnabarGymText_75a3d
+	text_end
 
 CinnabarGymText7:
-	TX_ASM
+	text_asm
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5
 	jr nz, .asm_2f755
@@ -412,19 +412,19 @@ CinnabarGymText7:
 	jp TextScriptEnd
 
 CinnabarGymText_75a68:
-	TX_FAR _CinnabarGymText_75a68
-	db "@"
+	text_far _CinnabarGymText_75a68
+	text_end
 
 CinnabarGymText_75a6d:
-	TX_FAR _CinnabarGymText_75a6d
-	db "@"
+	text_far _CinnabarGymText_75a6d
+	text_end
 
 CinnabarGymText_75a72:
-	TX_FAR _CinnabarGymText_75a72
-	db "@"
+	text_far _CinnabarGymText_75a72
+	text_end
 
 CinnabarGymText8:
-	TX_ASM
+	text_asm
 	call CinnabarGymScript_757a0
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6
 	jr nz, .asm_d87be
@@ -440,19 +440,19 @@ CinnabarGymText8:
 	jp TextScriptEnd
 
 CinnabarGymText_75a9d:
-	TX_FAR _CinnabarGymText_75a9d
-	db "@"
+	text_far _CinnabarGymText_75a9d
+	text_end
 
 CinnabarGymText_75aa2:
-	TX_FAR _CinnabarGymText_75aa2
-	db "@"
+	text_far _CinnabarGymText_75aa2
+	text_end
 
 CinnabarGymText_75aa7:
-	TX_FAR _CinnabarGymText_75aa7
-	db "@"
+	text_far _CinnabarGymText_75aa7
+	text_end
 
 CinnabarGymText9:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_BEAT_BLAINE
 	jr nz, .asm_627d9
 	ld hl, CinnabarGymText_75ac2
@@ -464,9 +464,9 @@ CinnabarGymText9:
 	jp TextScriptEnd
 
 CinnabarGymText_75ac2:
-	TX_FAR _CinnabarGymText_75ac2
-	db "@"
+	text_far _CinnabarGymText_75ac2
+	text_end
 
 CinnabarGymText_75ac7:
-	TX_FAR _CinnabarGymText_75ac7
-	db "@"
+	text_far _CinnabarGymText_75ac7
+	text_end