Sync with pokered

1 files changed, 65 insertions, 121 deletions

diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm
index 7e6fcc8b..9cba9c3e 100755
--- a/scripts/RockTunnelB1F.asm
+++ b/scripts/RockTunnelB1F.asm
@@ -23,219 +23,163 @@ RockTunnelB1F_TextPointers:
 	dw RockTunnel2Text8
 
 RockTunnel2TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0
-	dw RockTunnel2BattleText2 ; TextBeforeBattle
-	dw RockTunnel2AfterBattleText2 ; TextAfterBattle
-	dw RockTunnel2EndBattleText2 ; TextEndBattle
-	dw RockTunnel2EndBattleText2 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0, 4, RockTunnel2BattleText2, RockTunnel2EndBattleText2, RockTunnel2AfterBattleText2
 RockTunnel2TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1
-	dw RockTunnel2BattleText3 ; TextBeforeBattle
-	dw RockTunnel2AfterBattleText3 ; TextAfterBattle
-	dw RockTunnel2EndBattleText3 ; TextEndBattle
-	dw RockTunnel2EndBattleText3 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1, 3, RockTunnel2BattleText3, RockTunnel2EndBattleText3, RockTunnel2AfterBattleText3
 RockTunnel2TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
-	dw RockTunnel2BattleText4 ; TextBeforeBattle
-	dw RockTunnel2AfterBattleText4 ; TextAfterBattle
-	dw RockTunnel2EndBattleText4 ; TextEndBattle
-	dw RockTunnel2EndBattleText4 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2, 3, RockTunnel2BattleText4, RockTunnel2EndBattleText4, RockTunnel2AfterBattleText4
 RockTunnel2TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
-	dw RockTunnel2BattleText5 ; TextBeforeBattle
-	dw RockTunnel2AfterBattleText5 ; TextAfterBattle
-	dw RockTunnel2EndBattleText5 ; TextEndBattle
-	dw RockTunnel2EndBattleText5 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3, 4, RockTunnel2BattleText5, RockTunnel2EndBattleText5, RockTunnel2AfterBattleText5
 RockTunnel2TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
-	dw RockTunnel2BattleText6 ; TextBeforeBattle
-	dw RockTunnel2AfterBattleText6 ; TextAfterBattle
-	dw RockTunnel2EndBattleText6 ; TextEndBattle
-	dw RockTunnel2EndBattleText6 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4, 3, RockTunnel2BattleText6, RockTunnel2EndBattleText6, RockTunnel2AfterBattleText6
 RockTunnel2TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
-	dw RockTunnel2BattleText7 ; TextBeforeBattle
-	dw RockTunnel2AfterBattleText7 ; TextAfterBattle
-	dw RockTunnel2EndBattleText7 ; TextEndBattle
-	dw RockTunnel2EndBattleText7 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5, 4, RockTunnel2BattleText7, RockTunnel2EndBattleText7, RockTunnel2AfterBattleText7
 RockTunnel2TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
-	dw RockTunnel2BattleText8 ; TextBeforeBattle
-	dw RockTunnel2AfterBattleText8 ; TextAfterBattle
-	dw RockTunnel2EndBattleText8 ; TextEndBattle
-	dw RockTunnel2EndBattleText8 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6, 3, RockTunnel2BattleText8, RockTunnel2EndBattleText8, RockTunnel2AfterBattleText8
 RockTunnel2TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1
-	dw RockTunnel2BattleText9 ; TextBeforeBattle
-	dw RockTunnel2AfterBattleText9 ; TextAfterBattle
-	dw RockTunnel2EndBattleText9 ; TextEndBattle
-	dw RockTunnel2EndBattleText9 ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1, 3, RockTunnel2BattleText9, RockTunnel2EndBattleText9, RockTunnel2AfterBattleText9
+	db -1 ; end
 
 RockTunnel2Text1:
-	TX_ASM
+	text_asm
 	ld hl, RockTunnel2TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text2:
-	TX_ASM
+	text_asm
 	ld hl, RockTunnel2TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text3:
-	TX_ASM
+	text_asm
 	ld hl, RockTunnel2TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text4:
-	TX_ASM
+	text_asm
 	ld hl, RockTunnel2TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text5:
-	TX_ASM
+	text_asm
 	ld hl, RockTunnel2TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text6:
-	TX_ASM
+	text_asm
 	ld hl, RockTunnel2TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text7:
-	TX_ASM
+	text_asm
 	ld hl, RockTunnel2TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text8:
-	TX_ASM
+	text_asm
 	ld hl, RockTunnel2TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2BattleText2:
