From 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 4 Nov 2020 00:06:44 -0600
Subject: Sync with pokered

---
 scripts/Route22_2.asm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'scripts/Route22_2.asm')

diff --git a/scripts/Route22_2.asm b/scripts/Route22_2.asm
index 1cd23ed2..7f3fa54d 100755
--- a/scripts/Route22_2.asm
+++ b/scripts/Route22_2.asm
@@ -1,4 +1,4 @@
-Func_f1b27:
+Func_f1b27::
 	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
 	jr z, .asm_5118b
 	ld hl, Route22RivalAfterBattleText1
@@ -12,14 +12,14 @@ Func_f1b27:
 	ret
 
 Route22RivalBeforeBattleText1:
-	TX_FAR _Route22RivalBeforeBattleText1
-	db "@"
+	text_far _Route22RivalBeforeBattleText1
+	text_end
 
 Route22RivalAfterBattleText1:
-	TX_FAR _Route22RivalAfterBattleText1
-	db "@"
+	text_far _Route22RivalAfterBattleText1
+	text_end
 
-Func_f1b47:
+Func_f1b47::
 	CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
 	jr z, .asm_511a4
 	ld hl, Route22RivalAfterBattleText2
@@ -33,18 +33,18 @@ Func_f1b47:
 	ret
 
 Route22RivalBeforeBattleText2:
-	TX_FAR _Route22RivalBeforeBattleText2
-	db "@"
+	text_far _Route22RivalBeforeBattleText2
+	text_end
 
 Route22RivalAfterBattleText2:
-	TX_FAR _Route22RivalAfterBattleText2
-	db "@"
+	text_far _Route22RivalAfterBattleText2
+	text_end
 
-Func_f1b67:
+Func_f1b67::
 	ld hl, Route22FrontGateText_3c
 	call PrintText
 	ret
 
 Route22FrontGateText_3c:
-	TX_FAR _Route22FrontGateText
-	db "@"
+	text_far _Route22FrontGateText
+	text_end
-- 
cgit v1.3.1-sl0p