Sync with pokered

1 files changed, 49 insertions, 91 deletions

diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm
index a09e6f04..e5255674 100755
--- a/scripts/VictoryRoad2F.asm
+++ b/scripts/VictoryRoad2F.asm
@@ -44,7 +44,7 @@ VictoryRoad2Script0:
 	ld hl, CoordsData_51816
 	call CheckBoulderCoords
 	jp nc, CheckFightingMapTrainers
-	ld a, [hSpriteIndexOrTextID]
+	ldh a, [hSpriteIndexOrTextID]
 	cp $f
 	jp z, CheckFightingMapTrainers
 	EventFlagAddress hl, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1
@@ -65,9 +65,9 @@ VictoryRoad2Script0:
 	ret
 
 CoordsData_51816:
-	db $10,$01
-	db $10,$09
-	db $FF
+	dbmapcoord  1, 16
+	dbmapcoord  9, 16
+	db -1 ; end
 
 VictoryRoad2F_TextPointers:
 	dw VictoryRoad2Text1
@@ -85,161 +85,119 @@ VictoryRoad2F_TextPointers:
 	dw BoulderText
 
 VictoryRoad2TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
-	dw VictoryRoad2BattleText1 ; TextBeforeBattle
-	dw VictoryRoad2AfterBattleText1 ; TextAfterBattle
-	dw VictoryRoad2EndBattleText1 ; TextEndBattle
-	dw VictoryRoad2EndBattleText1 ; TextEndBattle
-
+	trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0, 4, VictoryRoad2BattleText1, VictoryRoad2EndBattleText1, VictoryRoad2AfterBattleText1
 VictoryRoad2TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1
-	dw VictoryRoad2BattleText2 ; TextBeforeBattle
-	dw VictoryRoad2AfterBattleText2 ; TextAfterBattle
-	dw VictoryRoad2EndBattleText2 ; TextEndBattle
-	dw VictoryRoad2EndBattleText2 ; TextEndBattle
-
+	trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1, 3, VictoryRoad2BattleText2, VictoryRoad2EndBattleText2, VictoryRoad2AfterBattleText2
 VictoryRoad2TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
-	dw VictoryRoad2BattleText3 ; TextBeforeBattle
-	dw VictoryRoad2AfterBattleText3 ; TextAfterBattle
-	dw VictoryRoad2EndBattleText3 ; TextEndBattle
-	dw VictoryRoad2EndBattleText3 ; TextEndBattle
-
+	trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2, 3, VictoryRoad2BattleText3, VictoryRoad2EndBattleText3, VictoryRoad2AfterBattleText3
 VictoryRoad2TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
-	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
-	dw VictoryRoad2BattleText4 ; TextBeforeBattle
-	dw VictoryRoad2AfterBattleText4 ; TextAfterBattle
-	dw VictoryRoad2EndBattleText4 ; TextEndBattle
-	dw VictoryRoad2EndBattleText4 ; TextEndBattle
-
+	trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3, 1, VictoryRoad2BattleText4, VictoryRoad2EndBattleText4, VictoryRoad2AfterBattleText4
 VictoryRoad2TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
-	dw VictoryRoad2BattleText5 ; TextBeforeBattle
-	dw VictoryRoad2AfterBattleText5 ; TextAfterBattle
-	dw VictoryRoad2EndBattleText5 ; TextEndBattle
-	dw VictoryRoad2EndBattleText5 ; TextEndBattle
-
+	trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4, 3, VictoryRoad2BattleText5, VictoryRoad2EndBattleText5, VictoryRoad2AfterBattleText5
 MoltresTrainerHeader:
