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/MrPsychicsHouse.asm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'scripts/MrPsychicsHouse.asm')

diff --git a/scripts/MrPsychicsHouse.asm b/scripts/MrPsychicsHouse.asm
index 7d4f54c0..399edfbd 100755
--- a/scripts/MrPsychicsHouse.asm
+++ b/scripts/MrPsychicsHouse.asm
@@ -5,41 +5,41 @@ MrPsychicsHouse_TextPointers:
 	dw SaffronHouse2Text1
 
 SaffronHouse2Text1:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_GOT_TM29
-	jr nz, .asm_9e72b
+	jr nz, .got_item
 	ld hl, TM29PreReceiveText
 	call PrintText
-	lb bc, TM_29, 1
+	lb bc, TM_PSYCHIC_M, 1
 	call GiveItem
-	jr nc, .BagFull
+	jr nc, .bag_full
 	ld hl, ReceivedTM29Text
 	call PrintText
 	SetEvent EVENT_GOT_TM29
-	jr .asm_fe4e1
-.BagFull
+	jr .done
+.bag_full
 	ld hl, TM29NoRoomText
 	call PrintText
-	jr .asm_fe4e1
-.asm_9e72b
+	jr .done
+.got_item
 	ld hl, TM29ExplanationText
 	call PrintText
-.asm_fe4e1
+.done
 	jp TextScriptEnd
 
 TM29PreReceiveText:
-	TX_FAR _TM29PreReceiveText
-	db "@"
+	text_far _TM29PreReceiveText
+	text_end
 
 ReceivedTM29Text:
-	TX_FAR _ReceivedTM29Text
-	TX_SFX_ITEM_1
-	db "@"
+	text_far _ReceivedTM29Text
+	sound_get_item_1
+	text_end
 
 TM29ExplanationText:
-	TX_FAR _TM29ExplanationText
-	db "@"
+	text_far _TM29ExplanationText
+	text_end
 
 TM29NoRoomText:
-	TX_FAR _TM29NoRoomText
-	db "@"
+	text_far _TM29NoRoomText
+	text_end
-- 
cgit v1.3.1-sl0p