Sync with pokered

1 files changed, 53 insertions, 95 deletions

diff --git a/scripts/SSAnneB1FRooms.asm b/scripts/SSAnneB1FRooms.asm
index 3777852c..2a077c33 100755
--- a/scripts/SSAnneB1FRooms.asm
+++ b/scripts/SSAnneB1FRooms.asm
@@ -26,176 +26,134 @@ SSAnneB1FRooms_TextPointers:
 	dw PickUpItemText
 
 SSAnne10TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0
-	dw SSAnne10BattleText1 ; TextBeforeBattle
-	dw SSAnne10AfterBattleText1 ; TextAfterBattle
-	dw SSAnne10EndBattleText1 ; TextEndBattle
-	dw SSAnne10EndBattleText1 ; TextEndBattle
-
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnne10BattleText1, SSAnne10EndBattleText1, SSAnne10AfterBattleText1
 SSAnne10TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1
-	dw SSAnne10BattleText2 ; TextBeforeBattle
-	dw SSAnne10AfterBattleText2 ; TextAfterBattle
-	dw SSAnne10EndBattleText2 ; TextEndBattle
-	dw SSAnne10EndBattleText2 ; TextEndBattle
-
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_1, 3, SSAnne10BattleText2, SSAnne10EndBattleText2, SSAnne10AfterBattleText2
 SSAnne10TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2
-	dw SSAnne10BattleText3 ; TextBeforeBattle
-	dw SSAnne10AfterBattleText3 ; TextAfterBattle
-	dw SSAnne10EndBattleText3 ; TextEndBattle
-	dw SSAnne10EndBattleText3 ; TextEndBattle
-
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_2, 2, SSAnne10BattleText3, SSAnne10EndBattleText3, SSAnne10AfterBattleText3
 SSAnne10TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3
-	dw SSAnne10BattleText4 ; TextBeforeBattle
-	dw SSAnne10AfterBattleText4 ; TextAfterBattle
-	dw SSAnne10EndBattleText4 ; TextEndBattle
-	dw SSAnne10EndBattleText4 ; TextEndBattle
-
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_3, 2, SSAnne10BattleText4, SSAnne10EndBattleText4, SSAnne10AfterBattleText4
 SSAnne10TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4
-	dw SSAnne10BattleText5 ; TextBeforeBattle
-	dw SSAnne10AfterBattleText5 ; TextAfterBattle
-	dw SSAnne10EndBattleText5 ; TextEndBattle
-	dw SSAnne10EndBattleText5 ; TextEndBattle
-
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_4, 2, SSAnne10BattleText5, SSAnne10EndBattleText5, SSAnne10AfterBattleText5
 SSAnne10TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5
-	dw SSAnne10BattleText6 ; TextBeforeBattle
-	dw SSAnne10AfterBattleText6 ; TextAfterBattle
-	dw SSAnne10EndBattleText6 ; TextEndBattle
-	dw SSAnne10EndBattleText6 ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_5, 3, SSAnne10BattleText6, SSAnne10EndBattleText6, SSAnne10AfterBattleText6
+	db -1 ; end
 
 SSAnne10Text1:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne10TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne10Text2:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne10TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne10Text3:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne10TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne10Text4:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne10TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne10Text5:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne10TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne10Text6:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne10TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne10Text8:
-	TX_FAR _SSAnne10Text8
-	TX_ASM
+	text_far _SSAnne10Text8
+	text_asm
 	ld a, MACHOKE
 	call PlayCry
 	jp TextScriptEnd
 
 SSAnne10BattleText1:
-	TX_FAR _SSAnne10BattleText1
-	db "@"
+	text_far _SSAnne10BattleText1
+	text_end
 
 SSAnne10EndBattleText1:
-	TX_FAR _SSAnne10EndBattleText1
-	db "@"
+	text_far _SSAnne10EndBattleText1
+	text_end
 
 SSAnne10AfterBattleText1:
-	TX_FAR _SSAnne10AfterBattleText1
-	db "@"
+	text_far _SSAnne10AfterBattleText1
+	text_end
 
 SSAnne10BattleText2:
-	TX_FAR _SSAnne10BattleText2
-	db "@"
+	text_far _SSAnne10BattleText2
+	text_end
 
 SSAnne10EndBattleText2:
-	TX_FAR _SSAnne10EndBattleText2
-	db "@"
+	text_far _SSAnne10EndBattleText2
+	text_end
 
 SSAnne10AfterBattleText2:
-	TX_FAR _SSAnne10AfterBattleText2
-	db "@"
+	text_far _SSAnne10AfterBattleText2
+	text_end
 
 SSAnne10BattleText3:
-	TX_FAR _SSAnne10BattleText3
-	db "@"
+	text_far _SSAnne10BattleText3
+	text_end
 
 SSAnne10EndBattleText3:
-	TX_FAR _SSAnne10EndBattleText3
-	db "@"
+	text_far _SSAnne10EndBattleText3
+	text_end
 
 SSAnne10AfterBattleText3:
-	TX_FAR _SSAnne10AfterBattleText3
-	db "@"
+	text_far _SSAnne10AfterBattleText3
+	text_end
 
 SSAnne10BattleText4:
-	TX_FAR _SSAnne10BattleText4
-	db "@"
+	text_far _SSAnne10BattleText4
+	text_end
 
 SSAnne10EndBattleText4:
-	TX_FAR _SSAnne10EndBattleText4
-	db "@"
+	text_far _SSAnne10EndBattleText4
+	text_end
 
 SSAnne10AfterBattleText4:
-	TX_FAR _SSAnne10AfterBattleText4
-	db "@"
+	text_far _SSAnne10AfterBattleText4
+	text_end
 
 SSAnne10BattleText5:
-	TX_FAR _SSAnne10BattleText5
-	db "@"
+	text_far _SSAnne10BattleText5
+	text_end
 
 SSAnne10EndBattleText5:
-	TX_FAR _SSAnne10EndBattleText5
-	db "@"
+	text_far _SSAnne10EndBattleText5
+	text_end
 
 SSAnne10AfterBattleText5:
-	TX_FAR _SSAnne10AfterBattleText5
-	db "@"
+	text_far _SSAnne10AfterBattleText5
+	text_end
 
 SSAnne10BattleText6:
-	TX_FAR _SSAnne10BattleText6
-	db "@"
+	text_far _SSAnne10BattleText6
+	text_end
 
 SSAnne10EndBattleText6:
-	TX_FAR _SSAnne10EndBattleText6
-	db "@"
+	text_far _SSAnne10EndBattleText6
+	text_end
 
 SSAnne10AfterBattleText6:
-	TX_FAR _SSAnne10AfterBattleText6
-	db "@"
+	text_far _SSAnne10AfterBattleText6
+	text_end
 
 SSAnne10Text7:
-	TX_FAR _SSAnne10Text7
-	db "@"
+	text_far _SSAnne10Text7
+	text_end