-	dbEventFlagBit EVENT_BEAT_MOLTRES
-	db ($0 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MOLTRES
-	dw MoltresBattleText  ; TextBeforeBattle
-	dw MoltresBattleText  ; TextAfterBattle
-	dw MoltresBattleText  ; TextEndBattle
-	dw MoltresBattleText  ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_MOLTRES, 0, MoltresBattleText, MoltresBattleText, MoltresBattleText
+	db -1 ; end
 
 VictoryRoad2Text1:
-	TX_ASM
+	text_asm
 	ld hl, VictoryRoad2TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text2:
-	TX_ASM
+	text_asm
 	ld hl, VictoryRoad2TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text3:
-	TX_ASM
+	text_asm
 	ld hl, VictoryRoad2TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text4:
-	TX_ASM
+	text_asm
 	ld hl, VictoryRoad2TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text5:
-	TX_ASM
+	text_asm
 	ld hl, VictoryRoad2TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MoltresText:
-	TX_ASM
+	text_asm
 	ld hl, MoltresTrainerHeader
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MoltresBattleText:
-	TX_FAR _MoltresBattleText
-	TX_ASM
+	text_far _MoltresBattleText
+	text_asm
 	ld a, MOLTRES
 	call PlayCry
 	call WaitForSoundToFinish
 	jp TextScriptEnd
 
 VictoryRoad2BattleText1:
-	TX_FAR _VictoryRoad2BattleText1
-	db "@"
+	text_far _VictoryRoad2BattleText1
+	text_end
 
 VictoryRoad2EndBattleText1:
-	TX_FAR _VictoryRoad2EndBattleText1
-	db "@"
+	text_far _VictoryRoad2EndBattleText1
+	text_end
 
 VictoryRoad2AfterBattleText1:
-	TX_FAR _VictoryRoad2AfterBattleText1
-	db "@"
+	text_far _VictoryRoad2AfterBattleText1
+	text_end
 
 VictoryRoad2BattleText2:
-	TX_FAR _VictoryRoad2BattleText2
-	db "@"
+	text_far _VictoryRoad2BattleText2
+	text_end
 
 VictoryRoad2EndBattleText2:
-	TX_FAR _VictoryRoad2EndBattleText2
-	db "@"
+	text_far _VictoryRoad2EndBattleText2
+	text_end
 
 VictoryRoad2AfterBattleText2:
-	TX_FAR _VictoryRoad2AfterBattleText2
-	db "@"
+	text_far _VictoryRoad2AfterBattleText2
+	text_end
 
 VictoryRoad2BattleText3:
-	TX_FAR _VictoryRoad2BattleText3
-	db "@"
+	text_far _VictoryRoad2BattleText3
+	text_end
 
 VictoryRoad2EndBattleText3:
-	TX_FAR _VictoryRoad2EndBattleText3
-	db "@"
+	text_far _VictoryRoad2EndBattleText3
+	text_end
 
 VictoryRoad2AfterBattleText3:
-	TX_FAR _VictoryRoad2AfterBattleText3
-	db "@"
+	text_far _VictoryRoad2AfterBattleText3
+	text_end
 
 VictoryRoad2BattleText4:
-	TX_FAR _VictoryRoad2BattleText4
-	db "@"
+	text_far _VictoryRoad2BattleText4
+	text_end
 
 VictoryRoad2EndBattleText4:
-	TX_FAR _VictoryRoad2EndBattleText4
-	db "@"
+	text_far _VictoryRoad2EndBattleText4
+	text_end
 
 VictoryRoad2AfterBattleText4:
-	TX_FAR _VictoryRoad2AfterBattleText4
-	db "@"
+	text_far _VictoryRoad2AfterBattleText4
+	text_end
 
 VictoryRoad2BattleText5:
-	TX_FAR _VictoryRoad2BattleText5
-	db "@"
+	text_far _VictoryRoad2BattleText5
+	text_end
 
 VictoryRoad2EndBattleText5:
-	TX_FAR _VictoryRoad2EndBattleText5
-	db "@"
+	text_far _VictoryRoad2EndBattleText5
+	text_end
 
 VictoryRoad2AfterBattleText5:
-	TX_FAR _VictoryRoad2AfterBattleText5
-	db "@"
+	text_far _VictoryRoad2AfterBattleText5
+	text_end