Clean up redundant labels

fix trainer header numbering

constants/event_constants.asm

@@ -427,12 +427,12 @@ const_value = 0
 	const EVENT_GOT_TM21                             ; 1A8, (D77C, bit 0)
 	const EVENT_BEAT_ERIKA                           ; 1A9, (D77C, bit 1)
 	const EVENT_BEAT_CELADON_GYM_TRAINER_0           ; 1AA, (D77C, bit 2)
-	const EVENT_BEAT_CELADON_GYM_TRAINER_2           ; 1AB, (D77C, bit 3)
+	const EVENT_BEAT_CELADON_GYM_TRAINER_1           ; 1AB, (D77C, bit 3)
-	const EVENT_BEAT_CELADON_GYM_TRAINER_3           ; 1AC, (D77C, bit 4)
+	const EVENT_BEAT_CELADON_GYM_TRAINER_2           ; 1AC, (D77C, bit 4)
-	const EVENT_BEAT_CELADON_GYM_TRAINER_4           ; 1AD, (D77C, bit 5)
+	const EVENT_BEAT_CELADON_GYM_TRAINER_3           ; 1AD, (D77C, bit 5)
-	const EVENT_BEAT_CELADON_GYM_TRAINER_5           ; 1AE, (D77C, bit 6)
+	const EVENT_BEAT_CELADON_GYM_TRAINER_4           ; 1AE, (D77C, bit 6)
-	const EVENT_BEAT_CELADON_GYM_TRAINER_6           ; 1AF, (D77C, bit 7)
+	const EVENT_BEAT_CELADON_GYM_TRAINER_5           ; 1AF, (D77C, bit 7)
-	const EVENT_BEAT_CELADON_GYM_TRAINER_7           ; 1B0, (D77D, bit 0)
+	const EVENT_BEAT_CELADON_GYM_TRAINER_6           ; 1B0, (D77D, bit 0)
 	const EVENT_1B1                                  ; 1B1, (D77D, bit 1)
 	const EVENT_1B2                                  ; 1B2, (D77D, bit 2)
 	const EVENT_1B3                                  ; 1B3, (D77D, bit 3)
@@ -603,11 +603,11 @@ const_value = 0
 	const EVENT_GOT_TM06                             ; 258, (D792, bit 0)
 	const EVENT_BEAT_KOGA                            ; 259, (D792, bit 1)
 	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_0           ; 25A, (D792, bit 2)
-	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2           ; 25B, (D792, bit 3)
+	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_1           ; 25B, (D792, bit 3)
-	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3           ; 25C, (D792, bit 4)
+	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2           ; 25C, (D792, bit 4)
-	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4           ; 25D, (D792, bit 5)
+	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3           ; 25D, (D792, bit 5)
-	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5           ; 25E, (D792, bit 6)
+	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4           ; 25E, (D792, bit 6)
-	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_6           ; 25F, (D792, bit 7)
+	const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5           ; 25F, (D792, bit 7)
 	const EVENT_260                                  ; 260, (D793, bit 0)
 	const EVENT_261                                  ; 261, (D793, bit 1)
 	const EVENT_262                                  ; 262, (D793, bit 2)
@@ -995,13 +995,13 @@ const_value = 0
 	const EVENT_3E0                                  ; 3E0, (D7C3, bit 0)
 	const EVENT_3E1                                  ; 3E1, (D7C3, bit 1)
 	const EVENT_BEAT_ROUTE_3_TRAINER_0               ; 3E2, (D7C3, bit 2)
-	const EVENT_BEAT_ROUTE_3_TRAINER_2               ; 3E3, (D7C3, bit 3)
+	const EVENT_BEAT_ROUTE_3_TRAINER_1               ; 3E3, (D7C3, bit 3)
-	const EVENT_BEAT_ROUTE_3_TRAINER_3               ; 3E4, (D7C3, bit 4)
+	const EVENT_BEAT_ROUTE_3_TRAINER_2               ; 3E4, (D7C3, bit 4)
-	const EVENT_BEAT_ROUTE_3_TRAINER_4               ; 3E5, (D7C3, bit 5)
+	const EVENT_BEAT_ROUTE_3_TRAINER_3               ; 3E5, (D7C3, bit 5)
-	const EVENT_BEAT_ROUTE_3_TRAINER_5               ; 3E6, (D7C3, bit 6)
+	const EVENT_BEAT_ROUTE_3_TRAINER_4               ; 3E6, (D7C3, bit 6)
-	const EVENT_BEAT_ROUTE_3_TRAINER_6               ; 3E7, (D7C3, bit 7)
+	const EVENT_BEAT_ROUTE_3_TRAINER_5               ; 3E7, (D7C3, bit 7)
-	const EVENT_BEAT_ROUTE_3_TRAINER_7               ; 3E8, (D7C4, bit 0)
+	const EVENT_BEAT_ROUTE_3_TRAINER_6               ; 3E8, (D7C4, bit 0)
-	const EVENT_BEAT_ROUTE_3_TRAINER_8               ; 3E9, (D7C4, bit 1)
+	const EVENT_BEAT_ROUTE_3_TRAINER_7               ; 3E9, (D7C4, bit 1)
 	const EVENT_3EA                                  ; 3EA, (D7C4, bit 2)
 	const EVENT_3EB                                  ; 3EB, (D7C4, bit 3)
 	const EVENT_3EC                                  ; 3EC, (D7C4, bit 4)
@@ -1090,14 +1090,14 @@ const_value = 0
 	const EVENT_43F                                  ; 43F, (D7CE, bit 7)
 	const EVENT_440                                  ; 440, (D7CF, bit 0)
 	const EVENT_BEAT_ROUTE_9_TRAINER_0               ; 441, (D7CF, bit 1)
-	const EVENT_BEAT_ROUTE_9_TRAINER_2               ; 442, (D7CF, bit 2)
+	const EVENT_BEAT_ROUTE_9_TRAINER_1               ; 442, (D7CF, bit 2)
-	const EVENT_BEAT_ROUTE_9_TRAINER_3               ; 443, (D7CF, bit 3)
+	const EVENT_BEAT_ROUTE_9_TRAINER_2               ; 443, (D7CF, bit 3)
-	const EVENT_BEAT_ROUTE_9_TRAINER_4               ; 444, (D7CF, bit 4)
+	const EVENT_BEAT_ROUTE_9_TRAINER_3               ; 444, (D7CF, bit 4)
-	const EVENT_BEAT_ROUTE_9_TRAINER_5               ; 445, (D7CF, bit 5)
+	const EVENT_BEAT_ROUTE_9_TRAINER_4               ; 445, (D7CF, bit 5)
-	const EVENT_BEAT_ROUTE_9_TRAINER_6               ; 446, (D7CF, bit 6)
+	const EVENT_BEAT_ROUTE_9_TRAINER_5               ; 446, (D7CF, bit 6)
-	const EVENT_BEAT_ROUTE_9_TRAINER_7               ; 447, (D7CF, bit 7)
+	const EVENT_BEAT_ROUTE_9_TRAINER_6               ; 447, (D7CF, bit 7)
-	const EVENT_BEAT_ROUTE_9_TRAINER_8               ; 448, (D7D0, bit 0)
+	const EVENT_BEAT_ROUTE_9_TRAINER_7               ; 448, (D7D0, bit 0)
-	const EVENT_BEAT_ROUTE_9_TRAINER_9               ; 449, (D7D0, bit 1)
+	const EVENT_BEAT_ROUTE_9_TRAINER_8               ; 449, (D7D0, bit 1)
 	const EVENT_44A                                  ; 44A, (D7D0, bit 2)
 	const EVENT_44B                                  ; 44B, (D7D0, bit 3)
 	const EVENT_44C                                  ; 44C, (D7D0, bit 4)
@@ -1113,13 +1113,13 @@ const_value = 0
 	const EVENT_BEAT_ROUTE_10_TRAINER_5              ; 456, (D7D1, bit 6)
 	const EVENT_457                                  ; 457, (D7D1, bit 7)
 	const EVENT_458                                  ; 458, (D7D2, bit 0)
-	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1         ; 459, (D7D2, bit 1)
+	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0         ; 459, (D7D2, bit 1)
-	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2         ; 45A, (D7D2, bit 2)
+	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1         ; 45A, (D7D2, bit 2)
-	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3         ; 45B, (D7D2, bit 3)
+	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2         ; 45B, (D7D2, bit 3)
-	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4         ; 45C, (D7D2, bit 4)
+	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3         ; 45C, (D7D2, bit 4)
-	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5         ; 45D, (D7D2, bit 5)
+	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4         ; 45D, (D7D2, bit 5)
-	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6         ; 45E, (D7D2, bit 6)
+	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5         ; 45E, (D7D2, bit 6)
-	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7         ; 45F, (D7D2, bit 7)
+	const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6         ; 45F, (D7D2, bit 7)
 	const EVENT_460                                  ; 460, (D7D3, bit 0)
 	const EVENT_BEAT_POWER_PLANT_VOLTORB_0           ; 461, (D7D3, bit 1)
 	const EVENT_BEAT_POWER_PLANT_VOLTORB_1           ; 462, (D7D3, bit 2)
@@ -1170,15 +1170,15 @@ const_value = 0
 	const EVENT_BEAT_ROUTE12_SNORLAX                 ; 48F, (D7D8, bit 7)
 	const EVENT_490                                  ; 490, (D7D9, bit 0)
 	const EVENT_BEAT_ROUTE_13_TRAINER_0              ; 491, (D7D9, bit 1)
-	const EVENT_BEAT_ROUTE_13_TRAINER_2              ; 492, (D7D9, bit 2)
+	const EVENT_BEAT_ROUTE_13_TRAINER_1              ; 492, (D7D9, bit 2)
-	const EVENT_BEAT_ROUTE_13_TRAINER_3              ; 493, (D7D9, bit 3)
+	const EVENT_BEAT_ROUTE_13_TRAINER_2              ; 493, (D7D9, bit 3)
-	const EVENT_BEAT_ROUTE_13_TRAINER_4              ; 494, (D7D9, bit 4)
+	const EVENT_BEAT_ROUTE_13_TRAINER_3              ; 494, (D7D9, bit 4)
-	const EVENT_BEAT_ROUTE_13_TRAINER_5              ; 495, (D7D9, bit 5)
+	const EVENT_BEAT_ROUTE_13_TRAINER_4              ; 495, (D7D9, bit 5)
-	const EVENT_BEAT_ROUTE_13_TRAINER_6              ; 496, (D7D9, bit 6)
+	const EVENT_BEAT_ROUTE_13_TRAINER_5              ; 496, (D7D9, bit 6)
-	const EVENT_BEAT_ROUTE_13_TRAINER_7              ; 497, (D7D9, bit 7)
+	const EVENT_BEAT_ROUTE_13_TRAINER_6              ; 497, (D7D9, bit 7)
-	const EVENT_BEAT_ROUTE_13_TRAINER_8              ; 498, (D7DA, bit 0)
+	const EVENT_BEAT_ROUTE_13_TRAINER_7              ; 498, (D7DA, bit 0)
-	const EVENT_BEAT_ROUTE_13_TRAINER_9              ; 499, (D7DA, bit 1)
+	const EVENT_BEAT_ROUTE_13_TRAINER_8              ; 499, (D7DA, bit 1)
-	const EVENT_BEAT_ROUTE_13_TRAINER_10             ; 49A, (D7DA, bit 2)
+	const EVENT_BEAT_ROUTE_13_TRAINER_9              ; 49A, (D7DA, bit 2)
 	const EVENT_49B                                  ; 49B, (D7DA, bit 3)
 	const EVENT_49C                                  ; 49C, (D7DA, bit 4)
 	const EVENT_49D                                  ; 49D, (D7DA, bit 5)
@@ -1282,15 +1282,15 @@ const_value = 0
 	const EVENT_4FF                                  ; 4FF, (D7E6, bit 7)
 	const EVENT_IN_SEAFOAM_ISLANDS                   ; 500, (D7E7, bit 0)
 	const EVENT_BEAT_ROUTE_20_TRAINER_0              ; 501, (D7E7, bit 1)
-	const EVENT_BEAT_ROUTE_20_TRAINER_2              ; 502, (D7E7, bit 2)
+	const EVENT_BEAT_ROUTE_20_TRAINER_1              ; 502, (D7E7, bit 2)
-	const EVENT_BEAT_ROUTE_20_TRAINER_3              ; 503, (D7E7, bit 3)
+	const EVENT_BEAT_ROUTE_20_TRAINER_2              ; 503, (D7E7, bit 3)
-	const EVENT_BEAT_ROUTE_20_TRAINER_4              ; 504, (D7E7, bit 4)
+	const EVENT_BEAT_ROUTE_20_TRAINER_3              ; 504, (D7E7, bit 4)
-	const EVENT_BEAT_ROUTE_20_TRAINER_5              ; 505, (D7E7, bit 5)
+	const EVENT_BEAT_ROUTE_20_TRAINER_4              ; 505, (D7E7, bit 5)
-	const EVENT_BEAT_ROUTE_20_TRAINER_6              ; 506, (D7E7, bit 6)
+	const EVENT_BEAT_ROUTE_20_TRAINER_5              ; 506, (D7E7, bit 6)
-	const EVENT_BEAT_ROUTE_20_TRAINER_7              ; 507, (D7E7, bit 7)
+	const EVENT_BEAT_ROUTE_20_TRAINER_6              ; 507, (D7E7, bit 7)
-	const EVENT_BEAT_ROUTE_20_TRAINER_8              ; 508, (D7E8, bit 0)
+	const EVENT_BEAT_ROUTE_20_TRAINER_7              ; 508, (D7E8, bit 0)
-	const EVENT_BEAT_ROUTE_20_TRAINER_9              ; 509, (D7E8, bit 1)
+	const EVENT_BEAT_ROUTE_20_TRAINER_8              ; 509, (D7E8, bit 1)
-	const EVENT_BEAT_ROUTE_20_TRAINER_10             ; 50A, (D7E8, bit 2)
+	const EVENT_BEAT_ROUTE_20_TRAINER_9              ; 50A, (D7E8, bit 2)
 	const EVENT_50B                                  ; 50B, (D7E8, bit 3)
 	const EVENT_50C                                  ; 50C, (D7E8, bit 4)
 	const EVENT_50D                                  ; 50D, (D7E8, bit 5)
@@ -1338,20 +1338,20 @@ const_value = 0
 	const EVENT_537                                  ; 537, (D7ED, bit 7)
 	const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1    ; 538, (D7EE, bit 0)
 	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0        ; 539, (D7EE, bit 1)
