1 files changed, 80 insertions, 81 deletions

diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm
index db34fcf2..1f965e0d 100755
--- a/scripts/ssanne9.asm
+++ b/scripts/ssanne9.asm
@@ -1,100 +1,99 @@
-SSAnne9Script: ; 61b4b (18:5b4b)
+SSAnne9Script:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, SSAnne9TrainerHeaders
+	ld hl, SSAnne9TrainerHeader0
 	ld de, SSAnne9ScriptPointers
-	ld a, [W_SSANNE9CURSCRIPT]
+	ld a, [wSSAnne9CurScript]
 	call ExecuteCurMapScriptInTable
-	ld [W_SSANNE9CURSCRIPT], a
+	ld [wSSAnne9CurScript], a
 	ret
 
-SSAnne9ScriptPointers: ; 61b64 (18:5b64)
+SSAnne9ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne9TextPointers: ; 61b6a (18:5b6a)
+SSAnne9TextPointers:
 	dw SSAnne9Text1
 	dw SSAnne9Text2
 	dw SSAnne9Text3
 	dw SSAnne9Text4
 	dw SSAnne9Text5
-	dw Predef5CText
+	dw PickUpItemText
 	dw SSAnne9Text7
 	dw SSAnne9Text8
-	dw Predef5CText
+	dw PickUpItemText
 	dw SSAnne9Text10
 	dw SSAnne9Text11
 	dw SSAnne9Text12
 	dw SSAnne9Text13
 
-SSAnne9TrainerHeaders: ; 61b84 (18:5b84)
-SSAnne9TrainerHeader0: ; 61b84 (18:5b84)
-	db $1 ; flag's bit
+SSAnne9TrainerHeader0:
+	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0
 	db ($2 << 4) ; trainer's view range
-	dw wd807 ; flag's byte
-	dw SSAnne9BattleText1 ; 0x5c51 TextBeforeBattle
-	dw SSAnne9AfterBattleText1 ; 0x5c5b TextAfterBattle
-	dw SSAnne9EndBattleText1 ; 0x5c56 TextEndBattle
-	dw SSAnne9EndBattleText1 ; 0x5c56 TextEndBattle
-
-SSAnne9TrainerHeader1: ; 61b90 (18:5b90)
-	db $2 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0
+	dw SSAnne9BattleText1 ; TextBeforeBattle
+	dw SSAnne9AfterBattleText1 ; TextAfterBattle
+	dw SSAnne9EndBattleText1 ; TextEndBattle
+	dw SSAnne9EndBattleText1 ; TextEndBattle
+
+SSAnne9TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dw wd807 ; flag's byte
-	dw SSAnne9BattleText2 ; 0x5c60 TextBeforeBattle
-	dw SSAnne9AfterBattleText2 ; 0x5c6a TextAfterBattle
-	dw SSAnne9EndBattleText2 ; 0x5c65 TextEndBattle
-	dw SSAnne9EndBattleText2 ; 0x5c65 TextEndBattle
-
-SSAnne9TrainerHeader2: ; 61b9c (18:5b9c)
-	db $3 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1
+	dw SSAnne9BattleText2 ; TextBeforeBattle
+	dw SSAnne9AfterBattleText2 ; TextAfterBattle
+	dw SSAnne9EndBattleText2 ; TextEndBattle
+	dw SSAnne9EndBattleText2 ; TextEndBattle
+
+SSAnne9TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dw wd807 ; flag's byte
-	dw SSAnne9BattleText3 ; 0x5c6f TextBeforeBattle
-	dw SSAnne9AfterBattleText3 ; 0x5c79 TextAfterBattle
-	dw SSAnne9EndBattleText3 ; 0x5c74 TextEndBattle
-	dw SSAnne9EndBattleText3 ; 0x5c74 TextEndBattle
-
-SSAnne9TrainerHeader3: ; 61ba8 (18:5ba8)
-	db $4 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2
+	dw SSAnne9BattleText3 ; TextBeforeBattle
+	dw SSAnne9AfterBattleText3 ; TextAfterBattle
+	dw SSAnne9EndBattleText3 ; TextEndBattle
+	dw SSAnne9EndBattleText3 ; TextEndBattle
+
+SSAnne9TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dw wd807 ; flag's byte
-	dw SSAnne9BattleText4 ; 0x5c7e TextBeforeBattle
-	dw SSAnne9AfterBattleText4 ; 0x5c88 TextAfterBattle
-	dw SSAnne9EndBattleText4 ; 0x5c83 TextEndBattle
-	dw SSAnne9EndBattleText4 ; 0x5c83 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3
+	dw SSAnne9BattleText4 ; TextBeforeBattle
+	dw SSAnne9AfterBattleText4 ; TextAfterBattle
+	dw SSAnne9EndBattleText4 ; TextEndBattle
+	dw SSAnne9EndBattleText4 ; TextEndBattle
 
 	db $ff
 
-SSAnne9Text1: ; 61bb5 (18:5bb5)
-	db $08 ; asm
+SSAnne9Text1:
+	TX_ASM
 	ld hl, SSAnne9TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne9Text2: ; 61bbf (18:5bbf)
-	db $08 ; asm
+SSAnne9Text2:
+	TX_ASM
 	ld hl, SSAnne9TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne9Text3: ; 61bc9 (18:5bc9)
-	db $08 ; asm
+SSAnne9Text3:
+	TX_ASM
 	ld hl, SSAnne9TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne9Text4: ; 61bd3 (18:5bd3)
