diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-16 18:10:10 -0400 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-16 18:10:10 -0400 |
commit | 894955f9d922de5fc33e6c0aa7af9795dbcbc158 (patch) | |
tree | 67dd99bdc03ba493937ed00876d5cd0229a83369 /constants/event_flags.asm | |
parent | 7054bfe71718d5b327bbd3725c82d2431c7fcfb1 (diff) |
Special script annotation, trainer constant enumeration, person-event structure update
Diffstat (limited to 'constants/event_flags.asm')
-rw-r--r-- | constants/event_flags.asm | 345 |
1 files changed, 196 insertions, 149 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index c158a5278..3df321a82 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,8 +1,8 @@ const_def - const EVENT_000 - const EVENT_001 + const EVENT_CHRIS1_IN_CABLE_CLUB + const EVENT_CHRIS2_IN_CABLE_CLUB const EVENT_002 const EVENT_003 const EVENT_004 @@ -778,16 +778,16 @@ const EVENT_WAREHOUSE_LAYOUT_3 const EVENT_WAREHOUSE_BLOCKED_OFF const EVENT_LEFT_MONS_WITH_CONTEST_OFFICER - const EVENT_309 - const EVENT_WILLS_ROOM_EXIT_OPEN const EVENT_WILLS_ROOM_ENTRANCE_CLOSED - const EVENT_KOGAS_ROOM_EXIT_OPEN + const EVENT_WILLS_ROOM_EXIT_OPEN const EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + const EVENT_KOGAS_ROOM_EXIT_OPEN + const EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED const EVENT_BRUNOS_ROOM_EXIT_OPEN const EVENT_KARENS_ROOM_ENTRANCE_CLOSED const EVENT_KARENS_ROOM_EXIT_OPEN const EVENT_LANCES_ROOM_ENTRANCE_CLOSED - const EVENT_312 + const EVENT_LANCES_ROOM_EXIT_OPEN const EVENT_CONTEST_OFFICER_HAS_SUN_STONE const EVENT_CONTEST_OFFICER_HAS_EVERSTONE const EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY @@ -1001,6 +1001,8 @@ const EVENT_3E5 const EVENT_3E6 const EVENT_3E7 +; Trainer Flags +; Swimmer F const EVENT_BEAT_SWIMMERF_ELAINE const EVENT_BEAT_SWIMMERF_PAULA const EVENT_BEAT_SWIMMERF_KAYLEE @@ -1008,18 +1010,19 @@ const EVENT_BEAT_SWIMMERF_DENISE const EVENT_BEAT_SWIMMERF_KARA const EVENT_BEAT_SWIMMERF_WENDY - const EVENT_3EF - const EVENT_3F0 - const EVENT_3F1 - const EVENT_3F2 + const EVENT_BEAT_SWIMMERF_LISA + const EVENT_BEAT_SWIMMERF_JILL + const EVENT_BEAT_SWIMMERF_MARY + const EVENT_BEAT_SWIMMERF_KATIE const EVENT_BEAT_SWIMMERF_DAWN - const EVENT_3F4 + const EVENT_BEAT_SWIMMERF_TARA const EVENT_BEAT_SWIMMERF_NICOLE const EVENT_BEAT_SWIMMERF_LORI - const EVENT_3F7 + const EVENT_BEAT_SWIMMERF_JODY const EVENT_BEAT_SWIMMERF_NIKKI const EVENT_BEAT_SWIMMERF_DIANA const EVENT_BEAT_SWIMMERF_BRIANA +; Bird Keeper const EVENT_BEAT_BIRD_KEEPER_ROD const EVENT_BEAT_BIRD_KEEPER_ABE const EVENT_BEAT_BIRD_KEEPER_BRYAN @@ -1031,17 +1034,19 @@ const EVENT_BEAT_BIRD_KEEPER_ROY const EVENT_BEAT_BIRD_KEEPER_BORIS const EVENT_BEAT_BIRD_KEEPER_BOB - const EVENT_406 - const EVENT_BEAT_BIRD_KEEPER_PETER const EVENT_BEAT_BIRD_KEEPER_JOSE + const EVENT_BEAT_BIRD_KEEPER_PETER + const EVENT_BEAT_BIRD_KEEPER_JOSE2 const EVENT_BEAT_BIRD_KEEPER_PERRY const EVENT_BEAT_BIRD_KEEPER_BRET - const EVENT_40B - const EVENT_40C - const EVENT_40D + const EVENT_BEAT_BIRD_KEEPER_JOSE3 + const EVENT_BEAT_BIRD_KEEPER_VANCE2 + const EVENT_BEAT_BIRD_KEEPER_VANCE3 +; Boarder const EVENT_BEAT_BOARDER_RONALD const EVENT_BEAT_BOARDER_BRAD const EVENT_BEAT_BOARDER_DOUGLAS +; Sage const EVENT_BEAT_SAGE_CHOW const EVENT_BEAT_SAGE_NICO const EVENT_BEAT_SAGE_JIN @@ -1051,6 +1056,7 @@ const EVENT_BEAT_SAGE_EDMOND const EVENT_BEAT_SAGE_NEAL const EVENT_BEAT_SAGE_LI +; Camper const EVENT_BEAT_CAMPER_ROLAND const EVENT_BEAT_CAMPER_TODD const EVENT_BEAT_CAMPER_IVAN @@ -1059,23 +1065,26 @@ const EVENT_BEAT_CAMPER_LLOYD const EVENT_BEAT_CAMPER_DEAN const EVENT_BEAT_CAMPER_SID - const EVENT_422 - const EVENT_423 + const EVENT_BEAT_CAMPER_HERVEY + const EVENT_BEAT_CAMPER_DALE const EVENT_BEAT_CAMPER_TED - const EVENT_425 - const EVENT_426 - const EVENT_427 - const EVENT_428 - const EVENT_429 - const EVENT_42A + const EVENT_BEAT_CAMPER_TODD2 + const EVENT_BEAT_CAMPER_TODD3 + const EVENT_BEAT_CAMPER_THOMAS + const EVENT_BEAT_CAMPER_LEROY + const EVENT_BEAT_CAMPER_DAVID + const EVENT_BEAT_CAMPER_JOHN const EVENT_BEAT_CAMPER_JERRY const EVENT_BEAT_CAMPER_SPENCER +; Burglar const EVENT_BEAT_BURGLAR_DUNCAN const EVENT_BEAT_BURGLAR_EDDIE const EVENT_BEAT_BURGLAR_COREY +; Unknown const EVENT_430 - const EVENT_431 - const EVENT_432 +; Biker + const EVENT_BEAT_BIKER_BENNY + const EVENT_BEAT_BIKER_KAZU const EVENT_BEAT_BIKER_DWAYNE const EVENT_BEAT_BIKER_HARRIS const EVENT_BEAT_BIKER_ZEKE @@ -1083,6 +1092,7 @@ const EVENT_BEAT_BIKER_RILEY const EVENT_BEAT_BIKER_JOEL const EVENT_BEAT_BIKER_GLENN +; Psychic const EVENT_BEAT_PSYCHIC_NATHAN const EVENT_BEAT_PSYCHIC_FRANKLIN const EVENT_BEAT_PSYCHIC_HERMAN @@ -1095,14 +1105,16 @@ const EVENT_BEAT_PSYCHIC_GILBERT const EVENT_BEAT_PSYCHIC_JARED const EVENT_BEAT_PSYCHIC_RODNEY +; Firebreather const EVENT_BEAT_FIREBREATHER_OTIS - const EVENT_447 - const EVENT_448 + const EVENT_BEAT_FIREBREATHER_DICK + const EVENT_BEAT_FIREBREATHER_NED const EVENT_BEAT_FIREBREATHER_BURT const EVENT_BEAT_FIREBREATHER_BILL const EVENT_BEAT_FIREBREATHER_WALT const EVENT_BEAT_FIREBREATHER_RAY const EVENT_BEAT_FIREBREATHER_LYLE +; Fisher const EVENT_BEAT_FISHER_JUSTIN const EVENT_BEAT_FISHER_RALPH const EVENT_BEAT_FISHER_ARNOLD @@ -1118,21 +1130,23 @@ const EVENT_BEAT_FISHER_MARTIN const EVENT_BEAT_FISHER_STEPHEN const EVENT_BEAT_FISHER_BARNEY - const EVENT_45D - const EVENT_45E - const EVENT_45F - const EVENT_460 - const EVENT_461 + const EVENT_BEAT_FISHER_RALPH2 + const EVENT_BEAT_FISHER_RALPH3 + const EVENT_BEAT_FISHER_TULLY2 + const EVENT_BEAT_FISHER_TULLY3 + const EVENT_BEAT_FISHER_WILTON2 const EVENT_BEAT_FISHER_SCOTT - const EVENT_463 + const EVENT_BEAT_FISHER_WILTON3 +; Twins const EVENT_BEAT_TWINS_AMY_AND_MAY const EVENT_BEAT_TWINS_ANN_AND_ANNE - const EVENT_466 - const EVENT_467 + const EVENT_BEAT_TWINS_ANN_AND_ANNE2 + const EVENT_BEAT_TWINS_AMY_AND_MAY2 const EVENT_BEAT_TWINS_JO_AND_ZOE - const EVENT_469 + const EVENT_BEAT_TWINS_JO_AND_ZOE2 const EVENT_BEAT_TWINS_MEG_AND_PEG - const EVENT_46B + const EVENT_BEAT_TWINS_MEG_AND_PEG2 +; Schoolboy const EVENT_BEAT_SCHOOLBOY_JACK const EVENT_BEAT_SCHOOLBOY_KIP const EVENT_BEAT_SCHOOLBOY_ALAN @@ -1145,12 +1159,13 @@ const EVENT_BEAT_SCHOOLBOY_CHAD const EVENT_BEAT_SCHOOLBOY_NATE const EVENT_BEAT_SCHOOLBOY_RICKY - const EVENT_478 - const EVENT_479 - const EVENT_47A - const EVENT_47B - const EVENT_47C - const EVENT_47D + const EVENT_BEAT_SCHOOLBOY_JACK2 + const EVENT_BEAT_SCHOOLBOY_JACK3 + const EVENT_BEAT_SCHOOLBOY_ALAN2 + const EVENT_BEAT_SCHOOLBOY_ALAN3 + const EVENT_BEAT_SCHOOLBOY_CHAD2 + const EVENT_BEAT_SCHOOLBOY_CHAD3 +; Picnicker const EVENT_BEAT_PICNICKER_LIZ const EVENT_BEAT_PICNICKER_GINA const EVENT_BEAT_PICNICKER_BROOKE @@ -1159,61 +1174,68 @@ const EVENT_BEAT_PICNICKER_HOPE const EVENT_BEAT_PICNICKER_SHARON const EVENT_BEAT_PICNICKER_DEBRA - const EVENT_486 + const EVENT_BEAT_PICNICKER_GINA2 const EVENT_BEAT_PICNICKER_ERIN - const EVENT_488 - const EVENT_489 + const EVENT_BEAT_PICNICKER_LIZ2 + const EVENT_BEAT_PICNICKER_LIZ3 const EVENT_BEAT_PICNICKER_HEIDI const EVENT_BEAT_PICNICKER_EDNA - const EVENT_48C - const EVENT_48D - const EVENT_48E - const EVENT_48F + const EVENT_BEAT_PICNICKER_GINA3 + const EVENT_BEAT_PICNICKER_TIFFANY2 + const EVENT_BEAT_PICNICKER_TIFFANY3 + const EVENT_BEAT_PICNICKER_ERIN2 const EVENT_BEAT_PICNICKER_TANYA const EVENT_BEAT_PICNICKER_TIFFANY - const EVENT_492 + const EVENT_BEAT_PICNICKER_ERIN3 +; Guitarist const EVENT_BEAT_GUITARIST_CLYDE const EVENT_BEAT_GUITARIST_VINCENT +; Juggler const EVENT_BEAT_JUGGLER_IRWIN const EVENT_BEAT_JUGGLER_FRITZ const EVENT_BEAT_JUGGLER_HORTON - const EVENT_498 - const EVENT_499 + const EVENT_BEAT_JUGGLER_IRWIN2 + const EVENT_BEAT_JUGGLER_IRWIN3 +; Gentleman const EVENT_BEAT_GENTLEMAN_PRESTON const EVENT_BEAT_GENTLEMAN_EDWARD const EVENT_BEAT_GENTLEMAN_GREGORY - const EVENT_49D + const EVENT_BEAT_GENTLEMAN_VIRGIL const EVENT_BEAT_GENTLEMAN_ALFRED +; Scientist const EVENT_BEAT_SCIENTIST_ROSS const EVENT_BEAT_SCIENTIST_MITCH const EVENT_BEAT_SCIENTIST_JED const EVENT_BEAT_SCIENTIST_MARC const EVENT_BEAT_SCIENTIST_RICH - const EVENT_4A4 +; Blackbelt + const EVENT_BEAT_BLACKBELT_KENJI2 const EVENT_BEAT_BLACKBELT_YOSHI - const EVENT_4A6 + const EVENT_BEAT_BLACKBELT_KENJI3 const EVENT_BEAT_BLACKBELT_LAO const EVENT_BEAT_BLACKBELT_NOB const EVENT_BEAT_BLACKBELT_KIYO const EVENT_BEAT_BLACKBELT_LUNG const EVENT_BEAT_BLACKBELT_KENJI const EVENT_BEAT_BLACKBELT_WAI +; Beauti const EVENT_BEAT_BEAUTY_VICTORIA const EVENT_BEAT_BEAUTY_SAMANTHA - const EVENT_4AF - const EVENT_4B0 - const EVENT_4B1 + const EVENT_BEAT_BEAUTY_JULIE + const EVENT_BEAT_BEAUTY_JACLYN + const EVENT_BEAT_BEAUTY_BRENDA const EVENT_BEAT_BEAUTY_CASSIE - const EVENT_4B3 - const EVENT_4B4 - const EVENT_4B5 - const EVENT_4B6 - const EVENT_4B7 - const EVENT_4B8 - const EVENT_4B9 + const EVENT_BEAT_BEAUTY_CAROLINE + const EVENT_BEAT_BEAUTY_CARLENE + const EVENT_BEAT_BEAUTY_JESSICA + const EVENT_BEAT_BEAUTY_RACHAEL + const EVENT_BEAT_BEAUTY_ANGELICA + const EVENT_BEAT_BEAUTY_KENDRA + const EVENT_BEAT_BEAUTY_VERONICA const EVENT_BEAT_BEAUTY_JULIA - const EVENT_4BB + const EVENT_BEAT_BEAUTY_THERESA const EVENT_BEAT_BEAUTY_VALERIE +; Johto Gym Leaders const EVENT_BEAT_FALKNER const EVENT_BEAT_BUGSY const EVENT_BEAT_WHITNEY @@ -1222,6 +1244,7 @@ const EVENT_BEAT_CHUCK const EVENT_BEAT_PRYCE const EVENT_BEAT_CLAIR +; Kanto Gym Leaders const EVENT_BEAT_BROCK const EVENT_BEAT_MISTY const EVENT_BEAT_LTSURGE @@ -1230,6 +1253,7 @@ const EVENT_BEAT_SABRINA const EVENT_BEAT_BLAINE const EVENT_BEAT_BLUE +; PokefanM const EVENT_BEAT_POKEFANM_WILLIAM const EVENT_BEAT_POKEFANM_DEREK const EVENT_BEAT_POKEFANM_ROBERT @@ -1239,20 +1263,24 @@ const EVENT_BEAT_POKEFANM_BRANDON const EVENT_BEAT_POKEFANM_JEREMY const EVENT_BEAT_POKEFANM_COLIN - const EVENT_4D6 - const EVENT_4D7 + const EVENT_BEAT_POKEFANM_DEREK2 + const EVENT_BEAT_POKEFANM_DEREK3 const EVENT_BEAT_POKEFANM_ALEX +; PokefanF const EVENT_BEAT_POKEFANF_BEVERLY const EVENT_BEAT_POKEFANF_RUTH - const EVENT_4DB - const EVENT_4DC + const EVENT_BEAT_POKEFANF_BEVERLY2 + const EVENT_BEAT_POKEFANF_BEVERLY3 const EVENT_BEAT_POKEFANF_GEORGIA +; Unknown const EVENT_4DE +; Kimono Girl const EVENT_BEAT_KIMONO_GIRL_NAOKO const EVENT_BEAT_KIMONO_GIRL_SAYO const EVENT_BEAT_KIMONO_GIRL_ZUKI const EVENT_BEAT_KIMONO_GIRL_KUNI const EVENT_BEAT_KIMONO_GIRL_MIKI +; Pokemaniac const EVENT_BEAT_POKEMANIAC_LARRY const EVENT_BEAT_POKEMANIAC_ANDREW const EVENT_BEAT_POKEMANIAC_CALVIN @@ -1261,11 +1289,12 @@ const EVENT_BEAT_POKEMANIAC_BRENT const EVENT_BEAT_POKEMANIAC_RON const EVENT_BEAT_POKEMANIAC_ETHAN - const EVENT_4EC - const EVENT_4ED + const EVENT_BEAT_POKEMANIAC_BRENT2 + const EVENT_BEAT_POKEMANIAC_BRENT3 const EVENT_BEAT_POKEMANIAC_ISSAC const EVENT_BEAT_POKEMANIAC_DONALD const EVENT_BEAT_POKEMANIAC_ZACH +; GruntM const EVENT_BEAT_ROCKET_GRUNTM_1 const EVENT_BEAT_ROCKET_GRUNTM_2 const EVENT_BEAT_ROCKET_GRUNTM_3 @@ -1277,7 +1306,6 @@ const EVENT_BEAT_ROCKET_GRUNTM_9 const EVENT_BEAT_ROCKET_GRUNTM_10 const EVENT_BEAT_ROCKET_GRUNTM_11 - const EVENT_4FC const EVENT_BEAT_ROCKET_GRUNTM_12 const EVENT_BEAT_ROCKET_GRUNTM_13 const EVENT_BEAT_ROCKET_GRUNTM_14 @@ -1285,23 +1313,26 @@ const EVENT_BEAT_ROCKET_GRUNTM_16 const EVENT_BEAT_ROCKET_GRUNTM_17 const EVENT_BEAT_ROCKET_GRUNTM_18 - const EVENT_504 - const EVENT_505 - const EVENT_506 - const EVENT_507 const EVENT_BEAT_ROCKET_GRUNTM_19 const EVENT_BEAT_ROCKET_GRUNTM_20 - const EVENT_50A - const EVENT_50B const EVENT_BEAT_ROCKET_GRUNTM_21 const EVENT_BEAT_ROCKET_GRUNTM_22 - const EVENT_50E - const EVENT_50F + const EVENT_BEAT_ROCKET_GRUNTM_23 + const EVENT_BEAT_ROCKET_GRUNTM_24 + const EVENT_BEAT_ROCKET_GRUNTM_25 + const EVENT_BEAT_ROCKET_GRUNTM_26 + const EVENT_BEAT_ROCKET_GRUNTM_27 + const EVENT_BEAT_ROCKET_GRUNTM_28 + const EVENT_BEAT_ROCKET_GRUNTM_29 + const EVENT_BEAT_ROCKET_GRUNTM_30 + const EVENT_BEAT_ROCKET_GRUNTM_31 +; GruntF const EVENT_BEAT_ROCKET_GRUNTF_1 const EVENT_BEAT_ROCKET_GRUNTF_2 const EVENT_BEAT_ROCKET_GRUNTF_3 const EVENT_BEAT_ROCKET_GRUNTF_4 const EVENT_BEAT_ROCKET_GRUNTF_5 +; Lass const EVENT_BEAT_LASS_CARRIE const EVENT_BEAT_LASS_BRIDGET const EVENT_BEAT_LASS_ALICE @@ -1313,11 +1344,12 @@ const EVENT_BEAT_LASS_MICHELLE const EVENT_BEAT_LASS_DANA const EVENT_BEAT_LASS_ELLEN - const EVENT_520 - const EVENT_521 - const EVENT_522 - const EVENT_523 - const EVENT_524 + const EVENT_BEAT_LASS_CONNIE2 + const EVENT_BEAT_LASS_CONNIE3 + const EVENT_BEAT_LASS_DANA2 + const EVENT_BEAT_LASS_DANA3 +; Hiker + const EVENT_BEAT_HIKER_ANTHONY2 const EVENT_BEAT_HIKER_RUSSELL const EVENT_BEAT_HIKER_PHILLIP const EVENT_BEAT_HIKER_LEONARD @@ -1328,15 +1360,16 @@ const EVENT_BEAT_HIKER_PARRY const EVENT_BEAT_HIKER_TIMOTHY const EVENT_BEAT_HIKER_BAILEY - const EVENT_52F + const EVENT_BEAT_HIKER_ANTHONY3 const EVENT_BEAT_HIKER_TIM const EVENT_BEAT_HIKER_NOLAND const EVENT_BEAT_HIKER_SIDNEY const EVENT_BEAT_HIKER_KENNY const EVENT_BEAT_HIKER_JIM const EVENT_BEAT_HIKER_DANIEL - const EVENT_536 - const EVENT_537 + const EVENT_BEAT_HIKER_PARRY2 + const EVENT_BEAT_HIKER_PARRY3 +; Bug Catcher const EVENT_BEAT_BUG_CATCHER_DON const EVENT_BEAT_BUG_CATCHER_ROB const EVENT_BEAT_BUG_CATCHER_ED @@ -1346,32 +1379,35 @@ const EVENT_BEAT_BUG_CATCHER_JOSH const EVENT_BEAT_BUG_CATCHER_ARNIE const EVENT_BEAT_BUG_CATCHER_KEN - const EVENT_541 - const EVENT_542 + const EVENT_BEAT_BUG_CATCHER_WADE2 + const EVENT_BEAT_BUG_CATCHER_WADE3 const EVENT_BEAT_BUG_CATCHER_DOUG - const EVENT_544 - const EVENT_545 + const EVENT_BEAT_BUG_CATCHER_ARNIE2 + const EVENT_BEAT_BUG_CATCHER_ARNIE3 +; Officer const EVENT_BEAT_OFFICER_KEITH const EVENT_BEAT_OFFICER_DIRK +; CooltrainerM const EVENT_BEAT_COOLTRAINERM_NICK const EVENT_BEAT_COOLTRAINERM_AARON const EVENT_BEAT_COOLTRAINERM_PAUL const EVENT_BEAT_COOLTRAINERM_CODY const EVENT_BEAT_COOLTRAINERM_MIKE - const EVENT_54D - const EVENT_54E + const EVENT_BEAT_COOLTRAINERM_GAVEN2 + const EVENT_BEAT_COOLTRAINERM_GAVEN3 const EVENT_BEAT_COOLTRAINERM_RYAN const EVENT_BEAT_COOLTRAINERM_JAKE const EVENT_BEAT_COOLTRAINERM_GAVEN const EVENT_BEAT_COOLTRAINERM_BLAKE const EVENT_BEAT_COOLTRAINERM_BRIAN - const EVENT_554 - const EVENT_555 - const EVENT_556 + const EVENT_BEAT_COOLTRAINERM_ERICK + const EVENT_BEAT_COOLTRAINERM_ANDY + const EVENT_BEAT_COOLTRAINERM_TYLER const EVENT_BEAT_COOLTRAINERM_SEAN const EVENT_BEAT_COOLTRAINERM_KEVIN - const EVENT_559 + const EVENT_BEAT_COOLTRAINERM_STEVE const EVENT_BEAT_COOLTRAINERM_ALLEN +; CooltrainerF const EVENT_BEAT_COOLTRAINERF_GWEN const EVENT_BEAT_COOLTRAINERF_LOIS const EVENT_BEAT_COOLTRAINERF_FRAN @@ -1383,21 +1419,24 @@ const EVENT_BEAT_COOLTRAINERF_BETH const EVENT_BEAT_COOLTRAINERF_REENA const EVENT_BEAT_COOLTRAINERF_MEGAN - const EVENT_566 + const EVENT_BEAT_COOLTRAINERF_BETH2 const EVENT_BEAT_COOLTRAINERF_CAROL const EVENT_BEAT_COOLTRAINERF_QUINN const EVENT_BEAT_COOLTRAINERF_EMMA const EVENT_BEAT_COOLTRAINERF_CYBIL const EVENT_BEAT_COOLTRAINERF_JENN - const EVENT_56C - const EVENT_56D - const EVENT_56E + const EVENT_BEAT_COOLTRAINERF_BETH3 + const EVENT_BEAT_COOLTRAINERF_REENA2 + const EVENT_BEAT_COOLTRAINERF_REENA3 +; ExecutiveF const EVENT_BEAT_ROCKET_EXECUTIVEF_1 const EVENT_BEAT_ROCKET_EXECUTIVEF_2 +; ExecutiveM const EVENT_BEAT_ROCKET_EXECUTIVEM_1 const EVENT_BEAT_ROCKET_EXECUTIVEM_2 const EVENT_BEAT_ROCKET_EXECUTIVEM_3 const EVENT_BEAT_ROCKET_EXECUTIVEM_4 +; Sailor const EVENT_BEAT_SAILOR_EUGENE const EVENT_BEAT_SAILOR_HUEY const EVENT_BEAT_SAILOR_TERRELL @@ -1408,27 +1447,31 @@ const EVENT_BEAT_SAILOR_KENNETH const EVENT_BEAT_SAILOR_STANLY const EVENT_BEAT_SAILOR_HARRY - const EVENT_57F - const EVENT_580 + const EVENT_BEAT_SAILOR_HUEY2 + const EVENT_BEAT_SAILOR_HUEY3 +; Super Nerd const EVENT_BEAT_SUPER_NERD_STAN const EVENT_BEAT_SUPER_NERD_ERIC - const EVENT_583 - const EVENT_584 - const EVENT_585 + const EVENT_BEAT_SUPER_NERD_GREGG + const EVENT_BEAT_SUPER_NERD_JAY + const EVENT_BEAY_SUPER_NERD_DAVE const EVENT_BEAT_SUPER_NERD_SAM const EVENT_BEAT_SUPER_NERD_TOM const EVENT_BEAT_SUPER_NERD_PAT const EVENT_BEAT_SUPER_NERD_SHAWN const EVENT_BEAT_SUPER_NERD_TERU +; Medium const EVENT_BEAT_MEDIUM_MARTHA const EVENT_BEAT_MEDIUM_GRACE - const EVENT_58D - const EVENT_58E - const EVENT_58F + const EVENT_BEAT_MEDIUM_BETHANY + const EVENT_BEAT_MEDIUM_MARGRET + const EVENT_BEAT_MEDIUM_ETHEL const EVENT_BEAT_MEDIUM_REBECCA const EVENT_BEAT_MEDIUM_DORIS +; Skier const EVENT_BEAT_SKIER_ROXANNE const EVENT_BEAT_SKIER_CLARISSA +; SwimmerM const EVENT_BEAT_SWIMMERM_HAROLD const EVENT_BEAT_SWIMMERM_SIMON const EVENT_BEAT_SWIMMERM_RANDALL @@ -1437,39 +1480,43 @@ const EVENT_BEAT_SWIMMERM_BERKE const EVENT_BEAT_SWIMMERM_KIRK const EVENT_BEAT_SWIMMERM_MATHEW - const EVENT_59C - const EVENT_59D - const EVENT_59E - const EVENT_59F - const EVENT_5A0 + const EVENT_BEAT_SWIMMERM_HAL + const EVENT_BEAT_SWIMMERM_PATON + const EVENT_BEAT_SWIMMERM_DARYL + const EVENT_BEAT_SWIMMERM_WALTER + const EVENT_BEAT_SWIMMERM_TONY const EVENT_BEAT_SWIMMERM_JEROME const EVENT_BEAT_SWIMMERM_TUCKER - const EVENT_5A3 + const EVENT_BEAT_SWIMMERM_RICK const EVENT_BEAT_SWIMMERM_CAMERON const EVENT_BEAT_SWIMMERM_SETH - const EVENT_5A6 - const EVENT_5A7 + const EVENT_BEAT_SWIMMERM_JAMES + const EVENT_BEAT_SWIMMERM_LEWIS const EVENT_BEAT_SWIMMERM_PARKER +; Youngster const EVENT_BEAT_YOUNGSTER_JOEY const EVENT_BEAT_YOUNGSTER_MIKEY const EVENT_BEAT_YOUNGSTER_ALBERT const EVENT_BEAT_YOUNGSTER_GORDON const EVENT_BEAT_YOUNGSTER_SAMUEL const EVENT_BEAT_YOUNGSTER_IAN - const EVENT_5AF - const EVENT_5B0 + const EVENT_BEAT_YOUNGSTER_JOEY2 + const EVENT_BEAT_YOUNGSTER_JOEY3 const EVENT_BEAT_YOUNGSTER_WARREN const EVENT_BEAT_YOUNGSTER_JIMMY const EVENT_BEAT_YOUNGSTER_OWEN const EVENT_BEAT_YOUNGSTER_JASON +; Teacher const EVENT_BEAT_TEACHER_COLETTE const EVENT_BEAT_TEACHER_HILLARY const EVENT_BEAT_TEACHER_SHIRLEY +; Elite Four and Champion const EVENT_BEAT_ELITE_4_WILL const EVENT_BEAT_ELITE_4_KOGA const EVENT_BEAT_ELITE_4_BRUNO const EVENT_BEAT_ELITE_4_KAREN const EVENT_BEAT_CHAMPION_LANCE +; New to Crystal const EVENT_BEAT_COOLTRAINERM_DARIN const EVENT_BEAT_COOLTRAINERF_CARA const EVENT_BEAT_TWINS_LEA_AND_PIA @@ -1601,9 +1648,9 @@ const EVENT_63D const EVENT_63E const EVENT_63F - const EVENT_640 - const EVENT_641 - const EVENT_642 + const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB const EVENT_643 const EVENT_644 const EVENT_645 @@ -1795,7 +1842,7 @@ const EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER const EVENT_ELMS_AIDE_IN_LAB - const EVENT_702 + const EVENT_COP_IN_ELMS_LAB const EVENT_703 const EVENT_704 const EVENT_705 @@ -1810,31 +1857,31 @@ const EVENT_BOULDER_IN_ICE_PATH_2 const EVENT_BOULDER_IN_ICE_PATH_3 const EVENT_BOULDER_IN_ICE_PATH_4 - const EVENT_711 + const EVENT_MYSTERY_GIFT_DELIVERY_GUY const EVENT_MET_BILL const EVENT_713 const EVENT_714 const EVENT_715 - const EVENT_716 - const EVENT_717 - const EVENT_718 - const EVENT_719 - const EVENT_71A - const EVENT_71B - const EVENT_71C - const EVENT_71D - const EVENT_71E - const EVENT_71F - const EVENT_720 - const EVENT_721 - const EVENT_722 - const EVENT_723 - const EVENT_724 - const EVENT_725 - const EVENT_726 - const EVENT_727 - const EVENT_728 - const EVENT_729 + const EVENT_BUG_CATCHING_CONTESTANT_1A + const EVENT_BUG_CATCHING_CONTESTANT_2A + const EVENT_BUG_CATCHING_CONTESTANT_3A + const EVENT_BUG_CATCHING_CONTESTANT_4A + const EVENT_BUG_CATCHING_CONTESTANT_5A + const EVENT_BUG_CATCHING_CONTESTANT_6A + const EVENT_BUG_CATCHING_CONTESTANT_7A + const EVENT_BUG_CATCHING_CONTESTANT_8A + const EVENT_BUG_CATCHING_CONTESTANT_9A + const EVENT_BUG_CATCHING_CONTESTANT_10A + const EVENT_BUG_CATCHING_CONTESTANT_1B + const EVENT_BUG_CATCHING_CONTESTANT_2B + const EVENT_BUG_CATCHING_CONTESTANT_3B + const EVENT_BUG_CATCHING_CONTESTANT_4B + const EVENT_BUG_CATCHING_CONTESTANT_5B + const EVENT_BUG_CATCHING_CONTESTANT_6B + const EVENT_BUG_CATCHING_CONTESTANT_7B + const EVENT_BUG_CATCHING_CONTESTANT_8B + const EVENT_BUG_CATCHING_CONTESTANT_9B + const EVENT_BUG_CATCHING_CONTESTANT_10B const EVENT_72A const EVENT_72B const EVENT_72C |