-	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2        ; 53A, (D7EE, bit 2)
+	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1        ; 53A, (D7EE, bit 2)
-	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3        ; 53B, (D7EE, bit 3)
+	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2        ; 53B, (D7EE, bit 3)
-	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4        ; 53C, (D7EE, bit 4)
+	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3        ; 53C, (D7EE, bit 4)
-	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5        ; 53D, (D7EE, bit 5)
+	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4        ; 53D, (D7EE, bit 5)
 	const EVENT_BEAT_MOLTRES                         ; 53E, (D7EE, bit 6)
 	const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2    ; 53F, (D7EE, bit 7)
 	const EVENT_GOT_NUGGET                           ; 540, (D7EF, bit 0)
 	const EVENT_BEAT_ROUTE24_ROCKET                  ; 541, (D7EF, bit 1)
 	const EVENT_BEAT_ROUTE_24_TRAINER_0              ; 542, (D7EF, bit 2)
-	const EVENT_BEAT_ROUTE_24_TRAINER_2              ; 543, (D7EF, bit 3)
+	const EVENT_BEAT_ROUTE_24_TRAINER_1              ; 543, (D7EF, bit 3)
-	const EVENT_BEAT_ROUTE_24_TRAINER_3              ; 544, (D7EF, bit 4)
+	const EVENT_BEAT_ROUTE_24_TRAINER_2              ; 544, (D7EF, bit 4)
-	const EVENT_BEAT_ROUTE_24_TRAINER_4              ; 545, (D7EF, bit 5)
+	const EVENT_BEAT_ROUTE_24_TRAINER_3              ; 545, (D7EF, bit 5)
-	const EVENT_BEAT_ROUTE_24_TRAINER_5              ; 546, (D7EF, bit 6)
+	const EVENT_BEAT_ROUTE_24_TRAINER_4              ; 546, (D7EF, bit 6)
-	const EVENT_BEAT_ROUTE_24_TRAINER_6              ; 547, (D7EF, bit 7)
+	const EVENT_BEAT_ROUTE_24_TRAINER_5              ; 547, (D7EF, bit 7)
 	const EVENT_548                                  ; 548, (D7F0, bit 0)
 	const EVENT_NUGGET_REWARD_AVAILABLE              ; 549, (D7F0, bit 1)
 	const EVENT_54A                                  ; 54A, (D7F0, bit 2)
@@ -1362,14 +1362,14 @@ const_value = 0
 	const EVENT_54F                                  ; 54F, (D7F0, bit 7)
 	const EVENT_MET_BILL                             ; 550, (D7F1, bit 0)
 	const EVENT_BEAT_ROUTE_25_TRAINER_0              ; 551, (D7F1, bit 1)
-	const EVENT_BEAT_ROUTE_25_TRAINER_2              ; 552, (D7F1, bit 2)
+	const EVENT_BEAT_ROUTE_25_TRAINER_1              ; 552, (D7F1, bit 2)
-	const EVENT_BEAT_ROUTE_25_TRAINER_3              ; 553, (D7F1, bit 3)
+	const EVENT_BEAT_ROUTE_25_TRAINER_2              ; 553, (D7F1, bit 3)
-	const EVENT_BEAT_ROUTE_25_TRAINER_4              ; 554, (D7F1, bit 4)
+	const EVENT_BEAT_ROUTE_25_TRAINER_3              ; 554, (D7F1, bit 4)
-	const EVENT_BEAT_ROUTE_25_TRAINER_5              ; 555, (D7F1, bit 5)
+	const EVENT_BEAT_ROUTE_25_TRAINER_4              ; 555, (D7F1, bit 5)
-	const EVENT_BEAT_ROUTE_25_TRAINER_6              ; 556, (D7F1, bit 6)
+	const EVENT_BEAT_ROUTE_25_TRAINER_5              ; 556, (D7F1, bit 6)
-	const EVENT_BEAT_ROUTE_25_TRAINER_7              ; 557, (D7F1, bit 7)
+	const EVENT_BEAT_ROUTE_25_TRAINER_6              ; 557, (D7F1, bit 7)
-	const EVENT_BEAT_ROUTE_25_TRAINER_8              ; 558, (D7F2, bit 0)
+	const EVENT_BEAT_ROUTE_25_TRAINER_7              ; 558, (D7F2, bit 0)
-	const EVENT_BEAT_ROUTE_25_TRAINER_9              ; 559, (D7F2, bit 1)
+	const EVENT_BEAT_ROUTE_25_TRAINER_8              ; 559, (D7F2, bit 1)
 	const EVENT_55A                                  ; 55A, (D7F2, bit 2)
 	const EVENT_USED_CELL_SEPARATOR_ON_BILL          ; 55B, (D7F2, bit 3)
 	const EVENT_GOT_SS_TICKET                        ; 55C, (D7F2, bit 4)
@@ -1394,18 +1394,18 @@ const_value = 0
 	const EVENT_56F                                  ; 56F, (D7F4, bit 7)
 	const EVENT_570                                  ; 570, (D7F5, bit 0)
 	const EVENT_BEAT_MT_MOON_1_TRAINER_0             ; 571, (D7F5, bit 1)
-	const EVENT_BEAT_MT_MOON_1_TRAINER_2             ; 572, (D7F5, bit 2)
+	const EVENT_BEAT_MT_MOON_1_TRAINER_1             ; 572, (D7F5, bit 2)
-	const EVENT_BEAT_MT_MOON_1_TRAINER_3             ; 573, (D7F5, bit 3)
+	const EVENT_BEAT_MT_MOON_1_TRAINER_2             ; 573, (D7F5, bit 3)
-	const EVENT_BEAT_MT_MOON_1_TRAINER_4             ; 574, (D7F5, bit 4)
+	const EVENT_BEAT_MT_MOON_1_TRAINER_3             ; 574, (D7F5, bit 4)
-	const EVENT_BEAT_MT_MOON_1_TRAINER_5             ; 575, (D7F5, bit 5)
+	const EVENT_BEAT_MT_MOON_1_TRAINER_4             ; 575, (D7F5, bit 5)
-	const EVENT_BEAT_MT_MOON_1_TRAINER_6             ; 576, (D7F5, bit 6)
+	const EVENT_BEAT_MT_MOON_1_TRAINER_5             ; 576, (D7F5, bit 6)
-	const EVENT_BEAT_MT_MOON_1_TRAINER_7             ; 577, (D7F5, bit 7)
+	const EVENT_BEAT_MT_MOON_1_TRAINER_6             ; 577, (D7F5, bit 7)
 	const EVENT_578                                  ; 578, (D7F6, bit 0)
 	const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD         ; 579, (D7F6, bit 1)
 	const EVENT_BEAT_MT_MOON_3_TRAINER_0             ; 57A, (D7F6, bit 2)
-	const EVENT_BEAT_MT_MOON_3_TRAINER_2             ; 57B, (D7F6, bit 3)
+	const EVENT_BEAT_MT_MOON_3_TRAINER_1             ; 57B, (D7F6, bit 3)
-	const EVENT_BEAT_MT_MOON_3_TRAINER_3             ; 57C, (D7F6, bit 4)
+	const EVENT_BEAT_MT_MOON_3_TRAINER_2             ; 57C, (D7F6, bit 4)
-	const EVENT_BEAT_MT_MOON_3_TRAINER_4             ; 57D, (D7F6, bit 5)
+	const EVENT_BEAT_MT_MOON_3_TRAINER_3             ; 57D, (D7F6, bit 5)
 	const EVENT_GOT_DOME_FOSSIL                      ; 57E, (D7F6, bit 6)
 	const EVENT_GOT_HELIX_FOSSIL                     ; 57F, (D7F6, bit 7)
 	const EVENT_580                                  ; 580, (D7F7, bit 0)
@@ -1634,9 +1634,9 @@ const_value = 0
 	const EVENT_65F                                  ; 65F, (D812, bit 7)
 	const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1    ; 660, (D813, bit 0)
 	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0        ; 661, (D813, bit 1)
-	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2        ; 662, (D813, bit 2)
+	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1        ; 662, (D813, bit 2)
-	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3        ; 663, (D813, bit 3)
+	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2        ; 663, (D813, bit 3)
-	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4        ; 664, (D813, bit 4)
+	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3        ; 664, (D813, bit 4)
 	const EVENT_665                                  ; 665, (D813, bit 5)
 	const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2    ; 666, (D813, bit 6)
 	const EVENT_667                                  ; 667, (D813, bit 7)
@@ -1650,10 +1650,10 @@ const_value = 0
 	const EVENT_66F                                  ; 66F, (D814, bit 7)
 	const EVENT_670                                  ; 670, (D815, bit 0)
 	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0      ; 671, (D815, bit 1)
-	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2      ; 672, (D815, bit 2)
+	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1      ; 672, (D815, bit 2)
-	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3      ; 673, (D815, bit 3)
+	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2      ; 673, (D815, bit 3)
-	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4      ; 674, (D815, bit 4)
+	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3      ; 674, (D815, bit 4)
-	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5      ; 675, (D815, bit 5)
+	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4      ; 675, (D815, bit 5)
 	const EVENT_676                                  ; 676, (D815, bit 6)
 	const EVENT_677                                  ; 677, (D815, bit 7)
 	const EVENT_678                                  ; 678, (D816, bit 0)
@@ -1682,7 +1682,7 @@ const_value = 0
 	const EVENT_68F                                  ; 68F, (D818, bit 7)
 	const EVENT_690                                  ; 690, (D819, bit 0)
 	const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0      ; 691, (D819, bit 1)
-	const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2      ; 692, (D819, bit 2)
+	const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1      ; 692, (D819, bit 2)
 	const EVENT_693                                  ; 693, (D819, bit 3)
 	const EVENT_694                                  ; 694, (D819, bit 4)
 	const EVENT_695                                  ; 695, (D819, bit 5)
@@ -1699,8 +1699,8 @@ const_value = 0
 	const EVENT_6A0                                  ; 6A0, (D81B, bit 0)
 	const EVENT_6A1                                  ; 6A1, (D81B, bit 1)
 	const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0      ; 6A2, (D81B, bit 2)
-	const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2      ; 6A3, (D81B, bit 3)
+	const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1      ; 6A3, (D81B, bit 3)
-	const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3      ; 6A4, (D81B, bit 4)
+	const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2      ; 6A4, (D81B, bit 4)
 	const EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED       ; 6A5, (D81B, bit 5)
 	const EVENT_ROCKET_DROPPED_LIFT_KEY              ; 6A6, (D81B, bit 6)
 	const EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI         ; 6A7, (D81B, bit 7)
@@ -1811,8 +1811,8 @@ const_value = 0
 	const EVENT_710                                  ; 710, (D829, bit 0)
 	const EVENT_711                                  ; 711, (D829, bit 1)
 	const EVENT_BEAT_SILPH_CO_4F_TRAINER_0           ; 712, (D829, bit 2)
-	const EVENT_BEAT_SILPH_CO_4F_TRAINER_2           ; 713, (D829, bit 3)
+	const EVENT_BEAT_SILPH_CO_4F_TRAINER_1           ; 713, (D829, bit 3)
-	const EVENT_BEAT_SILPH_CO_4F_TRAINER_3           ; 714, (D829, bit 4)
+	const EVENT_BEAT_SILPH_CO_4F_TRAINER_2           ; 714, (D829, bit 4)
 	const EVENT_715                                  ; 715, (D829, bit 5)
 	const EVENT_716                                  ; 716, (D829, bit 6)
 	const EVENT_717                                  ; 717, (D829, bit 7)
@@ -1827,9 +1827,9 @@ const_value = 0
 	const EVENT_720                                  ; 720, (D82B, bit 0)
 	const EVENT_721                                  ; 721, (D82B, bit 1)
 	const EVENT_BEAT_SILPH_CO_5F_TRAINER_0           ; 722, (D82B, bit 2)
-	const EVENT_BEAT_SILPH_CO_5F_TRAINER_2           ; 723, (D82B, bit 3)
+	const EVENT_BEAT_SILPH_CO_5F_TRAINER_1           ; 723, (D82B, bit 3)
-	const EVENT_BEAT_SILPH_CO_5F_TRAINER_3           ; 724, (D82B, bit 4)
+	const EVENT_BEAT_SILPH_CO_5F_TRAINER_2           ; 724, (D82B, bit 4)
-	const EVENT_BEAT_SILPH_CO_5F_TRAINER_4           ; 725, (D82B, bit 5)
+	const EVENT_BEAT_SILPH_CO_5F_TRAINER_3           ; 725, (D82B, bit 5)
 	const EVENT_726                                  ; 726, (D82B, bit 6)
 	const EVENT_727                                  ; 727, (D82B, bit 7)
 	const EVENT_SILPH_CO_5_UNLOCKED_DOOR1            ; 728, (D82C, bit 0)
@@ -1847,8 +1847,8 @@ const_value = 0
 	const EVENT_734                                  ; 734, (D82D, bit 4)
 	const EVENT_735                                  ; 735, (D82D, bit 5)
 	const EVENT_BEAT_SILPH_CO_6F_TRAINER_0           ; 736, (D82D, bit 6)
-	const EVENT_BEAT_SILPH_CO_6F_TRAINER_2           ; 737, (D82D, bit 7)
+	const EVENT_BEAT_SILPH_CO_6F_TRAINER_1           ; 737, (D82D, bit 7)
-	const EVENT_BEAT_SILPH_CO_6F_TRAINER_3           ; 738, (D82E, bit 0)
+	const EVENT_BEAT_SILPH_CO_6F_TRAINER_2           ; 738, (D82E, bit 0)
 	const EVENT_739                                  ; 739, (D82E, bit 1)
 	const EVENT_73A                                  ; 73A, (D82E, bit 2)
 	const EVENT_73B                                  ; 73B, (D82E, bit 3)
@@ -1862,9 +1862,9 @@ const_value = 0
 	const EVENT_743                                  ; 743, (D82F, bit 3)
 	const EVENT_744                                  ; 744, (D82F, bit 4)
 	const EVENT_BEAT_SILPH_CO_7F_TRAINER_0           ; 745, (D82F, bit 5)