-	db $08 ; asm
+SSAnne9Text4:
+	TX_ASM
 	ld hl, SSAnne9TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne9Text5: ; 61bdd (18:5bdd)
-	db $08 ; asm
+SSAnne9Text5:
+	TX_ASM
 	call SaveScreenTilesToBuffer1
 	ld hl, SSAnne9Text_61bf2
 	call PrintText
@@ -103,114 +102,114 @@ SSAnne9Text5: ; 61bdd (18:5bdd)
 	call DisplayPokedex
 	jp TextScriptEnd
 
-SSAnne9Text_61bf2: ; 61bf2 (18:5bf2)
+SSAnne9Text_61bf2:
 	TX_FAR _SSAnne9Text_61bf2
 	db "@"
 
-SSAnne9Text7: ; 61bf7 (18:5bf7)
-	db $08 ; asm
+SSAnne9Text7:
+	TX_ASM
 	ld hl, SSAnne9Text_61c01
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c01: ; 61c01 (18:5c01)
+SSAnne9Text_61c01:
 	TX_FAR _SSAnne9Text_61c01
 	db "@"
 
-SSAnne9Text8: ; 61c06 (18:5c06)
-	db $08 ; asm
+SSAnne9Text8:
+	TX_ASM
 	ld hl, SSAnne9Text_61c10
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c10: ; 61c10 (18:5c10)
+SSAnne9Text_61c10:
 	TX_FAR _SSAnne9Text_61c10
 	db "@"
 
-SSAnne9Text10: ; 61c15 (18:5c15)
-	db $08 ; asm
+SSAnne9Text10:
+	TX_ASM
 	ld hl, SSAnne9Text_61c1f
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c1f: ; 61c1f (18:5c1f)
+SSAnne9Text_61c1f:
 	TX_FAR _SSAnne9Text_61c1f
 	db "@"
 
-SSAnne9Text11: ; 61c24 (18:5c24)
-	db $08 ; asm
+SSAnne9Text11:
+	TX_ASM
 	ld hl, SSAnne9Text_61c2e
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c2e: ; 61c2e (18:5c2e)
+SSAnne9Text_61c2e:
 	TX_FAR _SSAnne9Text_61c2e
 	db "@"
 
-SSAnne9Text12: ; 61c33 (18:5c33)
-	db $08 ; asm
+SSAnne9Text12:
+	TX_ASM
 	ld hl, SSAnne9Text_61c3d
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c3d: ; 61c3d (18:5c3d)
+SSAnne9Text_61c3d:
 	TX_FAR _SSAnne9Text_61c3d
 	db "@"
 
-SSAnne9Text13: ; 61c42 (18:5c42)
-	db $08 ; asm
+SSAnne9Text13:
+	TX_ASM
 	ld hl, SSAnne9Text_61c4c
 	call PrintText
 	jp TextScriptEnd
 
-SSAnne9Text_61c4c: ; 61c4c (18:5c4c)
+SSAnne9Text_61c4c:
 	TX_FAR _SSAnne9Text_61c4c
 	db "@"
 
-SSAnne9BattleText1: ; 61c51 (18:5c51)
+SSAnne9BattleText1:
 	TX_FAR _SSAnne9BattleText1
 	db "@"
 
-SSAnne9EndBattleText1: ; 61c56 (18:5c56)
+SSAnne9EndBattleText1:
 	TX_FAR _SSAnne9EndBattleText1
 	db "@"
 
-SSAnne9AfterBattleText1: ; 61c5b (18:5c5b)
+SSAnne9AfterBattleText1:
 	TX_FAR _SSAnne9AfterBattleText1
 	db "@"
 
-SSAnne9BattleText2: ; 61c60 (18:5c60)
+SSAnne9BattleText2:
 	TX_FAR _SSAnne9BattleText2
 	db "@"
 
-SSAnne9EndBattleText2: ; 61c65 (18:5c65)
+SSAnne9EndBattleText2:
 	TX_FAR _SSAnne9EndBattleText2
 	db "@"
 
-SSAnne9AfterBattleText2: ; 61c6a (18:5c6a)
+SSAnne9AfterBattleText2:
 	TX_FAR _SSAnne9AfterBattleText2
 	db "@"
 
-SSAnne9BattleText3: ; 61c6f (18:5c6f)
+SSAnne9BattleText3:
 	TX_FAR _SSAnne9BattleText3
 	db "@"
 
-SSAnne9EndBattleText3: ; 61c74 (18:5c74)
+SSAnne9EndBattleText3:
 	TX_FAR _SSAnne9EndBattleText3
 	db "@"
 
-SSAnne9AfterBattleText3: ; 61c79 (18:5c79)
+SSAnne9AfterBattleText3:
 	TX_FAR _SSAnne9AfterBattleText3
 	db "@"
 
-SSAnne9BattleText4: ; 61c7e (18:5c7e)
+SSAnne9BattleText4:
 	TX_FAR _SSAnne9BattleText4
 	db "@"
 
-SSAnne9EndBattleText4: ; 61c83 (18:5c83)
+SSAnne9EndBattleText4:
 	TX_FAR _SSAnne9EndBattleText4
 	db "@"
 
-SSAnne9AfterBattleText4: ; 61c88 (18:5c88)
+SSAnne9AfterBattleText4:
 	TX_FAR _SSAnne9AfterBattleText4
 	db "@"