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/CeruleanCaveB1F.asm | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'scripts/CeruleanCaveB1F.asm')

diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm
index b98ca4ba..a94a7fe3 100755
--- a/scripts/CeruleanCaveB1F.asm
+++ b/scripts/CeruleanCaveB1F.asm
@@ -20,25 +20,18 @@ CeruleanCaveB1F_TextPointers:
 	dw PickUpItemText
 
 MewtwoTrainerHeader:
-	dbEventFlagBit EVENT_BEAT_MEWTWO
-	db ($0 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MEWTWO
-	dw MewtwoBattleText ; TextBeforeBattle
-	dw MewtwoBattleText ; TextAfterBattle
-	dw MewtwoBattleText ; TextEndBattle
-	dw MewtwoBattleText ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_MEWTWO, 0, MewtwoBattleText, MewtwoBattleText, MewtwoBattleText
+	db -1 ; end
 
 MewtwoText:
-	TX_ASM
+	text_asm
 	ld hl, MewtwoTrainerHeader
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MewtwoBattleText:
-	TX_FAR _MewtwoBattleText
-	TX_ASM
+	text_far _MewtwoBattleText
+	text_asm
 	ld a, MEWTWO
 	call PlayCry
 	call WaitForSoundToFinish
-- 
cgit v1.3.1-sl0p