12 files changed, 39 insertions, 39 deletions
diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm
index 8c41f914..662f65e0 100644
--- a/engine/battle/move_effects/conversion.asm
+++ b/engine/battle/move_effects/conversion.asm
@@ -25,8 +25,8 @@ ConversionEffect_:
 	jp PrintText
 
 ConvertedTypeText:
-	TX_FAR _ConvertedTypeText
-	db "@"
+	text_far _ConvertedTypeText
+	text_end
 
 PrintButItFailedText:
 	ld hl, PrintButItFailedText_
diff --git a/engine/battle/move_effects/drain_hp.asm b/engine/battle/move_effects/drain_hp.asm
index 60d23a95..452ccf0c 100644
--- a/engine/battle/move_effects/drain_hp.asm
+++ b/engine/battle/move_effects/drain_hp.asm
@@ -96,9 +96,9 @@ DrainHPEffect_:
 	jp PrintText
 
 SuckedHealthText:
-	TX_FAR _SuckedHealthText
-	db "@"
+	text_far _SuckedHealthText
+	text_end
 
 DreamWasEatenText:
-	TX_FAR _DreamWasEatenText
-	db "@"
+	text_far _DreamWasEatenText
+	text_end
diff --git a/engine/battle/move_effects/focus_energy.asm b/engine/battle/move_effects/focus_energy.asm
index af4a6521..7a426d2c 100644
--- a/engine/battle/move_effects/focus_energy.asm
+++ b/engine/battle/move_effects/focus_energy.asm
@@ -17,6 +17,6 @@ FocusEnergyEffect_:
 	jpab PrintButItFailedText_
 
 GettingPumpedText:
-	TX_DELAY
-	TX_FAR _GettingPumpedText
-	db "@"
+	text_pause
+	text_far _GettingPumpedText
+	text_end
diff --git a/engine/battle/move_effects/haze.asm b/engine/battle/move_effects/haze.asm
index bd73d249..521ff662 100644
--- a/engine/battle/move_effects/haze.asm
+++ b/engine/battle/move_effects/haze.asm
@@ -77,5 +77,5 @@ ResetStats:
 	ret
 
 StatusChangesEliminatedText:
-	TX_FAR _StatusChangesEliminatedText
-	db "@"
+	text_far _StatusChangesEliminatedText
+	text_end
diff --git a/engine/battle/move_effects/heal.asm b/engine/battle/move_effects/heal.asm
index 8042bc63..8cc9da93 100644
--- a/engine/battle/move_effects/heal.asm
+++ b/engine/battle/move_effects/heal.asm
@@ -108,13 +108,13 @@ HealEffect_:
 	jp BankswitchEtoF
 
 StartedSleepingEffect:
-	TX_FAR _StartedSleepingEffect
-	db "@"
+	text_far _StartedSleepingEffect
+	text_end
 
 FellAsleepBecameHealthyText:
-	TX_FAR _FellAsleepBecameHealthyText
-	db "@"
+	text_far _FellAsleepBecameHealthyText
+	text_end
 
 RegainedHealthText:
-	TX_FAR _RegainedHealthText
-	db "@"
+	text_far _RegainedHealthText
+	text_end
diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm
index 981f5da9..74360233 100644
--- a/engine/battle/move_effects/leech_seed.asm
+++ b/engine/battle/move_effects/leech_seed.asm
@@ -32,9 +32,9 @@ LeechSeedEffect_:
 	jp PrintText
 
 WasSeededText:
-	TX_FAR _WasSeededText
-	db "@"
+	text_far _WasSeededText
+	text_end
 
 EvadedAttackText:
-	TX_FAR _EvadedAttackText
-	db "@"
+	text_far _EvadedAttackText
+	text_end
diff --git a/engine/battle/move_effects/mist.asm b/engine/battle/move_effects/mist.asm
index 6373770d..67ee4921 100644
--- a/engine/battle/move_effects/mist.asm
+++ b/engine/battle/move_effects/mist.asm
@@ -15,5 +15,5 @@ MistEffect_:
 	jpab PrintButItFailedText_
 
 ShroudedInMistText:
-	TX_FAR _ShroudedInMistText
-	db "@"
+	text_far _ShroudedInMistText
+	text_end
diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm
index 5bdb86da..11140ec2 100644
--- a/engine/battle/move_effects/pay_day.asm
+++ b/engine/battle/move_effects/pay_day.asm
@@ -41,5 +41,5 @@ PayDayEffect_:
 	jp PrintText
 
 CoinsScatteredText:
-	TX_FAR _CoinsScatteredText
-	db "@"
+	text_far _CoinsScatteredText
+	text_end
diff --git a/engine/battle/move_effects/recoil.asm b/engine/battle/move_effects/recoil.asm
index e94f8043..63aff429 100644
--- a/engine/battle/move_effects/recoil.asm
+++ b/engine/battle/move_effects/recoil.asm
@@ -66,5 +66,5 @@ RecoilEffect_:
 	ld hl, HitWithRecoilText
 	jp PrintText
 HitWithRecoilText:
-	TX_FAR _HitWithRecoilText
-	db "@"
+	text_far _HitWithRecoilText
+	text_end
diff --git a/engine/battle/move_effects/reflect_light_screen.asm b/engine/battle/move_effects/reflect_light_screen.asm
index 7693a348..07338c9a 100644
--- a/engine/battle/move_effects/reflect_light_screen.asm
+++ b/engine/battle/move_effects/reflect_light_screen.asm
@@ -33,12 +33,12 @@ ReflectLightScreenEffect_:
 	jp BankswitchEtoF
 
 LightScreenProtectedText:
-	TX_FAR _LightScreenProtectedText
-	db "@"
+	text_far _LightScreenProtectedText
+	text_end
 
 ReflectGainedArmorText:
-	TX_FAR _ReflectGainedArmorText
-	db "@"
+	text_far _ReflectGainedArmorText
+	text_end
 
 BankswitchEtoF:
 	ld b, BANK(BattleCore)
diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm
index a1cd11b2..95c43462 100644
--- a/engine/battle/move_effects/substitute.asm
+++ b/engine/battle/move_effects/substitute.asm
@@ -65,13 +65,13 @@ SubstituteEffect_:
 	jp PrintText
 
 SubstituteText:
-	TX_FAR _SubstituteText
-	db "@"
+	text_far _SubstituteText
+	text_end
 
 HasSubstituteText:
-	TX_FAR _HasSubstituteText
-	db "@"
+	text_far _HasSubstituteText
+	text_end
 
 TooWeakSubstituteText:
-	TX_FAR _TooWeakSubstituteText
-	db "@"
+	text_far _TooWeakSubstituteText
+	text_end
diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm
index 1b459910..da26d031 100644
--- a/engine/battle/move_effects/transform.asm
+++ b/engine/battle/move_effects/transform.asm
@@ -144,5 +144,5 @@ TransformEffect_:
 	jp BankswitchEtoF
 
 TransformedText:
-	TX_FAR _TransformedText
-	db "@"
+	text_far _TransformedText
+	text_end