-	TX_FAR _RockTunnel2BattleText2
-	db "@"
+	text_far _RockTunnel2BattleText2
+	text_end
 
 RockTunnel2EndBattleText2:
-	TX_FAR _RockTunnel2EndBattleText2
-	db "@"
+	text_far _RockTunnel2EndBattleText2
+	text_end
 
 RockTunnel2AfterBattleText2:
-	TX_FAR _RockTunnel2AfterBattleText2
-	db "@"
+	text_far _RockTunnel2AfterBattleText2
+	text_end
 
 RockTunnel2BattleText3:
-	TX_FAR _RockTunnel2BattleText3
-	db "@"
+	text_far _RockTunnel2BattleText3
+	text_end
 
 RockTunnel2EndBattleText3:
-	TX_FAR _RockTunnel2EndBattleText3
-	db "@"
+	text_far _RockTunnel2EndBattleText3
+	text_end
 
 RockTunnel2AfterBattleText3:
-	TX_FAR _RockTunnel2AfterBattleText3
-	db "@"
+	text_far _RockTunnel2AfterBattleText3
+	text_end
 
 RockTunnel2BattleText4:
-	TX_FAR _RockTunnel2BattleText4
-	db "@"
+	text_far _RockTunnel2BattleText4
+	text_end
 
 RockTunnel2EndBattleText4:
-	TX_FAR _RockTunnel2EndBattleText4
-	db "@"
+	text_far _RockTunnel2EndBattleText4
+	text_end
 
 RockTunnel2AfterBattleText4:
-	TX_FAR _RockTunnel2AfterBattleText4
-	db "@"
+	text_far _RockTunnel2AfterBattleText4
+	text_end
 
 RockTunnel2BattleText5:
-	TX_FAR _RockTunnel2BattleText5
-	db "@"
+	text_far _RockTunnel2BattleText5
+	text_end
 
 RockTunnel2EndBattleText5:
-	TX_FAR _RockTunnel2EndBattleText5
-	db "@"
+	text_far _RockTunnel2EndBattleText5
+	text_end
 
 RockTunnel2AfterBattleText5:
-	TX_FAR _RockTunnel2AfterBattleText5
-	db "@"
+	text_far _RockTunnel2AfterBattleText5
+	text_end
 
 RockTunnel2BattleText6:
-	TX_FAR _RockTunnel2BattleText6
-	db "@"
+	text_far _RockTunnel2BattleText6
+	text_end
 
 RockTunnel2EndBattleText6:
-	TX_FAR _RockTunnel2EndBattleText6
-	db "@"
+	text_far _RockTunnel2EndBattleText6
+	text_end
 
 RockTunnel2AfterBattleText6:
-	TX_FAR _RockTunnel2AfterBattleText6
-	db "@"
+	text_far _RockTunnel2AfterBattleText6
+	text_end
 
 RockTunnel2BattleText7:
-	TX_FAR _RockTunnel2BattleText7
-	db "@"
+	text_far _RockTunnel2BattleText7
+	text_end
 
 RockTunnel2EndBattleText7:
-	TX_FAR _RockTunnel2EndBattleText7
-	db "@"
+	text_far _RockTunnel2EndBattleText7
+	text_end
 
 RockTunnel2AfterBattleText7:
-	TX_FAR _RockTunnel2AfterBattleText7
-	db "@"
+	text_far _RockTunnel2AfterBattleText7
+	text_end
 
 RockTunnel2BattleText8:
-	TX_FAR _RockTunnel2BattleText8
-	db "@"
+	text_far _RockTunnel2BattleText8
+	text_end
 
 RockTunnel2EndBattleText8:
-	TX_FAR _RockTunnel2EndBattleText8
-	db "@"
+	text_far _RockTunnel2EndBattleText8
+	text_end
 
 RockTunnel2AfterBattleText8:
-	TX_FAR _RockTunnel2AfterBattleText8
-	db "@"
+	text_far _RockTunnel2AfterBattleText8
+	text_end
 
 RockTunnel2BattleText9:
-	TX_FAR _RockTunnel2BattleText9
-	db "@"
+	text_far _RockTunnel2BattleText9
+	text_end
 
 RockTunnel2EndBattleText9:
-	TX_FAR _RockTunnel2EndBattleText9
-	db "@"
+	text_far _RockTunnel2EndBattleText9
+	text_end
 
 RockTunnel2AfterBattleText9:
-	TX_FAR _RockTunnel2AfterBattleText9
-	db "@"
+	text_far _RockTunnel2AfterBattleText9
+	text_end