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/PokemonMansion1F.asm | 45 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'scripts/PokemonMansion1F.asm')

diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm
index 639a4acf..ac86d626 100755
--- a/scripts/PokemonMansion1F.asm
+++ b/scripts/PokemonMansion1F.asm
@@ -45,14 +45,14 @@ Mansion1ReplaceBlock:
 	predef ReplaceTileBlock
 	ret
 
-Mansion1Script_Switches:
+Mansion1Script_Switches::
 	ld a, [wSpritePlayerStateData1FacingDirection]
 	cp SPRITE_FACING_UP
 	ret nz
 	xor a
-	ld [hJoyHeld], a
+	ldh [hJoyHeld], a
 	ld a, $4
-	ld [hSpriteIndexOrTextID], a
+	ldh [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
 PokemonMansion1F_ScriptPointers:
@@ -67,36 +67,29 @@ PokemonMansion1F_TextPointers:
 	dw Mansion1Text4
 
 Mansion1TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MANSION_1_TRAINER_0
-	dw Mansion1BattleText2 ; TextBeforeBattle
-	dw Mansion1AfterBattleText2 ; TextAfterBattle
-	dw Mansion1EndBattleText2 ; TextEndBattle
-	dw Mansion1EndBattleText2 ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_MANSION_1_TRAINER_0, 3, Mansion1BattleText2, Mansion1EndBattleText2, Mansion1AfterBattleText2
+	db -1 ; end
 
 Mansion1Text1:
-	TX_ASM
+	text_asm
 	ld hl, Mansion1TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Mansion1BattleText2:
-	TX_FAR _Mansion1BattleText2
-	db "@"
+	text_far _Mansion1BattleText2
+	text_end
 
 Mansion1EndBattleText2:
-	TX_FAR _Mansion1EndBattleText2
-	db "@"
+	text_far _Mansion1EndBattleText2
+	text_end
 
 Mansion1AfterBattleText2:
-	TX_FAR _Mansion1AfterBattleText2
-	db "@"
+	text_far _Mansion1AfterBattleText2
+	text_end
 
 Mansion1Text4:
-	TX_ASM
+	text_asm
 	ld hl, MansionSwitchText
 	call PrintText
 	call YesNoChoice
@@ -122,13 +115,13 @@ Mansion1Text4:
 	jp TextScriptEnd
 
 MansionSwitchText:
-	TX_FAR _MansionSwitchText
-	db "@"
+	text_far _MansionSwitchText
+	text_end
 
 MansionSwitchPressedText:
-	TX_FAR _MansionSwitchPressedText
-	db "@"
+	text_far _MansionSwitchPressedText
+	text_end
 
 MansionSwitchNotPressedText:
-	TX_FAR _MansionSwitchNotPressedText
-	db "@"
+	text_far _MansionSwitchNotPressedText
+	text_end
-- 
cgit v1.3.1-sl0p