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/CeruleanTradeHouse.asm | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'scripts/CeruleanTradeHouse.asm')

diff --git a/scripts/CeruleanTradeHouse.asm b/scripts/CeruleanTradeHouse.asm
index 8b5d4495..a6820fdb 100755
--- a/scripts/CeruleanTradeHouse.asm
+++ b/scripts/CeruleanTradeHouse.asm
@@ -9,7 +9,7 @@ CeruleanTradeHouse_TextPointers:
 	dw CeruleanHouse1Text4
 
 CeruleanHouse1Text1:
-	TX_ASM
+	text_asm
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	CheckEvent EVENT_GOT_BULBASAUR_IN_CERULEAN
@@ -61,46 +61,46 @@ CeruleanHouse1Text1:
 	jp TextScriptEnd
 
 CeruleanHouse1Text_1cfc8:
-	TX_FAR MelanieText1
-	TX_WAIT
-	db "@"
+	text_far MelanieText1
+	text_waitbutton
+	text_end
 
 CeruleanHouse1Text_1cfce:
-	TX_FAR MelanieText2
-	db "@"
+	text_far MelanieText2
+	text_end
 
 CeruleanHouse1Text_1cfd3:
-	TX_FAR MelanieText3
-	TX_WAIT
-	db "@"
+	text_far MelanieText3
+	text_waitbutton
+	text_end
 
 CeruleanHouse1Text_1cfd9:
-	TX_FAR MelanieText4
-	TX_WAIT
-	db "@"
+	text_far MelanieText4
+	text_waitbutton
+	text_end
 
 CeruleanHouse1Text_1cfdf:
-	TX_FAR MelanieText5
-	TX_WAIT
-	db "@"
+	text_far MelanieText5
+	text_waitbutton
+	text_end
 
 CeruleanHouse1Text2:
-	TX_FAR MelanieBulbasaurText
-	TX_ASM
+	text_far MelanieBulbasaurText
+	text_asm
 	ld a, BULBASAUR
 	call PlayCry
 	jp TextScriptEnd
 
 CeruleanHouse1Text3:
-	TX_FAR MelanieOddishText
-	TX_ASM
+	text_far MelanieOddishText
+	text_asm
 	ld a, ODDISH
 	call PlayCry
 	jp TextScriptEnd
 
 CeruleanHouse1Text4:
-	TX_FAR MelanieSandshrewText
-	TX_ASM
+	text_far MelanieSandshrewText
+	text_asm
 	ld a, SANDSHREW
 	call PlayCry
 	jp TextScriptEnd
-- 
cgit v1.3.1-sl0p