-	const EVENT_BEAT_SILPH_CO_7F_TRAINER_2           ; 746, (D82F, bit 6)
+	const EVENT_BEAT_SILPH_CO_7F_TRAINER_1           ; 746, (D82F, bit 6)
-	const EVENT_BEAT_SILPH_CO_7F_TRAINER_3           ; 747, (D82F, bit 7)
+	const EVENT_BEAT_SILPH_CO_7F_TRAINER_2           ; 747, (D82F, bit 7)
-	const EVENT_BEAT_SILPH_CO_7F_TRAINER_4           ; 748, (D830, bit 0)
+	const EVENT_BEAT_SILPH_CO_7F_TRAINER_3           ; 748, (D830, bit 0)
 	const EVENT_749                                  ; 749, (D830, bit 1)
 	const EVENT_74A                                  ; 74A, (D830, bit 2)
 	const EVENT_74B                                  ; 74B, (D830, bit 3)
@@ -2066,7 +2066,7 @@ const_value = 0
 	const EVENT_80F                                  ; 80F, (D848, bit 7)
 	const EVENT_810                                  ; 810, (D849, bit 0)
 	const EVENT_BEAT_MANSION_3_TRAINER_0             ; 811, (D849, bit 1)
-	const EVENT_BEAT_MANSION_3_TRAINER_2             ; 812, (D849, bit 2)
+	const EVENT_BEAT_MANSION_3_TRAINER_1             ; 812, (D849, bit 2)
 	const EVENT_813                                  ; 813, (D849, bit 3)
 	const EVENT_814                                  ; 814, (D849, bit 4)
 	const EVENT_815                                  ; 815, (D849, bit 5)
@@ -2082,7 +2082,7 @@ const_value = 0
 	const EVENT_81F                                  ; 81F, (D84A, bit 7)
 	const EVENT_820                                  ; 820, (D84B, bit 0)
 	const EVENT_BEAT_MANSION_4_TRAINER_0             ; 821, (D84B, bit 1)
-	const EVENT_BEAT_MANSION_4_TRAINER_2             ; 822, (D84B, bit 2)
+	const EVENT_BEAT_MANSION_4_TRAINER_1             ; 822, (D84B, bit 2)
 	const EVENT_823                                  ; 823, (D84B, bit 3)
 	const EVENT_824                                  ; 824, (D84B, bit 4)
 	const EVENT_825                                  ; 825, (D84B, bit 5)
@@ -2482,13 +2482,13 @@ const_value = 0
 	const EVENT_9AF                                  ; 9AF, (D87C, bit 7)
 	const EVENT_9B0                                  ; 9B0, (D87D, bit 0)
 	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0         ; 9B1, (D87D, bit 1)
-	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2         ; 9B2, (D87D, bit 2)
+	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1         ; 9B2, (D87D, bit 2)
-	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3         ; 9B3, (D87D, bit 3)
+	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2         ; 9B3, (D87D, bit 3)
-	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4         ; 9B4, (D87D, bit 4)
+	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3         ; 9B4, (D87D, bit 4)
-	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5         ; 9B5, (D87D, bit 5)
+	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4         ; 9B5, (D87D, bit 5)
-	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6         ; 9B6, (D87D, bit 6)
+	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5         ; 9B6, (D87D, bit 6)
-	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7         ; 9B7, (D87D, bit 7)
+	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6         ; 9B7, (D87D, bit 7)
-	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8         ; 9B8, (D87E, bit 0)
+	const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7         ; 9B8, (D87E, bit 0)
 	const EVENT_9B9                                  ; 9B9, (D87E, bit 1)
 	const EVENT_9BA                                  ; 9BA, (D87E, bit 2)
 	const EVENT_9BB                                  ; 9BB, (D87E, bit 3)

home.asm

@@ -4408,7 +4408,6 @@ endm
 
 
 CallFunctionInTable::
-JumpTable::
 ; Call function a in jumptable hl.
 ; de is not preserved.
 	push hl

scripts/agatha.asm

@@ -1,7 +1,7 @@
 AgathaScript:
 	call AgathaShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, AgathaTrainerHeaders
+	ld hl, AgathaTrainerHeader0
 	ld de, AgathaScriptPointers
 	ld a, [wAgathaCurScript]
 	call ExecuteCurMapScriptInTable
@@ -120,7 +120,6 @@ AgathaTextPointers:
 	dw AgathaText1
 	dw AgathaDontRunAwayText
 
-AgathaTrainerHeaders:
 AgathaTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range

scripts/bruno.asm

@@ -1,7 +1,7 @@
 BrunoScript:
 	call BrunoShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, BrunoTrainerHeaders
+	ld hl, BrunoTrainerHeader0
 	ld de, BrunoScriptPointers
 	ld a, [wBrunoCurScript]
 	call ExecuteCurMapScriptInTable
@@ -117,7 +117,6 @@ BrunoTextPointers:
 	dw BrunoText1
 	dw BrunoDontRunAwayText
 
-BrunoTrainerHeaders:
 BrunoTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range

scripts/celadongym.asm

@@ -4,7 +4,7 @@ CeladonGymScript:
 	res 6, [hl]
 	call nz, CeladonGymScript_48927
 	call EnableAutoTextBoxDrawing
