diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 345 | ||||
| -rw-r--r-- | constants/map_constants.asm | 11 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 1 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 56 | ||||
| -rw-r--r-- | constants/trainer_constants.asm | 1232 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 2 |
6 files changed, 872 insertions, 775 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 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 75b9b5e76..6e793ef6a 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -739,3 +739,14 @@ OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 const EMOTE_ROD_UP ; 9 const EMOTE_ROD_LEFT ; a const EMOTE_ROD_RIGHT ; b + + const_def + const SIGNPOST_READ + const SIGNPOST_UP + const SIGNPOST_DOWN + const SIGNPOST_RIGHT + const SIGNPOST_LEFT + const SIGNPOST_IFSET + const SIGNPOST_IFNOTSET + const SIGNPOST_ITEMIFSET + const SIGNPOST_COPY diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 6b69713e1..9346ae0e6 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -12,6 +12,7 @@ PLAYER_NAME_LENGTH EQU 8 PKMN_NAME_LENGTH EQU 11 MOVE_NAME_LENGTH EQU 13 ITEM_NAME_LENGTH EQU 13 +TRAINER_CLASS_NAME_LENGTH EQU 13 NAME_LENGTH EQU 11 LV_CHAR EQU $6e diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index c4fde4e75..1d354263f 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,4 +1,5 @@ +; pokemon const_value set 1 const BULBASAUR const IVYSAUR @@ -257,3 +258,58 @@ const_value SET const_value + -1 NUM_POKEMON EQU const_value EGG EQU 253 + +; pokemon structure in RAM + const_def + + const MON_SPECIES + const MON_ITEM + const MON_MOVE1 + const MON_MOVE2 + const MON_MOVE3 + const MON_MOVE4 + const MON_ID + const MON_07 + const MON_EXP + const MON_09 + const MON_0A + const MON_HP_EXP + const MON_0C + const MON_ATK_EXP + const MON_0E + const MON_DEF_EXP + const MON_10 + const MON_SPD_EXP + const MON_12 + const MON_SPC_EXP + const MON_14 + const MON_DVS + const MON_16 + const MON_PP1 + const MON_PP2 + const MON_PP3 + const MON_PP4 + const MON_HAPPINESS + const MON_PKRUS + const MON_CAUGHTTIME + const MON_CAUGHTGENDER + const MON_LEVEL +BOXMON_STRUCT_LENGTH EQU const_value + + const MON_STATUS + const MON_21 + const MON_HP + const MON_23 + const MON_MAXHP + const MON_25 + const MON_ATK + const MON_27 + const MON_DEF + const MON_29 + const MON_SPD + const MON_2B + const MON_SAT + const MON_2D + const MON_SDF + const MON_2F +PARTYMON_STRUCT_LENGTH EQU const_value diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index d546adde4..6eaff4e53 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,625 +1,609 @@ -NUM_TRAINER_CLASSES EQU $44 - ; trainer groups -FALKNER EQU $01 -WHITNEY EQU $02 -BUGSY EQU $03 -MORTY EQU $04 -PRYCE EQU $05 -JASMINE EQU $06 -CHUCK EQU $07 -CLAIR EQU $08 -RIVAL1 EQU $09 -POKEMON_PROF EQU $0A -WILL EQU $0B -CAL EQU $0C -BRUNO EQU $0D -KAREN EQU $0E -KOGA EQU $0F -CHAMPION EQU $10 -BROCK EQU $11 -MISTY EQU $12 -LT_SURGE EQU $13 -SCIENTIST EQU $14 -ERIKA EQU $15 -YOUNGSTER EQU $16 -SCHOOLBOY EQU $17 -BIRD_KEEPER EQU $18 -LASS EQU $19 -JANINE EQU $1A -COOLTRAINERM EQU $1B -COOLTRAINERF EQU $1C -BEAUTY EQU $1D -POKEMANIAC EQU $1E -GRUNTM EQU $1F -GENTLEMAN EQU $20 -SKIER EQU $21 -TEACHER EQU $22 -SABRINA EQU $23 -BUG_CATCHER EQU $24 -FISHER EQU $25 -SWIMMERM EQU $26 -SWIMMERF EQU $27 -SAILOR EQU $28 -SUPER_NERD EQU $29 -RIVAL2 EQU $2A -GUITARIST EQU $2B -HIKER EQU $2C -BIKER EQU $2D -BLAINE EQU $2E -BURGLAR EQU $2F -FIREBREATHER EQU $30 -JUGGLER EQU $31 -BLACKBELT_T EQU $32 -EXECUTIVEM EQU $33 -PSYCHIC_T EQU $34 -PICNICKER EQU $35 -CAMPER EQU $36 -EXECUTIVEF EQU $37 -SAGE EQU $38 -MEDIUM EQU $39 -BOARDER EQU $3A -POKEFANM EQU $3B -KIMONO_GIRL EQU $3C -TWINS EQU $3D -POKEFANF EQU $3E -RED EQU $3F -BLUE EQU $40 -OFFICER EQU $41 -GRUNTF EQU $42 -MYSTICALMAN EQU $43 - -; Rival1 -RIVAL1_1 EQU $01 -RIVAL1_2 EQU $02 -RIVAL1_3 EQU $03 -RIVAL1_4 EQU $04 -RIVAL1_5 EQU $05 -RIVAL1_6 EQU $06 -RIVAL1_7 EQU $07 -RIVAL1_8 EQU $08 -RIVAL1_9 EQU $09 -RIVAL1_10 EQU $0a -RIVAL1_11 EQU $0b -RIVAL1_12 EQU $0c -RIVAL1_13 EQU $0d -RIVAL1_14 EQU $0e -RIVAL1_15 EQU $0f - -; PokemonProf -; no trainers - -; SpecialPKMN1 -CAL1 EQU $01 -CAL2 EQU $02 -CAL3 EQU $03 - -; Champion -LANCE EQU $01 - -; Scientist -ROSS EQU $01 -MITCH EQU $02 -JED EQU $03 -MARC EQU $04 -RICH EQU $05 - -; Youngster -JOEY1 EQU $01 -MIKEY EQU $02 -ALBERT EQU $03 -GORDON EQU $04 -SAMUEL EQU $05 -IAN EQU $06 -JOEY2 EQU $07 -JOEY3 EQU $08 -WARREN EQU $09 -JIMMY EQU $0a -OWEN EQU $0b -JASON EQU $0c -JOEY4 EQU $0d -JOEY5 EQU $0e - -; Schoolboy -JACK1 EQU $01 -KIPP EQU $02 -ALAN1 EQU $03 -JOHNNY EQU $04 -DANNY EQU $05 -TOMMY EQU $06 -DUDLEY EQU $07 -JOE EQU $08 -BILLY EQU $09 -CHAD1 EQU $0a -NATE EQU $0b -RICKY EQU $0c -JACK2 EQU $0d -JACK3 EQU $0e -ALAN2 EQU $0f -ALAN3 EQU $10 -CHAD2 EQU $11 -CHAD3 EQU $12 -JACK4 EQU $13 -JACK5 EQU $14 -ALAN4 EQU $15 -ALAN5 EQU $16 -CHAD4 EQU $17 -CHAD5 EQU $18 - -; BirdKeeper -ROD EQU $01 -ABE EQU $02 -BRYAN EQU $03 -THEO EQU $04 -TOBY EQU $05 -DENIS EQU $06 -VANCE1 EQU $07 -HANK EQU $08 -ROY EQU $09 -BORIS EQU $0a -BOB EQU $0b -JOSE1 EQU $0c -PETER EQU $0d -JOSE2 EQU $0e -PERRY EQU $0f -BRET EQU $10 -JOSE3 EQU $11 -VANCE2 EQU $12 -VANCE3 EQU $13 - -; Lass -CARRIE EQU $01 -BRIDGET EQU $02 -ALICE EQU $03 -KRISE EQU $04 -CONNIE1 EQU $05 -LINDA EQU $06 -LAURA EQU $07 -SHANNON EQU $08 -MICHELLE EQU $09 -DANA1 EQU $0a -ELLEN EQU $0b -CONNIE2 EQU $0c -CONNIE3 EQU $0d -DANA2 EQU $0e -DANA3 EQU $0f -DANA4 EQU $10 -DANA5 EQU $11 - -; CooltrainerM -NICK EQU $01 -AARON EQU $02 -PAUL EQU $03 -CODY EQU $04 -MIKE EQU $05 -GAVEN1 EQU $06 -GAVEN2 EQU $07 -RYAN EQU $08 -JAKE EQU $09 -GAVEN3 EQU $0a -BLAKE EQU $0b -BRIAN EQU $0c -ERICK EQU $0d -ANDY EQU $0e -TYLER EQU $0f -SEAN EQU $10 -KEVIN EQU $11 -STEVE EQU $12 -ALLEN EQU $13 -DARIN EQU $14 - -; CooltrainerF -GWEN EQU $01 -LOIS EQU $02 -FRAN EQU $03 -LOLA EQU $04 -KATE EQU $05 -IRENE EQU $06 -KELLY EQU $07 -JOYCE EQU $08 -BETH1 EQU $09 -REENA1 EQU $0a -MEGAN EQU $0b -BETH2 EQU $0c -CAROL EQU $0d -QUINN EQU $0e -EMMA EQU $0f -CYBIL EQU $10 -JENN EQU $11 -BETH3 EQU $12 -REENA2 EQU $13 -REENA3 EQU $14 -CARA EQU $15 - -; Beauty -VICTORIA EQU $01 -SAMANTHA EQU $02 -JULIE EQU $03 -JACLYN EQU $04 -BRENDA EQU $05 -CASSIE EQU $06 -CAROLINE EQU $07 -CARLENE EQU $08 -JESSICA EQU $09 -RACHAEL EQU $0a -ANGELICA EQU $0b -KENDRA EQU $0c -VERONICA EQU $0d -JULIA EQU $0e -THERESA EQU $0f -VALERIE EQU $10 -OLIVIA EQU $11 - -; Pokemaniac -LARRY EQU $01 -ANDREW EQU $02 -CALVIN EQU $03 -SHANE EQU $04 -BEN EQU $05 -BRENT1 EQU $06 -RON EQU $07 -ETHAN EQU $08 -BRENT2 EQU $09 -BRENT3 EQU $0a -ISSAC EQU $0b -DONALD EQU $0c -ZACH EQU $0d -BRENT4 EQU $0e -MILLER EQU $0f - -; Gentleman -PRESTON EQU $01 -EDWARD EQU $02 -GREGORY EQU $03 -VIRGIL EQU $04 -ALFRED EQU $05 - -; Skier -ROXANNE EQU $01 -CLARISSA EQU $02 - -; Teacher -COLETTE EQU $01 -HILLARY EQU $02 -SHIRLEY EQU $03 - -; BugCatcher -DON EQU $01 -ROB EQU $02 -ED EQU $03 -WADE1 EQU $04 -BUG_CATCHER_BENNY EQU $05 -AL EQU $06 -JOSH EQU $07 -ARNIE1 EQU $08 -KEN EQU $09 -WADE2 EQU $0a -WADE3 EQU $0b -DOUG EQU $0c -ARNIE2 EQU $0d -ARNIE3 EQU $0e -WADE4 EQU $0f -WADE5 EQU $10 -ARNIE4 EQU $11 -ARNIE5 EQU $12 -WAYNE EQU $13 - -; Fisher -JUSTIN EQU $01 -RALPH1 EQU $02 -ARNOLD EQU $03 -KYLE EQU $04 -HENRY EQU $05 -MARVIN EQU $06 -TULLY1 EQU $07 -ANDRE EQU $08 -RAYMOND EQU $09 -WILTON1 EQU $0a -EDGAR EQU $0b -JONAH EQU $0c -MARTIN EQU $0d -STEPHEN EQU $0e -BARNEY EQU $0f -RALPH2 EQU $10 -RALPH3 EQU $11 -TULLY2 EQU $12 -TULLY3 EQU $13 -WILTON2 EQU $14 -SCOTT EQU $15 -WILTON3 EQU $16 -RALPH4 EQU $17 -RALPH5 EQU $18 -TULLY4 EQU $19 - -; SwimmerM -HAROLD EQU $01 -SIMON EQU $02 -RANDALL EQU $03 -CHARLIE EQU $04 -GEORGE EQU $05 -BERKE EQU $06 -KIRK EQU $07 -MATHEW EQU $08 -HAL EQU $09 -PATON EQU $0a -DARYL EQU $0b -WALTER EQU $0c -TONY EQU $0d -JEROME EQU $0e -TUCKER EQU $0f -RICK EQU $10 -CAMERON EQU $11 -SETH EQU $12 -JAMES EQU $13 -LEWIS EQU $14 -PARKER EQU $15 - -; SwimmerF -ELAINE EQU $01 -PAULA EQU $02 -KAYLEE EQU $03 -SUSIE EQU $04 -DENISE EQU $05 -KARA EQU $06 -WENDY EQU $07 -LISA EQU $08 -JILL EQU $09 -MARY EQU $0a -KATIE EQU $0b -DAWN EQU $0c -TARA EQU $0d -NICOLE EQU $0e -LORI EQU $0f -JODY EQU $10 -NIKKI EQU $11 -DIANA EQU $12 -BRIANA EQU $13 - -; Sailor -EUGENE EQU $01 -HUEY1 EQU $02 -TERRELL EQU $03 -KENT EQU $04 -ERNEST EQU $05 -JEFF EQU $06 -GARRETT EQU $07 -KENNETH EQU $08 -STANLY EQU $09 -HARRY EQU $0a -HUEY2 EQU $0b -HUEY3 EQU $0c -HUEY4 EQU $0d - -; SuperNerd -STAN EQU $01 -ERIC EQU $02 -GREGG EQU $03 -JAY EQU $04 -DAVE EQU $05 -SAM EQU $06 -TOM EQU $07 -PAT EQU $08 -SHAWN EQU $09 -TERU EQU $0a -RUSS EQU $0b -NORTON EQU $0c -HUGH EQU $0d -MARKUS EQU $0e - -; Guitarist -CLYDE EQU $01 -VINCENT EQU $02 - -; Hiker -ANTHONY1 EQU $01 -RUSSELL EQU $02 -PHILLIP EQU $03 -LEONARD EQU $04 -ANTHONY2 EQU $05 -BENJAMIN EQU $06 -ERIK EQU $07 -MICHAEL EQU $08 -PARRY1 EQU $09 -TIMOTHY EQU $0a -BAILEY EQU $0b -ANTHONY3 EQU $0c -TIM EQU $0d -NOLAND EQU $0e -SIDNEY EQU $0f -KENNY EQU $10 -JIM EQU $11 -DANIEL EQU $12 -PARRY2 EQU $13 -PARRY3 EQU $14 -ANTHONY4 EQU $15 -ANTHONY5 EQU $16 - -; Biker -BIKER_BENNY EQU $01 -KAZU EQU $02 -DWAYNE EQU $03 -HARRIS EQU $04 -ZEKE EQU $05 -CHARLES EQU $06 -RILEY EQU $07 -JOEL EQU $08 -GLENN EQU $09 - -; Burglar -DUNCAN EQU $01 -EDDIE EQU $02 -COREY EQU $03 - -; Firebreather -OTIS EQU $01 -DICK EQU $02 -NED EQU $03 -BURT EQU $04 -BILL EQU $05 -WALT EQU $06 -RAY EQU $07 -LYLE EQU $08 - -; Juggler -IRWIN1 EQU $01 -FRITZ EQU $02 -HORTON EQU $03 -IRWIN2 EQU $04 -IRWIN3 EQU $05 -IRWIN4 EQU $06 - -; Blackbelt -KENJI1 EQU $01 -YOSHI EQU $02 -KENJI2 EQU $03 -LAO EQU $04 -NOB EQU $05 -KIYO EQU $06 -LUNG EQU $07 -KENJI3 EQU $08 -WAI EQU $09 - -; Psychic -NATHAN EQU $01 -FRANKLIN EQU $02 -HERMAN EQU $03 -FIDEL EQU $04 -GREG EQU $05 -NORMAN EQU $06 -MARK EQU $07 -PHIL EQU $08 -RICHARD EQU $09 -GILBERT EQU $0a -JARED EQU $0b -RODNEY EQU $0c - -; Picnicker -LIZ1 EQU $01 -GINA1 EQU $02 -BROOKE EQU $03 -KIM EQU $04 -CINDY EQU $05 -HOPE EQU $06 -SHARON EQU $07 -DEBRA EQU $08 -GINA2 EQU $09 -ERIN1 EQU $0a -LIZ2 EQU $0b -LIZ3 EQU $0c -HEIDI EQU $0d -EDNA EQU $0e -GINA3 EQU $0f -TIFFANY1 EQU $10 -TIFFANY2 EQU $11 -ERIN2 EQU $12 -TANYA EQU $13 -TIFFANY3 EQU $14 -ERIN3 EQU $15 -LIZ4 EQU $16 -LIZ5 EQU $17 -GINA4 EQU $18 -GINA5 EQU $19 -TIFFANY4 EQU $1a - -; Camper -ROLAND EQU $01 -TODD1 EQU $02 -IVAN EQU $03 -ELLIOT EQU $04 -BARRY EQU $05 -LLOYD EQU $06 -DEAN EQU $07 -SID EQU $08 -HARVEY EQU $09 -DALE EQU $0a -TED EQU $0b -TODD2 EQU $0c -TODD3 EQU $0d -THOMAS EQU $0e -LEROY EQU $0f -DAVID EQU $10 -JOHN EQU $11 -JERRY EQU $12 -SPENCER EQU $13 -TODD4 EQU $14 -TODD5 EQU $15 -QUENTIN EQU $16 - -; Sage -CHOW EQU $01 -NICO EQU $02 -JIN EQU $03 -TROY EQU $04 -JEFFREY EQU $05 -PING EQU $06 -EDMOND EQU $07 -NEAL EQU $08 -LI EQU $09 -GAKU EQU $0a -MASA EQU $0b -KOJI EQU $0c - -; Medium -MARTHA EQU $01 -GRACE EQU $02 -BETHANY EQU $03 -MARGRET EQU $04 -ETHEL EQU $05 -REBECCA EQU $06 -DORIS EQU $07 - -; Boarder -RONALD EQU $01 -BRAD EQU $02 -DOUGLAS EQU $03 - -; PokefanM -WILLIAM EQU $01 -DEREK1 EQU $02 -ROBERT EQU $03 -JOSHUA EQU $04 -CARTER EQU $05 -TREVOR EQU $06 -BRANDON EQU $07 -JEREMY EQU $08 -COLIN EQU $09 -DEREK2 EQU $0a -DEREK3 EQU $0b -ALEX EQU $0c -REX EQU $0d -ALLAN EQU $0e - -; KimonoGirl -NAOKO1 EQU $01 -NAOKO2 EQU $02 -SAYO EQU $03 -ZUKI EQU $04 -KUNI EQU $05 -MIKI EQU $06 - -; Twins -AMYANDMAY1 EQU $01 -ANNANDANNE1 EQU $02 -ANNANDANNE2 EQU $03 -AMYANDMAY2 EQU $04 -JOANDZOE1 EQU $05 -JOANDZOE2 EQU $06 -MEGANDPEG1 EQU $07 -MEGANDPEG2 EQU $08 -LEAANDPIA1 EQU $09 -LEAANDPIA2 EQU $0a - -; PokefanF -BEVERLY1 EQU $01 -RUTH EQU $02 -BEVERLY2 EQU $03 -BEVERLY3 EQU $04 -GEORGIA EQU $05 -JAIME EQU $06 - -; Officer -KEITH EQU $01 -DIRK EQU $02 - -; Mysticalman -EUSINE EQU $01 + enum_start 1 + trainerclass FALKNER + + trainerclass WHITNEY + + trainerclass BUGSY + + trainerclass MORTY + + trainerclass PRYCE + + trainerclass JASMINE + + trainerclass CHUCK + + trainerclass CLAIR + + trainerclass RIVAL1 + const RIVAL1_1 + const RIVAL1_2 + const RIVAL1_3 + const RIVAL1_4 + const RIVAL1_5 + const RIVAL1_6 + const RIVAL1_7 + const RIVAL1_8 + const RIVAL1_9 + const RIVAL1_10 + const RIVAL1_11 + const RIVAL1_12 + const RIVAL1_13 + const RIVAL1_14 + const RIVAL1_15 + + trainerclass POKEMON_PROF + + trainerclass WILL + + trainerclass CAL + const CAL1 + const CAL2 + const CAL3 + + trainerclass BRUNO + + trainerclass KAREN + + trainerclass KOGA + + trainerclass CHAMPION + const LANCE + + trainerclass BROCK + + trainerclass MISTY + + trainerclass LT_SURGE + + trainerclass SCIENTIST + const ROSS + const MITCH + const JED + const MARC + const RICH + + trainerclass ERIKA + + trainerclass YOUNGSTER + const JOEY1 + const MIKEY + const ALBERT + const GORDON + const SAMUEL + const IAN + const JOEY2 + const JOEY3 + const WARREN + const JIMMY + const OWEN + const JASON + const JOEY4 + const JOEY5 + + trainerclass SCHOOLBOY + const JACK1 + const KIPP + const ALAN1 + const JOHNNY + const DANNY + const TOMMY + const DUDLEY + const JOE + const BILLY + const CHAD1 + const NATE + const RICKY + const JACK2 + const JACK3 + const ALAN2 + const ALAN3 + const CHAD2 + const CHAD3 + const JACK4 + const JACK5 + const ALAN4 + const ALAN5 + const CHAD4 + const CHAD5 + + trainerclass BIRD_KEEPER + const ROD + const ABE + const BRYAN + const THEO + const TOBY + const DENIS + const VANCE1 + const HANK + const ROY + const BORIS + const BOB + const JOSE1 + const PETER + const JOSE2 + const PERRY + const BRET + const JOSE3 + const VANCE2 + const VANCE3 + + trainerclass LASS + const CARRIE + const BRIDGET + const ALICE + const KRISE + const CONNIE1 + const LINDA + const LAURA + const SHANNON + const MICHELLE + const DANA1 + const ELLEN + const CONNIE2 + const CONNIE3 + const DANA2 + const DANA3 + const DANA4 + const DANA5 + + trainerclass JANINE + + trainerclass COOLTRAINERM + const NICK + const AARON + const PAUL + const CODY + const MIKE + const GAVEN1 + const GAVEN2 + const RYAN + const JAKE + const GAVEN3 + const BLAKE + const BRIAN + const ERICK + const ANDY + const TYLER + const SEAN + const KEVIN + const STEVE + const ALLEN + const DARIN + + trainerclass COOLTRAINERF + const GWEN + const LOIS + const FRAN + const LOLA + const KATE + const IRENE + const KELLY + const JOYCE + const BETH1 + const REENA1 + const MEGAN + const BETH2 + const CAROL + const QUINN + const EMMA + const CYBIL + const JENN + const BETH3 + const REENA2 + const REENA3 + const CARA + + trainerclass BEAUTY + const VICTORIA + const SAMANTHA + const JULIE + const JACLYN + const BRENDA + const CASSIE + const CAROLINE + const CARLENE + const JESSICA + const RACHAEL + const ANGELICA + const KENDRA + const VERONICA + const JULIA + const THERESA + const VALERIE + const OLIVIA + + trainerclass POKEMANIAC + const LARRY + const ANDREW + const CALVIN + const SHANE + const BEN + const BRENT1 + const RON + const ETHAN + const BRENT2 + const BRENT3 + const ISSAC + const DONALD + const ZACH + const BRENT4 + const MILLER + + trainerclass GRUNTM + + trainerclass GENTLEMAN + const PRESTON + const EDWARD + const GREGORY + const VIRGIL + const ALFRED + + trainerclass SKIER + const ROXANNE + const CLARISSA + + trainerclass TEACHER + const COLETTE + const HILLARY + const SHIRLEY + + trainerclass SABRINA + + trainerclass BUG_CATCHER + const DON + const ROB + const ED + const WADE1 + const BUG_CATCHER_BENNY + const AL + const JOSH + const ARNIE1 + const KEN + const WADE2 + const WADE3 + const DOUG + const ARNIE2 + const ARNIE3 + const WADE4 + const WADE5 + const ARNIE4 + const ARNIE5 + const WAYNE + + trainerclass FISHER + const JUSTIN + const RALPH1 + const ARNOLD + const KYLE + const HENRY + const MARVIN + const TULLY1 + const ANDRE + const RAYMOND + const WILTON1 + const EDGAR + const JONAH + const MARTIN + const STEPHEN + const BARNEY + const RALPH2 + const RALPH3 + const TULLY2 + const TULLY3 + const WILTON2 + const SCOTT + const WILTON3 + const RALPH4 + const RALPH5 + const TULLY4 + + trainerclass SWIMMERM + const HAROLD + const SIMON + const RANDALL + const CHARLIE + const GEORGE + const BERKE + const KIRK + const MATHEW + const HAL + const PATON + const DARYL + const WALTER + const TONY + const JEROME + const TUCKER + const RICK + const CAMERON + const SETH + const JAMES + const LEWIS + const PARKER + + trainerclass SWIMMERF + const ELAINE + const PAULA + const KAYLEE + const SUSIE + const DENISE + const KARA + const WENDY + const LISA + const JILL + const MARY + const KATIE + const DAWN + const TARA + const NICOLE + const LORI + const JODY + const NIKKI + const DIANA + const BRIANA + + trainerclass SAILOR + const EUGENE + const HUEY1 + const TERRELL + const KENT + const ERNEST + const JEFF + const GARRETT + const KENNETH + const STANLY + const HARRY + const HUEY2 + const HUEY3 + const HUEY4 + + trainerclass SUPER_NERD + const STAN + const ERIC + const GREGG + const JAY + const DAVE + const SAM + const TOM + const PAT + const SHAWN + const TERU + const RUSS + const NORTON + const HUGH + const MARKUS + + trainerclass RIVAL2 + + trainerclass GUITARIST + const CLYDE + const VINCENT + + trainerclass HIKER + const ANTHONY1 + const RUSSELL + const PHILLIP + const LEONARD + const ANTHONY2 + const BENJAMIN + const ERIK + const MICHAEL + const PARRY1 + const TIMOTHY + const BAILEY + const ANTHONY3 + const TIM + const NOLAND + const SIDNEY + const KENNY + const JIM + const DANIEL + const PARRY2 + const PARRY3 + const ANTHONY4 + const ANTHONY5 + + trainerclass BIKER + const BIKER_BENNY + const KAZU + const DWAYNE + const HARRIS + const ZEKE + const CHARLES + const RILEY + const JOEL + const GLENN + + trainerclass BLAINE + + trainerclass BURGLAR + const DUNCAN + const EDDIE + const COREY + + trainerclass FIREBREATHER + const OTIS + const DICK + const NED + const BURT + const BILL + const WALT + const RAY + const LYLE + + trainerclass JUGGLER + const IRWIN1 + const FRITZ + const HORTON + const IRWIN2 + const IRWIN3 + const IRWIN4 + + trainerclass BLACKBELT_T + const KENJI1 + const YOSHI + const KENJI2 + const LAO + const NOB + const KIYO + const LUNG + const KENJI3 + const WAI + + trainerclass EXECUTIVEM + + trainerclass PSYCHIC_T + const NATHAN + const FRANKLIN + const HERMAN + const FIDEL + const GREG + const NORMAN + const MARK + const PHIL + const RICHARD + const GILBERT + const JARED + const RODNEY + + trainerclass PICNICKER + const LIZ1 + const GINA1 + const BROOKE + const KIM + const CINDY + const HOPE + const SHARON + const DEBRA + const GINA2 + const ERIN1 + const LIZ2 + const LIZ3 + const HEIDI + const EDNA + const GINA3 + const TIFFANY1 + const TIFFANY2 + const ERIN2 + const TANYA + const TIFFANY3 + const ERIN3 + const LIZ4 + const LIZ5 + const GINA4 + const GINA5 + const TIFFANY4 + + trainerclass CAMPER + const ROLAND + const TODD1 + const IVAN + const ELLIOT + const BARRY + const LLOYD + const DEAN + const SID + const HARVEY + const DALE + const TED + const TODD2 + const TODD3 + const THOMAS + const LEROY + const DAVID + const JOHN + const JERRY + const SPENCER + const TODD4 + const TODD5 + const QUENTIN + + trainerclass EXECUTIVEF + + trainerclass SAGE + const CHOW + const NICO + const JIN + const TROY + const JEFFREY + const PING + const EDMOND + const NEAL + const LI + const GAKU + const MASA + const KOJI + + trainerclass MEDIUM + const MARTHA + const GRACE + const BETHANY + const MARGRET + const ETHEL + const REBECCA + const DORIS + + trainerclass BOARDER + const RONALD + const BRAD + const DOUGLAS + + trainerclass POKEFANM + const WILLIAM + const DEREK1 + const ROBERT + const JOSHUA + const CARTER + const TREVOR + const BRANDON + const JEREMY + const COLIN + const DEREK2 + const DEREK3 + const ALEX + const REX + const ALLAN + + trainerclass KIMONO_GIRL + const NAOKO1 + const NAOKO2 + const SAYO + const ZUKI + const KUNI + const MIKI + + trainerclass TWINS + const AMYANDMAY1 + const ANNANDANNE1 + const ANNANDANNE2 + const AMYANDMAY2 + const JOANDZOE1 + const JOANDZOE2 + const MEGANDPEG1 + const MEGANDPEG2 + const LEAANDPIA1 + const LEAANDPIA2 + + trainerclass POKEFANF + const BEVERLY1 + const RUTH + const BEVERLY2 + const BEVERLY3 + const GEORGIA + const JAIME + + trainerclass RED + + trainerclass BLUE + + trainerclass OFFICER + const KEITH + const DIRK + + trainerclass GRUNTF + + trainerclass MYSTICALMAN + const EUSINE + +NUM_TRAINER_CLASSES EQU __enum__ diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index e5430b431..8fe8284f2 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -71,5 +71,3 @@ PLAYER_SURF_PIKA EQU 8 OBJECT_STRUCT_LENGTH EQU 40 NUM_OBJECT_STRUCTS EQU 13 - -PARTYMON_STRUCT_LENGTH EQU 48 |