Sync with pokered

1 files changed, 50 insertions, 78 deletions

diff --git a/scripts/SSAnne2FRooms.asm b/scripts/SSAnne2FRooms.asm
index fb57cf37..ff1dcfaf 100755
--- a/scripts/SSAnne2FRooms.asm
+++ b/scripts/SSAnne2FRooms.asm
@@ -28,69 +28,41 @@ SSAnne2FRooms_TextPointers:
 	dw SSAnne9Text13
 
 SSAnne9TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0
-	dw SSAnne9BattleText1 ; TextBeforeBattle
-	dw SSAnne9AfterBattleText1 ; TextAfterBattle
-	dw SSAnne9EndBattleText1 ; TextEndBattle
-	dw SSAnne9EndBattleText1 ; TextEndBattle
-
+	trainer EVENT_BEAT_SS_ANNE_9_TRAINER_0, 2, SSAnne9BattleText1, SSAnne9EndBattleText1, SSAnne9AfterBattleText1
 SSAnne9TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1
-	dw SSAnne9BattleText2 ; TextBeforeBattle
-	dw SSAnne9AfterBattleText2 ; TextAfterBattle
-	dw SSAnne9EndBattleText2 ; TextEndBattle
-	dw SSAnne9EndBattleText2 ; TextEndBattle
-
+	trainer EVENT_BEAT_SS_ANNE_9_TRAINER_1, 3, SSAnne9BattleText2, SSAnne9EndBattleText2, SSAnne9AfterBattleText2
 SSAnne9TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2
-	dw SSAnne9BattleText3 ; TextBeforeBattle
-	dw SSAnne9AfterBattleText3 ; TextAfterBattle
-	dw SSAnne9EndBattleText3 ; TextEndBattle
-	dw SSAnne9EndBattleText3 ; TextEndBattle
-
+	trainer EVENT_BEAT_SS_ANNE_9_TRAINER_2, 3, SSAnne9BattleText3, SSAnne9EndBattleText3, SSAnne9AfterBattleText3
 SSAnne9TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3
-	dw SSAnne9BattleText4 ; TextBeforeBattle
-	dw SSAnne9AfterBattleText4 ; TextAfterBattle
-	dw SSAnne9EndBattleText4 ; TextEndBattle
-	dw SSAnne9EndBattleText4 ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_SS_ANNE_9_TRAINER_3, 2, SSAnne9BattleText4, SSAnne9EndBattleText4, SSAnne9AfterBattleText4
+	db -1 ; end
 
 SSAnne9Text1:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne9TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne9Text2:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne9TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne9Text3:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne9TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne9Text4:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne9TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 SSAnne9Text5:
-	TX_ASM
+	text_asm
 	call SaveScreenTilesToBuffer1
 	ld hl, SSAnne9Text_61bf2
 	call PrintText
@@ -100,93 +72,93 @@ SSAnne9Text5:
 	jp TextScriptEnd
 
 SSAnne9Text_61bf2:
-	TX_FAR _SSAnne9Text_61bf2
-	db "@"
+	text_far _SSAnne9Text_61bf2
+	text_end
 
 SSAnne9Text7:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne9Text_61c01
 	call PrintText
 	jp TextScriptEnd
 
 SSAnne9Text_61c01:
-	TX_FAR _SSAnne9Text_61c01
-	db "@"
+	text_far _SSAnne9Text_61c01
+	text_end
 
 SSAnne9Text8:
-	TX_ASM
+	text_asm
 	ld hl, SSAnne9Text_61c10
 	call PrintText
 	jp TextScriptEnd
 
 SSAnne9Text_61c10:
-	TX_FAR _SSAnne9Text_61c10
-	db "@"
+	text_far _SSAnne9Text_61c10
+	text_end
 
 SSAnne9Text10:
-	TX_ASM
-	callba Func_f2570
+	text_asm
+	farcall Func_f2570
 	jp TextScriptEnd
 
 SSAnne9Text11:
-	TX_ASM
-	callba Func_f257c
+	text_asm
+	farcall Func_f257c
 	jp TextScriptEnd
 
 SSAnne9Text12:
-	TX_ASM
-	callba Func_f2588
+	text_asm
+	farcall Func_f2588
 	jp TextScriptEnd
 
 SSAnne9Text13:
-	TX_ASM
-	callba Func_f2594
+	text_asm
+	farcall Func_f2594
 	jp TextScriptEnd
 
 SSAnne9BattleText1:
-	TX_FAR _SSAnne9BattleText1
-	db "@"
+	text_far _SSAnne9BattleText1
+	text_end
 
 SSAnne9EndBattleText1:
-	TX_FAR _SSAnne9EndBattleText1
-	db "@"
+	text_far _SSAnne9EndBattleText1
+	text_end
 
 SSAnne9AfterBattleText1:
-	TX_FAR _SSAnne9AfterBattleText1
-	db "@"
+	text_far _SSAnne9AfterBattleText1
+	text_end
 
 SSAnne9BattleText2:
-	TX_FAR _SSAnne9BattleText2
-	db "@"
+	text_far _SSAnne9BattleText2
+	text_end
 
 SSAnne9EndBattleText2:
-	TX_FAR _SSAnne9EndBattleText2
-	db "@"
+	text_far _SSAnne9EndBattleText2
+	text_end
 
 SSAnne9AfterBattleText2:
-	TX_FAR _SSAnne9AfterBattleText2
-	db "@"
+	text_far _SSAnne9AfterBattleText2
+	text_end
 
 SSAnne9BattleText3:
-	TX_FAR _SSAnne9BattleText3
-	db "@"
+	text_far _SSAnne9BattleText3
+	text_end
 
 SSAnne9EndBattleText3:
-	TX_FAR _SSAnne9EndBattleText3
-	db "@"
+	text_far _SSAnne9EndBattleText3
+	text_end
 
 SSAnne9AfterBattleText3:
-	TX_FAR _SSAnne9AfterBattleText3
-	db "@"
+	text_far _SSAnne9AfterBattleText3
+	text_end
 
 SSAnne9BattleText4:
-	TX_FAR _SSAnne9BattleText4
-	db "@"
+	text_far _SSAnne9BattleText4
+	text_end
 
 SSAnne9EndBattleText4:
-	TX_FAR _SSAnne9EndBattleText4
-	db "@"
+	text_far _SSAnne9EndBattleText4
+	text_end
 
 SSAnne9AfterBattleText4:
-	TX_FAR _SSAnne9AfterBattleText4
-	db "@"
+	text_far _SSAnne9AfterBattleText4
+	text_end