1 files changed, 47 insertions, 48 deletions

diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm
index 760bb604..a8307c01 100755
--- a/scripts/pokemontower4.asm
+++ b/scripts/pokemontower4.asm
@@ -1,105 +1,104 @@
-PokemonTower4Script: ; 607f6 (18:47f6)
+PokemonTower4Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower4TrainerHeaders
+	ld hl, PokemonTower4TrainerHeader0
 	ld de, PokemonTower4ScriptPointers
-	ld a, [W_POKEMONTOWER4CURSCRIPT]
+	ld a, [wPokemonTower4CurScript]
 	call ExecuteCurMapScriptInTable
-	ld [W_POKEMONTOWER4CURSCRIPT], a
+	ld [wPokemonTower4CurScript], a
 	ret
 
-PokemonTower4ScriptPointers: ; 60809 (18:4809)
+PokemonTower4ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PokemonTower4TextPointers: ; 6080f (18:480f)
+PokemonTower4TextPointers:
 	dw PokemonTower4Text1
 	dw PokemonTower4Text2
 	dw PokemonTower4Text3
-	dw Predef5CText
-	dw Predef5CText
-	dw Predef5CText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
 
-PokemonTower4TrainerHeaders: ; 6081b (18:481b)
-PokemonTower4TrainerHeader0: ; 6081b (18:481b)
-	db $1 ; flag's bit
+PokemonTower4TrainerHeader0:
+	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0
 	db ($2 << 4) ; trainer's view range
-	dw wd766 ; flag's byte
-	dw PokemonTower4BattleText1 ; 0x485e TextBeforeBattle
-	dw PokemonTower4AfterBattleText1 ; 0x4868 TextAfterBattle
-	dw PokemonTower4EndBattleText1 ; 0x4863 TextEndBattle
-	dw PokemonTower4EndBattleText1 ; 0x4863 TextEndBattle
-
-PokemonTower4TrainerHeader1: ; 60827 (18:4827)
-	db $2 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_0
+	dw PokemonTower4BattleText1 ; TextBeforeBattle
+	dw PokemonTower4AfterBattleText1 ; TextAfterBattle
+	dw PokemonTower4EndBattleText1 ; TextEndBattle
+	dw PokemonTower4EndBattleText1 ; TextEndBattle
+
+PokemonTower4TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dw wd766 ; flag's byte
-	dw PokemonTower4BattleText2 ; 0x486d TextBeforeBattle
-	dw PokemonTower4AfterBattleText2 ; 0x4877 TextAfterBattle
-	dw PokemonTower4EndBattleText2 ; 0x4872 TextEndBattle
-	dw PokemonTower4EndBattleText2 ; 0x4872 TextEndBattle
-
-PokemonTower4TrainerHeader2: ; 60833 (18:4833)
-	db $3 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_1
+	dw PokemonTower4BattleText2 ; TextBeforeBattle
+	dw PokemonTower4AfterBattleText2 ; TextAfterBattle
+	dw PokemonTower4EndBattleText2 ; TextEndBattle
+	dw PokemonTower4EndBattleText2 ; TextEndBattle
+
+PokemonTower4TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dw wd766 ; flag's byte
-	dw PokemonTower4BattleText3 ; 0x487c TextBeforeBattle
-	dw PokemonTower4AfterBattleText3 ; 0x4886 TextAfterBattle
-	dw PokemonTower4EndBattleText3 ; 0x4881 TextEndBattle
-	dw PokemonTower4EndBattleText3 ; 0x4881 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_2
+	dw PokemonTower4BattleText3 ; TextBeforeBattle
+	dw PokemonTower4AfterBattleText3 ; TextAfterBattle
+	dw PokemonTower4EndBattleText3 ; TextEndBattle
+	dw PokemonTower4EndBattleText3 ; TextEndBattle
 
 	db $ff
 
-PokemonTower4Text1: ; 60840 (18:4840)
-	db $08 ; asm
+PokemonTower4Text1:
+	TX_ASM
 	ld hl, PokemonTower4TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower4Text2: ; 6084a (18:484a)
-	db $08 ; asm
+PokemonTower4Text2:
+	TX_ASM
 	ld hl, PokemonTower4TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower4Text3: ; 60854 (18:4854)
-	db $08 ; asm
+PokemonTower4Text3:
+	TX_ASM
 	ld hl, PokemonTower4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower4BattleText1: ; 6085e (18:485e)
+PokemonTower4BattleText1:
 	TX_FAR _PokemonTower4BattleText1
 	db "@"
 
-PokemonTower4EndBattleText1: ; 60863 (18:4863)
+PokemonTower4EndBattleText1:
 	TX_FAR _PokemonTower4EndBattleText1
 	db "@"
 
-PokemonTower4AfterBattleText1: ; 60868 (18:4868)
+PokemonTower4AfterBattleText1:
 	TX_FAR _PokemonTower4AfterBattleText1
 	db "@"
 
-PokemonTower4BattleText2: ; 6086d (18:486d)
+PokemonTower4BattleText2:
 	TX_FAR _PokemonTower4BattleText2
 	db "@"
 
-PokemonTower4EndBattleText2: ; 60872 (18:4872)
+PokemonTower4EndBattleText2:
 	TX_FAR _PokemonTower4EndBattleText2
 	db "@"
 
-PokemonTower4AfterBattleText2: ; 60877 (18:4877)
+PokemonTower4AfterBattleText2:
 	TX_FAR _PokemonTower4AfterBattleText2
 	db "@"
 
-PokemonTower4BattleText3: ; 6087c (18:487c)
+PokemonTower4BattleText3:
 	TX_FAR _PokemonTower4BattleText3
 	db "@"
 
-PokemonTower4EndBattleText3: ; 60881 (18:4881)
+PokemonTower4EndBattleText3:
 	TX_FAR _PokemonTower4EndBattleText3
 	db "@"
 
-PokemonTower4AfterBattleText3: ; 60886 (18:4886)
+PokemonTower4AfterBattleText3:
 	TX_FAR _PokemonTower4AfterBattleText3
 	db "@"