diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/event_constants.asm | 212 |
1 files changed, 106 insertions, 106 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 47448d09..5b73012b 100755 --- a/constants/event_constants.asm +++ b/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_3 ; 1AC, (D77C, bit 4) - const EVENT_BEAT_CELADON_GYM_TRAINER_4 ; 1AD, (D77C, bit 5) - const EVENT_BEAT_CELADON_GYM_TRAINER_5 ; 1AE, (D77C, bit 6) - const EVENT_BEAT_CELADON_GYM_TRAINER_6 ; 1AF, (D77C, bit 7) - const EVENT_BEAT_CELADON_GYM_TRAINER_7 ; 1B0, (D77D, bit 0) + const EVENT_BEAT_CELADON_GYM_TRAINER_1 ; 1AB, (D77C, bit 3) + const EVENT_BEAT_CELADON_GYM_TRAINER_2 ; 1AC, (D77C, bit 4) + const EVENT_BEAT_CELADON_GYM_TRAINER_3 ; 1AD, (D77C, bit 5) + const EVENT_BEAT_CELADON_GYM_TRAINER_4 ; 1AE, (D77C, bit 6) + const EVENT_BEAT_CELADON_GYM_TRAINER_5 ; 1AF, (D77C, bit 7) + 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_3 ; 25C, (D792, bit 4) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 ; 25D, (D792, bit 5) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 ; 25E, (D792, bit 6) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 ; 25F, (D792, bit 7) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 ; 25B, (D792, bit 3) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 ; 25C, (D792, bit 4) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 ; 25D, (D792, bit 5) + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 ; 25E, (D792, bit 6) + 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_3 ; 3E4, (D7C3, bit 4) - const EVENT_BEAT_ROUTE_3_TRAINER_4 ; 3E5, (D7C3, bit 5) - const EVENT_BEAT_ROUTE_3_TRAINER_5 ; 3E6, (D7C3, bit 6) - const EVENT_BEAT_ROUTE_3_TRAINER_6 ; 3E7, (D7C3, bit 7) - const EVENT_BEAT_ROUTE_3_TRAINER_7 ; 3E8, (D7C4, bit 0) - const EVENT_BEAT_ROUTE_3_TRAINER_8 ; 3E9, (D7C4, bit 1) + const EVENT_BEAT_ROUTE_3_TRAINER_1 ; 3E3, (D7C3, bit 3) + const EVENT_BEAT_ROUTE_3_TRAINER_2 ; 3E4, (D7C3, bit 4) + const EVENT_BEAT_ROUTE_3_TRAINER_3 ; 3E5, (D7C3, bit 5) + const EVENT_BEAT_ROUTE_3_TRAINER_4 ; 3E6, (D7C3, bit 6) + const EVENT_BEAT_ROUTE_3_TRAINER_5 ; 3E7, (D7C3, bit 7) + const EVENT_BEAT_ROUTE_3_TRAINER_6 ; 3E8, (D7C4, bit 0) + 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_3 ; 443, (D7CF, bit 3) - const EVENT_BEAT_ROUTE_9_TRAINER_4 ; 444, (D7CF, bit 4) - const EVENT_BEAT_ROUTE_9_TRAINER_5 ; 445, (D7CF, bit 5) - const EVENT_BEAT_ROUTE_9_TRAINER_6 ; 446, (D7CF, bit 6) - const EVENT_BEAT_ROUTE_9_TRAINER_7 ; 447, (D7CF, bit 7) - const EVENT_BEAT_ROUTE_9_TRAINER_8 ; 448, (D7D0, bit 0) - const EVENT_BEAT_ROUTE_9_TRAINER_9 ; 449, (D7D0, bit 1) + const EVENT_BEAT_ROUTE_9_TRAINER_1 ; 442, (D7CF, bit 2) + const EVENT_BEAT_ROUTE_9_TRAINER_2 ; 443, (D7CF, bit 3) + const EVENT_BEAT_ROUTE_9_TRAINER_3 ; 444, (D7CF, bit 4) + const EVENT_BEAT_ROUTE_9_TRAINER_4 ; 445, (D7CF, bit 5) + const EVENT_BEAT_ROUTE_9_TRAINER_5 ; 446, (D7CF, bit 6) + const EVENT_BEAT_ROUTE_9_TRAINER_6 ; 447, (D7CF, bit 7) + const EVENT_BEAT_ROUTE_9_TRAINER_7 ; 448, (D7D0, bit 0) + 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_2 ; 45A, (D7D2, bit 2) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 ; 45B, (D7D2, bit 3) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 ; 45C, (D7D2, bit 4) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 ; 45D, (D7D2, bit 5) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45E, (D7D2, bit 6) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 ; 45F, (D7D2, bit 7) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 ; 459, (D7D2, bit 1) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 ; 45A, (D7D2, bit 2) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 ; 45B, (D7D2, bit 3) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 ; 45C, (D7D2, bit 4) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 ; 45D, (D7D2, bit 5) + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 ; 45E, (D7D2, bit 6) + 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_3 ; 493, (D7D9, bit 3) - const EVENT_BEAT_ROUTE_13_TRAINER_4 ; 494, (D7D9, bit 4) - const EVENT_BEAT_ROUTE_13_TRAINER_5 ; 495, (D7D9, bit 5) - const EVENT_BEAT_ROUTE_13_TRAINER_6 ; 496, (D7D9, bit 6) - const EVENT_BEAT_ROUTE_13_TRAINER_7 ; 497, (D7D9, bit 7) - const EVENT_BEAT_ROUTE_13_TRAINER_8 ; 498, (D7DA, bit 0) - const EVENT_BEAT_ROUTE_13_TRAINER_9 ; 499, (D7DA, bit 1) - const EVENT_BEAT_ROUTE_13_TRAINER_10 ; 49A, (D7DA, bit 2) + const EVENT_BEAT_ROUTE_13_TRAINER_1 ; 492, (D7D9, bit 2) + const EVENT_BEAT_ROUTE_13_TRAINER_2 ; 493, (D7D9, bit 3) + const EVENT_BEAT_ROUTE_13_TRAINER_3 ; 494, (D7D9, bit 4) + const EVENT_BEAT_ROUTE_13_TRAINER_4 ; 495, (D7D9, bit 5) + const EVENT_BEAT_ROUTE_13_TRAINER_5 ; 496, (D7D9, bit 6) + const EVENT_BEAT_ROUTE_13_TRAINER_6 ; 497, (D7D9, bit 7) + const EVENT_BEAT_ROUTE_13_TRAINER_7 ; 498, (D7DA, bit 0) + const EVENT_BEAT_ROUTE_13_TRAINER_8 ; 499, (D7DA, bit 1) + 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_3 ; 503, (D7E7, bit 3) - const EVENT_BEAT_ROUTE_20_TRAINER_4 ; 504, (D7E7, bit 4) - const EVENT_BEAT_ROUTE_20_TRAINER_5 ; 505, (D7E7, bit 5) - const EVENT_BEAT_ROUTE_20_TRAINER_6 ; 506, (D7E7, bit 6) - const EVENT_BEAT_ROUTE_20_TRAINER_7 ; 507, (D7E7, bit 7) - const EVENT_BEAT_ROUTE_20_TRAINER_8 ; 508, (D7E8, bit 0) - const EVENT_BEAT_ROUTE_20_TRAINER_9 ; 509, (D7E8, bit 1) - const EVENT_BEAT_ROUTE_20_TRAINER_10 ; 50A, (D7E8, bit 2) + const EVENT_BEAT_ROUTE_20_TRAINER_1 ; 502, (D7E7, bit 2) + const EVENT_BEAT_ROUTE_20_TRAINER_2 ; 503, (D7E7, bit 3) + const EVENT_BEAT_ROUTE_20_TRAINER_3 ; 504, (D7E7, bit 4) + const EVENT_BEAT_ROUTE_20_TRAINER_4 ; 505, (D7E7, bit 5) + const EVENT_BEAT_ROUTE_20_TRAINER_5 ; 506, (D7E7, bit 6) + const EVENT_BEAT_ROUTE_20_TRAINER_6 ; 507, (D7E7, bit 7) + const EVENT_BEAT_ROUTE_20_TRAINER_7 ; 508, (D7E8, bit 0) + const EVENT_BEAT_ROUTE_20_TRAINER_8 ; 509, (D7E8, bit 1) + 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_3 ; 53B, (D7EE, bit 3) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53C, (D7EE, bit 4) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 ; 53D, (D7EE, bit 5) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 ; 53A, (D7EE, bit 2) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 ; 53B, (D7EE, bit 3) + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53C, (D7EE, bit 4) + 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_3 ; 544, (D7EF, bit 4) - const EVENT_BEAT_ROUTE_24_TRAINER_4 ; 545, (D7EF, bit 5) - const EVENT_BEAT_ROUTE_24_TRAINER_5 ; 546, (D7EF, bit 6) - const EVENT_BEAT_ROUTE_24_TRAINER_6 ; 547, (D7EF, bit 7) + const EVENT_BEAT_ROUTE_24_TRAINER_1 ; 543, (D7EF, bit 3) + const EVENT_BEAT_ROUTE_24_TRAINER_2 ; 544, (D7EF, bit 4) + const EVENT_BEAT_ROUTE_24_TRAINER_3 ; 545, (D7EF, bit 5) + const EVENT_BEAT_ROUTE_24_TRAINER_4 ; 546, (D7EF, bit 6) + 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_3 ; 553, (D7F1, bit 3) - const EVENT_BEAT_ROUTE_25_TRAINER_4 ; 554, (D7F1, bit 4) - const EVENT_BEAT_ROUTE_25_TRAINER_5 ; 555, (D7F1, bit 5) - const EVENT_BEAT_ROUTE_25_TRAINER_6 ; 556, (D7F1, bit 6) - const EVENT_BEAT_ROUTE_25_TRAINER_7 ; 557, (D7F1, bit 7) - const EVENT_BEAT_ROUTE_25_TRAINER_8 ; 558, (D7F2, bit 0) - const EVENT_BEAT_ROUTE_25_TRAINER_9 ; 559, (D7F2, bit 1) + const EVENT_BEAT_ROUTE_25_TRAINER_1 ; 552, (D7F1, bit 2) + const EVENT_BEAT_ROUTE_25_TRAINER_2 ; 553, (D7F1, bit 3) + const EVENT_BEAT_ROUTE_25_TRAINER_3 ; 554, (D7F1, bit 4) + const EVENT_BEAT_ROUTE_25_TRAINER_4 ; 555, (D7F1, bit 5) + const EVENT_BEAT_ROUTE_25_TRAINER_5 ; 556, (D7F1, bit 6) + const EVENT_BEAT_ROUTE_25_TRAINER_6 ; 557, (D7F1, bit 7) + const EVENT_BEAT_ROUTE_25_TRAINER_7 ; 558, (D7F2, bit 0) + 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_3 ; 573, (D7F5, bit 3) - const EVENT_BEAT_MT_MOON_1_TRAINER_4 ; 574, (D7F5, bit 4) - const EVENT_BEAT_MT_MOON_1_TRAINER_5 ; 575, (D7F5, bit 5) - const EVENT_BEAT_MT_MOON_1_TRAINER_6 ; 576, (D7F5, bit 6) - const EVENT_BEAT_MT_MOON_1_TRAINER_7 ; 577, (D7F5, bit 7) + const EVENT_BEAT_MT_MOON_1_TRAINER_1 ; 572, (D7F5, bit 2) + const EVENT_BEAT_MT_MOON_1_TRAINER_2 ; 573, (D7F5, bit 3) + const EVENT_BEAT_MT_MOON_1_TRAINER_3 ; 574, (D7F5, bit 4) + const EVENT_BEAT_MT_MOON_1_TRAINER_4 ; 575, (D7F5, bit 5) + const EVENT_BEAT_MT_MOON_1_TRAINER_5 ; 576, (D7F5, bit 6) + 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_3 ; 57C, (D7F6, bit 4) - const EVENT_BEAT_MT_MOON_3_TRAINER_4 ; 57D, (D7F6, bit 5) + const EVENT_BEAT_MT_MOON_3_TRAINER_1 ; 57B, (D7F6, bit 3) + const EVENT_BEAT_MT_MOON_3_TRAINER_2 ; 57C, (D7F6, bit 4) + 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_3 ; 663, (D813, bit 3) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 ; 664, (D813, bit 4) + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 ; 662, (D813, bit 2) + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 ; 663, (D813, bit 3) + 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_3 ; 673, (D815, bit 3) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ; 674, (D815, bit 4) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 ; 675, (D815, bit 5) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 ; 672, (D815, bit 2) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 ; 673, (D815, bit 3) + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 ; 674, (D815, bit 4) + 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_3 ; 6A4, (D81B, bit 4) + const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 ; 6A3, (D81B, bit 3) + 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_3 ; 714, (D829, bit 4) + const EVENT_BEAT_SILPH_CO_4F_TRAINER_1 ; 713, (D829, bit 3) + 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_3 ; 724, (D82B, bit 4) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_4 ; 725, (D82B, bit 5) + const EVENT_BEAT_SILPH_CO_5F_TRAINER_1 ; 723, (D82B, bit 3) + const EVENT_BEAT_SILPH_CO_5F_TRAINER_2 ; 724, (D82B, bit 4) + 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_3 ; 738, (D82E, bit 0) + const EVENT_BEAT_SILPH_CO_6F_TRAINER_1 ; 737, (D82D, bit 7) + 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_3 ; 747, (D82F, bit 7) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_4 ; 748, (D830, bit 0) + const EVENT_BEAT_SILPH_CO_7F_TRAINER_1 ; 746, (D82F, bit 6) + const EVENT_BEAT_SILPH_CO_7F_TRAINER_2 ; 747, (D82F, bit 7) + 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_3 ; 9B3, (D87D, bit 3) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 ; 9B4, (D87D, bit 4) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 ; 9B5, (D87D, bit 5) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 ; 9B6, (D87D, bit 6) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 ; 9B7, (D87D, bit 7) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8 ; 9B8, (D87E, bit 0) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 ; 9B2, (D87D, bit 2) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 ; 9B3, (D87D, bit 3) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 ; 9B4, (D87D, bit 4) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 ; 9B5, (D87D, bit 5) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 ; 9B6, (D87D, bit 6) + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 ; 9B7, (D87D, bit 7) + 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) |