diff options
Diffstat (limited to 'constants/event_flags.asm')
| -rw-r--r-- | constants/event_flags.asm | 67 |
1 files changed, 41 insertions, 26 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index a36e0273f..82aa5b82f 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -243,7 +243,7 @@ EVENT_BEAT_BIRD_KEEPER_BRYAN EQU $3fd EVENT_BEAT_BIRD_KEEPER_THEO EQU $3fe EVENT_BEAT_BIRD_KEEPER_TOBY EQU $3ff EVENT_BEAT_BIRD_KEEPER_DENIS EQU $400 -EVENT_BEAT_BIRD_KEEPER_VANCE_1 EQU $401 +EVENT_BEAT_BIRD_KEEPER_VANCE EQU $401 EVENT_BEAT_BIRD_KEEPER_HANK EQU $402 EVENT_BEAT_BIRD_KEEPER_ROY EQU $403 EVENT_BEAT_BIRD_KEEPER_BORIS EQU $404 @@ -265,7 +265,7 @@ EVENT_BEAT_SAGE_EDMOND EQU $417 EVENT_BEAT_SAGE_NEAL EQU $418 EVENT_BEAT_SAGE_LI EQU $419 EVENT_BEAT_CAMPER_ROLAND EQU $41a -EVENT_BEAT_CAMPER_TODD_1 EQU $41b +EVENT_BEAT_CAMPER_TODD EQU $41b EVENT_BEAT_CAMPER_IVAN EQU $41c EVENT_BEAT_CAMPER_ELLIOT EQU $41d EVENT_BEAT_CAMPER_BARRY EQU $41e @@ -304,15 +304,15 @@ EVENT_BEAT_FIREBREATHER_WALT EQU $44b EVENT_BEAT_FIREBREATHER_RAY EQU $44c EVENT_BEAT_FIREBREATHER_LYLE EQU $44d EVENT_BEAT_FISHER_JUSTIN EQU $44e -EVENT_BEAT_FISHER_RALPH_1 EQU $44f +EVENT_BEAT_FISHER_RALPH EQU $44f EVENT_BEAT_FISHER_ARNOLD EQU $450 EVENT_BEAT_FISHER_KYLE EQU $451 EVENT_BEAT_FISHER_HENRY EQU $452 EVENT_BEAT_FISHER_MARVIN EQU $453 -EVENT_BEAT_FISHER_TULLY_1 EQU $454 +EVENT_BEAT_FISHER_TULLY EQU $454 EVENT_BEAT_FISHER_ANDRE EQU $455 EVENT_BEAT_FISHER_RAYMOND EQU $456 -EVENT_BEAT_FISHER_WILTON_1 EQU $457 +EVENT_BEAT_FISHER_WILTON EQU $457 EVENT_BEAT_FISHER_EDGAR EQU $458 EVENT_BEAT_FISHER_JONAH EQU $459 EVENT_BEAT_FISHER_MARTIN EQU $45a @@ -323,7 +323,7 @@ EVENT_BEAT_TWINS_AMY_AND_MAY EQU $464 EVENT_BEAT_TWINS_ANN_AND_ANNE EQU $465 EVENT_BEAT_TWINS_JO_AND_ZOE EQU $468 EVENT_BEAT_TWINS_MEG_AND_PEG EQU $46a -EVENT_BEAT_SCHOOLBOY_JACK_1 EQU $46c +EVENT_BEAT_SCHOOLBOY_JACK EQU $46c EVENT_BEAT_SCHOOLBOY_KIP EQU $46d EVENT_BEAT_SCHOOLBOY_ALAN EQU $46e EVENT_BEAT_SCHOOLBOY_JOHNNY EQU $46f @@ -332,25 +332,25 @@ EVENT_BEAT_SCHOOLBOY_TOMMY EQU $471 EVENT_BEAT_SCHOOLBOY_DUDLEY EQU $472 EVENT_BEAT_SCHOOLBOY_JOE EQU $473 EVENT_BEAT_SCHOOLBOY_BILLY EQU $474 -EVENT_BEAT_SCHOOLBOY_CHAD_1 EQU $475 +EVENT_BEAT_SCHOOLBOY_CHAD EQU $475 EVENT_BEAT_SCHOOLBOY_NATE EQU $476 EVENT_BEAT_SCHOOLBOY_RICKY EQU $477 -EVENT_BEAT_PICNICKER_LIZ_1 EQU $47e -EVENT_BEAT_PICNICKER_GINA_1 EQU $47f +EVENT_BEAT_PICNICKER_LIZ EQU $47e +EVENT_BEAT_PICNICKER_GINA EQU $47f EVENT_BEAT_PICNICKER_BROOKE EQU $480 EVENT_BEAT_PICNICKER_KIM EQU $481 EVENT_BEAT_PICNICKER_CINDY EQU $482 EVENT_BEAT_PICNICKER_HOPE EQU $483 EVENT_BEAT_PICNICKER_SHARON EQU $484 EVENT_BEAT_PICNICKER_DEBRA EQU $485 -EVENT_BEAT_PICNICKER_ERIN_1 EQU $487 +EVENT_BEAT_PICNICKER_ERIN EQU $487 EVENT_BEAT_PICNICKER_HEIDI EQU $48a EVENT_BEAT_PICNICKER_EDNA EQU $48b EVENT_BEAT_PICNICKER_TANYA EQU $490 -EVENT_BEAT_PICNICKER_TIFFANY_3 EQU $491 +EVENT_BEAT_PICNICKER_TIFFANY EQU $491 EVENT_BEAT_GUITARIST_CLYDE EQU $493 EVENT_BEAT_GUITARIST_VINCENT EQU $494 -EVENT_BEAT_JUGGLER_IRWIN_1 EQU $495 +EVENT_BEAT_JUGGLER_IRWIN EQU $495 EVENT_BEAT_JUGGLER_FRITZ EQU $496 EVENT_BEAT_JUGGLER_HORTON EQU $497 EVENT_BEAT_GENTLEMAN_PRESTON EQU $49a @@ -365,8 +365,9 @@ EVENT_BEAT_SCIENTIST_RICH EQU $4a3 EVENT_BEAT_BLACKBELT_YOSHI EQU $4a5 EVENT_BEAT_BLACKBELT_LAO EQU $4a7 EVENT_BEAT_BLACKBELT_NOB EQU $4a8 +EVENT_BEAT_BLACKBELT_KIYO EQU $4a9 EVENT_BEAT_BLACKBELT_LUNG EQU $4aa -EVENT_BEAT_BLACKBELT_KENJI_3 EQU $4ab +EVENT_BEAT_BLACKBELT_KENJI EQU $4ab EVENT_BEAT_BLACKBELT_WAI EQU $4ac EVENT_BEAT_BEAUTY_VICTORIA EQU $4ad EVENT_BEAT_BEAUTY_SAMANTHA EQU $4ae @@ -449,7 +450,7 @@ EVENT_BEAT_LASS_CARRIE EQU $515 EVENT_BEAT_LASS_BRIDGET EQU $516 EVENT_BEAT_LASS_ALICE EQU $517 EVENT_BEAT_LASS_KRISE EQU $518 -EVENT_BEAT_LASS_CONNIE_1 EQU $519 +EVENT_BEAT_LASS_CONNIE EQU $519 EVENT_BEAT_LASS_LINDA EQU $51a EVENT_BEAT_LASS_LAURA EQU $51b EVENT_BEAT_LASS_SHANNON EQU $51c @@ -459,11 +460,11 @@ EVENT_BEAT_LASS_ELLEN EQU $51f EVENT_BEAT_HIKER_RUSSELL EQU $525 EVENT_BEAT_HIKER_PHILLIP EQU $526 EVENT_BEAT_HIKER_LEONARD EQU $527 -EVENT_BEAT_HIKER_ANTHONY_2 EQU $528 +EVENT_BEAT_HIKER_ANTHONY EQU $528 EVENT_BEAT_HIKER_BENJAMIN EQU $529 EVENT_BEAT_HIKER_ERIK EQU $52a EVENT_BEAT_HIKER_MICHAEL EQU $52b -EVENT_BEAT_HIKER_PARRY_3 EQU $52c +EVENT_BEAT_HIKER_PARRY EQU $52c EVENT_BEAT_HIKER_TIMOTHY EQU $52d EVENT_BEAT_HIKER_BAILEY EQU $52e EVENT_BEAT_HIKER_TIM EQU $530 @@ -475,13 +476,15 @@ EVENT_BEAT_HIKER_DANIEL EQU $535 EVENT_BEAT_BUG_CATCHER_DON EQU $538 EVENT_BEAT_BUG_CATCHER_ROB EQU $539 EVENT_BEAT_BUG_CATCHER_ED EQU $53a -EVENT_BEAT_BUG_CATCHER_WADE_1 EQU $53b +EVENT_BEAT_BUG_CATCHER_WADE EQU $53b EVENT_BEAT_BUG_CATCHER_BENNY EQU $53c EVENT_BEAT_BUG_CATCHER_AL EQU $53d EVENT_BEAT_BUG_CATCHER_JOSH EQU $53e -EVENT_BEAT_BUG_CATCHER_ARNIE_1 EQU $53f +EVENT_BEAT_BUG_CATCHER_ARNIE EQU $53f EVENT_BEAT_BUG_CATCHER_KEN EQU $540 EVENT_BEAT_BUG_CATCHER_DOUG EQU $543 +EVENT_BEAT_OFFICER_KEITH EQU $546 +EVENT_BEAT_OFFICER_DIRK EQU $547 EVENT_BEAT_COOLTRAINERM_NICK EQU $548 EVENT_BEAT_COOLTRAINERM_AARON EQU $549 EVENT_BEAT_COOLTRAINERM_PAUL EQU $54a @@ -489,10 +492,11 @@ EVENT_BEAT_COOLTRAINERM_CODY EQU $54b EVENT_BEAT_COOLTRAINERM_MIKE EQU $54c EVENT_BEAT_COOLTRAINERM_RYAN EQU $54f EVENT_BEAT_COOLTRAINERM_JAKE EQU $550 -EVENT_BEAT_COOLTRAINERM_GAVEN_3 EQU $551 +EVENT_BEAT_COOLTRAINERM_GAVEN EQU $551 EVENT_BEAT_COOLTRAINERM_BLAKE EQU $552 EVENT_BEAT_COOLTRAINERM_BRIAN EQU $553 EVENT_BEAT_COOLTRAINERM_SEAN EQU $557 +EVENT_BEAT_COOLTRAINERM_KEVIN EQU $558 EVENT_BEAT_COOLTRAINERM_ALLEN EQU $55a EVENT_BEAT_COOLTRAINERF_GWEN EQU $55b EVENT_BEAT_COOLTRAINERF_LOIS EQU $55c @@ -502,25 +506,31 @@ EVENT_BEAT_COOLTRAINERF_KATE EQU $55f EVENT_BEAT_COOLTRAINERF_IRENE EQU $560 EVENT_BEAT_COOLTRAINERF_KELLY EQU $561 EVENT_BEAT_COOLTRAINERF_JOYCE EQU $562 -EVENT_BEAT_COOLTRAINERF_BETH_1 EQU $563 -EVENT_BEAT_COOLTRAINERF_REENA_1 EQU $564 +EVENT_BEAT_COOLTRAINERF_BETH EQU $563 +EVENT_BEAT_COOLTRAINERF_REENA EQU $564 EVENT_BEAT_COOLTRAINERF_MEGAN EQU $565 EVENT_BEAT_COOLTRAINERF_CAROL EQU $567 EVENT_BEAT_COOLTRAINERF_QUINN EQU $568 EVENT_BEAT_COOLTRAINERF_EMMA EQU $569 EVENT_BEAT_COOLTRAINERF_CYBIL EQU $56a EVENT_BEAT_COOLTRAINERF_JENN EQU $56b -EVENT_BEAT_ROCKET_EXECUTIVEF EQU $56f -EVENT_BEAT_ROCKET_EXECUTIVEM EQU $572 +EVENT_BEAT_ROCKET_EXECUTIVEF_1 EQU $56f +EVENT_BEAT_ROCKET_EXECUTIVEF_2 EQU $570 +EVENT_BEAT_ROCKET_EXECUTIVEM_1 EQU $571 +EVENT_BEAT_ROCKET_EXECUTIVEM_2 EQU $572 +EVENT_BEAT_ROCKET_EXECUTIVEM_3 EQU $573 +EVENT_BEAT_ROCKET_EXECUTIVEM_4 EQU $574 EVENT_BEAT_SAILOR_EUGENE EQU $575 -EVENT_BEAT_SAILOR_HUEY_1 EQU $576 +EVENT_BEAT_SAILOR_HUEY EQU $576 EVENT_BEAT_SAILOR_TERRELL EQU $577 EVENT_BEAT_SAILOR_KENT EQU $578 EVENT_BEAT_SAILOR_ERNEST EQU $579 EVENT_BEAT_SAILOR_JEFF EQU $57a EVENT_BEAT_SAILOR_GARRETT EQU $57b EVENT_BEAT_SAILOR_KENNETH EQU $57c +EVENT_BEAT_SAILOR_STANLY EQU $57d EVENT_BEAT_SAILOR_HARRY EQU $57e +EVENT_BEAT_SUPER_NERD_STAN EQU $581 EVENT_BEAT_SUPER_NERD_ERIC EQU $582 EVENT_BEAT_SUPER_NERD_SAM EQU $586 EVENT_BEAT_SUPER_NERD_TOM EQU $587 @@ -546,7 +556,7 @@ EVENT_BEAT_SWIMMERM_TUCKER EQU $5a2 EVENT_BEAT_SWIMMERM_CAMERON EQU $5a4 EVENT_BEAT_SWIMMERM_SETH EQU $5a5 EVENT_BEAT_SWIMMERM_PARKER EQU $5a8 -EVENT_BEAT_YOUNGSTER_JOEY_1 EQU $5a9 +EVENT_BEAT_YOUNGSTER_JOEY EQU $5a9 EVENT_BEAT_YOUNGSTER_MIKEY EQU $5aa EVENT_BEAT_YOUNGSTER_ALBERT EQU $5ab EVENT_BEAT_YOUNGSTER_GORDON EQU $5ac @@ -559,6 +569,9 @@ EVENT_BEAT_YOUNGSTER_JASON EQU $5b4 EVENT_BEAT_TEACHER_COLETTE EQU $5b5 EVENT_BEAT_TEACHER_HILLARY EQU $5b6 EVENT_BEAT_TEACHER_SHIRLEY EQU $5b7 +EVENT_BEAT_ELITE_4_WILL EQU $5b8 +EVENT_BEAT_ELITE_4_KOGA EQU $5b9 +EVENT_BEAT_ELITE_4_BRUNO EQU $5ba EVENT_BEAT_ELITE_4_KAREN EQU $5bb EVENT_BEAT_CHAMPION_LANCE EQU $5bc EVENT_BEAT_COOLTRAINERM_DARIN EQU $5bd @@ -566,7 +579,9 @@ EVENT_BEAT_COOLTRAINERF_CARA EQU $5be EVENT_BEAT_TWINS_LEA_AND_PIA EQU $5bf EVENT_BEAT_BUG_CATCHER_WAYNE EQU $5c0 EVENT_BEAT_BEAUTY_OLIVIA EQU $5c1 -EVENT_BEAT_POKEMANIAC_MILER EQU $5c4 +EVENT_BEAT_POKEFANF_JAIME EQU $5c2 +EVENT_BEAT_CAMPER_QUENTIN EQU $5c3 +EVENT_BEAT_POKEMANIAC_MILLER EQU $5c4 EVENT_BEAT_SUPER_NERD_HUGH EQU $5c5 EVENT_BEAT_SUPER_NERD_MARKUS EQU $5c6 EVENT_BEAT_POKEFANM_REX EQU $5c7 |