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/CopycatsHouse2F.asm | 76 ++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'scripts/CopycatsHouse2F.asm')

diff --git a/scripts/CopycatsHouse2F.asm b/scripts/CopycatsHouse2F.asm
index e0ec5425..ef0742ab 100755
--- a/scripts/CopycatsHouse2F.asm
+++ b/scripts/CopycatsHouse2F.asm
@@ -11,79 +11,79 @@ CopycatsHouse2F_TextPointers:
 	dw CopycatsHouse2FText7
 
 CopycatsHouse2FText1:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_GOT_TM31
-	jr nz, .asm_7ccf3
-	ld a, $1
+	jr nz, .got_item
+	ld a, TRUE
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, CopycatsHouse2FText_5ccd4
 	call PrintText
 	ld b, POKE_DOLL
 	call IsItemInBag
-	jr z, .asm_62ecd
+	jr z, .done
 	ld hl, TM31PreReceiveText
 	call PrintText
-	lb bc, TM_31, 1
+	lb bc, TM_MIMIC, 1
 	call GiveItem
-	jr nc, .BagFull
+	jr nc, .bag_full
 	ld hl, ReceivedTM31Text
 	call PrintText
 	ld a, POKE_DOLL
-	ld [$ffdb], a
-	callba RemoveItemByID
+	ldh [hItemToRemoveID], a
+	farcall RemoveItemByID
 	SetEvent EVENT_GOT_TM31
-	jr .asm_62ecd
-.BagFull
+	jr .done
+.bag_full
 	ld hl, TM31NoRoomText
 	call PrintText
-	jr .asm_62ecd
-.asm_7ccf3
+	jr .done
+.got_item
 	ld hl, TM31ExplanationText2
 	call PrintText
-.asm_62ecd
+.done
 	jp TextScriptEnd
 
 CopycatsHouse2FText_5ccd4:
-	TX_FAR _CopycatsHouse2FText_5ccd4
-	db "@"
+	text_far _CopycatsHouse2FText_5ccd4
+	text_end
 
 TM31PreReceiveText:
-	TX_FAR _TM31PreReceiveText
-	db "@"
+	text_far _TM31PreReceiveText
+	text_end
 
 ReceivedTM31Text:
-	TX_FAR _ReceivedTM31Text
-	TX_SFX_ITEM_1
+	text_far _ReceivedTM31Text
+	sound_get_item_1
 TM31ExplanationText1:
-	TX_FAR _TM31ExplanationText1
-	TX_WAIT
-	db "@"
+	text_far _TM31ExplanationText1
+	text_waitbutton
+	text_end
 
 TM31ExplanationText2:
-	TX_FAR _TM31ExplanationText2
-	db "@"
+	text_far _TM31ExplanationText2
+	text_end
 
 TM31NoRoomText:
-	TX_FAR _TM31NoRoomText
-	TX_WAIT
-	db "@"
+	text_far _TM31NoRoomText
+	text_waitbutton
+	text_end
 
 CopycatsHouse2FText2:
-	TX_FAR _CopycatsHouse2FText2
-	db "@"
+	text_far _CopycatsHouse2FText2
+	text_end
 
 CopycatsHouse2FText5:
 CopycatsHouse2FText4:
 CopycatsHouse2FText3:
-	TX_FAR _CopycatsHouse2FText3
-	db "@"
+	text_far _CopycatsHouse2FText3
+	text_end
 
 CopycatsHouse2FText6:
-	TX_FAR _CopycatsHouse2FText6
-	db "@"
+	text_far _CopycatsHouse2FText6
+	text_end
 
 CopycatsHouse2FText7:
-	TX_ASM
+	text_asm
 	ld a, [wSpritePlayerStateData1FacingDirection]
 	cp SPRITE_FACING_UP
 	ld hl, CopycatsHouse2FText_5cd1c
@@ -94,9 +94,9 @@ CopycatsHouse2FText7:
 	jp TextScriptEnd
 
 CopycatsHouse2FText_5cd17:
-	TX_FAR _CopycatsHouse2FText_5cd17
-	db "@"
+	text_far _CopycatsHouse2FText_5cd17
+	text_end
 
 CopycatsHouse2FText_5cd1c:
-	TX_FAR _CopycatsHouse2FText_5cd1c
-	db "@"
+	text_far _CopycatsHouse2FText_5cd1c
+	text_end
-- 
cgit v1.3.1-sl0p