-	ld hl, CeladonGymTrainerHeaders
+	ld hl, CeladonGymTrainerHeader0
 	ld de, CeladonGymScriptPointers
 	ld a, [wCeladonGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -66,7 +66,7 @@ CeladonGymText_48963:
 	set 3, [hl]
 
 	; deactivate gym trainers
-	SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_7
+	SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6
 
 	jp CeladonGymText_48943
 
@@ -83,7 +83,6 @@ CeladonGymTextPointers:
 	dw TM21Text
 	dw TM21NoRoomText
 
-CeladonGymTrainerHeaders:
 CeladonGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -93,55 +92,55 @@ CeladonGymTrainerHeader0:
 	dw CeladonGymEndBattleText2 ; TextEndBattle
 	dw CeladonGymEndBattleText2 ; TextEndBattle
 
-CeladonGymTrainerHeader2:
+CeladonGymTrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_1
 	dw CeladonGymBattleText3 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText3 ; TextAfterBattle
 	dw CeladonGymEndBattleText3 ; TextEndBattle
 	dw CeladonGymEndBattleText3 ; TextEndBattle
 
-CeladonGymTrainerHeader3:
+CeladonGymTrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2
 	dw CeladonGymBattleText4 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText4 ; TextAfterBattle
 	dw CeladonGymEndBattleText4 ; TextEndBattle
 	dw CeladonGymEndBattleText4 ; TextEndBattle
 
-CeladonGymTrainerHeader4:
+CeladonGymTrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3
 	dw CeladonGymBattleText5 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText5 ; TextAfterBattle
 	dw CeladonGymEndBattleText5 ; TextEndBattle
 	dw CeladonGymEndBattleText5 ; TextEndBattle
 
-CeladonGymTrainerHeader5:
+CeladonGymTrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4
 	dw CeladonGymBattleText6 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText6 ; TextAfterBattle
 	dw CeladonGymEndBattleText6 ; TextEndBattle
 	dw CeladonGymEndBattleText6 ; TextEndBattle
 
-CeladonGymTrainerHeader6:
+CeladonGymTrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5
 	dw CeladonGymBattleText7 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText7 ; TextAfterBattle
 	dw CeladonGymEndBattleText7 ; TextEndBattle
 	dw CeladonGymEndBattleText7 ; TextEndBattle
 
-CeladonGymTrainerHeader7:
+CeladonGymTrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_7, 1
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_7, 1
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6, 1
 	dw CeladonGymBattleText8 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText8 ; TextAfterBattle
 	dw CeladonGymEndBattleText8 ; TextEndBattle
@@ -229,7 +228,7 @@ CeladonGymAfterBattleText2:
 
 CeladonGymText3:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader2
+	ld hl, CeladonGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -247,7 +246,7 @@ CeladonGymAfterBattleText3:
 
 CeladonGymText4:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader3
+	ld hl, CeladonGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -265,7 +264,7 @@ CeladonGymAfterBattleText4:
 
 CeladonGymText5:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader4
+	ld hl, CeladonGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -283,7 +282,7 @@ CeladonGymAfterBattleText5:
 
 CeladonGymText6:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader5
+	ld hl, CeladonGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -301,7 +300,7 @@ CeladonGymAfterBattleText6:
 
 CeladonGymText7:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader6
+	ld hl, CeladonGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -319,7 +318,7 @@ CeladonGymAfterBattleText7:
 
 CeladonGymText8:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader7
+	ld hl, CeladonGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/ceruleangym.asm

@@ -4,7 +4,7 @@ CeruleanGymScript:
 	res 6, [hl]
 	call nz, CeruleanGymScript_5c6d0
 	call EnableAutoTextBoxDrawing
-	ld hl, CeruleanGymTrainerHeaders
+	ld hl, CeruleanGymTrainerHeader0
 	ld de, CeruleanGymScriptPointers
 	ld a, [wCeruleanGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -79,7 +79,6 @@ CeruleanGymTextPointers:
 	dw CeruleanGymText6
 	dw CeruleanGymText7
 
-CeruleanGymTrainerHeaders:
 CeruleanGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -148,7 +147,6 @@ CeruleanGymText5:
 	db "@"
 
 CeruleanGymText6:
-ReceivedTM11Text:
 	TX_FAR _ReceivedTM11Text
 	TX_SFX_ITEM_1
 	db "@"

scripts/fightingdojo.asm

@@ -1,6 +1,6 @@
 FightingDojoScript:
 	call EnableAutoTextBoxDrawing
-	ld hl, FightingDojoTrainerHeaders
+	ld hl, FightingDojoTrainerHeader0
 	ld de, FightingDojoScriptPointers
 	ld a, [wFightingDojoCurScript]
 	call ExecuteCurMapScriptInTable
@@ -90,7 +90,6 @@ FightingDojoTextPointers:
 	dw FightingDojoText7
 	dw FightingDojoText8
 
-FightingDojoTrainerHeaders:
 FightingDojoTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/fuchsiagym.asm

@@ -1,7 +1,7 @@
 FuchsiaGymScript:
 	call FuchsiaGymScript_75453
 	call EnableAutoTextBoxDrawing
-	ld hl, FuchsiaGymTrainerHeaders
+	ld hl, FuchsiaGymTrainerHeader0
 	ld de, FuchsiaGymScriptPointers
 	ld a, [wFuchsiaGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -66,7 +66,7 @@ FuchsiaGymScript3_75497:
 	set 4, [hl]
 
 	; deactivate gym trainers
-	SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_6
+	SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
 
 	jp FuchsiaGymScript_75477
 
@@ -83,7 +83,6 @@ FuchsiaGymTextPointers:
 	dw FuchsiaGymText10
 	dw FuchsiaGymText11
 
-FuchsiaGymTrainerHeaders:
 FuchsiaGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -93,46 +92,46 @@ FuchsiaGymTrainerHeader0:
 	dw FuchsiaGymEndBattleText1 ; TextEndBattle
 	dw FuchsiaGymEndBattleText1 ; TextEndBattle
 
-FuchsiaGymTrainerHeader2:
+FuchsiaGymTrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_1
 	dw FuchsiaGymBattleText2 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText2 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText2 ; TextEndBattle
 	dw FuchsiaGymEndBattleText2 ; TextEndBattle
 
-FuchsiaGymTrainerHeader3:
+FuchsiaGymTrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
 	dw FuchsiaGymBattleText3 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText3 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText3 ; TextEndBattle
 	dw FuchsiaGymEndBattleText3 ; TextEndBattle
 
-FuchsiaGymTrainerHeader4:
+FuchsiaGymTrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
 	dw FuchsiaGymBattleText4 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText4 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText4 ; TextEndBattle
 	dw FuchsiaGymEndBattleText4 ; TextEndBattle
 
-FuchsiaGymTrainerHeader5:
+FuchsiaGymTrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
 	dw FuchsiaGymBattleText5 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText5 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText5 ; TextEndBattle
 	dw FuchsiaGymEndBattleText5 ; TextEndBattle
 
-FuchsiaGymTrainerHeader6:
+FuchsiaGymTrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
 	dw FuchsiaGymBattleText6 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText6 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText6 ; TextEndBattle
@@ -223,7 +222,7 @@ FuchsiaGymAfterBattleText1:
 
 FuchsiaGymText3:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader2
+	ld hl, FuchsiaGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -241,7 +240,7 @@ FuchsiaGymAfterBattleText2:
 
 FuchsiaGymText4:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader3
+	ld hl, FuchsiaGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -259,7 +258,7 @@ FuchsiaGymAfterBattleText3:
 
 FuchsiaGymText5:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader4
+	ld hl, FuchsiaGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -277,7 +276,7 @@ FuchsiaGymAfterBattleText4:
 
 FuchsiaGymText6:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader5
+	ld hl, FuchsiaGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -295,7 +294,7 @@ FuchsiaGymAfterBattleText5:
 
 FuchsiaGymText7:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader6
+	ld hl, FuchsiaGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/lance.asm

@@ -1,7 +1,7 @@
 LanceScript:
 	call LanceShowOrHideEntranceBlocks
 	call EnableAutoTextBoxDrawing
-	ld hl, LanceTrainerHeaders
+	ld hl, LanceTrainerHeader0
 	ld de, LanceScriptPointers
 	ld a, [wLanceCurScript]
 	call ExecuteCurMapScriptInTable
@@ -130,7 +130,6 @@ LanceScript3:
 LanceTextPointers:
 	dw LanceText1
 
-LanceTrainerHeaders:
 LanceTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range

scripts/lorelei.asm

@@ -1,7 +1,7 @@
 LoreleiScript:
 	call LoreleiShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, LoreleiTrainerHeaders
+	ld hl, LoreleiTrainerHeader0
 	ld de, LoreleiScriptPointers
 	ld a, [wLoreleiCurScript]
 	call ExecuteCurMapScriptInTable
@@ -119,7 +119,6 @@ LoreleiTextPointers:
 	dw LoreleiText1
 	dw LoreleiDontRunAwayText
 
-LoreleiTrainerHeaders:
 LoreleiTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range

scripts/mansion1.asm

@@ -1,7 +1,7 @@
 Mansion1Script:
 	call Mansion1Subscript1
 	call EnableAutoTextBoxDrawing
-	ld hl, Mansion1TrainerHeaders
+	ld hl, Mansion1TrainerHeader0
 	ld de, Mansion1ScriptPointers
 	ld a, [wMansion1CurScript]
 	call ExecuteCurMapScriptInTable
@@ -66,7 +66,6 @@ Mansion1TextPointers:
 	dw PickUpItemText
 	dw Mansion1Text4
 
-Mansion1TrainerHeaders:
 Mansion1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/mansion2.asm

@@ -1,7 +1,7 @@
 Mansion2Script:
 	call Mansion2Script_51fee
 	call EnableAutoTextBoxDrawing
-	ld hl, Mansion2TrainerHeaders
+	ld hl, Mansion2TrainerHeader0
 	ld de, Mansion2ScriptPointers
 	ld a, [wMansion2CurScript]
 	call ExecuteCurMapScriptInTable
@@ -63,7 +63,6 @@ Mansion2TextPointers:
 	dw Mansion2Text4
 	dw Mansion2Text5
 
-Mansion2TrainerHeaders:
 Mansion2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0
 	db ($0 << 4) ; trainer's view range

scripts/mansion3.asm

@@ -90,7 +90,6 @@ Mansion3TextPointers:
 	dw Mansion3Text5
 	dw Mansion3Text6
 
-Mansion3TrainerHeaders:
 Mansion3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0
 	db ($0 << 4) ; trainer's view range
@@ -100,10 +99,10 @@ Mansion3TrainerHeader0:
 	dw Mansion3EndBattleText1 ; TextEndBattle
 	dw Mansion3EndBattleText1 ; TextEndBattle
 
-Mansion3TrainerHeader2:
+Mansion3TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1
 	dw Mansion3BattleText2 ; TextBeforeBattle
 	dw Mansion3AfterBattleText2 ; TextAfterBattle
 	dw Mansion3EndBattleText2 ; TextEndBattle
@@ -119,7 +118,7 @@ Mansion3Text1:
 
 Mansion3Text2:
 	TX_ASM
-	ld hl, Mansion3TrainerHeader2
+	ld hl, Mansion3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/mansion4.asm

@@ -69,7 +69,6 @@ Mansion4TextPointers:
 	dw PickUpItemText
 	dw Mansion3Text6
 
-Mansion4TrainerHeaders:
 Mansion4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0
 	db ($0 << 4) ; trainer's view range
@@ -79,10 +78,10 @@ Mansion4TrainerHeader0:
 	dw Mansion4EndBattleText1 ; TextEndBattle
 	dw Mansion4EndBattleText1 ; TextEndBattle
 
-Mansion4TrainerHeader2:
+Mansion4TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1
 	dw Mansion4BattleText2 ; TextBeforeBattle
 	dw Mansion4AfterBattleText2 ; TextAfterBattle
 	dw Mansion4EndBattleText2 ; TextEndBattle
@@ -98,7 +97,7 @@ Mansion4Text1:
 
 Mansion4Text2:
 	TX_ASM
-	ld hl, Mansion4TrainerHeader2
+	ld hl, Mansion4TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/mtmoon1.asm

@@ -28,7 +28,6 @@ MtMoon1TextPointers:
 	dw PickUpItemText
 	dw MtMoon1Text14
 
-MtMoon1TrainerHeaders:
 MtMoon1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -38,55 +37,55 @@ MtMoon1TrainerHeader0:
 	dw MtMoon1EndBattleText2 ; TextEndBattle
 	dw MtMoon1EndBattleText2 ; TextEndBattle
 
-MtMoon1TrainerHeader2:
+MtMoon1TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_1
 	dw MtMoon1BattleText3 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText3 ; TextAfterBattle
 	dw MtMoon1EndBattleText3 ; TextEndBattle
 	dw MtMoon1EndBattleText3 ; TextEndBattle
 
-MtMoon1TrainerHeader3:
+MtMoon1TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2
 	dw MtMoon1BattleText4 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText4 ; TextAfterBattle
 	dw MtMoon1EndBattleText4 ; TextEndBattle
 	dw MtMoon1EndBattleText4 ; TextEndBattle
 
-MtMoon1TrainerHeader4:
+MtMoon1TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3
 	dw MtMoon1BattleText5 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText5 ; TextAfterBattle
 	dw MtMoon1EndBattleText5 ; TextEndBattle
 	dw MtMoon1EndBattleText5 ; TextEndBattle
 
-MtMoon1TrainerHeader5:
+MtMoon1TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4
 	dw MtMoon1BattleText6 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText6 ; TextAfterBattle
 	dw MtMoon1EndBattleText6 ; TextEndBattle
 	dw MtMoon1EndBattleText6 ; TextEndBattle
 
-MtMoon1TrainerHeader6:
+MtMoon1TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5
 	dw MtMoon1BattleText7 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText7 ; TextAfterBattle
 	dw MtMoon1EndBattleText7 ; TextEndBattle
 	dw MtMoon1EndBattleText7 ; TextEndBattle
 
-MtMoon1TrainerHeader7:
+MtMoon1TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_7
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6
 	dw MtMoon1BattleText8 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText8 ; TextAfterBattle
 	dw MtMoon1EndBattleText8 ; TextEndBattle
@@ -102,37 +101,37 @@ MtMoon1Text1:
 
 MtMoon1Text2:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader2
+	ld hl, MtMoon1TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MtMoon1Text3:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader3
+	ld hl, MtMoon1TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MtMoon1Text4:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader4
+	ld hl, MtMoon1TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MtMoon1Text5:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader5
+	ld hl, MtMoon1TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MtMoon1Text6:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader6
+	ld hl, MtMoon1TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MtMoon1Text7:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader7
+	ld hl, MtMoon1TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/mtmoon3.asm

@@ -166,7 +166,6 @@ MtMoon3TextPointers:
 	dw PickUpItemText
 	dw MtMoon3Text_49f99
 
-MtMoon3TrainerHeaders:
 MtMoon3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -176,28 +175,28 @@ MtMoon3TrainerHeader0:
 	dw MtMoon3EndBattleText2 ; TextEndBattle
 	dw MtMoon3EndBattleText2 ; TextEndBattle
 
-MtMoon3TrainerHeader2:
+MtMoon3TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1
 	dw MtMoon3BattleText3 ; TextBeforeBattle
 	dw MtMoon3AfterBattleText3 ; TextAfterBattle
 	dw MtMoon3EndBattleText3 ; TextEndBattle
 	dw MtMoon3EndBattleText3 ; TextEndBattle
 
-MtMoon3TrainerHeader3:
+MtMoon3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2
 	dw MtMoon3BattleText4 ; TextBeforeBattle
 	dw MtMoon3AfterBattleText4 ; TextAfterBattle
 	dw MtMoon3EndBattleText4 ; TextEndBattle
 	dw MtMoon3EndBattleText4 ; TextEndBattle
 
-MtMoon3TrainerHeader4:
+MtMoon3TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3
 	dw MtMoon3BattleText5 ; TextBeforeBattle
 	dw MtMoon3AfterBattleText5 ; TextAfterBattle
 	dw MtMoon3EndBattleText5 ; TextEndBattle
@@ -245,19 +244,19 @@ MtMoon3Text2:
 
 MtMoon3Text3:
 	TX_ASM
-	ld hl, MtMoon3TrainerHeader2
+	ld hl, MtMoon3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MtMoon3Text4:
 	TX_ASM
-	ld hl, MtMoon3TrainerHeader3
+	ld hl, MtMoon3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 MtMoon3Text5:
 	TX_ASM
-	ld hl, MtMoon3TrainerHeader4
+	ld hl, MtMoon3TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/pewtercity.asm

@@ -298,9 +298,7 @@ PewterCityText_1945d:
 	db "@"
 
 PewterCityText14:
-
+	TX_FAR _PewterCityText14
-PewterCityText_19462:
-	TX_FAR _PewterCityText_19462
 	db "@"
 
 PewterCityText6:

scripts/pewtergym.asm

@@ -4,7 +4,7 @@ PewterGymScript:
 	res 6, [hl]
 	call nz, PewterGymScript_5c3a4
 	call EnableAutoTextBoxDrawing
-	ld hl, PewterGymTrainerHeaders
+	ld hl, PewterGymTrainerHeader0
 	ld de, PewterGymScriptPointers
 	ld a, [wPewterGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -87,7 +87,6 @@ PewterGymTextPointers:
 	dw PewterGymText5
 	dw PewterGymText6
 
-PewterGymTrainerHeaders:
 PewterGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0
 	db ($5 << 4) ; trainer's view range

scripts/pokemontower3.asm

@@ -1,6 +1,6 @@
 PokemonTower3Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower3TrainerHeaders
+	ld hl, PokemonTower3TrainerHeader0
 	ld de, PokemonTower3ScriptPointers
 	ld a, [wPokemonTower3CurScript]
 	call ExecuteCurMapScriptInTable
@@ -18,7 +18,6 @@ PokemonTower3TextPointers:
 	dw PokemonTower3Text3
 	dw PickUpItemText
 
-PokemonTower3TrainerHeaders:
 PokemonTower3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/pokemontower4.asm

@@ -1,6 +1,6 @@
 PokemonTower4Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower4TrainerHeaders
+	ld hl, PokemonTower4TrainerHeader0
 	ld de, PokemonTower4ScriptPointers
 	ld a, [wPokemonTower4CurScript]
 	call ExecuteCurMapScriptInTable
@@ -20,7 +20,6 @@ PokemonTower4TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-PokemonTower4TrainerHeaders:
 PokemonTower4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/pokemontower5.asm

@@ -1,6 +1,6 @@
 PokemonTower5Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower5TrainerHeaders
+	ld hl, PokemonTower5TrainerHeader0
 	ld de, PokemonTower5ScriptPointers
 	ld a, [wPokemonTower5CurScript]
 	call ExecuteCurMapScriptInTable
@@ -57,7 +57,6 @@ PokemonTower5TextPointers:
 	dw PickUpItemText
 	dw PokemonTower5Text7
 
-PokemonTower5TrainerHeaders:
 PokemonTower5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/pokemontower6.asm

@@ -1,6 +1,6 @@
 PokemonTower6Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower6TrainerHeaders
+	ld hl, PokemonTower6TrainerHeader0
 	ld de, PokemonTower6ScriptPointers
 	ld a, [wPokemonTower6CurScript]
 	call ExecuteCurMapScriptInTable
@@ -103,7 +103,6 @@ PokemonTower6TextPointers:
 	dw PokemonTower6Text6
 	dw PokemonTower6Text7
 
-PokemonTower6TrainerHeaders:
 PokemonTower6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/pokemontower7.asm

@@ -1,6 +1,6 @@
 PokemonTower7Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower7TrainerHeaders
+	ld hl, PokemonTower7TrainerHeader0
 	ld de, PokemonTower7ScriptPointers
 	ld a, [wPokemonTower7CurScript]
 	call ExecuteCurMapScriptInTable
@@ -204,7 +204,6 @@ PokemonTower7TextPointers:
 	dw PokemonTower7Text3
 	dw PokemonTower7FujiText
 
-PokemonTower7TrainerHeaders:
 PokemonTower7TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/powerplant.asm

@@ -1,6 +1,6 @@
 PowerPlantScript:
 	call EnableAutoTextBoxDrawing
-	ld hl, PowerPlantTrainerHeaders
+	ld hl, Voltorb0TrainerHeader
 	ld de, .ScriptPointers
 	ld a, [wPowerPlantCurScript]
 	call ExecuteCurMapScriptInTable
@@ -28,7 +28,6 @@ PowerPlantTextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-PowerPlantTrainerHeaders:
 Voltorb0TrainerHeader:
 	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0
 	db 0 ; view range

scripts/rockethideout1.asm

@@ -1,7 +1,7 @@
 RocketHideout1Script:
 	call RocketHideout1Script_44be0
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout1TrainerHeaders
+	ld hl, RocketHideout1TrainerHeader0
 	ld de, RocketHideout1ScriptPointers
 	ld a, [wRocketHideout1CurScript]
 	call ExecuteCurMapScriptInTable
@@ -15,7 +15,7 @@ RocketHideout1Script_44be0:
 	ret z
 	CheckEvent EVENT_677
 	jr nz, .asm_44c01
-	CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
+	CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	jr nz, .asm_44bf7
 	ld a, $54
 	jr .asm_44c03
@@ -44,7 +44,6 @@ RocketHideout1TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout1TrainerHeaders:
 RocketHideout1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -54,37 +53,37 @@ RocketHideout1TrainerHeader0:
 	dw RocketHideout1EndBattleText2 ; TextEndBattle
 	dw RocketHideout1EndBattleText2 ; TextEndBattle
 
-RocketHideout1TrainerHeader2:
+RocketHideout1TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1
 	dw RocketHideout1BattleText3 ; TextBeforeBattle
 	dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle
 	dw RocketHideout1EndBattleText3 ; TextEndBattle
 	dw RocketHideout1EndBattleText3 ; TextEndBattle
 
-RocketHideout1TrainerHeader3:
+RocketHideout1TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
 	dw RocketHideout1BattleText4 ; TextBeforeBattle
 	dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle
 	dw RocketHideout1EndBattleText4 ; TextEndBattle
 	dw RocketHideout1EndBattleText4 ; TextEndBattle
 
-RocketHideout1TrainerHeader4:
+RocketHideout1TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
 	dw RocketHideout1BattleText5 ; TextBeforeBattle
 	dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle
 	dw RocketHideout1EndBattleText5 ; TextEndBattle
 	dw RocketHideout1EndBattleText5 ; TextEndBattle
 
-RocketHideout1TrainerHeader5:
+RocketHideout1TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	dw RocketHideout1BattleText6 ; TextBeforeBattle
 	dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle
 	dw RocketHideout1EndBattleText6 ; TextEndBattle
@@ -100,32 +99,32 @@ RocketHideout1Text1:
 
 RocketHideout1Text2:
 	TX_ASM
-	ld hl, RocketHideout1TrainerHeader2
+	ld hl, RocketHideout1TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RocketHideout1Text3:
 	TX_ASM
-	ld hl, RocketHideout1TrainerHeader3
+	ld hl, RocketHideout1TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RocketHideout1Text4:
 	TX_ASM
-	ld hl, RocketHideout1TrainerHeader4
+	ld hl, RocketHideout1TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RocketHideout1Text5:
 	TX_ASM
-	ld hl, RocketHideout1TrainerHeader5
+	ld hl, RocketHideout1TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RocketHideout1EndBattleText6:
 	TX_FAR _RocketHideout1EndBattleText6
 	TX_ASM
-	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
+	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	ld hl, RocketHideout1Text_44c9f
 	ret
 

scripts/rockethideout2.asm

@@ -1,6 +1,6 @@
 RocketHideout2Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout2TrainerHeaders
+	ld hl, RocketHideout2TrainerHeader0
 	ld de, RocketHideout2ScriptPointers
 	ld a, [wRocketHideout2CurScript]
 	call ExecuteCurMapScriptInTable
@@ -420,7 +420,6 @@ RocketHideout2TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout2TrainerHeaders:
 RocketHideout2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/rockethideout3.asm

@@ -1,6 +1,6 @@
 RocketHideout3Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout3TrainerHeaders
+	ld hl, RocketHideout3TrainerHeader0
 	ld de, RocketHideout3ScriptPointers
 	ld a, [wRocketHideout3CurScript]
 	call ExecuteCurMapScriptInTable
@@ -149,7 +149,6 @@ RocketHideout3TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout3TrainerHeaders:
 RocketHideout3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -159,10 +158,10 @@ RocketHideout3TrainerHeader0:
 	dw RocketHideout3EndBattleText2 ; TextEndBattle
 	dw RocketHideout3EndBattleText2 ; TextEndBattle
 
-RocketHideout3TrainerHeader2:
+RocketHideout3TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1
 	dw RocketHideout3BattleTxt ; TextBeforeBattle
 	dw RocketHideout3AfterBattleText3 ; TextAfterBattle
 	dw RocketHideout3EndBattleText3 ; TextEndBattle
@@ -190,7 +189,7 @@ RocketHideout3AfterBattleTxt2:
 
 RocketHideout3Text2:
 	TX_ASM
-	ld hl, RocketHideout3TrainerHeader2
+	ld hl, RocketHideout3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/rockethideout4.asm

@@ -15,7 +15,7 @@ RocketHideout4Script_45473:
 	ret z
 	CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
 	jr nz, .asm_45496
-	CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1
+	CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1
 	jr z, .asm_4548c
 	ld a, $2d
 	jr .asm_45498
@@ -84,7 +84,6 @@ RocketHideout4TextPointers:
 	dw PickUpItemText
 	dw RocketHideout4Text10
 
-RocketHideout4TrainerHeaders:
 RocketHideout4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
 	db ($0 << 4) ; trainer's view range
@@ -94,19 +93,19 @@ RocketHideout4TrainerHeader0:
 	dw RocketHideout4EndBattleText2 ; TextEndBattle
 	dw RocketHideout4EndBattleText2 ; TextEndBattle
 
-RocketHideout4TrainerHeader2:
+RocketHideout4TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	db ($0 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	dw RocketHideout4BattleText3 ; TextBeforeBattle
 	dw RocketHideout4AfterBattleText3 ; TextAfterBattle
 	dw RocketHideout4EndBattleText3 ; TextEndBattle
 	dw RocketHideout4EndBattleText3 ; TextEndBattle
 
-RocketHideout4TrainerHeader3:
+RocketHideout4TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	dw RocketHideout4BattleText4 ; TextBeforeBattle
 	dw RocketHideout4AfterBattleText4 ; TextAfterBattle
 	dw RocketHideout4EndBattleText4 ; TextEndBattle
@@ -174,7 +173,7 @@ RocketHideout4AfterBattleText2:
 
 RocketHideout4Text3:
 	TX_ASM
-	ld hl, RocketHideout4TrainerHeader2
+	ld hl, RocketHideout4TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -192,7 +191,7 @@ RocketHideout4AfterBattleText3:
 
 RocketHideout4Text4:
 	TX_ASM
-	ld hl, RocketHideout4TrainerHeader3
+	ld hl, RocketHideout4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/rocktunnel1.asm

@@ -1,6 +1,6 @@
 RockTunnel1Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RockTunnel1TrainerHeaders
+	ld hl, RockTunnel1TrainerHeader0
 	ld de, RockTunnel1ScriptPointers
 	ld a, [wRockTunnel1CurScript]
 	call ExecuteCurMapScriptInTable
@@ -22,65 +22,64 @@ RockTunnel1TextPointers:
 	dw RockTunnel1Text7
 	dw RockTunnel1Text8
 
-RockTunnel1TrainerHeaders:
+RockTunnel1TrainerHeader0:
-RockTunnel1TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0
 	dw RockTunnel1BattleText1 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText1 ; TextAfterBattle
 	dw RockTunnel1EndBattleText1 ; TextEndBattle
 	dw RockTunnel1EndBattleText1 ; TextEndBattle
 
-RockTunnel1TrainerHeader2:
+RockTunnel1TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
 	dw RockTunnel1BattleText2 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText2 ; TextAfterBattle
 	dw RockTunnel1EndBattleText2 ; TextEndBattle
 	dw RockTunnel1EndBattleText2 ; TextEndBattle
 
-RockTunnel1TrainerHeader3:
+RockTunnel1TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
 	dw RockTunnel1BattleText3 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText3 ; TextAfterBattle
 	dw RockTunnel1EndBattleText3 ; TextEndBattle
 	dw RockTunnel1EndBattleText3 ; TextEndBattle
 
-RockTunnel1TrainerHeader4:
+RockTunnel1TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
 	dw RockTunnel1BattleText4 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText4 ; TextAfterBattle
 	dw RockTunnel1EndBattleText4 ; TextEndBattle
 	dw RockTunnel1EndBattleText4 ; TextEndBattle
 
-RockTunnel1TrainerHeader5:
+RockTunnel1TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
 	dw RockTunnel1BattleText5 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText5 ; TextAfterBattle
 	dw RockTunnel1EndBattleText5 ; TextEndBattle
 	dw RockTunnel1EndBattleText5 ; TextEndBattle
 
-RockTunnel1TrainerHeader6:
+RockTunnel1TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
 	dw RockTunnel1BattleText6 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText6 ; TextAfterBattle
 	dw RockTunnel1EndBattleText6 ; TextEndBattle
 	dw RockTunnel1EndBattleText6 ; TextEndBattle
 
-RockTunnel1TrainerHeader7:
+RockTunnel1TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
 	dw RockTunnel1BattleText7 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText7 ; TextAfterBattle
 	dw RockTunnel1EndBattleText7 ; TextEndBattle
@@ -90,37 +89,37 @@ RockTunnel1TrainerHeader7:
 
 RockTunnel1Text1:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader1
+	ld hl, RockTunnel1TrainerHeader0
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text2:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader2
+	ld hl, RockTunnel1TrainerHeader1
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text3:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader3
+	ld hl, RockTunnel1TrainerHeader2
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text4:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader4
+	ld hl, RockTunnel1TrainerHeader3
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text5:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader5
+	ld hl, RockTunnel1TrainerHeader4
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text6:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader6
+	ld hl, RockTunnel1TrainerHeader5
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text7:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader7
+	ld hl, RockTunnel1TrainerHeader6
 RockTunnel1TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd

scripts/rocktunnel2.asm

@@ -1,6 +1,6 @@
 RockTunnel2Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RockTunnel2TrainerHeaders
+	ld hl, RockTunnel2TrainerHeader0
 	ld de, RockTunnel2ScriptPointers
 	ld a, [wRockTunnel2CurScript]
 	call ExecuteCurMapScriptInTable
@@ -22,7 +22,6 @@ RockTunnel2TextPointers:
 	dw RockTunnel2Text7
 	dw RockTunnel2Text8
 
-RockTunnel2TrainerHeaders:
 RockTunnel2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -32,64 +31,64 @@ RockTunnel2TrainerHeader0:
 	dw RockTunnel2EndBattleText2 ; TextEndBattle
 	dw RockTunnel2EndBattleText2 ; TextEndBattle
 
-RockTunnel2TrainerHeader2:
+RockTunnel2TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1
 	dw RockTunnel2BattleText3 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText3 ; TextAfterBattle
 	dw RockTunnel2EndBattleText3 ; TextEndBattle
 	dw RockTunnel2EndBattleText3 ; TextEndBattle
 
-RockTunnel2TrainerHeader3:
+RockTunnel2TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
 	dw RockTunnel2BattleText4 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText4 ; TextAfterBattle
 	dw RockTunnel2EndBattleText4 ; TextEndBattle
 	dw RockTunnel2EndBattleText4 ; TextEndBattle
 
-RockTunnel2TrainerHeader4:
+RockTunnel2TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
 	dw RockTunnel2BattleText5 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText5 ; TextAfterBattle
 	dw RockTunnel2EndBattleText5 ; TextEndBattle
 	dw RockTunnel2EndBattleText5 ; TextEndBattle
 
-RockTunnel2TrainerHeader5:
+RockTunnel2TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
 	dw RockTunnel2BattleText6 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText6 ; TextAfterBattle
 	dw RockTunnel2EndBattleText6 ; TextEndBattle
 	dw RockTunnel2EndBattleText6 ; TextEndBattle
 
-RockTunnel2TrainerHeader6:
+RockTunnel2TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
 	dw RockTunnel2BattleText7 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText7 ; TextAfterBattle
 	dw RockTunnel2EndBattleText7 ; TextEndBattle
 	dw RockTunnel2EndBattleText7 ; TextEndBattle
 
-RockTunnel2TrainerHeader7:
+RockTunnel2TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
 	dw RockTunnel2BattleText8 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText8 ; TextAfterBattle
 	dw RockTunnel2EndBattleText8 ; TextEndBattle
 	dw RockTunnel2EndBattleText8 ; TextEndBattle
 
-RockTunnel2TrainerHeader8:
+RockTunnel2TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1
 	dw RockTunnel2BattleText9 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText9 ; TextAfterBattle
 	dw RockTunnel2EndBattleText9 ; TextEndBattle
@@ -105,43 +104,43 @@ RockTunnel2Text1:
 
 RockTunnel2Text2:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader2
+	ld hl, RockTunnel2TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text3:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader3
+	ld hl, RockTunnel2TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text4:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader4
+	ld hl, RockTunnel2TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text5:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader5
+	ld hl, RockTunnel2TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text6:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader6
+	ld hl, RockTunnel2TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text7:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader7
+	ld hl, RockTunnel2TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text8:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader8
+	ld hl, RockTunnel2TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/route10.asm

@@ -1,6 +1,6 @@
 Route10Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route10TrainerHeaders
+	ld hl, Route10TrainerHeader0
 	ld de, Route10ScriptPointers
 	ld a, [wRoute10CurScript]
 	call ExecuteCurMapScriptInTable
@@ -24,7 +24,6 @@ Route10TextPointers:
 	dw Route10Text9
 	dw Route10Text10
 
-Route10TrainerHeaders:
 Route10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/route11.asm

@@ -1,6 +1,6 @@
 Route11Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route11TrainerHeaders
+	ld hl, Route11TrainerHeader0
 	ld de, Route11ScriptPointers
 	ld a, [wRoute11CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,7 +25,6 @@ Route11TextPointers:
 	dw Route11Text10
 	dw Route11Text11
 
-Route11TrainerHeaders:
 Route11TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/route12.asm

@@ -1,6 +1,6 @@
 Route12Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route12TrainerHeaders
+	ld hl, Route12TrainerHeader0
 	ld de, Route12ScriptPointers
 	ld a, [wRoute12CurScript]
 	call ExecuteCurMapScriptInTable
@@ -76,7 +76,6 @@ Route12TextPointers:
 	dw Route12Text13
 	dw Route12Text14
 
-Route12TrainerHeaders:
 Route12TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/route13.asm

@@ -1,6 +1,6 @@
 Route13Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route13TrainerHeaders
+	ld hl, Route13TrainerHeader0
 	ld de, Route13ScriptPointers
 	ld a, [wRoute13CurScript]
 	call ExecuteCurMapScriptInTable
@@ -27,7 +27,6 @@ Route13TextPointers:
 	dw Route13Text12
 	dw Route13Text13
 
-Route13TrainerHeaders:
 Route13TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -37,82 +36,82 @@ Route13TrainerHeader0:
 	dw Route13EndBattleText2 ; TextEndBattle
 	dw Route13EndBattleText2 ; TextEndBattle
 
-Route13TrainerHeader2:
+Route13TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_1
 	dw Route13BattleText3 ; TextBeforeBattle
 	dw Route13AfterBattleText3 ; TextAfterBattle
 	dw Route13EndBattleText3 ; TextEndBattle
 	dw Route13EndBattleText3 ; TextEndBattle
 
-Route13TrainerHeader3:
+Route13TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2
 	dw Route13BattleText4 ; TextBeforeBattle
 	dw Route13AfterBattleText4 ; TextAfterBattle
 	dw Route13EndBattleText4 ; TextEndBattle
 	dw Route13EndBattleText4 ; TextEndBattle
 
-Route13TrainerHeader4:
+Route13TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3
 	dw Route13BattleText5 ; TextBeforeBattle
 	dw Route13AfterBattleText5 ; TextAfterBattle
 	dw Route13EndBattleText5 ; TextEndBattle
 	dw Route13EndBattleText5 ; TextEndBattle
 
-Route13TrainerHeader5:
+Route13TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4
 	dw Route13BattleText6 ; TextBeforeBattle
 	dw Route13AfterBattleText6 ; TextAfterBattle
 	dw Route13EndBattleText6 ; TextEndBattle
 	dw Route13EndBattleText6 ; TextEndBattle
 
-Route13TrainerHeader6:
+Route13TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5
 	dw Route13BattleText7 ; TextBeforeBattle
 	dw Route13AfterBattleText7 ; TextAfterBattle
 	dw Route13EndBattleText7 ; TextEndBattle
 	dw Route13EndBattleText7 ; TextEndBattle
 
-Route13TrainerHeader7:
+Route13TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6
 	dw Route13BattleText8 ; TextBeforeBattle
 	dw Route13AfterBattleText8 ; TextAfterBattle
 	dw Route13EndBattleText8 ; TextEndBattle
 	dw Route13EndBattleText8 ; TextEndBattle
 
-Route13TrainerHeader8:
+Route13TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7, 1
 	dw Route13BattleText9 ; TextBeforeBattle
 	dw Route13AfterBattleText9 ; TextAfterBattle
 	dw Route13EndBattleText9 ; TextEndBattle
 	dw Route13EndBattleText9 ; TextEndBattle
 
-Route13TrainerHeader9:
+Route13TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1
 	dw Route13BattleText10 ; TextBeforeBattle
 	dw Route13AfterBattleText10 ; TextAfterBattle
 	dw Route13EndBattleText10 ; TextEndBattle
 	dw Route13EndBattleText10 ; TextEndBattle
 
-Route13TrainerHeader10:
+Route13TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_10, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_10, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1
 	dw Route13BattleText11 ; TextBeforeBattle
 	dw Route13AfterBattleText11 ; TextAfterBattle
 	dw Route13EndBattleText11 ; TextEndBattle
@@ -140,7 +139,7 @@ Route13AfterBattleText2:
 
 Route13Text2:
 	TX_ASM
-	ld hl, Route13TrainerHeader2
+	ld hl, Route13TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -158,7 +157,7 @@ Route13AfterBattleText3:
 
 Route13Text3:
 	TX_ASM
-	ld hl, Route13TrainerHeader3
+	ld hl, Route13TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -176,7 +175,7 @@ Route13AfterBattleText4:
 
 Route13Text4:
 	TX_ASM
-	ld hl, Route13TrainerHeader4
+	ld hl, Route13TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -194,7 +193,7 @@ Route13AfterBattleText5:
 
 Route13Text5:
 	TX_ASM
-	ld hl, Route13TrainerHeader5
+	ld hl, Route13TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -212,7 +211,7 @@ Route13AfterBattleText6:
 
 Route13Text6:
 	TX_ASM
-	ld hl, Route13TrainerHeader6
+	ld hl, Route13TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -230,7 +229,7 @@ Route13AfterBattleText7:
 
 Route13Text7:
 	TX_ASM
-	ld hl, Route13TrainerHeader7
+	ld hl, Route13TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -248,7 +247,7 @@ Route13AfterBattleText8:
 
 Route13Text8:
 	TX_ASM
-	ld hl, Route13TrainerHeader8
+	ld hl, Route13TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -266,7 +265,7 @@ Route13AfterBattleText9:
 
 Route13Text9:
 	TX_ASM
-	ld hl, Route13TrainerHeader9
+	ld hl, Route13TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -284,7 +283,7 @@ Route13AfterBattleText10:
 
 Route13Text10:
 	TX_ASM
-	ld hl, Route13TrainerHeader10
+	ld hl, Route13TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/route14.asm

@@ -1,6 +1,6 @@
 Route14Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route14TrainerHeaders
+	ld hl, Route14TrainerHeader0
 	ld de, Route14ScriptPointers
 	ld a, [wRoute14CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,7 +25,6 @@ Route14TextPointers:
 	dw Route14Text10
 	dw Route14Text11
 
-Route14TrainerHeaders:
 Route14TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/route15.asm

@@ -1,6 +1,6 @@
 Route15Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route15TrainerHeaders
+	ld hl, Route15TrainerHeader0
 	ld de, Route15ScriptPointers
 	ld a, [wRoute15CurScript]
 	call ExecuteCurMapScriptInTable
@@ -26,7 +26,6 @@ Route15TextPointers:
 	dw PickUpItemText
 	dw Route15Text12
 
-Route15TrainerHeaders:
 Route15TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/route16.asm

@@ -1,6 +1,6 @@
 Route16Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route16TrainerHeaders
+	ld hl, Route16TrainerHeader0
 	ld de, Route16ScriptPointers
 	ld a, [wRoute16CurScript]
 	call ExecuteCurMapScriptInTable
@@ -74,7 +74,6 @@ Route16TextPointers:
 	dw Route16Text10
 	dw Route16Text11
 
-Route16TrainerHeaders:
 Route16TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/route17.asm

@@ -1,6 +1,6 @@
 Route17Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route17TrainerHeaders
+	ld hl, Route17TrainerHeader0
 	ld de, Route17ScriptPointers
 	ld a, [wRoute17CurScript]
 	call ExecuteCurMapScriptInTable
@@ -30,7 +30,6 @@ Route17TextPointers:
 	dw Route17Text15
 	dw Route17Text16
 
-Route17TrainerHeaders:
 Route17TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/route18.asm

@@ -1,6 +1,6 @@
 Route18Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route18TrainerHeaders
+	ld hl, Route18TrainerHeader0
 	ld de, Route18ScriptPointers
 	ld a, [wRoute18CurScript]
 	call ExecuteCurMapScriptInTable
@@ -19,7 +19,6 @@ Route18TextPointers:
 	dw Route18Text4
 	dw Route18Text5
 
-Route18TrainerHeaders:
 Route18TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/route19.asm

@@ -1,6 +1,6 @@
 Route19Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route19TrainerHeaders
+	ld hl, Route19TrainerHeader0
 	ld de, Route19ScriptPointers
 	ld a, [wRoute19CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,7 +25,6 @@ Route19TextPointers:
 	dw Route19Text10
 	dw Route19Text11
 
-Route19TrainerHeaders:
 Route19TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/route20.asm

@@ -75,7 +75,6 @@ Route20TextPointers:
 	dw Route20Text11
 	dw Route20Text12
 
-Route20TrainerHeaders:
 Route20TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -85,82 +84,82 @@ Route20TrainerHeader0:
 	dw Route20EndBattleText1 ; TextEndBattle
 	dw Route20EndBattleText1 ; TextEndBattle
 
-Route20TrainerHeader2:
+Route20TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1
 	dw Route20BattleText2 ; TextBeforeBattle
 	dw Route20AfterBattleText2 ; TextAfterBattle
 	dw Route20EndBattleText2 ; TextEndBattle
 	dw Route20EndBattleText2 ; TextEndBattle
 
-Route20TrainerHeader3:
+Route20TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2
 	dw Route20BattleText3 ; TextBeforeBattle
 	dw Route20AfterBattleText3 ; TextAfterBattle
 	dw Route20EndBattleText3 ; TextEndBattle
 	dw Route20EndBattleText3 ; TextEndBattle
 
-Route20TrainerHeader4:
+Route20TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3
 	dw Route20BattleText4 ; TextBeforeBattle
 	dw Route20AfterBattleText4 ; TextAfterBattle
 	dw Route20EndBattleText4 ; TextEndBattle
 	dw Route20EndBattleText4 ; TextEndBattle
 
-Route20TrainerHeader5:
+Route20TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4
 	dw Route20BattleText5 ; TextBeforeBattle
 	dw Route20AfterBattleText5 ; TextAfterBattle
 	dw Route20EndBattleText5 ; TextEndBattle
 	dw Route20EndBattleText5 ; TextEndBattle
 
-Route20TrainerHeader6:
+Route20TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5
 	dw Route20BattleText6 ; TextBeforeBattle
 	dw Route20AfterBattleText6 ; TextAfterBattle
 	dw Route20EndBattleText6 ; TextEndBattle
 	dw Route20EndBattleText6 ; TextEndBattle
 
-Route20TrainerHeader7:
+Route20TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6
 	dw Route20BattleText7 ; TextBeforeBattle
 	dw Route20AfterBattleText7 ; TextAfterBattle
 	dw Route20EndBattleText7 ; TextEndBattle
 	dw Route20EndBattleText7 ; TextEndBattle
 
-Route20TrainerHeader8:
+Route20TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1
 	dw Route20BattleText8 ; TextBeforeBattle
 	dw Route20AfterBattleText8 ; TextAfterBattle
 	dw Route20EndBattleText8 ; TextEndBattle
 	dw Route20EndBattleText8 ; TextEndBattle
 
-Route20TrainerHeader9:
+Route20TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1
 	dw Route20BattleText9 ; TextBeforeBattle
 	dw Route20AfterBattleText9 ; TextAfterBattle
 	dw Route20EndBattleText9 ; TextEndBattle
 	dw Route20EndBattleText9 ; TextEndBattle
 
-Route20TrainerHeader10:
+Route20TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_10, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_10, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1
 	dw Route20BattleText10 ; TextBeforeBattle
 	dw Route20AfterBattleText10 ; TextAfterBattle
 	dw Route20EndBattleText10 ; TextEndBattle
@@ -176,55 +175,55 @@ Route20Text1:
 
 Route20Text2:
 	TX_ASM
-	ld hl, Route20TrainerHeader2
+	ld hl, Route20TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text3:
 	TX_ASM
-	ld hl, Route20TrainerHeader3
+	ld hl, Route20TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text4:
 	TX_ASM
-	ld hl, Route20TrainerHeader4
+	ld hl, Route20TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text5:
 	TX_ASM
-	ld hl, Route20TrainerHeader5
+	ld hl, Route20TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text6:
 	TX_ASM
-	ld hl, Route20TrainerHeader6
+	ld hl, Route20TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text7:
 	TX_ASM
-	ld hl, Route20TrainerHeader7
+	ld hl, Route20TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text8:
 	TX_ASM
-	ld hl, Route20TrainerHeader8
+	ld hl, Route20TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text9:
 	TX_ASM
-	ld hl, Route20TrainerHeader9
+	ld hl, Route20TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text10:
 	TX_ASM
-	ld hl, Route20TrainerHeader10
+	ld hl, Route20TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/route21.asm

@@ -1,6 +1,6 @@
 Route21Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route21TrainerHeaders
+	ld hl, Route21TrainerHeader0
 	ld de, Route21ScriptPointers
 	ld a, [wRoute21CurScript]
 	call ExecuteCurMapScriptInTable
@@ -23,7 +23,6 @@ Route21TextPointers:
 	dw Route21Text8
 	dw Route21Text9
 
-Route21TrainerHeaders:
 Route21TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0
 	db ($0 << 4) ; trainer's view range

scripts/route24.asm

@@ -1,6 +1,6 @@
 Route24Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route24TrainerHeaders
+	ld hl, Route24TrainerHeader0
 	ld de, Route24ScriptPointers
 	ld a, [wRoute24CurScript]
 	call ExecuteCurMapScriptInTable
@@ -85,7 +85,6 @@ Route24TextPointers:
 	dw Route24Text7
 	dw PickUpItemText
 
-Route24TrainerHeaders:
 Route24TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -95,46 +94,46 @@ Route24TrainerHeader0:
 	dw Route24EndBattleText1 ; TextEndBattle
 	dw Route24EndBattleText1 ; TextEndBattle
 
-Route24TrainerHeader2:
+Route24TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_1
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_1
 	dw Route24BattleText2 ; TextBeforeBattle
 	dw Route24AfterBattleText2 ; TextAfterBattle
 	dw Route24EndBattleText2 ; TextEndBattle
 	dw Route24EndBattleText2 ; TextEndBattle
 
-Route24TrainerHeader3:
+Route24TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2
 	dw Route24BattleText3 ; TextBeforeBattle
 	dw Route24AfterBattleText3 ; TextAfterBattle
 	dw Route24EndBattleText3 ; TextEndBattle
 	dw Route24EndBattleText3 ; TextEndBattle
 
-Route24TrainerHeader4:
+Route24TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3
 	dw Route24BattleText4 ; TextBeforeBattle
 	dw Route24AfterBattleText4 ; TextAfterBattle
 	dw Route24EndBattleText4 ; TextEndBattle
 	dw Route24EndBattleText4 ; TextEndBattle
 
-Route24TrainerHeader5:
+Route24TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4
 	dw Route24BattleText5 ; TextBeforeBattle
 	dw Route24AfterBattleText5 ; TextAfterBattle
 	dw Route24EndBattleText5 ; TextEndBattle
 	dw Route24EndBattleText5 ; TextEndBattle
 
-Route24TrainerHeader6:
+Route24TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5
 	dw Route24BattleText6 ; TextBeforeBattle
 	dw Route24AfterBattleText6 ; TextAfterBattle
 	dw Route24EndBattleText6 ; TextEndBattle
@@ -219,31 +218,31 @@ Route24Text2:
 
 Route24Text3:
 	TX_ASM
-	ld hl, Route24TrainerHeader2
+	ld hl, Route24TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text4:
 	TX_ASM
-	ld hl, Route24TrainerHeader3
+	ld hl, Route24TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text5:
 	TX_ASM
-	ld hl, Route24TrainerHeader4
+	ld hl, Route24TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text6:
 	TX_ASM
-	ld hl, Route24TrainerHeader5
+	ld hl, Route24TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text7:
 	TX_ASM
-	ld hl, Route24TrainerHeader6
+	ld hl, Route24TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/route25.asm

@@ -1,7 +1,7 @@
 Route25Script:
 	call Route25Script_515e1
 	call EnableAutoTextBoxDrawing
-	ld hl, Route25TrainerHeaders
+	ld hl, Route25TrainerHeader0
 	ld de, Route25ScriptPointers
 	ld a, [wRoute25CurScript]
 	call ExecuteCurMapScriptInTable
@@ -53,7 +53,6 @@ Route25TextPointers:
 	dw PickUpItemText
 	dw Route25Text11
 
-Route25TrainerHeaders:
 Route25TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -63,73 +62,73 @@ Route25TrainerHeader0:
 	dw Route25EndBattleText1 ; TextEndBattle
 	dw Route25EndBattleText1 ; TextEndBattle
 
-Route25TrainerHeader2:
+Route25TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1
 	dw Route25BattleText2 ; TextBeforeBattle
 	dw Route25AfterBattleText2 ; TextAfterBattle
 	dw Route25EndBattleText2 ; TextEndBattle
 	dw Route25EndBattleText2 ; TextEndBattle
 
-Route25TrainerHeader3:
+Route25TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2
 	dw Route25BattleText3 ; TextBeforeBattle
 	dw Route25AfterBattleText3 ; TextAfterBattle
 	dw Route25EndBattleText3 ; TextEndBattle
 	dw Route25EndBattleText3 ; TextEndBattle
 
-Route25TrainerHeader4:
+Route25TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3
 	dw Route25BattleText4 ; TextBeforeBattle
 	dw Route25AfterBattleText4 ; TextAfterBattle
 	dw Route25EndBattleText4 ; TextEndBattle
 	dw Route25EndBattleText4 ; TextEndBattle
 
-Route25TrainerHeader5:
+Route25TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4
 	dw Route25BattleText5 ; TextBeforeBattle
 	dw Route25AfterBattleText5 ; TextAfterBattle
 	dw Route25EndBattleText5 ; TextEndBattle
 	dw Route25EndBattleText5 ; TextEndBattle
 
-Route25TrainerHeader6:
+Route25TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5
 	dw Route25BattleText6 ; TextBeforeBattle
 	dw Route25AfterBattleText6 ; TextAfterBattle
 	dw Route25EndBattleText6 ; TextEndBattle
 	dw Route25EndBattleText6 ; TextEndBattle
 
-Route25TrainerHeader7:
+Route25TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6
 	dw Route25BattleText7 ; TextBeforeBattle
 	dw Route25AfterBattleText7 ; TextAfterBattle
 	dw Route25EndBattleText7 ; TextEndBattle
 	dw Route25EndBattleText7 ; TextEndBattle
 
-Route25TrainerHeader8:
+Route25TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1
 	dw Route25BattleText8 ; TextBeforeBattle
 	dw Route25AfterBattleText8 ; TextAfterBattle
 	dw Route25EndBattleText8 ; TextEndBattle
 	dw Route25EndBattleText8 ; TextEndBattle
 
-Route25TrainerHeader9:
+Route25TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_9, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1
 	dw Route25BattleText9 ; TextBeforeBattle
 	dw Route25AfterBattleText9 ; TextAfterBattle
 	dw Route25EndBattleText9 ; TextEndBattle
@@ -145,49 +144,49 @@ Route25Text1:
 
 Route25Text2:
 	TX_ASM
-	ld hl, Route25TrainerHeader2
+	ld hl, Route25TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text3:
 	TX_ASM
-	ld hl, Route25TrainerHeader3
+	ld hl, Route25TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text4:
 	TX_ASM
-	ld hl, Route25TrainerHeader4
+	ld hl, Route25TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text5:
 	TX_ASM
-	ld hl, Route25TrainerHeader5
+	ld hl, Route25TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text6:
 	TX_ASM
-	ld hl, Route25TrainerHeader6
+	ld hl, Route25TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text7:
 	TX_ASM
-	ld hl, Route25TrainerHeader7
+	ld hl, Route25TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text8:
 	TX_ASM
-	ld hl, Route25TrainerHeader8
+	ld hl, Route25TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text9:
 	TX_ASM
-	ld hl, Route25TrainerHeader9
+	ld hl, Route25TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 

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:
+Route3TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2
+	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:
+Route3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3
+	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:
+Route3TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4
+	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:
+Route3TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5
+	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:
+Route3TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6
+	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:
+Route3TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1
+	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:
+Route3TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_8, 1
+	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
 

scripts/route4.asm

@@ -1,6 +1,6 @@
 Route4Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route4TrainerHeaders
+	ld hl, Route4TrainerHeader0
 	ld de, Route4ScriptPointers
 	ld a, [wRoute4CurScript]
 	call ExecuteCurMapScriptInTable
@@ -20,7 +20,6 @@ Route4TextPointers:
 	dw Route4Text5
 	dw Route4Text6
 
-Route4TrainerHeaders:
 Route4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/route6.asm

@@ -1,6 +1,6 @@
 Route6Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route6TrainerHeaders
+	ld hl, Route6TrainerHeader0
 	ld de, Route6ScriptPointers
 	ld a, [wRoute6CurScript]
 	call ExecuteCurMapScriptInTable
@@ -21,7 +21,6 @@ Route6TextPointers:
 	dw Route6Text6
 	dw Route6Text7
 
-Route6TrainerHeaders:
 Route6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0
 	db ($0 << 4) ; trainer's view range

scripts/route8.asm

@@ -1,6 +1,6 @@
 Route8Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route8TrainerHeaders
+	ld hl, Route8TrainerHeader0
 	ld de, Route8ScriptPointers
 	ld a, [wRoute8CurScript]
 	call ExecuteCurMapScriptInTable
@@ -24,7 +24,6 @@ Route8TextPointers:
 	dw Route8Text9
 	dw Route8Text10
 
-Route8TrainerHeaders:
 Route8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/route9.asm

@@ -1,6 +1,6 @@
 Route9Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route9TrainerHeaders
+	ld hl, Route9TrainerHeader0
 	ld de, Route9ScriptPointers
 	ld a, [wRoute9CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,7 +25,6 @@ Route9TextPointers:
 	dw PickUpItemText
 	dw Route9Text11
 
-Route9TrainerHeaders:
 Route9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -35,73 +34,73 @@ Route9TrainerHeader0:
 	dw Route9EndBattleText1 ; TextEndBattle
 	dw Route9EndBattleText1 ; TextEndBattle
 
-Route9TrainerHeader2:
+Route9TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1
 	dw Route9BattleText2 ; TextBeforeBattle
 	dw Route9AfterBattleText2 ; TextAfterBattle
 	dw Route9EndBattleText2 ; TextEndBattle
 	dw Route9EndBattleText2 ; TextEndBattle
 
-Route9TrainerHeader3:
+Route9TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2
 	dw Route9BattleText3 ; TextBeforeBattle
 	dw Route9AfterBattleText3 ; TextAfterBattle
 	dw Route9EndBattleText3 ; TextEndBattle
 	dw Route9EndBattleText3 ; TextEndBattle
 
-Route9TrainerHeader4:
+Route9TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3
 	dw Route9BattleText4 ; TextBeforeBattle
 	dw Route9AfterBattleText4 ; TextAfterBattle
 	dw Route9EndBattleText4 ; TextEndBattle
 	dw Route9EndBattleText4 ; TextEndBattle
 
-Route9TrainerHeader5:
+Route9TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4
 	dw Route9BattleText5 ; TextBeforeBattle
 	dw Route9AfterBattleText5 ; TextAfterBattle
 	dw Route9EndBattleText5 ; TextEndBattle
 	dw Route9EndBattleText5 ; TextEndBattle
 
-Route9TrainerHeader6:
+Route9TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5
 	dw Route9BattleText6 ; TextBeforeBattle
 	dw Route9AfterBattleText6 ; TextAfterBattle
 	dw Route9EndBattleText6 ; TextEndBattle
 	dw Route9EndBattleText6 ; TextEndBattle
 
-Route9TrainerHeader7:
+Route9TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6
 	dw Route9BattleText7 ; TextBeforeBattle
 	dw Route9AfterBattleText7 ; TextAfterBattle
 	dw Route9EndBattleText7 ; TextEndBattle
 	dw Route9EndBattleText7 ; TextEndBattle
 
-Route9TrainerHeader8:
+Route9TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1
 	dw Route9BattleText8 ; TextBeforeBattle
 	dw Route9AfterBattleText8 ; TextAfterBattle
 	dw Route9EndBattleText8 ; TextEndBattle
 	dw Route9EndBattleText8 ; TextEndBattle
 
-Route9TrainerHeader9:
+Route9TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1
 	dw Route9BattleText9 ; TextBeforeBattle
 	dw Route9AfterBattleText9 ; TextAfterBattle
 	dw Route9EndBattleText9 ; TextEndBattle
@@ -116,42 +115,42 @@ Route9Text1:
 
 Route9Text2:
 	TX_ASM
-	ld hl, Route9TrainerHeader2
+	ld hl, Route9TrainerHeader1
 	jr Route9TalkToTrainer
 
 Route9Text3:
 	TX_ASM
-	ld hl, Route9TrainerHeader3
+	ld hl, Route9TrainerHeader2
 	jr Route9TalkToTrainer
 
 Route9Text4:
 	TX_ASM
-	ld hl, Route9TrainerHeader4
+	ld hl, Route9TrainerHeader3
 	jr Route9TalkToTrainer
 
 Route9Text5:
 	TX_ASM
-	ld hl, Route9TrainerHeader5
+	ld hl, Route9TrainerHeader4
 	jr Route9TalkToTrainer
 
 Route9Text6:
 	TX_ASM
-	ld hl, Route9TrainerHeader6
+	ld hl, Route9TrainerHeader5
 	jr Route9TalkToTrainer
 
 Route9Text7:
 	TX_ASM
-	ld hl, Route9TrainerHeader7
+	ld hl, Route9TrainerHeader6
 	jr Route9TalkToTrainer
 
 Route9Text8:
 	TX_ASM
-	ld hl, Route9TrainerHeader8
+	ld hl, Route9TrainerHeader7
 	jr Route9TalkToTrainer
 
 Route9Text9:
 	TX_ASM
-	ld hl, Route9TrainerHeader9
+	ld hl, Route9TrainerHeader8
 Route9TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd

scripts/saffrongym.asm

@@ -84,7 +84,6 @@ SaffronGymTextPointers:
 	dw SaffronGymText11
 	dw SaffronGymText12
 
-SaffronGymTrainerHeaders:
 SaffronGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/silphco10.asm

@@ -1,7 +1,7 @@
 SilphCo10Script:
 	call SilphCo10Script_5a14f
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo10TrainerHeaders
+	ld hl, SilphCo10TrainerHeader0
 	ld de, SilphCo10ScriptPointers
 	ld a, [wSilphCo10CurScript]
 	call ExecuteCurMapScriptInTable
@@ -47,7 +47,6 @@ SilphCo10TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo10TrainerHeaders:
 SilphCo10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/silphco11.asm

@@ -1,7 +1,7 @@
 SilphCo11Script:
 	call SilphCo11Script_62110
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo11TrainerHeaders
+	ld hl, SilphCo11TrainerHeader0
 	ld de, SilphCo11ScriptPointers
 	ld a, [wSilphCo11CurScript]
 	call ExecuteCurMapScriptInTable
@@ -280,7 +280,6 @@ SilphCo11TextPointers:
 	dw SilphCo11Text5
 	dw SilphCo11Text6
 
-SilphCo11TrainerHeaders:
 SilphCo11TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/silphco2.asm

@@ -1,7 +1,7 @@
 SilphCo2Script:
 	call SilphCo2Script_59d07
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo2TrainerHeaders
+	ld hl, SilphCo2TrainerHeader0
 	ld de, SilphCo2ScriptPointers
 	ld a, [wSilphCo2CurScript]
 	call ExecuteCurMapScriptInTable
@@ -98,7 +98,6 @@ SilphCo2TextPointers:
 	dw SilphCo2Text4
 	dw SilphCo2Text5
 
-SilphCo2TrainerHeaders:
 SilphCo2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/silphco3.asm

@@ -1,7 +1,7 @@
 SilphCo3Script:
 	call SilphCo3Script_59f71
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo3TrainerHeaders
+	ld hl, SilphCo3TrainerHeader0
 	ld de, SilphCo3ScriptPointers
 	ld a, [wSilphCo3CurScript]
 	call ExecuteCurMapScriptInTable
@@ -61,7 +61,6 @@ SilphCo3TextPointers:
 	dw SilphCo3Text3
 	dw PickUpItemText
 
-SilphCo3TrainerHeaders:
 SilphCo3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/silphco4.asm

@@ -1,7 +1,7 @@
 SilphCo4Script:
 	call SilphCo4Script_19d21
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo4TrainerHeaders
+	ld hl, SilphCo4TrainerHeader0
 	ld de, SilphCo4ScriptPointers
 	ld a, [wSilphCo4CurScript]
 	call ExecuteCurMapScriptInTable
@@ -100,7 +100,6 @@ SilphCo4TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo4TrainerHeaders:
 SilphCo4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -110,19 +109,19 @@ SilphCo4TrainerHeader0:
 	dw SilphCo4EndBattleText2 ; TextEndBattle
 	dw SilphCo4EndBattleText2 ; TextEndBattle
 
-SilphCo4TrainerHeader2:
+SilphCo4TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_1
 	dw SilphCo4BattleText3 ; TextBeforeBattle
 	dw SilphCo4AfterBattleText3 ; TextAfterBattle
 	dw SilphCo4EndBattleText3 ; TextEndBattle
 	dw SilphCo4EndBattleText3 ; TextEndBattle
 
-SilphCo4TrainerHeader3:
+SilphCo4TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2
 	dw SilphCo4BattleText4 ; TextBeforeBattle
 	dw SilphCo4AfterBattleText4 ; TextAfterBattle
 	dw SilphCo4EndBattleText4 ; TextEndBattle
@@ -165,7 +164,7 @@ SilphCo4AfterBattleText2:
 
 SilphCo4Text3:
 	TX_ASM
-	ld hl, SilphCo4TrainerHeader2
+	ld hl, SilphCo4TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -183,7 +182,7 @@ SilphCo4AfterBattleText3:
 
 SilphCo4Text4:
 	TX_ASM
-	ld hl, SilphCo4TrainerHeader3
+	ld hl, SilphCo4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/silphco5.asm

@@ -1,7 +1,7 @@
 SilphCo5Script:
 	call SilphCo5Script_19f4d
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo5TrainerHeaders
+	ld hl, SilphCo5TrainerHeader0
 	ld de, SilphCo5ScriptPointers
 	ld a, [wSilphCo5CurScript]
 	call ExecuteCurMapScriptInTable
@@ -83,8 +83,7 @@ SilphCo5TextPointers:
 	dw SilphCo5Text10
 	dw SilphCo5Text11
 
-SilphCo5TrainerHeaders:
+SilphCo5TrainerHeader0:
-Silphco5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0
@@ -93,28 +92,28 @@ Silphco5TrainerHeader0:
 	dw SilphCo5EndBattleText2 ; TextEndBattle
 	dw SilphCo5EndBattleText2 ; TextEndBattle
 
-Silphco5TrainerHeader2:
+SilphCo5TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1
 	dw SilphCo5BattleText3 ; TextBeforeBattle
 	dw SilphCo5AfterBattleText3 ; TextAfterBattle
 	dw SilphCo5EndBattleText3 ; TextEndBattle
 	dw SilphCo5EndBattleText3 ; TextEndBattle
 
-Silphco5TrainerHeader3:
+SilphCo5TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2
 	dw SilphCo5BattleText4 ; TextBeforeBattle
 	dw SilphCo5AfterBattleText4 ; TextAfterBattle
 	dw SilphCo5EndBattleText4 ; TextEndBattle
 	dw SilphCo5EndBattleText4 ; TextEndBattle
 
-Silphco5TrainerHeader4:
+SilphCo5TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3
 	dw SilphCo5BattleText5 ; TextBeforeBattle
 	dw SilphCo5AfterBattleText5 ; TextAfterBattle
 	dw SilphCo5EndBattleText5 ; TextEndBattle
@@ -139,7 +138,7 @@ SilphCo5Text_1a015:
 
 SilphCo5Text2:
 	TX_ASM
-	ld hl, Silphco5TrainerHeader0
+	ld hl, SilphCo5TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -157,7 +156,7 @@ SilphCo5AfterBattleText2:
 
 SilphCo5Text3:
 	TX_ASM
-	ld hl, Silphco5TrainerHeader2
+	ld hl, SilphCo5TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -175,7 +174,7 @@ SilphCo5AfterBattleText3:
 
 SilphCo5Text4:
 	TX_ASM
-	ld hl, Silphco5TrainerHeader3
+	ld hl, SilphCo5TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -193,7 +192,7 @@ SilphCo5AfterBattleText4:
 
 SilphCo5Text5:
 	TX_ASM
-	ld hl, Silphco5TrainerHeader4
+	ld hl, SilphCo5TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/silphco6.asm

@@ -1,7 +1,7 @@
 SilphCo6Script:
 	call SilphCo6Script_1a1bf
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo6TrainerHeaders
+	ld hl, SilphCo6TrainerHeader0
 	ld de, SilphCo6ScriptPointers
 	ld a, [wSilphCo6CurScript]
 	call ExecuteCurMapScriptInTable
@@ -51,7 +51,6 @@ SilphCo6TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo6TrainerHeaders:
 SilphCo6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -61,19 +60,19 @@ SilphCo6TrainerHeader0:
 	dw SilphCo6EndBattleText2 ; TextEndBattle
 	dw SilphCo6EndBattleText2 ; TextEndBattle
 
-SilphCo6TrainerHeader2:
+SilphCo6TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1
 	dw SilphCo6BattleText3 ; TextBeforeBattle
 	dw SilphCo6AfterBattleText3 ; TextAfterBattle
 	dw SilphCo6EndBattleText3 ; TextEndBattle
 	dw SilphCo6EndBattleText3 ; TextEndBattle
 
-SilphCo6TrainerHeader3:
+SilphCo6TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1
 	dw SilphCo6BattleText4 ; TextBeforeBattle
 	dw SilphCo6AfterBattleText4 ; TextAfterBattle
 	dw SilphCo6EndBattleText4 ; TextEndBattle
@@ -186,7 +185,7 @@ SilphCo6AfterBattleText2:
 
 SilphCo6Text7:
 	TX_ASM
-	ld hl, SilphCo6TrainerHeader2
+	ld hl, SilphCo6TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -204,7 +203,7 @@ SilphCo6AfterBattleText3:
 
 SilphCo6Text8:
 	TX_ASM
-	ld hl, SilphCo6TrainerHeader3
+	ld hl, SilphCo6TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/silphco7.asm

@@ -1,7 +1,7 @@
 SilphCo7Script:
 	call SilphCo7Script_51b77
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo7TrainerHeaders
+	ld hl, SilphCo7TrainerHeader0
 	ld de, SilphCo7ScriptPointers
 	ld a, [wSilphCo7CurScript]
 	call ExecuteCurMapScriptInTable
@@ -279,7 +279,6 @@ SilphCo7TextPointers:
 	dw SilphCo7Text14
 	dw SilphCo7Text15
 
-SilphCo7TrainerHeaders:
 SilphCo7TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -289,28 +288,28 @@ SilphCo7TrainerHeader0:
 	dw SilphCo7EndBattleText1 ; TextEndBattle
 	dw SilphCo7EndBattleText1 ; TextEndBattle
 
-SilphCo7TrainerHeader2:
+SilphCo7TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_1
 	dw SilphCo7BattleText2 ; TextBeforeBattle
 	dw SilphCo7AfterBattleText2 ; TextAfterBattle
 	dw SilphCo7EndBattleText2 ; TextEndBattle
 	dw SilphCo7EndBattleText2 ; TextEndBattle
 
-SilphCo7TrainerHeader3:
+SilphCo7TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2
 	dw SilphCo7BattleText3 ; TextBeforeBattle
 	dw SilphCo7AfterBattleText3 ; TextAfterBattle
 	dw SilphCo7EndBattleText3 ; TextEndBattle
 	dw SilphCo7EndBattleText3 ; TextEndBattle
 
-SilphCo7TrainerHeader4:
+SilphCo7TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1
 	dw SilphCo7BattleText4 ; TextBeforeBattle
 	dw SilphCo7AfterBattleText4 ; TextAfterBattle
 	dw SilphCo7EndBattleText4 ; TextEndBattle
@@ -449,7 +448,7 @@ SilphCo7AfterBattleText1:
 
 SilphCo7Text6:
 	TX_ASM
-	ld hl, SilphCo7TrainerHeader2
+	ld hl, SilphCo7TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -467,7 +466,7 @@ SilphCo7AfterBattleText2:
 
 SilphCo7Text7:
 	TX_ASM
-	ld hl, SilphCo7TrainerHeader3
+	ld hl, SilphCo7TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -485,7 +484,7 @@ SilphCo7AfterBattleText3:
 
 SilphCo7Text8:
 	TX_ASM
-	ld hl, SilphCo7TrainerHeader4
+	ld hl, SilphCo7TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/silphco8.asm

@@ -81,7 +81,6 @@ SilphCo8TextPointers:
 	dw SilphCo8Text3
 	dw SilphCo8Text4
 
-SilphCo8TrainerHeaders:
 SilphCo8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/silphco9.asm

@@ -1,7 +1,7 @@
 SilphCo9Script:
 	call SilphCo9Script_5d7d1
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo9TrainerHeaders
+	ld hl, SilphCo9TrainerHeader0
 	ld de, SilphCo9ScriptPointers
 	ld a, [wSilphCo9CurScript]
 	call ExecuteCurMapScriptInTable
@@ -129,7 +129,6 @@ SilphCo9TextPointers:
 	dw SilphCo9Text3
 	dw SilphCo9Text4
 
-SilphCo9TrainerHeaders:
 SilphCo9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/ssanne10.asm

@@ -1,6 +1,6 @@
 SSAnne10Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne10TrainerHeaders
+	ld hl, SSAnne10TrainerHeader0
 	ld de, SSAnne10ScriptPointers
 	ld a, [wSSAnne10CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,7 +25,6 @@ SSAnne10TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-SSAnne10TrainerHeaders:
 SSAnne10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/ssanne5.asm

@@ -19,7 +19,6 @@ SSAnne5TextPointers:
 	dw SSAnne5Text4
 	dw SSAnne5Text5
 
-SSAnne5TrainerHeaders:
 SSAnne5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/ssanne8.asm

@@ -1,6 +1,6 @@
 SSAnne8Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne8TrainerHeaders
+	ld hl, SSAnne8TrainerHeader0
 	ld de, SSAnne8ScriptPointers
 	ld a, [wSSAnne8CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,7 +25,6 @@ SSAnne8TextPointers:
 	dw PickUpItemText
 	dw SSAnne8Text11
 
-SSAnne8TrainerHeaders:
 SSAnne8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/ssanne9.asm

@@ -3,7 +3,7 @@ SSAnne9Script:
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, SSAnne9TrainerHeaders
+	ld hl, SSAnne9TrainerHeader0
 	ld de, SSAnne9ScriptPointers
 	ld a, [wSSAnne9CurScript]
 	call ExecuteCurMapScriptInTable
@@ -30,7 +30,6 @@ SSAnne9TextPointers:
 	dw SSAnne9Text12
 	dw SSAnne9Text13
 
-SSAnne9TrainerHeaders:
 SSAnne9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/unknowndungeon3.asm

@@ -1,6 +1,6 @@
 UnknownDungeon3Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, UnknownDungeon3TrainerHeaders
+	ld hl, MewtwoTrainerHeader
 	ld de, .ScriptPointers
 	ld a, [wUnknownDungeon3CurScript]
 	call ExecuteCurMapScriptInTable
@@ -17,7 +17,6 @@ UnknownDungeon3TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-UnknownDungeon3TrainerHeaders:
 MewtwoTrainerHeader:
 	dbEventFlagBit EVENT_BEAT_MEWTWO
 	db ($0 << 4) ; trainer's view range

scripts/vermiliongym.asm

@@ -99,7 +99,6 @@ VermilionGymTextPointers:
 	dw VermilionGymText7
 	dw VermilionGymText8
 
-VermilionGymTrainerHeaders:
 VermilionGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range

scripts/victoryroad1.asm

@@ -4,7 +4,7 @@ VictoryRoad1Script:
 	res 5, [hl]
 	call nz, .next
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad1TrainerHeaders
+	ld hl, VictoryRoad1TrainerHeader0
 	ld de, VictoryRoad1ScriptPointers
 	ld a, [wVictoryRoad1CurScript]
 	call ExecuteCurMapScriptInTable
@@ -46,7 +46,6 @@ VictoryRoad1TextPointers:
 	dw BoulderText
 	dw BoulderText
 
-VictoryRoad1TrainerHeaders:
 VictoryRoad1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0
 	db ($2 << 4) ; trainer's view range

scripts/victoryroad2.asm

@@ -8,7 +8,7 @@ VictoryRoad2Script:
 	res 5, [hl]
 	call nz, VictoryRoad2Script_517c9
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad2TrainerHeaders
+	ld hl, VictoryRoad2TrainerHeader0
 	ld de, VictoryRoad2ScriptPointers
 	ld a, [wVictoryRoad2CurScript]
 	call ExecuteCurMapScriptInTable
@@ -83,7 +83,6 @@ VictoryRoad2TextPointers:
 	dw BoulderText
 	dw BoulderText
 
-VictoryRoad2TrainerHeaders:
 VictoryRoad2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -93,37 +92,37 @@ VictoryRoad2TrainerHeader0:
 	dw VictoryRoad2EndBattleText1 ; TextEndBattle
 	dw VictoryRoad2EndBattleText1 ; TextEndBattle
 
-VictoryRoad2TrainerHeader2:
+VictoryRoad2TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1
 	dw VictoryRoad2BattleText2 ; TextBeforeBattle
 	dw VictoryRoad2AfterBattleText2 ; TextAfterBattle
 	dw VictoryRoad2EndBattleText2 ; TextEndBattle
 	dw VictoryRoad2EndBattleText2 ; TextEndBattle
 
-VictoryRoad2TrainerHeader3:
+VictoryRoad2TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
 	dw VictoryRoad2BattleText3 ; TextBeforeBattle
 	dw VictoryRoad2AfterBattleText3 ; TextAfterBattle
 	dw VictoryRoad2EndBattleText3 ; TextEndBattle
 	dw VictoryRoad2EndBattleText3 ; TextEndBattle
 
-VictoryRoad2TrainerHeader4:
+VictoryRoad2TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
 	dw VictoryRoad2BattleText4 ; TextBeforeBattle
 	dw VictoryRoad2AfterBattleText4 ; TextAfterBattle
 	dw VictoryRoad2EndBattleText4 ; TextEndBattle
 	dw VictoryRoad2EndBattleText4 ; TextEndBattle
 
-VictoryRoad2TrainerHeader5:
+VictoryRoad2TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
 	dw VictoryRoad2BattleText5 ; TextBeforeBattle
 	dw VictoryRoad2AfterBattleText5 ; TextAfterBattle
 	dw VictoryRoad2EndBattleText5 ; TextEndBattle
@@ -148,25 +147,25 @@ VictoryRoad2Text1:
 
 VictoryRoad2Text2:
 	TX_ASM
-	ld hl, VictoryRoad2TrainerHeader2
+	ld hl, VictoryRoad2TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text3:
 	TX_ASM
-	ld hl, VictoryRoad2TrainerHeader3
+	ld hl, VictoryRoad2TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text4:
 	TX_ASM
-	ld hl, VictoryRoad2TrainerHeader4
+	ld hl, VictoryRoad2TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text5:
 	TX_ASM
-	ld hl, VictoryRoad2TrainerHeader5
+	ld hl, VictoryRoad2TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/victoryroad3.asm

@@ -1,7 +1,7 @@
 VictoryRoad3Script:
 	call VictoryRoad3Script_44996
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad3TrainerHeaders
+	ld hl, VictoryRoad3TrainerHeader0
 	ld de, VictoryRoad3ScriptPointers
 	ld a, [wVictoryRoad3CurScript]
 	call ExecuteCurMapScriptInTable
@@ -86,7 +86,6 @@ VictoryRoad3TextPointers:
 	dw BoulderText
 	dw BoulderText
 
-VictoryRoad3TrainerHeaders:
 VictoryRoad3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0
 	db ($1 << 4) ; trainer's view range
@@ -96,28 +95,28 @@ VictoryRoad3TrainerHeader0:
 	dw VictoryRoad3EndBattleText2 ; TextEndBattle
 	dw VictoryRoad3EndBattleText2 ; TextEndBattle
 
-VictoryRoad3TrainerHeader2:
+VictoryRoad3TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1
 	dw VictoryRoad3BattleText3 ; TextBeforeBattle
 	dw VictoryRoad3AfterBattleText3 ; TextAfterBattle
 	dw VictoryRoad3EndBattleText3 ; TextEndBattle
 	dw VictoryRoad3EndBattleText3 ; TextEndBattle
 
-VictoryRoad3TrainerHeader3:
+VictoryRoad3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
 	dw VictoryRoad3BattleText4 ; TextBeforeBattle
 	dw VictoryRoad3AfterBattleText4 ; TextAfterBattle
 	dw VictoryRoad3EndBattleText4 ; TextEndBattle
 	dw VictoryRoad3EndBattleText4 ; TextEndBattle
 
-VictoryRoad3TrainerHeader4:
+VictoryRoad3TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
 	dw VictoryRoad3BattleText5 ; TextBeforeBattle
 	dw VictoryRoad3AfterBattleText5 ; TextAfterBattle
 	dw VictoryRoad3EndBattleText5 ; TextEndBattle
@@ -133,19 +132,19 @@ VictoryRoad3Text1:
 
 VictoryRoad3Text2:
 	TX_ASM
-	ld hl, VictoryRoad3TrainerHeader2
+	ld hl, VictoryRoad3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad3Text3:
 	TX_ASM
-	ld hl, VictoryRoad3TrainerHeader3
+	ld hl, VictoryRoad3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad3Text4:
 	TX_ASM
-	ld hl, VictoryRoad3TrainerHeader4
+	ld hl, VictoryRoad3TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/viridianforest.asm

@@ -1,6 +1,6 @@
 ViridianForestScript:
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianForestTrainerHeaders
+	ld hl, ViridianForestTrainerHeader0
 	ld de, ViridianForestScriptPointers
 	ld a, [wViridianForestCurScript]
 	call ExecuteCurMapScriptInTable
@@ -28,7 +28,6 @@ ViridianForestTextPointers:
 	dw ViridianForestText13
 	dw ViridianForestText14
 
-ViridianForestTrainerHeaders:
 ViridianForestTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0
 	db ($4 << 4) ; trainer's view range

scripts/viridiangym.asm

@@ -3,7 +3,7 @@ ViridianGymScript:
 	ld de, Gym8LeaderName
 	call LoadGymLeaderAndCityName
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianGymTrainerHeaders
+	ld hl, ViridianGymTrainerHeader0
 	ld de, ViridianGymScriptPointers
 	ld a, [wViridianGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -184,7 +184,6 @@ ViridianGymTextPointers:
 	dw ViridianGymText13
 	dw ViridianGymText14
 
-ViridianGymTrainerHeaders:
 ViridianGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0
 	db ($4 << 4) ; trainer's view range

text/maps/pewter_city.asm

@@ -70,7 +70,7 @@ _PewterCityText_1945d::
 	cont "Follow me!"
 	done
 
-_PewterCityText_19462::
+_PewterCityText14::
 	text "If you have the"
 	line "right stuff, go"
 	cont "take on BROCK!"