Clean up redundant labels

fix trainer header numbering

1 files changed, 28 insertions, 29 deletions

diff --git a/scripts/route3.asm b/scripts/route3.asm
index b2c5de3e..e4748b8c 100755
--- a/scripts/route3.asm
+++ b/scripts/route3.asm
@@ -24,7 +24,6 @@ Route3TextPointers:
 	dw Route3Text9
 	dw Route3Text10
 
-Route3TrainerHeaders:
 Route3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -34,64 +33,64 @@ Route3TrainerHeader0:
 	dw Route3EndBattleText1 ; TextEndBattle
 	dw Route3EndBattleText1 ; TextEndBattle
 
-Route3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2
+Route3TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_1
 	dw Route3BattleText2 ; TextBeforeBattle
 	dw Route3AfterBattleText2 ; TextAfterBattle
 	dw Route3EndBattleText2 ; TextEndBattle
 	dw Route3EndBattleText2 ; TextEndBattle
 
-Route3TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3
+Route3TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2
 	dw Route3BattleText3 ; TextBeforeBattle
 	dw Route3AfterBattleText3 ; TextAfterBattle
 	dw Route3EndBattleText3 ; TextEndBattle
 	dw Route3EndBattleText3 ; TextEndBattle
 
-Route3TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4
+Route3TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3
 	dw Route3BattleText4 ; TextBeforeBattle
 	dw Route3AfterBattleText4 ; TextAfterBattle
 	dw Route3EndBattleText4 ; TextEndBattle
 	dw Route3EndBattleText4 ; TextEndBattle
 
-Route3TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5
+Route3TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4
 	dw Route3BattleText5 ; TextBeforeBattle
 	dw Route3AfterBattleText5 ; TextAfterBattle
 	dw Route3EndBattleText5 ; TextEndBattle
 	dw Route3EndBattleText5 ; TextEndBattle
 
-Route3TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6
+Route3TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5
 	dw Route3BattleText6 ; TextBeforeBattle
 	dw Route3AfterBattleText6 ; TextAfterBattle
 	dw Route3EndBattleText6 ; TextEndBattle
 	dw Route3EndBattleText6 ; TextEndBattle
 
-Route3TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1
+Route3TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6, 1
 	dw Route3BattleText7 ; TextBeforeBattle
 	dw Route3AfterBattleText7 ; TextAfterBattle
 	dw Route3EndBattleText7 ; TextEndBattle
 	dw Route3EndBattleText7 ; TextEndBattle
 
-Route3TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_8, 1
+Route3TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1
 	dw Route3BattleText8 ; TextBeforeBattle
 	dw Route3AfterBattleText8 ; TextAfterBattle
 	dw Route3EndBattleText8 ; TextEndBattle
@@ -123,7 +122,7 @@ Route3AfterBattleText1:
 
 Route3Text3:
 	TX_ASM
-	ld hl, Route3TrainerHeader2
+	ld hl, Route3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -141,7 +140,7 @@ Route3AfterBattleText2:
 
 Route3Text4:
 	TX_ASM
-	ld hl, Route3TrainerHeader3
+	ld hl, Route3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -159,7 +158,7 @@ Route3AfterBattleText3:
 
 Route3Text5:
 	TX_ASM
-	ld hl, Route3TrainerHeader4
+	ld hl, Route3TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -177,7 +176,7 @@ Route3AfterBattleText4:
 
 Route3Text6:
 	TX_ASM
-	ld hl, Route3TrainerHeader5
+	ld hl, Route3TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -195,7 +194,7 @@ Route3AfterBattleText5:
 
 Route3Text7:
 	TX_ASM
-	ld hl, Route3TrainerHeader6
+	ld hl, Route3TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -213,7 +212,7 @@ Route3AfterBattleText6:
 
 Route3Text8:
 	TX_ASM
-	ld hl, Route3TrainerHeader7
+	ld hl, Route3TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -231,7 +230,7 @@ Route3AfterBattleText7:
 
 Route3Text9:
 	TX_ASM
-	ld hl, Route3TrainerHeader8
+	ld hl, Route3TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd