More label updates, moved predefs to new file

Also named most of the engine and event flag constants.
This commit is contained in:
PikalaxALT
2015-07-20 03:51:52 -04:00
parent 94129b6b45
commit bef792f2d2
90 changed files with 1926 additions and 1899 deletions

View File

@@ -16,13 +16,13 @@
const ENGINE_POKERUS
const ENGINE_ROCKET_SIGNAL_ON_CH20
const ENGINE_CREDITS_SKIP
const ENGINE_BUG_CONTEST_ON
const ENGINE_BUG_CONTEST_ON ; 10
const ENGINE_BUG_CONTEST_TIMER
const ENGINE_12
const ENGINE_ROCKETS_IN_RADIO_TOWER
const ENGINE_BIKE_SHOP_CALL_ENABLED
const ENGINE_GIVE_POKERUS
const ENGINE_16
const ENGINE_FLORIA
const ENGINE_ROCKETS_IN_MAHOGANY
const ENGINE_STRENGTH_ACTIVE
const ENGINE_ALWAYS_ON_BIKE
@@ -32,7 +32,7 @@
const ENGINE_PLAINBADGE
const ENGINE_FOGBADGE
const ENGINE_MINERALBADGE
const ENGINE_STORMBADGE
const ENGINE_STORMBADGE ; 20
const ENGINE_GLACIERBADGE
const ENGINE_RISINGBADGE
const ENGINE_BOULDERBADGE
@@ -48,7 +48,7 @@
const ENGINE_UNLOCKED_UNOWNS_3
const ENGINE_UNLOCKED_UNOWNS_4
const ENGINE_UNLOCKED_UNOWNS_5
const ENGINE_UNLOCKED_UNOWNS_6
const ENGINE_UNLOCKED_UNOWNS_6 ; 30
const ENGINE_UNLOCKED_UNOWNS_7
const ENGINE_UNLOCKED_UNOWNS_8
const ENGINE_FLYPOINT_KRISS_HOUSE
@@ -64,7 +64,7 @@
const ENGINE_FLYPOINT_CELADON
const ENGINE_FLYPOINT_FUCHSIA
const ENGINE_FLYPOINT_CINNABAR
const ENGINE_FLYPOINT_INDIGO_PLATEAU
const ENGINE_FLYPOINT_INDIGO_PLATEAU ; 40
const ENGINE_FLYPOINT_NEW_BARK
const ENGINE_FLYPOINT_CHERRYGROVE
const ENGINE_FLYPOINT_VIOLET
@@ -80,7 +80,7 @@
const ENGINE_FLYPOINT_UNUSED
const ENGINE_LUCKY_NUMBER_SHOW
const ENGINE_4F
const ENGINE_KURT_MAKING_BALLS
const ENGINE_KURT_MAKING_BALLS ; 50
const ENGINE_DAILY_BUG_CONTEST
const ENGINE_SPECIAL_WILDDATA
const ENGINE_TIME_CAPSULE
@@ -95,8 +95,8 @@
const ENGINE_TEA_IN_BLUES_HOUSE
const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
const ENGINE_DAILY_MOVE_TUTOR
const ENGINE_5F
const ENGINE_60
const ENGINE_BUENAS_PASSWORD
const ENGINE_BUENAS_PASSWORD_2 ; 60
const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
const ENGINE_62
const ENGINE_PLAYER_IS_FEMALE
@@ -112,7 +112,7 @@
const ENGINE_RALPH
const ENGINE_LIZ
const ENGINE_ANTHONY
const ENGINE_TODD
const ENGINE_TODD ; 70
const ENGINE_GINA
const ENGINE_ARNIE
const ENGINE_ALAN
@@ -128,37 +128,37 @@
const ENGINE_BEVERLY_HAS_NUGGET
const ENGINE_JOSE_HAS_STAR_PIECE
const ENGINE_WADE_HAS_ITEM
const ENGINE_GINA_HAS_LEAF_STONE
const ENGINE_GINA_HAS_LEAF_STONE ; 80
const ENGINE_ALAN_HAS_FIRE_STONE
const ENGINE_LIZ_HAS_THUNDERSTONE
const ENGINE_DANA_HAS_THUNDERSTONE
const ENGINE_DEREK_HAS_NUGGET
const ENGINE_TULLY_HAS_WATER_STONE
const ENGINE_TIFFANY_HAS_PINK_BOW
const ENGINE_WILTON_HAS_ITEM
const ENGINE_87
const ENGINE_88
const ENGINE_89
const ENGINE_8A
const ENGINE_8B
const ENGINE_8C
const ENGINE_8D
const ENGINE_8E
const ENGINE_8F
const ENGINE_90
const ENGINE_91
const ENGINE_92
const ENGINE_93
const ENGINE_94
const ENGINE_95
const ENGINE_96
const ENGINE_97
const ENGINE_98
const ENGINE_99
const ENGINE_9A
const ENGINE_9B
const ENGINE_9C
const ENGINE_9D
const ENGINE_9E
const ENGINE_JACK_MONDAY_MORNING
const ENGINE_HUEY_WEDNESDAY_NIGHT
const ENGINE_GAVEN_THURSDAY_MORNING
const ENGINE_BETH_FRIDAY_AFTERNOON
const ENGINE_JOSE_SATURDAY_NIGHT
const ENGINE_REENA_SUNDAY_MORNING
const ENGINE_JOEY_MONDAY_AFTERNOON
const ENGINE_WADE_TUESDAY_NIGHT
const ENGINE_RALPH_WEDNESDAY_MORNING
const ENGINE_LIZ_THURSDAY_AFTERNOON ; 90
const ENGINE_ANTHONY_FRIDAY_NIGHT
const ENGINE_TODD_SATURDAY_MORNING
const ENGINE_GINA_SUNDAY_AFTERNOON
const ENGINE_ARNIE_TUESDAY_MORNING
const ENGINE_ALAN_WEDNESDAY_AFTERNOON
const ENGINE_DANA_THURSDAY_NIGHT
const ENGINE_CHAD_FRIDAY_MORNING
const ENGINE_TULLY_SUNDAY_NIGHT
const ENGINE_BRENT_MONDAY_MORNING
const ENGINE_TIFFANY_TUESDAY_AFTERNOON
const ENGINE_VANCE_WEDNESDAY_NIGHT
const ENGINE_WILTON_THRUSDAY_MORNING
const ENGINE_PARRY_FRIDAY_AFTERNOON
const ENGINE_ERIN_SATURDAY_NIGHT
const ENGINE_KRIS_IN_CABLE_CLUB
const ENGINE_DUNSPARCE_SWARM
const ENGINE_DUNSPARCE_SWARM ; a0
const ENGINE_YANMA_SWARM

View File

@@ -1,14 +1,16 @@
const_def
const EVENT_000
const EVENT_001
const EVENT_002
const EVENT_003
const EVENT_004
const EVENT_005
const EVENT_006
const EVENT_007
; These first eight flags are reset upon reloading the map.
const EVENT_GAVE_KURT_APRICORNS ; 000
const EVENT_RECEIVED_BALLS_FROM_KURT
const EVENT_DRAGON_SHRINE_QUESTION_2
const EVENT_DRAGON_SHRINE_QUESTION_3
const EVENT_DRAGON_SHRINE_QUESTION_4
const EVENT_DRAGON_SHRINE_QUESTION_5
const EVENT_JUST_RECEIVED_DRATINI
const EVENT_IN_YOUR_ROOM
; Johto story events
const EVENT_GOT_TM31_MUD_SLAP
const EVENT_GOT_TM49_FURY_CUTTER
const EVENT_GOT_TM01_DYNAMICPUNCH
@@ -49,23 +51,23 @@
const EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
const EVENT_MADE_UNOWN_APPEAR_IN_RUINS
const EVENT_FAST_SHIP_DESTINATION_OLIVINE
const EVENT_030
const EVENT_031
const EVENT_032
const EVENT_033
const EVENT_034
const EVENT_035
const EVENT_FAST_SHIP_FIRST_TIME
const EVENT_FAST_SHIP_HAS_ARRIVED
const EVENT_FAST_SHIP_FOUND_GIRL
const EVENT_FAST_SHIP_LAZY_SAILOR
const EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
const EVENT_KURT_GAVE_YOU_LURE_BALL
const EVENT_INITIALIZED_EVENTS
const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
const EVENT_038
const EVENT_039
const EVENT_03A
const EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
const EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
const EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
const EVENT_03B
const EVENT_03C
const EVENT_HEALED_MOOMOO
const EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
const EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST ; 040
const EVENT_DUDE_TALKED_TO_YOU
const EVENT_LEARNED_TO_CATCH_POKEMON
const EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
@@ -75,13 +77,13 @@
const EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
const EVENT_GOT_PINK_BOW_FROM_MARY
const EVENT_USED_BASEMENT_KEY
const EVENT_04A
const EVENT_RECEIVED_CARD_KEY
const EVENT_GOT_TM08_ROCK_SMASH
const EVENT_04C
const EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
const EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
const EVENT_GOT_TM05_ROAR
const EVENT_GOT_EEVEE
const EVENT_GOT_KENYA
const EVENT_GOT_KENYA ; 050
const EVENT_GAVE_KENYA
const EVENT_GOT_HP_UP_FROM_RANDY
const EVENT_GOT_TM50_NIGHTMARE
@@ -97,7 +99,7 @@
const EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
const EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
const EVENT_GOT_TM02_HEADBUTT
const EVENT_DECIDED_TO_HELP_LANCE
const EVENT_DECIDED_TO_HELP_LANCE ; 060
const EVENT_GOT_TYROGUE_FROM_KIYO
const EVENT_MET_FRIEDA_OF_FRIDAY
const EVENT_GOT_POISON_BARB_FROM_FRIEDA
@@ -112,25 +114,25 @@
const EVENT_MET_SANTOS_OF_SATURDAY
const EVENT_GOT_SPELL_TAG_FROM_SANTOS
const EVENT_MET_MONICA_OF_MONDAY
const EVENT_GOT_SHARP_BEAK_FROM_MONICA
const EVENT_GOT_SHARP_BEAK_FROM_MONICA ; 070
const EVENT_GOT_SOFT_SAND_FROM_KATE
const EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
const EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
const EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
const EVENT_GOT_TM47_STEEL_WING
const EVENT_GOT_TM37_SANDSTORM
const EVENT_076
const EVENT_FIRST_TIME_BANKING_WITH_MOM
const EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
const EVENT_GOT_CLEAR_BELL
const EVENT_GOT_SILVER_WING
const EVENT_GOT_TM12_SWEET_SCENT
const EVENT_RELEASED_THE_BEASTS
const EVENT_GOT_MASTER_BALL_FROM_ELM
; Johto Signpost Items
const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
; Signpost items
const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER
const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER ; 080
const EVENT_081
const EVENT_082
const EVENT_083
@@ -187,8 +189,9 @@
const EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY
const EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION
const EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE
; Crystal-exclusive events in Johto
const EVENT_MET_FLORIA
const EVENT_0BA
const EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
const EVENT_BUGGING_KURT_TOO_MUCH
const EVENT_TALKED_TO_RUINS_COWARD
const EVENT_GOT_DRATINI
@@ -202,6 +205,7 @@
const EVENT_0C5
const EVENT_0C6
const EVENT_0C7
; Kanto story events
const EVENT_GOT_NUGGET_FROM_GUY
const EVENT_RETURNED_MACHINE_PART
const EVENT_MET_MANAGER_AT_POWER_PLANT
@@ -230,6 +234,7 @@
const EVENT_TALKED_TO_OAK_IN_KANTO
const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
const EVENT_GOT_TM29_PSYCHIC
; Kanto Signpost Items
const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE
const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL
@@ -258,11 +263,12 @@
const EVENT_CELADON_CITY_HIDDEN_PP_UP
const EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY
const EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL
const EVENT_100
const EVENT_101
const EVENT_102
const EVENT_103
const EVENT_104
const EVENT_GINA_GAVE_LEAF_STONE
const EVENT_ALAN_GAVE_FIRE_STONE
const EVENT_DANA_GAVE_THUNDERSTONE
const EVENT_TULLY_GAVE_WATER_STONE
const EVENT_TIFFANY_GAVE_PINK_BOW
; ???
const EVENT_105
const EVENT_106
const EVENT_107
@@ -602,13 +608,15 @@
const EVENT_255
const EVENT_256
const EVENT_257
const EVENT_258
const EVENT_259
const EVENT_25A
const EVENT_25B
const EVENT_25C
const EVENT_25D
const EVENT_25E
; Kurt events
const EVENT_GAVE_KURT_RED_APRICORN
const EVENT_GAVE_KURT_BLU_APRICORN
const EVENT_GAVE_KURT_YLW_APRICORN
const EVENT_GAVE_KURT_GRN_APRICORN
const EVENT_GAVE_KURT_WHT_APRICORN
const EVENT_GAVE_KURT_BLK_APRICORN
const EVENT_GAVE_KURT_PNK_APRICORN
; Phone events
const EVENT_JACK_ASKED_FOR_PHONE_NUMBER
const EVENT_260
const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
@@ -620,7 +628,7 @@
const EVENT_GOT_CARBOS_FROM_VANCE
const EVENT_GOT_IRON_FROM_PARRY
const EVENT_GOT_CALCIUM_FROM_ERIN
const EVENT_26A
const EVENT_KENJI_ON_BREAK
const EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
const EVENT_26C
const EVENT_BETH_ASKED_FOR_PHONE_NUMBER
@@ -674,10 +682,12 @@
const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
const EVENT_29F
const EVENT_2A0 ; 2a0
const EVENT_2A1
const EVENT_2A2
const EVENT_2A3
; Ruins Of Alph puzzles
const EVENT_SOLVED_HO_OH_PUZZLE ; 2a0
const EVENT_SOLVED_KABUTO_PUZZLE
const EVENT_SOLVED_OMANYTE_PUZZLE
const EVENT_SOLVED_AERODACTYL_PUZZLE
; Decorations
const EVENT_DECO_BED_1
const EVENT_DECO_BED_2
const EVENT_DECO_BED_3
@@ -724,7 +734,8 @@
const EVENT_DECO_BIG_SNORLAX_DOLL
const EVENT_DECO_BIG_ONIX_DOLL ; 2d0
const EVENT_DECO_BIG_LAPRAS_DOLL
const EVENT_2D2
; More Johto events
const EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
const EVENT_SWITCH_1
const EVENT_SWITCH_2
const EVENT_SWITCH_3
@@ -807,6 +818,7 @@
const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
const EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
; More Crystal-specific events
const EVENT_LISTENED_TO_INITIAL_RADIO
const EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
const EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
@@ -835,6 +847,7 @@
const EVENT_GOT_ODD_EGG
const EVENT_33F
const EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
; ???
const EVENT_341
const EVENT_342
const EVENT_343
@@ -1533,6 +1546,7 @@
const EVENT_BEAT_SAGE_GAKU
const EVENT_BEAT_SAGE_MASA
const EVENT_BEAT_SAGE_KOJI
; ???
const EVENT_5CC
const EVENT_5CD
const EVENT_5CE
@@ -1725,7 +1739,7 @@
const EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
const EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
const EVENT_MOUNT_MORTAR_B1F_CARBOS
const EVENT_ICE_PATH_1F_HM_WATERFALL
const EVENT_GOT_HM07_WATERFALL
const EVENT_ICE_PATH_1F_PP_UP
const EVENT_ICE_PATH_B1F_IRON
const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
@@ -1835,9 +1849,9 @@
const EVENT_6F2
const EVENT_ILEX_FOREST_APPRENTICE
const EVENT_ILEX_FOREST_CHARCOAL_MASTER
const EVENT_6F5
const EVENT_6F6
const EVENT_6F7
const EVENT_CHARCOAL_KILN_FARFETCH_D
const EVENT_CHARCOAL_KILN_APPRENTICE
const EVENT_CHARCOAL_KILN_BOSS
const EVENT_ROUTE_36_SUDOWOODO
const EVENT_AZALEA_TOWN_SLOWPOKES
const EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
@@ -1943,7 +1957,7 @@
const EVENT_ROUTE_40_MONICA_OF_MONDAY
const EVENT_LANCES_ROOM_OAK_AND_MARY
const EVENT_UNION_CAVE_B2F_LAPRAS ; 760
const EVENT_761
const EVENT_TEAM_ROCKET_DISBANDED
const EVENT_RED_IN_MT_SILVER
const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
const EVENT_BURNED_TOWER_MORTY

View File

@@ -1,22 +1,22 @@
; trainer groups
enum_start 1
trainerclass FALKNER
trainerclass FALKNER ; 1
trainerclass WHITNEY
trainerclass WHITNEY ; 2
trainerclass BUGSY
trainerclass BUGSY ; 3
trainerclass MORTY
trainerclass MORTY ; 4
trainerclass PRYCE
trainerclass PRYCE ; 5
trainerclass JASMINE
trainerclass JASMINE ; 6
trainerclass CHUCK
trainerclass CHUCK ; 7
trainerclass CLAIR
trainerclass CLAIR ; 8
trainerclass RIVAL1
trainerclass RIVAL1 ; 9
const RIVAL1_1
const RIVAL1_2
const RIVAL1_3
@@ -33,40 +33,40 @@
const RIVAL1_14
const RIVAL1_15
trainerclass POKEMON_PROF
trainerclass POKEMON_PROF ; a
trainerclass WILL
trainerclass WILL ; b
trainerclass CAL
trainerclass CAL ; c
const CAL1
const CAL2
const CAL3
trainerclass BRUNO
trainerclass BRUNO ; d
trainerclass KAREN
trainerclass KAREN ; e
trainerclass KOGA
trainerclass KOGA ; f
trainerclass CHAMPION
trainerclass CHAMPION ; 10
const LANCE
trainerclass BROCK
trainerclass BROCK ; 11
trainerclass MISTY
trainerclass MISTY ; 12
trainerclass LT_SURGE
trainerclass LT_SURGE ; 13
trainerclass SCIENTIST
trainerclass SCIENTIST ; 14
const ROSS
const MITCH
const JED
const MARC
const RICH
trainerclass ERIKA
trainerclass ERIKA ; 15
trainerclass YOUNGSTER
trainerclass YOUNGSTER ; 16
const JOEY1
const MIKEY
const ALBERT
@@ -82,7 +82,7 @@
const JOEY4
const JOEY5
trainerclass SCHOOLBOY
trainerclass SCHOOLBOY ; 17
const JACK1
const KIPP
const ALAN1
@@ -108,7 +108,7 @@
const CHAD4
const CHAD5
trainerclass BIRD_KEEPER
trainerclass BIRD_KEEPER ; 18
const ROD
const ABE
const BRYAN
@@ -129,7 +129,7 @@
const VANCE2
const VANCE3
trainerclass LASS
trainerclass LASS ; 19
const CARRIE
const BRIDGET
const ALICE
@@ -148,9 +148,9 @@
const DANA4
const DANA5
trainerclass JANINE
trainerclass JANINE ; 1a
trainerclass COOLTRAINERM
trainerclass COOLTRAINERM ; 1b
const NICK
const AARON
const PAUL
@@ -172,7 +172,7 @@
const ALLEN
const DARIN
trainerclass COOLTRAINERF
trainerclass COOLTRAINERF ; 1c
const GWEN
const LOIS
const FRAN
@@ -195,7 +195,7 @@
const REENA3
const CARA
trainerclass BEAUTY
trainerclass BEAUTY ; 1d
const VICTORIA
const SAMANTHA
const JULIE
@@ -214,7 +214,7 @@
const VALERIE
const OLIVIA
trainerclass POKEMANIAC
trainerclass POKEMANIAC ; 1e
const LARRY
const ANDREW
const CALVIN
@@ -231,27 +231,27 @@
const BRENT4
const MILLER
trainerclass GRUNTM
trainerclass GRUNTM ; 1f
trainerclass GENTLEMAN
trainerclass GENTLEMAN ; 20
const PRESTON
const EDWARD
const GREGORY
const VIRGIL
const ALFRED
trainerclass SKIER
trainerclass SKIER ; 21
const ROXANNE
const CLARISSA
trainerclass TEACHER
trainerclass TEACHER ; 22
const COLETTE
const HILLARY
const SHIRLEY
trainerclass SABRINA
trainerclass SABRINA ; 23
trainerclass BUG_CATCHER
trainerclass BUG_CATCHER ; 24
const DON
const ROB
const ED
@@ -272,7 +272,7 @@
const ARNIE5
const WAYNE
trainerclass FISHER
trainerclass FISHER ; 25
const JUSTIN
const RALPH1
const ARNOLD
@@ -299,7 +299,7 @@
const RALPH5
const TULLY4
trainerclass SWIMMERM
trainerclass SWIMMERM ; 26
const HAROLD
const SIMON
const RANDALL
@@ -322,7 +322,7 @@
const LEWIS
const PARKER
trainerclass SWIMMERF
trainerclass SWIMMERF ; 27
const ELAINE
const PAULA
const KAYLEE
@@ -343,7 +343,7 @@
const DIANA
const BRIANA
trainerclass SAILOR
trainerclass SAILOR ; 28
const EUGENE
const HUEY1
const TERRELL
@@ -358,7 +358,7 @@
const HUEY3
const HUEY4
trainerclass SUPER_NERD
trainerclass SUPER_NERD ; 29
const STAN
const ERIC
const GREGG
@@ -374,13 +374,13 @@
const HUGH
const MARKUS
trainerclass RIVAL2
trainerclass RIVAL2 ; 2a
trainerclass GUITARIST
trainerclass GUITARIST ; 2b
const CLYDE
const VINCENT
trainerclass HIKER
trainerclass HIKER ; 2c
const ANTHONY1
const RUSSELL
const PHILLIP
@@ -404,7 +404,7 @@
const ANTHONY4
const ANTHONY5
trainerclass BIKER
trainerclass BIKER ; 2d
const BIKER_BENNY
const KAZU
const DWAYNE
@@ -415,14 +415,14 @@
const JOEL
const GLENN
trainerclass BLAINE
trainerclass BLAINE ; 2e
trainerclass BURGLAR
trainerclass BURGLAR ; 2f
const DUNCAN
const EDDIE
const COREY
trainerclass FIREBREATHER
trainerclass FIREBREATHER ; 30
const OTIS
const DICK
const NED
@@ -432,7 +432,7 @@
const RAY
const LYLE
trainerclass JUGGLER
trainerclass JUGGLER ; 31
const IRWIN1
const FRITZ
const HORTON
@@ -440,7 +440,7 @@
const IRWIN3
const IRWIN4
trainerclass BLACKBELT_T
trainerclass BLACKBELT_T ; 32
const KENJI1
const YOSHI
const KENJI2
@@ -451,9 +451,9 @@
const KENJI3
const WAI
trainerclass EXECUTIVEM
trainerclass EXECUTIVEM ; 33
trainerclass PSYCHIC_T
trainerclass PSYCHIC_T ; 34
const NATHAN
const FRANKLIN
const HERMAN
@@ -467,7 +467,7 @@
const JARED
const RODNEY
trainerclass PICNICKER
trainerclass PICNICKER ; 35
const LIZ1
const GINA1
const BROOKE
@@ -495,7 +495,7 @@
const GINA5
const TIFFANY4
trainerclass CAMPER
trainerclass CAMPER ; 36
const ROLAND
const TODD1
const IVAN
@@ -519,9 +519,9 @@
const TODD5
const QUENTIN
trainerclass EXECUTIVEF
trainerclass EXECUTIVEF ; 37
trainerclass SAGE
trainerclass SAGE ; 38
const CHOW
const NICO
const JIN
@@ -535,7 +535,7 @@
const MASA
const KOJI
trainerclass MEDIUM
trainerclass MEDIUM ; 39
const MARTHA
const GRACE
const BETHANY
@@ -544,12 +544,12 @@
const REBECCA
const DORIS
trainerclass BOARDER
trainerclass BOARDER ; 3a
const RONALD
const BRAD
const DOUGLAS
trainerclass POKEFANM
trainerclass POKEFANM ; 3b
const WILLIAM
const DEREK1
const ROBERT
@@ -565,7 +565,7 @@
const REX
const ALLAN
trainerclass KIMONO_GIRL
trainerclass KIMONO_GIRL ; 3c
const NAOKO1
const NAOKO2
const SAYO
@@ -573,7 +573,7 @@
const KUNI
const MIKI
trainerclass TWINS
trainerclass TWINS ; 3d
const AMYANDMAY1
const ANNANDANNE1
const ANNANDANNE2
@@ -585,7 +585,7 @@
const LEAANDPIA1
const LEAANDPIA2
trainerclass POKEFANF
trainerclass POKEFANF ; 3e
const BEVERLY1
const RUTH
const BEVERLY2
@@ -593,17 +593,17 @@
const GEORGIA
const JAIME
trainerclass RED
trainerclass RED ; 3f
trainerclass BLUE
trainerclass BLUE ; 40
trainerclass OFFICER
trainerclass OFFICER ; 41
const KEITH
const DIRK
trainerclass GRUNTF
trainerclass GRUNTF ; 42
trainerclass MYSTICALMAN
trainerclass MYSTICALMAN ; 43
const EUSINE
NUM_TRAINER_CLASSES EQU __enum__