diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-12 02:00:17 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-12 02:00:17 -0400 |
| commit | d282fe479994cb84980604706510ae0b03664c9c (patch) | |
| tree | 0213ed1516de3c5f1986559f1125bcf7c47dc83e | |
| parent | 63cc4daae2962544b9f1c5af9343841af8ddd7a1 (diff) | |
Event and engine constant enumeration; replace static flag numbers with their constant names
358 files changed, 4251 insertions, 2875 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 6cce77a56..b0933e860 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -1,162 +1,164 @@ -ENGINE_RADIO_CARD EQU $00 -ENGINE_MAP_CARD EQU $01 -ENGINE_PHONE_CARD EQU $02 -ENGINE_EXPN_CARD EQU $03 -ENGINE_POKEGEAR EQU $04 -ENGINE_DAYCARE_MONS_ARE_COMPATIBLE EQU $05 -ENGINE_DAYCARE_MAN_HAS_MON EQU $06 -ENGINE_DAYCARE_LADY_HAS_MON EQU $07 -ENGINE_MOM_SAVING_MONEY EQU $08 -ENGINE_DST EQU $09 -ENGINE_0A EQU $0a -ENGINE_POKEDEX EQU $0b -ENGINE_UNOWN_DEX EQU $0c -ENGINE_POKERUS EQU $0d -ENGINE_ROCKET_SIGNAL_ON_CH20 EQU $0e -ENGINE_CREDITS_SKIP EQU $0f -ENGINE_BUG_CONTEST_ON EQU $10 -ENGINE_BUG_CONTEST_TIMER EQU $11 -ENGINE_12 EQU $12 -ENGINE_ROCKETS_IN_RADIO_TOWER EQU $13 -ENGINE_BIKE_SHOP_CALL_ENABLED EQU $14 -ENGINE_GIVE_POKERUS EQU $15 -ENGINE_16 EQU $16 -ENGINE_ROCKETS_IN_MAHOGANY EQU $17 -ENGINE_STRENGTH_ACTIVE EQU $18 -ENGINE_ALWAYS_ON_BIKE EQU $19 -ENGINE_DOWNHILL EQU $1a -ENGINE_ZEPHYRBADGE EQU $1b -ENGINE_HIVEBADGE EQU $1c -ENGINE_PLAINBADGE EQU $1d -ENGINE_FOGBADGE EQU $1e -ENGINE_MINERALBADGE EQU $1f -ENGINE_STORMBADGE EQU $20 -ENGINE_GLACIERBADGE EQU $21 -ENGINE_RISINGBADGE EQU $22 -ENGINE_BOULDERBADGE EQU $23 -ENGINE_CASCADEBADGE EQU $24 -ENGINE_THUNDERBADGE EQU $25 -ENGINE_RAINBOWBADGE EQU $26 -ENGINE_SOULBADGE EQU $27 -ENGINE_MARSHBADGE EQU $28 -ENGINE_VOLCANOBADGE EQU $29 -ENGINE_EARTHBADGE EQU $2a -ENGINE_UNLOCKED_UNOWNS_1 EQU $2b -ENGINE_UNLOCKED_UNOWNS_2 EQU $2c -ENGINE_UNLOCKED_UNOWNS_3 EQU $2d -ENGINE_UNLOCKED_UNOWNS_4 EQU $2e -ENGINE_UNLOCKED_UNOWNS_5 EQU $2f -ENGINE_UNLOCKED_UNOWNS_6 EQU $30 -ENGINE_UNLOCKED_UNOWNS_7 EQU $31 -ENGINE_UNLOCKED_UNOWNS_8 EQU $32 -ENGINE_FLYPOINT_KRISS_HOUSE EQU $33 -ENGINE_FLYPOINT_VIRIDIAN_POKECENTER EQU $34 -ENGINE_FLYPOINT_PALLET EQU $35 -ENGINE_FLYPOINT_VIRIDIAN EQU $36 -ENGINE_FLYPOINT_PEWTER EQU $37 -ENGINE_FLYPOINT_CERULEAN EQU $38 -ENGINE_FLYPOINT_ROCK_TUNNEL EQU $39 -ENGINE_FLYPOINT_VERMILION EQU $3a -ENGINE_FLYPOINT_LAVENDER EQU $3b -ENGINE_FLYPOINT_SAFFRON EQU $3c -ENGINE_FLYPOINT_CELADON EQU $3d -ENGINE_FLYPOINT_FUCHSIA EQU $3e -ENGINE_FLYPOINT_CINNABAR EQU $3f -ENGINE_FLYPOINT_INDIGO_PLATEAU EQU $40 -ENGINE_FLYPOINT_NEW_BARK EQU $41 -ENGINE_FLYPOINT_CHERRYGROVE EQU $42 -ENGINE_FLYPOINT_VIOLET EQU $43 -ENGINE_FLYPOINT_AZALEA EQU $44 -ENGINE_FLYPOINT_CIANWOOD EQU $45 -ENGINE_FLYPOINT_GOLDENROD EQU $46 -ENGINE_FLYPOINT_OLIVINE EQU $47 -ENGINE_FLYPOINT_ECRUTEAK EQU $48 -ENGINE_FLYPOINT_MAHOGANY EQU $49 -ENGINE_FLYPOINT_LAKE_OF_RAGE EQU $4a -ENGINE_FLYPOINT_BLACKTHORN EQU $4b -ENGINE_FLYPOINT_SILVER_CAVE EQU $4c -ENGINE_FLYPOINT_UNUSED EQU $4d -ENGINE_LUCKY_NUMBER_SHOW EQU $4e -ENGINE_4F EQU $4f -ENGINE_KURT_MAKING_BALLS EQU $50 -ENGINE_51 EQU $51 -ENGINE_SPECIAL_WILDDATA EQU $52 -ENGINE_TIME_CAPSULE EQU $53 -ENGINE_ALL_FRUIT_TREES EQU $54 -ENGINE_SHUCKLE_GIVEN EQU $55 -ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED EQU $56 -ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY EQU $57 -ENGINE_MT_MOON_SQUARE_CLEFAIRY EQU $58 -ENGINE_UNION_CAVE_LAPRAS EQU $59 -ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT EQU $5a -ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT EQU $5b -ENGINE_TEA_IN_BLUES_HOUSE EQU $5c -ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT EQU $5d -ENGINE_5E EQU $5e -ENGINE_5F EQU $5f -ENGINE_60 EQU $60 -ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON EQU $61 -ENGINE_62 EQU $62 -ENGINE_PLAYER_IS_FEMALE EQU $63 -ENGINE_HAVE_EXAMINED_GS_BALL EQU $64 -ENGINE_JACK EQU $65 -ENGINE_HUEY EQU $66 -ENGINE_GAVEN EQU $67 -ENGINE_BETH EQU $68 -ENGINE_JOSE EQU $69 -ENGINE_REENA EQU $6a -ENGINE_JOEY EQU $6b -ENGINE_WADE EQU $6c -ENGINE_RALPH EQU $6d -ENGINE_LIZ EQU $6e -ENGINE_ANTHONY EQU $6f -ENGINE_TODD EQU $70 -ENGINE_GINA EQU $71 -ENGINE_ARNIE EQU $72 -ENGINE_ALAN EQU $73 -ENGINE_DANA EQU $74 -ENGINE_CHAD EQU $75 -ENGINE_TULLY EQU $76 -ENGINE_BRENT EQU $77 -ENGINE_TIFFANY EQU $78 -ENGINE_VANCE EQU $79 -ENGINE_WILTON EQU $7a -ENGINE_PARRY EQU $7b -ENGINE_ERIN EQU $7c -ENGINE_BEVERLY_HAS_NUGGET EQU $7d -ENGINE_JOSE_HAS_STAR_PIECE EQU $7e -ENGINE_WADE_HAS_ITEM EQU $7f -ENGINE_GINA_HAS_LEAF_STONE EQU $80 -ENGINE_ALAN_HAS_FIRE_STONE EQU $81 -ENGINE_LIZ_HAS_THUNDERSTONE EQU $82 -ENGINE_DEREK_HAS_NUGGET EQU $83 -ENGINE_TULLY_HAS_WATER_STONE EQU $84 -ENGINE_TIFFANY_HAS_PINK_BOW EQU $85 -ENGINE_WILTON_HAS_ITEM EQU $86 -ENGINE_87 EQU $87 -ENGINE_88 EQU $88 -ENGINE_89 EQU $89 -ENGINE_8A EQU $8a -ENGINE_8B EQU $8b -ENGINE_8C EQU $8c -ENGINE_8D EQU $8d -ENGINE_8E EQU $8e -ENGINE_8F EQU $8f -ENGINE_90 EQU $90 -ENGINE_91 EQU $91 -ENGINE_92 EQU $92 -ENGINE_93 EQU $93 -ENGINE_94 EQU $94 -ENGINE_95 EQU $95 -ENGINE_96 EQU $96 -ENGINE_97 EQU $97 -ENGINE_98 EQU $98 -ENGINE_99 EQU $99 -ENGINE_9A EQU $9a -ENGINE_9B EQU $9b -ENGINE_9C EQU $9c -ENGINE_9D EQU $9d -ENGINE_9E EQU $9e -ENGINE_KRIS_IN_CABLE_CLUB EQU $9f -ENGINE_DUNSPARCE_SWARM EQU $a0 -ENGINE_YANMA_SWARM EQU $a1 + const_def + + const ENGINE_RADIO_CARD + const ENGINE_MAP_CARD + const ENGINE_PHONE_CARD + const ENGINE_EXPN_CARD + const ENGINE_POKEGEAR + const ENGINE_DAYCARE_MONS_ARE_COMPATIBLE + const ENGINE_DAYCARE_MAN_HAS_MON + const ENGINE_DAYCARE_LADY_HAS_MON + const ENGINE_MOM_SAVING_MONEY + const ENGINE_DST + const ENGINE_0A + const ENGINE_POKEDEX + const ENGINE_UNOWN_DEX + const ENGINE_POKERUS + const ENGINE_ROCKET_SIGNAL_ON_CH20 + const ENGINE_CREDITS_SKIP + const ENGINE_BUG_CONTEST_ON + 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_ROCKETS_IN_MAHOGANY + const ENGINE_STRENGTH_ACTIVE + const ENGINE_ALWAYS_ON_BIKE + const ENGINE_DOWNHILL + const ENGINE_ZEPHYRBADGE + const ENGINE_HIVEBADGE + const ENGINE_PLAINBADGE + const ENGINE_FOGBADGE + const ENGINE_MINERALBADGE + const ENGINE_STORMBADGE + const ENGINE_GLACIERBADGE + const ENGINE_RISINGBADGE + const ENGINE_BOULDERBADGE + const ENGINE_CASCADEBADGE + const ENGINE_THUNDERBADGE + const ENGINE_RAINBOWBADGE + const ENGINE_SOULBADGE + const ENGINE_MARSHBADGE + const ENGINE_VOLCANOBADGE + const ENGINE_EARTHBADGE + const ENGINE_UNLOCKED_UNOWNS_1 + const ENGINE_UNLOCKED_UNOWNS_2 + const ENGINE_UNLOCKED_UNOWNS_3 + const ENGINE_UNLOCKED_UNOWNS_4 + const ENGINE_UNLOCKED_UNOWNS_5 + const ENGINE_UNLOCKED_UNOWNS_6 + const ENGINE_UNLOCKED_UNOWNS_7 + const ENGINE_UNLOCKED_UNOWNS_8 + const ENGINE_FLYPOINT_KRISS_HOUSE + const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER + const ENGINE_FLYPOINT_PALLET + const ENGINE_FLYPOINT_VIRIDIAN + const ENGINE_FLYPOINT_PEWTER + const ENGINE_FLYPOINT_CERULEAN + const ENGINE_FLYPOINT_ROCK_TUNNEL + const ENGINE_FLYPOINT_VERMILION + const ENGINE_FLYPOINT_LAVENDER + const ENGINE_FLYPOINT_SAFFRON + const ENGINE_FLYPOINT_CELADON + const ENGINE_FLYPOINT_FUCHSIA + const ENGINE_FLYPOINT_CINNABAR + const ENGINE_FLYPOINT_INDIGO_PLATEAU + const ENGINE_FLYPOINT_NEW_BARK + const ENGINE_FLYPOINT_CHERRYGROVE + const ENGINE_FLYPOINT_VIOLET + const ENGINE_FLYPOINT_AZALEA + const ENGINE_FLYPOINT_CIANWOOD + const ENGINE_FLYPOINT_GOLDENROD + const ENGINE_FLYPOINT_OLIVINE + const ENGINE_FLYPOINT_ECRUTEAK + const ENGINE_FLYPOINT_MAHOGANY + const ENGINE_FLYPOINT_LAKE_OF_RAGE + const ENGINE_FLYPOINT_BLACKTHORN + const ENGINE_FLYPOINT_SILVER_CAVE + const ENGINE_FLYPOINT_UNUSED + const ENGINE_LUCKY_NUMBER_SHOW + const ENGINE_4F + const ENGINE_KURT_MAKING_BALLS + const ENGINE_51 + const ENGINE_SPECIAL_WILDDATA + const ENGINE_TIME_CAPSULE + const ENGINE_ALL_FRUIT_TREES + const ENGINE_SHUCKLE_GIVEN + const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED + const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY + const ENGINE_MT_MOON_SQUARE_CLEFAIRY + const ENGINE_UNION_CAVE_LAPRAS + const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT + const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + const ENGINE_TEA_IN_BLUES_HOUSE + const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT + const ENGINE_5E + const ENGINE_5F + const ENGINE_60 + const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON + const ENGINE_62 + const ENGINE_PLAYER_IS_FEMALE + const ENGINE_HAVE_EXAMINED_GS_BALL + const ENGINE_JACK + const ENGINE_HUEY + const ENGINE_GAVEN + const ENGINE_BETH + const ENGINE_JOSE + const ENGINE_REENA + const ENGINE_JOEY + const ENGINE_WADE + const ENGINE_RALPH + const ENGINE_LIZ + const ENGINE_ANTHONY + const ENGINE_TODD + const ENGINE_GINA + const ENGINE_ARNIE + const ENGINE_ALAN + const ENGINE_DANA + const ENGINE_CHAD + const ENGINE_TULLY + const ENGINE_BRENT + const ENGINE_TIFFANY + const ENGINE_VANCE + const ENGINE_WILTON + const ENGINE_PARRY + const ENGINE_ERIN + const ENGINE_BEVERLY_HAS_NUGGET + const ENGINE_JOSE_HAS_STAR_PIECE + const ENGINE_WADE_HAS_ITEM + const ENGINE_GINA_HAS_LEAF_STONE + const ENGINE_ALAN_HAS_FIRE_STONE + const ENGINE_LIZ_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_KRIS_IN_CABLE_CLUB + const ENGINE_DUNSPARCE_SWARM + const ENGINE_YANMA_SWARM diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 692db4882..a3f3567d7 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,684 +1,2053 @@ -EVENT_GOT_TM31_MUD_SLAP EQU $008 -EVENT_GOT_TM49_FURY_CUTTER EQU $009 -EVENT_GOT_TM01_DYNAMICPUNCH EQU $00a -EVENT_GOT_TM45_ATTRACT EQU $00b -EVENT_GOT_TM30_SHADOW_BALL EQU $00c -EVENT_GOT_TM23_IRON_TAIL EQU $00d -EVENT_GOT_TM16_ICY_WIND EQU $00e -EVENT_GOT_TM24_DRAGONBREATH EQU $00f -EVENT_GOT_HM01_CUT EQU $010 -EVENT_GOT_HM02_FLY EQU $011 -EVENT_GOT_HM03_SURF EQU $012 -EVENT_GOT_HM04_STRENGTH EQU $013 -EVENT_GOT_HM05_FLASH EQU $014 -EVENT_GOT_HM06_WHIRLPOOL EQU $015 -EVENT_GOT_OLD_ROD EQU $017 -EVENT_GOT_GOOD_ROD EQU $018 -EVENT_GOT_SUPER_ROD EQU $019 -EVENT_GOT_A_POKEMON_FROM_ELM EQU $01a -EVENT_GOT_CYNDAQUIL_FROM_ELM EQU $01b -EVENT_GOT_TOTODILE_FROM_ELM EQU $01c -EVENT_GOT_CHIKORITA_FROM_ELM EQU $01d -EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON EQU $01e -EVENT_GAVE_MYSTERY_EGG_TO_ELM EQU $01f -EVENT_JASMINE_RETURNED_TO_GYM EQU $020 -EVENT_CLEARED_RADIO_TOWER EQU $021 -EVENT_CLEARED_ROCKET_HIDEOUT EQU $022 -EVENT_GOT_SECRETPOTION_FROM_PHARMACY EQU $023 -EVENT_GOT_SS_TICKET_FROM_ELM EQU $024 -EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER EQU $025 -EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE EQU $026 -EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE EQU $027 -EVENT_MADE_WHITNEY_CRY EQU $028 -EVENT_HERDED_FARFETCHD EQU $029 -EVENT_FOUGHT_SUDOWOODO EQU $02a -EVENT_CLEARED_SLOWPOKE_WELL EQU $02b -EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE EQU $02c -EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE EQU $02d -EVENT_MADE_UNOWN_APPEAR_IN_RUINS EQU $02e -EVENT_FAST_SHIP_DESTINATION_OLIVINE EQU $02f -EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS EQU $037 -EVENT_HEALED_MOOMOO EQU $03d -EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM EQU $03e -EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO EQU $03f -EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST EQU $040 -EVENT_DUDE_TALKED_TO_YOU EQU $041 -EVENT_LEARNED_TO_CATCH_POKEMON EQU $042 -EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON EQU $043 -EVENT_BEAT_ELITE_FOUR EQU $044 -EVENT_GOT_SHUCKIE EQU $045 -EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM EQU $046 -EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER EQU $047 -EVENT_GOT_PINK_BOW_FROM_MARY EQU $048 -EVENT_USED_BASEMENT_KEY EQU $049 -EVENT_GOT_TM08_ROCK_SMASH EQU $04b -EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE EQU $04d -EVENT_GOT_TM05_ROAR EQU $04e -EVENT_GOT_EEVEE EQU $04f -EVENT_GOT_KENYA EQU $050 -EVENT_GAVE_KENYA EQU $051 -EVENT_GOT_HP_UP_FROM_RANDY EQU $052 -EVENT_GOT_TM50_NIGHTMARE EQU $053 -EVENT_TOGEPI_HATCHED EQU $054 -EVENT_SHOWED_TOGEPI_TO_ELM EQU $055 -EVENT_GOT_EVERSTONE_FROM_ELM EQU $056 -EVENT_GOT_QUICK_CLAW EQU $057 -EVENT_GOT_TM10_HIDDEN_POWER EQU $058 -EVENT_GOT_TM36_SLUDGE_BOMB EQU $059 -EVENT_GOT_ITEMFINDER EQU $05a -EVENT_GOT_BICYCLE EQU $05b -EVENT_GOT_SQUIRTBOTTLE EQU $05c -EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 EQU $05d -EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN EQU $05e -EVENT_GOT_TM02_HEADBUTT EQU $05f -EVENT_DECIDED_TO_HELP_LANCE EQU $060 -EVENT_GOT_TYROGUE_FROM_KIYO EQU $061 -EVENT_MET_FRIEDA_OF_FRIDAY EQU $062 -EVENT_GOT_POISON_BARB_FROM_FRIEDA EQU $063 -EVENT_MET_TUSCANY_OF_TUESDAY EQU $064 -EVENT_GOT_PINK_BOW_FROM_TUSCANY EQU $065 -EVENT_MET_ARTHUR_OF_THURSDAY EQU $066 -EVENT_GOT_HARD_STONE_FROM_ARTHUR EQU $067 -EVENT_MET_SUNNY_OF_SUNDAY EQU $068 -EVENT_GOT_MAGNET_FROM_SUNNY EQU $069 -EVENT_MET_WESLEY_OF_WEDNESDAY EQU $06a -EVENT_GOT_BLACKBELT_FROM_WESLEY EQU $06b -EVENT_MET_SANTOS_OF_SATURDAY EQU $06c -EVENT_GOT_SPELL_TAG_FROM_SANTOS EQU $06d -EVENT_MET_MONICA_OF_MONDAY EQU $06e -EVENT_GOT_SHARP_BEAK_FROM_MONICA EQU $06f -EVENT_GOT_SOFT_SAND_FROM_KATE EQU $070 -EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA EQU $071 -EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE EQU $072 -EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL EQU $073 -EVENT_GOT_TM47_STEEL_WING EQU $074 -EVENT_GOT_TM37_SANDSTORM EQU $075 -EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE EQU $077 -EVENT_GOT_CLEAR_BELL EQU $078 -EVENT_GOT_SILVER_WING EQU $079 -EVENT_GOT_TM12_SWEET_SCENT EQU $07a -EVENT_RELEASED_THE_BEASTS EQU $07b -EVENT_GOT_MASTER_BALL_FROM_ELM EQU $07c -EVENT_FOUND_REVIVE_IN_ROCKET_BASE_B1F EQU $086 -EVENT_MET_FLORIA EQU $0b9 -EVENT_BUGGING_KURT_TOO_MUCH EQU $0bb -EVENT_TALKED_TO_RUINS_COWARD EQU $0bc -EVENT_GOT_DRATINI EQU $0bd -EVENT_CAN_GIVE_GS_BALL_TO_KURT EQU $0be -EVENT_GAVE_GS_BALL_TO_KURT EQU $0bf -EVENT_FOREST_IS_RESTLESS EQU $0c0 -EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG EQU $0c1 -EVENT_GOT_NUGGET_FROM_GUY EQU $0c8 -EVENT_RETURNED_MACHINE_PART EQU $0c9 -EVENT_MET_MANAGER_AT_POWER_PLANT EQU $0ca -EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM EQU $0cb -EVENT_MET_REDS_MOM EQU $0cc -EVENT_RESTORED_POWER_TO_KANTO EQU $0cd -EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON EQU $0ce -EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM EQU $0cf -EVENT_RETURNED_LOST_ITEM_TO_COPYCAT EQU $0d0 -EVENT_GOT_PASS_FROM_COPYCAT EQU $0d1 -EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB EQU $0d2 -EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL EQU $0d3 -EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT EQU $0d4 -EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE EQU $0d5 -EVENT_ENABLE_DIPLOMA_PRINTING EQU $0d6 -EVENT_CINNABAR_ROCKS_CLEARED EQU $0d7 -EVENT_CLEARED_NUGGET_BRIDGE EQU $0d8 -EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER EQU $0d9 -EVENT_GOT_TM03_CURSE EQU $0da -EVENT_GOT_CLEANSE_TAG EQU $0db -EVENT_GOT_TM19_GIGA_DRAIN EQU $0dc -EVENT_GOT_TM06_TOXIC EQU $0dd -EVENT_GOT_UP_GRADE EQU $0de -EVENT_GOT_TM07_ZAP_CANNON EQU $0df -EVENT_GOT_TM42_DREAM_EATER EQU $0e0 -EVENT_TALKED_TO_OAK_IN_KANTO EQU $0e1 -EVENT_GOT_HP_UP_FROM_VERMILION_GUY EQU $0e2 -EVENT_GOT_TM29_PSYCHIC EQU $0e3 -EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE EQU $0f9 -EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY EQU $0fa -EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM EQU $0fb -EVENT_JACK_ASKED_FOR_PHONE_NUMBER EQU $25f -EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER EQU $261 -EVENT_HUEY_ASKED_FOR_PHONE_NUMBER EQU $263 -EVENT_GOT_PROTEIN_FROM_HUEY EQU $265 -EVENT_GOT_HP_UP_FROM_JOEY EQU $266 -EVENT_GOT_CARBOS_FROM_VANCE EQU $267 -EVENT_GOT_IRON_FROM_PARRY EQU $268 -EVENT_GOT_CALCIUM_FROM_ERIN EQU $269 -EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER EQU $26b -EVENT_BETH_ASKED_FOR_PHONE_NUMBER EQU $26d -EVENT_JOSE_ASKED_FOR_PHONE_NUMBER EQU $26f -EVENT_REENA_ASKED_FOR_PHONE_NUMBER EQU $271 -EVENT_JOEY_ASKED_FOR_PHONE_NUMBER EQU $273 -EVENT_WADE_ASKED_FOR_PHONE_NUMBER EQU $275 -EVENT_RALPH_ASKED_FOR_PHONE_NUMBER EQU $277 -EVENT_LIZ_ASKED_FOR_PHONE_NUMBER EQU $279 -EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER EQU $27b -EVENT_TODD_ASKED_FOR_PHONE_NUMBER EQU $27d -EVENT_GINA_ASKED_FOR_PHONE_NUMBER EQU $27f -EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER EQU $281 -EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER EQU $283 -EVENT_ALAN_ASKED_FOR_PHONE_NUMBER EQU $285 -EVENT_DANA_ASKED_FOR_PHONE_NUMBER EQU $289 -EVENT_CHAD_ASKED_FOR_PHONE_NUMBER EQU $28b -EVENT_DEREK_ASKED_FOR_PHONE_NUMBER EQU $28d -EVENT_TULLY_ASKED_FOR_PHONE_NUMBER EQU $28f -EVENT_BRENT_ASKED_FOR_PHONE_NUMBER EQU $291 -EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER EQU $293 -EVENT_VANCE_ASKED_FOR_PHONE_NUMBER EQU $295 -EVENT_WILTON_ASKED_FOR_PHONE_NUMBER EQU $297 -EVENT_KENJI_ASKED_FOR_PHONE_NUMBER EQU $299 -EVENT_PARRY_ASKED_FOR_PHONE_NUMBER EQU $29b -EVENT_ERIN_ASKED_FOR_PHONE_NUMBER EQU $29d -EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD EQU $29e -EVENT_SWITCH_1 EQU $2d3 -EVENT_SWITCH_2 EQU $2d4 -EVENT_SWITCH_3 EQU $2d5 -EVENT_EMERGENCY_SWITCH EQU $2d6 -EVENT_SWITCH_4 EQU $2d7 -EVENT_SWITCH_5 EQU $2d8 -EVENT_SWITCH_6 EQU $2d9 -EVENT_SWITCH_7 EQU $2da -EVENT_SWITCH_8 EQU $2db -EVENT_SWITCH_9 EQU $2dc -EVENT_SWITCH_10 EQU $2dd -EVENT_SWITCH_11 EQU $2de -EVENT_SWITCH_12 EQU $2df -EVENT_SWITCH_13 EQU $2e0 -EVENT_SWITCH_14 EQU $2e1 -EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART EQU $2e2 -EVENT_TURNED_OFF_SECURITY_CAMERAS EQU $2e3 -EVENT_SECURITY_CAMERA_1 EQU $2e4 -EVENT_SECURITY_CAMERA_2 EQU $2e5 -EVENT_SECURITY_CAMERA_3 EQU $2e6 -EVENT_SECURITY_CAMERA_4 EQU $2e7 -EVENT_SECURITY_CAMERA_5 EQU $2e8 -EVENT_EXPLODING_TRAP_1 EQU $2e9 -EVENT_EXPLODING_TRAP_2 EQU $2ea -EVENT_EXPLODING_TRAP_3 EQU $2eb -EVENT_EXPLODING_TRAP_4 EQU $2ec -EVENT_EXPLODING_TRAP_5 EQU $2ed -EVENT_EXPLODING_TRAP_6 EQU $2ee -EVENT_EXPLODING_TRAP_7 EQU $2ef -EVENT_EXPLODING_TRAP_8 EQU $2f0 -EVENT_EXPLODING_TRAP_9 EQU $2f1 -EVENT_EXPLODING_TRAP_10 EQU $2f2 -EVENT_EXPLODING_TRAP_11 EQU $2f3 -EVENT_EXPLODING_TRAP_12 EQU $2f4 -EVENT_EXPLODING_TRAP_13 EQU $2f5 -EVENT_EXPLODING_TRAP_14 EQU $2f6 -EVENT_EXPLODING_TRAP_15 EQU $2f7 -EVENT_EXPLODING_TRAP_16 EQU $2f8 -EVENT_EXPLODING_TRAP_17 EQU $2f9 -EVENT_EXPLODING_TRAP_18 EQU $2fa -EVENT_EXPLODING_TRAP_19 EQU $2fb -EVENT_EXPLODING_TRAP_20 EQU $2fc -EVENT_EXPLODING_TRAP_21 EQU $2fd -EVENT_EXPLODING_TRAP_22 EQU $2fe -EVENT_LEARNED_HAIL_GIOVANNI EQU $2ff -EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER EQU $300 -EVENT_LEARNED_SLOWPOKETAIL EQU $301 -EVENT_LEARNED_RATICATE_TAIL EQU $302 -EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE EQU $303 -EVENT_WAREHOUSE_LAYOUT_1 EQU $304 -EVENT_WAREHOUSE_LAYOUT_2 EQU $305 -EVENT_WAREHOUSE_LAYOUT_3 EQU $306 -EVENT_WAREHOUSE_BLOCKED_OFF EQU $307 -EVENT_WILLS_ROOM_EXIT_OPEN EQU $30a -EVENT_WILLS_ROOM_ENTRANCE_CLOSED EQU $30b -EVENT_KOGAS_ROOM_EXIT_OPEN EQU $30c -EVENT_KOGAS_ROOM_ENTRANCE_CLOSED EQU $30d -EVENT_BRUNOS_ROOM_EXIT_OPEN EQU $30e -EVENT_KARENS_ROOM_ENTRANCE_CLOSED EQU $30f -EVENT_KARENS_ROOM_EXIT_OPEN EQU $310 -EVENT_LANCES_ROOM_ENTRANCE_CLOSED EQU $311 -EVENT_FOUGHT_HO_OH EQU $317 -EVENT_FOUGHT_LUGIA EQU $318 -EVENT_BEAT_RIVAL_IN_MT_MOON EQU $319 -EVENT_MET_BILLS_GRANDPA EQU $31a -EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA EQU $31b -EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA EQU $31c -EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA EQU $31d -EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA EQU $31e -EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA EQU $31f -EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA EQU $320 -EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA EQU $321 -EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA EQU $322 -EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA EQU $323 -EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA EQU $324 -EVENT_LISTENED_TO_INITIAL_RADIO EQU $325 -EVENT_WALL_OPENED_IN_HO_OH_CHAMBER EQU $326 -EVENT_WALL_OPENED_IN_KABUTO_CHAMBER EQU $327 -EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER EQU $328 -EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER EQU $329 -EVENT_WELCOMED_TO_POKECOM_CENTER EQU $32a -EVENT_WADE_HAS_BERRY EQU $32b -EVENT_WADE_HAS_PSNCUREBERRY EQU $32c -EVENT_WADE_HAS_PRZCUREBERRY EQU $32d -EVENT_WADE_HAS_BITTER_BERRY EQU $32e -EVENT_WILTON_HAS_ULTRA_BALL EQU $32f -EVENT_WILTON_HAS_GREAT_BALL EQU $330 -EVENT_WILTON_HAS_POKE_BALL EQU $331 -EVENT_HOLE_IN_BURNED_TOWER EQU $332 -EVENT_FOUGHT_EUSINE EQU $333 -EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER EQU $334 -EVENT_FOUGHT_SUICUNE EQU $335 -EVENT_GOT_RAINBOW_WING EQU $336 -EVENT_HUEY_PROTEIN EQU $337 -EVENT_JOEY_HP_UP EQU $338 -EVENT_VANCE_CARBOS EQU $339 -EVENT_PARRY_IRON EQU $33a -EVENT_ERIN_CALCIUM EQU $33b -EVENT_BUENA_OFFERED_HER_PHONE_NUMBER EQU $33c -EVENT_MET_BUENA EQU $33d -EVENT_GOT_ODD_EGG EQU $33e -EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER EQU $340 -EVENT_BEAT_SWIMMERF_ELAINE EQU $3e8 -EVENT_BEAT_SWIMMERF_PAULA EQU $3e9 -EVENT_BEAT_SWIMMERF_KAYLEE EQU $3ea -EVENT_BEAT_SWIMMERF_SUSIE EQU $3eb -EVENT_BEAT_SWIMMERF_DENISE EQU $3ec -EVENT_BEAT_SWIMMERF_KARA EQU $3ed -EVENT_BEAT_SWIMMERF_WENDY EQU $3ee -EVENT_BEAT_SWIMMERF_DAWN EQU $3f3 -EVENT_BEAT_SWIMMERF_NICOLE EQU $3f5 -EVENT_BEAT_SWIMMERF_LORI EQU $3f6 -EVENT_BEAT_SWIMMERF_NIKKI EQU $3f8 -EVENT_BEAT_SWIMMERF_DIANA EQU $3f9 -EVENT_BEAT_SWIMMERF_BRIANA EQU $3fa -EVENT_BEAT_BIRD_KEEPER_ROD EQU $3fb -EVENT_BEAT_BIRD_KEEPER_ABE EQU $3fc -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 EQU $401 -EVENT_BEAT_BIRD_KEEPER_HANK EQU $402 -EVENT_BEAT_BIRD_KEEPER_ROY EQU $403 -EVENT_BEAT_BIRD_KEEPER_BORIS EQU $404 -EVENT_BEAT_BIRD_KEEPER_BOB EQU $405 -EVENT_BEAT_BIRD_KEEPER_PETER EQU $407 -EVENT_BEAT_BIRD_KEEPER_JOSE EQU $408 -EVENT_BEAT_BIRD_KEEPER_PERRY EQU $409 -EVENT_BEAT_BIRD_KEEPER_BRET EQU $40a -EVENT_BEAT_BOARDER_RONALD EQU $40e -EVENT_BEAT_BOARDER_BRAD EQU $40f -EVENT_BEAT_BOARDER_DOUGLAS EQU $410 -EVENT_BEAT_SAGE_CHOW EQU $411 -EVENT_BEAT_SAGE_NICO EQU $412 -EVENT_BEAT_SAGE_JIN EQU $413 -EVENT_BEAT_SAGE_TROY EQU $414 -EVENT_BEAT_SAGE_JEFFREY EQU $415 -EVENT_BEAT_SAGE_PING EQU $416 -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 EQU $41b -EVENT_BEAT_CAMPER_IVAN EQU $41c -EVENT_BEAT_CAMPER_ELLIOT EQU $41d -EVENT_BEAT_CAMPER_BARRY EQU $41e -EVENT_BEAT_CAMPER_LLOYD EQU $41f -EVENT_BEAT_CAMPER_DEAN EQU $420 -EVENT_BEAT_CAMPER_SID EQU $421 -EVENT_BEAT_CAMPER_TED EQU $424 -EVENT_BEAT_CAMPER_JERRY EQU $42b -EVENT_BEAT_CAMPER_SPENCER EQU $42c -EVENT_BEAT_BURGLAR_DUNCAN EQU $42d -EVENT_BEAT_BURGLAR_EDDIE EQU $42e -EVENT_BEAT_BURGLAR_COREY EQU $42f -EVENT_BEAT_BIKER_DWAYNE EQU $433 -EVENT_BEAT_BIKER_HARRIS EQU $434 -EVENT_BEAT_BIKER_ZEKE EQU $435 -EVENT_BEAT_BIKER_CHARLES EQU $436 -EVENT_BEAT_BIKER_RILEY EQU $437 -EVENT_BEAT_BIKER_JOEL EQU $438 -EVENT_BEAT_BIKER_GLENN EQU $439 -EVENT_BEAT_PSYCHIC_NATHAN EQU $43a -EVENT_BEAT_PSYCHIC_FRANKLIN EQU $43b -EVENT_BEAT_PSYCHIC_HERMAN EQU $43c -EVENT_BEAT_PSYCHIC_FIDEL EQU $43d -EVENT_BEAT_PSYCHIC_GREG EQU $43e -EVENT_BEAT_PSYCHIC_NORMAN EQU $43f -EVENT_BEAT_PSYCHIC_MARK EQU $440 -EVENT_BEAT_PSYCHIC_PHIL EQU $441 -EVENT_BEAT_PSYCHIC_RICHARD EQU $442 -EVENT_BEAT_PSYCHIC_GILBERT EQU $443 -EVENT_BEAT_PSYCHIC_JARED EQU $444 -EVENT_BEAT_PSYCHIC_RODNEY EQU $445 -EVENT_BEAT_FIREBREATHER_OTIS EQU $446 -EVENT_BEAT_FIREBREATHER_BURT EQU $449 -EVENT_BEAT_FIREBREATHER_BILL EQU $44a -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 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 EQU $454 -EVENT_BEAT_FISHER_ANDRE EQU $455 -EVENT_BEAT_FISHER_RAYMOND EQU $456 -EVENT_BEAT_FISHER_WILTON EQU $457 -EVENT_BEAT_FISHER_EDGAR EQU $458 -EVENT_BEAT_FISHER_JONAH EQU $459 -EVENT_BEAT_FISHER_MARTIN EQU $45a -EVENT_BEAT_FISHER_STEPHEN EQU $45b -EVENT_BEAT_FISHER_BARNEY EQU $45c -EVENT_BEAT_FISHER_SCOTT EQU $462 -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 EQU $46c -EVENT_BEAT_SCHOOLBOY_KIP EQU $46d -EVENT_BEAT_SCHOOLBOY_ALAN EQU $46e -EVENT_BEAT_SCHOOLBOY_JOHNNY EQU $46f -EVENT_BEAT_SCHOOLBOY_DANNY EQU $470 -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 EQU $475 -EVENT_BEAT_SCHOOLBOY_NATE EQU $476 -EVENT_BEAT_SCHOOLBOY_RICKY EQU $477 -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 EQU $487 -EVENT_BEAT_PICNICKER_HEIDI EQU $48a -EVENT_BEAT_PICNICKER_EDNA EQU $48b -EVENT_BEAT_PICNICKER_TANYA EQU $490 -EVENT_BEAT_PICNICKER_TIFFANY EQU $491 -EVENT_BEAT_GUITARIST_CLYDE EQU $493 -EVENT_BEAT_GUITARIST_VINCENT EQU $494 -EVENT_BEAT_JUGGLER_IRWIN EQU $495 -EVENT_BEAT_JUGGLER_FRITZ EQU $496 -EVENT_BEAT_JUGGLER_HORTON EQU $497 -EVENT_BEAT_GENTLEMAN_PRESTON EQU $49a -EVENT_BEAT_GENTLEMAN_EDWARD EQU $49b -EVENT_BEAT_GENTLEMAN_GREGORY EQU $49c -EVENT_BEAT_GENTLEMAN_ALFRED EQU $49e -EVENT_BEAT_SCIENTIST_ROSS EQU $49f -EVENT_BEAT_SCIENTIST_MITCH EQU $4a0 -EVENT_BEAT_SCIENTIST_JED EQU $4a1 -EVENT_BEAT_SCIENTIST_MARC EQU $4a2 -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 EQU $4ab -EVENT_BEAT_BLACKBELT_WAI EQU $4ac -EVENT_BEAT_BEAUTY_VICTORIA EQU $4ad -EVENT_BEAT_BEAUTY_SAMANTHA EQU $4ae -EVENT_BEAT_BEAUTY_CASSIE EQU $4b2 -EVENT_BEAT_BEAUTY_JULIA EQU $4ba -EVENT_BEAT_BEAUTY_VALERIE EQU $4bc -EVENT_BEAT_FALKNER EQU $4bd -EVENT_BEAT_BUGSY EQU $4be -EVENT_BEAT_WHITNEY EQU $4bf -EVENT_BEAT_MORTY EQU $4c0 -EVENT_BEAT_JASMINE EQU $4c1 -EVENT_BEAT_CHUCK EQU $4c2 -EVENT_BEAT_PRYCE EQU $4c3 -EVENT_BEAT_CLAIR EQU $4c4 -EVENT_BEAT_BROCK EQU $4c5 -EVENT_BEAT_MISTY EQU $4c6 -EVENT_BEAT_LTSURGE EQU $4c7 -EVENT_BEAT_ERIKA EQU $4c8 -EVENT_BEAT_JANINE EQU $4c9 -EVENT_BEAT_SABRINA EQU $4ca -EVENT_BEAT_BLAINE EQU $4cb -EVENT_BEAT_BLUE EQU $4cc -EVENT_BEAT_POKEFANM_WILLIAM EQU $4cd -EVENT_BEAT_POKEFANM_DEREK EQU $4ce -EVENT_BEAT_POKEFANM_ROBERT EQU $4cf -EVENT_BEAT_POKEFANM_JOSHUA EQU $4d0 -EVENT_BEAT_POKEFANM_CARTER EQU $4d1 -EVENT_BEAT_POKEFANM_TREVOR EQU $4d2 -EVENT_BEAT_POKEFANM_BRANDON EQU $4d3 -EVENT_BEAT_POKEFANM_JEREMY EQU $4d4 -EVENT_BEAT_POKEFANM_COLIN EQU $4d5 -EVENT_BEAT_POKEFANM_ALEX EQU $4d8 -EVENT_BEAT_POKEFANF_BEVERLY EQU $4d9 -EVENT_BEAT_POKEFANF_RUTH EQU $4da -EVENT_BEAT_POKEFANF_GEORGIA EQU $4dd -EVENT_BEAT_KIMONO_GIRL_NAOKO EQU $4df -EVENT_BEAT_KIMONO_GIRL_SAYO EQU $4e0 -EVENT_BEAT_KIMONO_GIRL_ZUKI EQU $4e1 -EVENT_BEAT_KIMONO_GIRL_KUNI EQU $4e2 -EVENT_BEAT_KIMONO_GIRL_MIKI EQU $4e3 -EVENT_BEAT_POKEMANIAC_LARRY EQU $4e4 -EVENT_BEAT_POKEMANIAC_ANDREW EQU $4e5 -EVENT_BEAT_POKEMANIAC_CALVIN EQU $4e6 -EVENT_BEAT_POKEMANIAC_SHANE EQU $4e7 -EVENT_BEAT_POKEMANIAC_BEN EQU $4e8 -EVENT_BEAT_POKEMANIAC_BRENT EQU $4e9 -EVENT_BEAT_POKEMANIAC_RON EQU $4ea -EVENT_BEAT_POKEMANIAC_ETHAN EQU $4eb -EVENT_BEAT_POKEMANIAC_ISSAC EQU $4ee -EVENT_BEAT_POKEMANIAC_DONALD EQU $4ef -EVENT_BEAT_POKEMANIAC_ZACH EQU $4f0 -EVENT_BEAT_ROCKET_GRUNTM_1 EQU $4f1 -EVENT_BEAT_ROCKET_GRUNTM_2 EQU $4f2 -EVENT_BEAT_ROCKET_GRUNTM_3 EQU $4f3 -EVENT_BEAT_ROCKET_GRUNTM_4 EQU $4f4 -EVENT_BEAT_ROCKET_GRUNTM_5 EQU $4f5 -EVENT_BEAT_ROCKET_GRUNTM_6 EQU $4f6 -EVENT_BEAT_ROCKET_GRUNTM_7 EQU $4f7 -EVENT_BEAT_ROCKET_GRUNTM_8 EQU $4f8 -EVENT_BEAT_ROCKET_GRUNTM_9 EQU $4f9 -EVENT_BEAT_ROCKET_GRUNTM_10 EQU $4fa -EVENT_BEAT_ROCKET_GRUNTM_11 EQU $4fb -EVENT_BEAT_ROCKET_GRUNTM_12 EQU $4fd -EVENT_BEAT_ROCKET_GRUNTM_13 EQU $4fe -EVENT_BEAT_ROCKET_GRUNTM_14 EQU $4ff -EVENT_BEAT_ROCKET_GRUNTM_15 EQU $500 -EVENT_BEAT_ROCKET_GRUNTM_16 EQU $501 -EVENT_BEAT_ROCKET_GRUNTM_17 EQU $502 -EVENT_BEAT_ROCKET_GRUNTM_18 EQU $503 -EVENT_BEAT_ROCKET_GRUNTM_19 EQU $508 -EVENT_BEAT_ROCKET_GRUNTM_20 EQU $509 -EVENT_BEAT_ROCKET_GRUNTM_21 EQU $50c -EVENT_BEAT_ROCKET_GRUNTM_22 EQU $50d -EVENT_BEAT_ROCKET_GRUNTF_1 EQU $510 -EVENT_BEAT_ROCKET_GRUNTF_2 EQU $511 -EVENT_BEAT_ROCKET_GRUNTF_3 EQU $512 -EVENT_BEAT_ROCKET_GRUNTF_4 EQU $513 -EVENT_BEAT_ROCKET_GRUNTF_5 EQU $514 -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 EQU $519 -EVENT_BEAT_LASS_LINDA EQU $51a -EVENT_BEAT_LASS_LAURA EQU $51b -EVENT_BEAT_LASS_SHANNON EQU $51c -EVENT_BEAT_LASS_MICHELLE EQU $51d -EVENT_BEAT_LASS_DANA EQU $51e -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 EQU $528 -EVENT_BEAT_HIKER_BENJAMIN EQU $529 -EVENT_BEAT_HIKER_ERIK EQU $52a -EVENT_BEAT_HIKER_MICHAEL EQU $52b -EVENT_BEAT_HIKER_PARRY EQU $52c -EVENT_BEAT_HIKER_TIMOTHY EQU $52d -EVENT_BEAT_HIKER_BAILEY EQU $52e -EVENT_BEAT_HIKER_TIM EQU $530 -EVENT_BEAT_HIKER_NOLAND EQU $531 -EVENT_BEAT_HIKER_SIDNEY EQU $532 -EVENT_BEAT_HIKER_KENNY EQU $533 -EVENT_BEAT_HIKER_JIM EQU $534 -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 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 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 -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 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 -EVENT_BEAT_COOLTRAINERF_FRAN EQU $55d -EVENT_BEAT_COOLTRAINERF_LOLA EQU $55e -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 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_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 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 -EVENT_BEAT_SUPER_NERD_PAT EQU $588 -EVENT_BEAT_SUPER_NERD_SHAWN EQU $589 -EVENT_BEAT_SUPER_NERD_TERU EQU $58a -EVENT_BEAT_MEDIUM_MARTHA EQU $58b -EVENT_BEAT_MEDIUM_GRACE EQU $58c -EVENT_BEAT_MEDIUM_REBECCA EQU $590 -EVENT_BEAT_MEDIUM_DORIS EQU $591 -EVENT_BEAT_SKIER_ROXANNE EQU $592 -EVENT_BEAT_SKIER_CLARISSA EQU $593 -EVENT_BEAT_SWIMMERM_HAROLD EQU $594 -EVENT_BEAT_SWIMMERM_SIMON EQU $595 -EVENT_BEAT_SWIMMERM_RANDALL EQU $596 -EVENT_BEAT_SWIMMERM_CHARLIE EQU $597 -EVENT_BEAT_SWIMMERM_GEORGE EQU $598 -EVENT_BEAT_SWIMMERM_BERKE EQU $599 -EVENT_BEAT_SWIMMERM_KIRK EQU $59a -EVENT_BEAT_SWIMMERM_MATHEW EQU $59b -EVENT_BEAT_SWIMMERM_JEROME EQU $5a1 -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 EQU $5a9 -EVENT_BEAT_YOUNGSTER_MIKEY EQU $5aa -EVENT_BEAT_YOUNGSTER_ALBERT EQU $5ab -EVENT_BEAT_YOUNGSTER_GORDON EQU $5ac -EVENT_BEAT_YOUNGSTER_SAMUEL EQU $5ad -EVENT_BEAT_YOUNGSTER_IAN EQU $5ae -EVENT_BEAT_YOUNGSTER_WARREN EQU $5b1 -EVENT_BEAT_YOUNGSTER_JIMMY EQU $5b2 -EVENT_BEAT_YOUNGSTER_OWEN EQU $5b3 -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 -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_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 -EVENT_BEAT_POKEFANM_ALLAN EQU $5c8 -EVENT_BEAT_SAGE_GAKU EQU $5c9 -EVENT_BEAT_SAGE_MASA EQU $5ca -EVENT_BEAT_SAGE_KOJI EQU $5cb -EVENT_RIVAL_SPROUT_TOWER EQU $6c4 -EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE EQU $6ff -EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER EQU $700 -EVENT_ELMS_AIDE_IN_LAB EQU $701 -EVENT_BOULDER_IN_BLACKTHORN_GYM_1 EQU $706 -EVENT_BOULDER_IN_BLACKTHORN_GYM_2 EQU $707 -EVENT_BOULDER_IN_BLACKTHORN_GYM_3 EQU $708 -EVENT_BOULDER_IN_ICE_PATH_1 EQU $70d -EVENT_BOULDER_IN_ICE_PATH_2 EQU $70e -EVENT_BOULDER_IN_ICE_PATH_3 EQU $70f -EVENT_BOULDER_IN_ICE_PATH_4 EQU $710 -EVENT_MET_BILL EQU $712 -EVENT_OPENED_MT_SILVER EQU $74f -EVENT_FOUGHT_SNORLAX EQU $750 -EVENT_RED_IN_MT_SILVER EQU $762 -EVENT_RANG_CLEAR_BELL EQU $767 -EVENT_FLORIA_AT_SUDOWOODO EQU $769 -EVENT_TRAINERS_IN_CERULEAN_GYM EQU $76f -EVENT_BLUE_IN_CINNABAR EQU $775 -EVENT_TELEPORT_GUY EQU $77c -EVENT_PICKED_UP_FOCUS_BAND EQU $77d -EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM EQU $794 -EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM EQU $795 -EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM EQU $796 -EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM EQU $797 -EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM EQU $798 -EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM EQU $799 -EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM EQU $79a -EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM EQU $79b -EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM EQU $79c -EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM EQU $79d -EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM EQU $79e -EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM EQU $79f -EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM EQU $7a0 -EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM EQU $7a1 -EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM EQU $7a2 -EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM EQU $7a3 -EVENT_EUSINE_IN_BURNED_TOWER EQU $7aa -EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY EQU $7ae -EVENT_SAW_SUICUNE_ON_ROUTE_42 EQU $7af -EVENT_SAW_SUICUNE_ON_ROUTE_36 EQU $7b0 -EVENT_SET_WHEN_FOUGHT_HO_OH EQU $7b7 + + 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 + const EVENT_GOT_TM31_MUD_SLAP + const EVENT_GOT_TM49_FURY_CUTTER + const EVENT_GOT_TM01_DYNAMICPUNCH + const EVENT_GOT_TM45_ATTRACT + const EVENT_GOT_TM30_SHADOW_BALL + const EVENT_GOT_TM23_IRON_TAIL + const EVENT_GOT_TM16_ICY_WIND + const EVENT_GOT_TM24_DRAGONBREATH + const EVENT_GOT_HM01_CUT + const EVENT_GOT_HM02_FLY + const EVENT_GOT_HM03_SURF + const EVENT_GOT_HM04_STRENGTH + const EVENT_GOT_HM05_FLASH + const EVENT_GOT_HM06_WHIRLPOOL + const EVENT_016 + const EVENT_GOT_OLD_ROD + const EVENT_GOT_GOOD_ROD + const EVENT_GOT_SUPER_ROD + const EVENT_GOT_A_POKEMON_FROM_ELM + const EVENT_GOT_CYNDAQUIL_FROM_ELM + const EVENT_GOT_TOTODILE_FROM_ELM + const EVENT_GOT_CHIKORITA_FROM_ELM + const EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON + const EVENT_GAVE_MYSTERY_EGG_TO_ELM + const EVENT_JASMINE_RETURNED_TO_GYM + const EVENT_CLEARED_RADIO_TOWER + const EVENT_CLEARED_ROCKET_HIDEOUT + const EVENT_GOT_SECRETPOTION_FROM_PHARMACY + const EVENT_GOT_SS_TICKET_FROM_ELM + const EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER + const EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE + const EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE + const EVENT_MADE_WHITNEY_CRY + const EVENT_HERDED_FARFETCHD + const EVENT_FOUGHT_SUDOWOODO + const EVENT_CLEARED_SLOWPOKE_WELL + const EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE + 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_036 + const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS + const EVENT_038 + const EVENT_039 + const EVENT_03A + 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_DUDE_TALKED_TO_YOU + const EVENT_LEARNED_TO_CATCH_POKEMON + const EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON + const EVENT_BEAT_ELITE_FOUR + const EVENT_GOT_SHUCKIE + const EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM + 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_GOT_TM08_ROCK_SMASH + const EVENT_04C + const EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE + const EVENT_GOT_TM05_ROAR + const EVENT_GOT_EEVEE + const EVENT_GOT_KENYA + const EVENT_GAVE_KENYA + const EVENT_GOT_HP_UP_FROM_RANDY + const EVENT_GOT_TM50_NIGHTMARE + const EVENT_TOGEPI_HATCHED + const EVENT_SHOWED_TOGEPI_TO_ELM + const EVENT_GOT_EVERSTONE_FROM_ELM + const EVENT_GOT_QUICK_CLAW + const EVENT_GOT_TM10_HIDDEN_POWER + const EVENT_GOT_TM36_SLUDGE_BOMB + const EVENT_GOT_ITEMFINDER + const EVENT_GOT_BICYCLE + const EVENT_GOT_SQUIRTBOTTLE + 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_GOT_TYROGUE_FROM_KIYO + const EVENT_MET_FRIEDA_OF_FRIDAY + const EVENT_GOT_POISON_BARB_FROM_FRIEDA + const EVENT_MET_TUSCANY_OF_TUESDAY + const EVENT_GOT_PINK_BOW_FROM_TUSCANY + const EVENT_MET_ARTHUR_OF_THURSDAY + const EVENT_GOT_HARD_STONE_FROM_ARTHUR + const EVENT_MET_SUNNY_OF_SUNDAY + const EVENT_GOT_MAGNET_FROM_SUNNY + const EVENT_MET_WESLEY_OF_WEDNESDAY + const EVENT_GOT_BLACKBELT_FROM_WESLEY + 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_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_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 + const EVENT_07D + const EVENT_07E + const EVENT_07F + const EVENT_080 + const EVENT_081 + const EVENT_082 + const EVENT_083 + const EVENT_084 + const EVENT_085 + const EVENT_FOUND_REVIVE_IN_ROCKET_BASE_B1F + const EVENT_087 + const EVENT_088 + const EVENT_089 + const EVENT_08A + const EVENT_08B + const EVENT_08C + const EVENT_08D + const EVENT_08E + const EVENT_08F + const EVENT_090 + const EVENT_091 + const EVENT_092 + const EVENT_093 + const EVENT_094 + const EVENT_095 + const EVENT_096 + const EVENT_097 + const EVENT_098 + const EVENT_099 + const EVENT_09A + const EVENT_09B + const EVENT_09C + const EVENT_09D + const EVENT_09E + const EVENT_09F + const EVENT_0A0 + const EVENT_0A1 + const EVENT_0A2 + const EVENT_0A3 + const EVENT_0A4 + const EVENT_0A5 + const EVENT_0A6 + const EVENT_0A7 + const EVENT_0A8 + const EVENT_0A9 + const EVENT_0AA + const EVENT_0AB + const EVENT_0AC + const EVENT_0AD + const EVENT_0AE + const EVENT_0AF + const EVENT_0B0 + const EVENT_0B1 + const EVENT_0B2 + const EVENT_0B3 + const EVENT_0B4 + const EVENT_0B5 + const EVENT_0B6 + const EVENT_0B7 + const EVENT_0B8 + const EVENT_MET_FLORIA + const EVENT_0BA + const EVENT_BUGGING_KURT_TOO_MUCH + const EVENT_TALKED_TO_RUINS_COWARD + const EVENT_GOT_DRATINI + const EVENT_CAN_GIVE_GS_BALL_TO_KURT + const EVENT_GAVE_GS_BALL_TO_KURT + const EVENT_FOREST_IS_RESTLESS + const EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG + const EVENT_0C2 + const EVENT_0C3 + const EVENT_0C4 + const EVENT_0C5 + const EVENT_0C6 + const EVENT_0C7 + const EVENT_GOT_NUGGET_FROM_GUY + const EVENT_RETURNED_MACHINE_PART + const EVENT_MET_MANAGER_AT_POWER_PLANT + const EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM + const EVENT_MET_REDS_MOM + const EVENT_RESTORED_POWER_TO_KANTO + const EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON + const EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM + const EVENT_RETURNED_LOST_ITEM_TO_COPYCAT + const EVENT_GOT_PASS_FROM_COPYCAT + const EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB + const EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL + const EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT + const EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE + const EVENT_ENABLE_DIPLOMA_PRINTING + const EVENT_CINNABAR_ROCKS_CLEARED + const EVENT_CLEARED_NUGGET_BRIDGE + const EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER + const EVENT_GOT_TM03_CURSE + const EVENT_GOT_CLEANSE_TAG + const EVENT_GOT_TM19_GIGA_DRAIN + const EVENT_GOT_TM06_TOXIC + const EVENT_GOT_UP_GRADE + const EVENT_GOT_TM07_ZAP_CANNON + const EVENT_GOT_TM42_DREAM_EATER + const EVENT_TALKED_TO_OAK_IN_KANTO + const EVENT_GOT_HP_UP_FROM_VERMILION_GUY + const EVENT_GOT_TM29_PSYCHIC + const EVENT_0E4 + const EVENT_0E5 + const EVENT_0E6 + const EVENT_0E7 + const EVENT_0E8 + const EVENT_0E9 + const EVENT_0EA + const EVENT_0EB + const EVENT_0EC + const EVENT_0ED + const EVENT_0EE + const EVENT_0EF + const EVENT_0F0 + const EVENT_0F1 + const EVENT_0F2 + const EVENT_0F3 + const EVENT_0F4 + const EVENT_0F5 + const EVENT_0F6 + const EVENT_0F7 + const EVENT_0F8 + const EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE + const EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY + const EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM + const EVENT_0FC + const EVENT_0FD + const EVENT_0FE + const EVENT_0FF + const EVENT_100 + const EVENT_101 + const EVENT_102 + const EVENT_103 + const EVENT_104 + const EVENT_105 + const EVENT_106 + const EVENT_107 + const EVENT_108 + const EVENT_109 + const EVENT_10A + const EVENT_10B + const EVENT_10C + const EVENT_10D + const EVENT_10E + const EVENT_10F + const EVENT_110 + const EVENT_111 + const EVENT_112 + const EVENT_113 + const EVENT_114 + const EVENT_115 + const EVENT_116 + const EVENT_117 + const EVENT_118 + const EVENT_119 + const EVENT_11A + const EVENT_11B + const EVENT_11C + const EVENT_11D + const EVENT_11E + const EVENT_11F + const EVENT_120 + const EVENT_121 + const EVENT_122 + const EVENT_123 + const EVENT_124 + const EVENT_125 + const EVENT_126 + const EVENT_127 + const EVENT_128 + const EVENT_129 + const EVENT_12A + const EVENT_12B + const EVENT_12C + const EVENT_12D + const EVENT_12E + const EVENT_12F + const EVENT_130 + const EVENT_131 + const EVENT_132 + const EVENT_133 + const EVENT_134 + const EVENT_135 + const EVENT_136 + const EVENT_137 + const EVENT_138 + const EVENT_139 + const EVENT_13A + const EVENT_13B + const EVENT_13C + const EVENT_13D + const EVENT_13E + const EVENT_13F + const EVENT_140 + const EVENT_141 + const EVENT_142 + const EVENT_143 + const EVENT_144 + const EVENT_145 + const EVENT_146 + const EVENT_147 + const EVENT_148 + const EVENT_149 + const EVENT_14A + const EVENT_14B + const EVENT_14C + const EVENT_14D + const EVENT_14E + const EVENT_14F + const EVENT_150 + const EVENT_151 + const EVENT_152 + const EVENT_153 + const EVENT_154 + const EVENT_155 + const EVENT_156 + const EVENT_157 + const EVENT_158 + const EVENT_159 + const EVENT_15A + const EVENT_15B + const EVENT_15C + const EVENT_15D + const EVENT_15E + const EVENT_15F + const EVENT_160 + const EVENT_161 + const EVENT_162 + const EVENT_163 + const EVENT_164 + const EVENT_165 + const EVENT_166 + const EVENT_167 + const EVENT_168 + const EVENT_169 + const EVENT_16A + const EVENT_16B + const EVENT_16C + const EVENT_16D + const EVENT_16E + const EVENT_16F + const EVENT_170 + const EVENT_171 + const EVENT_172 + const EVENT_173 + const EVENT_174 + const EVENT_175 + const EVENT_176 + const EVENT_177 + const EVENT_178 + const EVENT_179 + const EVENT_17A + const EVENT_17B + const EVENT_17C + const EVENT_17D + const EVENT_17E + const EVENT_17F + const EVENT_180 + const EVENT_181 + const EVENT_182 + const EVENT_183 + const EVENT_184 + const EVENT_185 + const EVENT_186 + const EVENT_187 + const EVENT_188 + const EVENT_189 + const EVENT_18A + const EVENT_18B + const EVENT_18C + const EVENT_18D + const EVENT_18E + const EVENT_18F + const EVENT_190 + const EVENT_191 + const EVENT_192 + const EVENT_193 + const EVENT_194 + const EVENT_195 + const EVENT_196 + const EVENT_197 + const EVENT_198 + const EVENT_199 + const EVENT_19A + const EVENT_19B + const EVENT_19C + const EVENT_19D + const EVENT_19E + const EVENT_19F + const EVENT_1A0 + const EVENT_1A1 + const EVENT_1A2 + const EVENT_1A3 + const EVENT_1A4 + const EVENT_1A5 + const EVENT_1A6 + const EVENT_1A7 + const EVENT_1A8 + const EVENT_1A9 + const EVENT_1AA + const EVENT_1AB + const EVENT_1AC + const EVENT_1AD + const EVENT_1AE + const EVENT_1AF + const EVENT_1B0 + const EVENT_1B1 + const EVENT_1B2 + const EVENT_1B3 + const EVENT_1B4 + const EVENT_1B5 + const EVENT_1B6 + const EVENT_1B7 + const EVENT_1B8 + const EVENT_1B9 + const EVENT_1BA + const EVENT_1BB + const EVENT_1BC + const EVENT_1BD + const EVENT_1BE + const EVENT_1BF + const EVENT_1C0 + const EVENT_1C1 + const EVENT_1C2 + const EVENT_1C3 + const EVENT_1C4 + const EVENT_1C5 + const EVENT_1C6 + const EVENT_1C7 + const EVENT_1C8 + const EVENT_1C9 + const EVENT_1CA + const EVENT_1CB + const EVENT_1CC + const EVENT_1CD + const EVENT_1CE + const EVENT_1CF + const EVENT_1D0 + const EVENT_1D1 + const EVENT_1D2 + const EVENT_1D3 + const EVENT_1D4 + const EVENT_1D5 + const EVENT_1D6 + const EVENT_1D7 + const EVENT_1D8 + const EVENT_1D9 + const EVENT_1DA + const EVENT_1DB + const EVENT_1DC + const EVENT_1DD + const EVENT_1DE + const EVENT_1DF + const EVENT_1E0 + const EVENT_1E1 + const EVENT_1E2 + const EVENT_1E3 + const EVENT_1E4 + const EVENT_1E5 + const EVENT_1E6 + const EVENT_1E7 + const EVENT_1E8 + const EVENT_1E9 + const EVENT_1EA + const EVENT_1EB + const EVENT_1EC + const EVENT_1ED + const EVENT_1EE + const EVENT_1EF + const EVENT_1F0 + const EVENT_1F1 + const EVENT_1F2 + const EVENT_1F3 + const EVENT_1F4 + const EVENT_1F5 + const EVENT_1F6 + const EVENT_1F7 + const EVENT_1F8 + const EVENT_1F9 + const EVENT_1FA + const EVENT_1FB + const EVENT_1FC + const EVENT_1FD + const EVENT_1FE + const EVENT_1FF + const EVENT_200 + const EVENT_201 + const EVENT_202 + const EVENT_203 + const EVENT_204 + const EVENT_205 + const EVENT_206 + const EVENT_207 + const EVENT_208 + const EVENT_209 + const EVENT_20A + const EVENT_20B + const EVENT_20C + const EVENT_20D + const EVENT_20E + const EVENT_20F + const EVENT_210 + const EVENT_211 + const EVENT_212 + const EVENT_213 + const EVENT_214 + const EVENT_215 + const EVENT_216 + const EVENT_217 + const EVENT_218 + const EVENT_219 + const EVENT_21A + const EVENT_21B + const EVENT_21C + const EVENT_21D + const EVENT_21E + const EVENT_21F + const EVENT_220 + const EVENT_221 + const EVENT_222 + const EVENT_223 + const EVENT_224 + const EVENT_225 + const EVENT_226 + const EVENT_227 + const EVENT_228 + const EVENT_229 + const EVENT_22A + const EVENT_22B + const EVENT_22C + const EVENT_22D + const EVENT_22E + const EVENT_22F + const EVENT_230 + const EVENT_231 + const EVENT_232 + const EVENT_233 + const EVENT_234 + const EVENT_235 + const EVENT_236 + const EVENT_237 + const EVENT_238 + const EVENT_239 + const EVENT_23A + const EVENT_23B + const EVENT_23C + const EVENT_23D + const EVENT_23E + const EVENT_23F + const EVENT_240 + const EVENT_241 + const EVENT_242 + const EVENT_243 + const EVENT_244 + const EVENT_245 + const EVENT_246 + const EVENT_247 + const EVENT_248 + const EVENT_249 + const EVENT_24A + const EVENT_24B + const EVENT_24C + const EVENT_24D + const EVENT_24E + const EVENT_24F + const EVENT_250 + const EVENT_251 + const EVENT_252 + const EVENT_253 + const EVENT_254 + 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 + const EVENT_JACK_ASKED_FOR_PHONE_NUMBER + const EVENT_260 + const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER + const EVENT_262 + const EVENT_HUEY_ASKED_FOR_PHONE_NUMBER + const EVENT_264 + const EVENT_GOT_PROTEIN_FROM_HUEY + const EVENT_GOT_HP_UP_FROM_JOEY + const EVENT_GOT_CARBOS_FROM_VANCE + const EVENT_GOT_IRON_FROM_PARRY + const EVENT_GOT_CALCIUM_FROM_ERIN + const EVENT_26A + const EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER + const EVENT_26C + const EVENT_BETH_ASKED_FOR_PHONE_NUMBER + const EVENT_26E + const EVENT_JOSE_ASKED_FOR_PHONE_NUMBER + const EVENT_270 + const EVENT_REENA_ASKED_FOR_PHONE_NUMBER + const EVENT_272 + const EVENT_JOEY_ASKED_FOR_PHONE_NUMBER + const EVENT_274 + const EVENT_WADE_ASKED_FOR_PHONE_NUMBER + const EVENT_276 + const EVENT_RALPH_ASKED_FOR_PHONE_NUMBER + const EVENT_278 + const EVENT_LIZ_ASKED_FOR_PHONE_NUMBER + const EVENT_27A + const EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER + const EVENT_27C + const EVENT_TODD_ASKED_FOR_PHONE_NUMBER + const EVENT_27E + const EVENT_GINA_ASKED_FOR_PHONE_NUMBER + const EVENT_280 + const EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER + const EVENT_282 + const EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER + const EVENT_284 + const EVENT_ALAN_ASKED_FOR_PHONE_NUMBER + const EVENT_286 + const EVENT_287 + const EVENT_288 + const EVENT_DANA_ASKED_FOR_PHONE_NUMBER + const EVENT_28A + const EVENT_CHAD_ASKED_FOR_PHONE_NUMBER + const EVENT_28C + const EVENT_DEREK_ASKED_FOR_PHONE_NUMBER + const EVENT_28E + const EVENT_TULLY_ASKED_FOR_PHONE_NUMBER + const EVENT_290 + const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER + const EVENT_292 + const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER + const EVENT_294 + const EVENT_VANCE_ASKED_FOR_PHONE_NUMBER + const EVENT_296 + const EVENT_WILTON_ASKED_FOR_PHONE_NUMBER + const EVENT_298 + const EVENT_KENJI_ASKED_FOR_PHONE_NUMBER + const EVENT_29A + const EVENT_PARRY_ASKED_FOR_PHONE_NUMBER + const EVENT_29C + const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER + const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD + const EVENT_29F + const EVENT_2A0 + const EVENT_2A1 + const EVENT_2A2 + const EVENT_2A3 + const EVENT_2A4 + const EVENT_2A5 + const EVENT_2A6 + const EVENT_2A7 + const EVENT_2A8 + const EVENT_2A9 + const EVENT_2AA + const EVENT_2AB + const EVENT_2AC + const EVENT_2AD + const EVENT_2AE + const EVENT_2AF + const EVENT_2B0 + const EVENT_2B1 + const EVENT_2B2 + const EVENT_2B3 + const EVENT_2B4 + const EVENT_2B5 + const EVENT_2B6 + const EVENT_2B7 + const EVENT_2B8 + const EVENT_2B9 + const EVENT_2BA + const EVENT_2BB + const EVENT_2BC + const EVENT_2BD + const EVENT_2BE + const EVENT_2BF + const EVENT_2C0 + const EVENT_2C1 + const EVENT_2C2 + const EVENT_2C3 + const EVENT_2C4 + const EVENT_2C5 + const EVENT_2C6 + const EVENT_2C7 + const EVENT_2C8 + const EVENT_2C9 + const EVENT_2CA + const EVENT_2CB + const EVENT_2CC + const EVENT_2CD + const EVENT_2CE + const EVENT_2CF + const EVENT_2D0 + const EVENT_2D1 + const EVENT_2D2 + const EVENT_SWITCH_1 + const EVENT_SWITCH_2 + const EVENT_SWITCH_3 + const EVENT_EMERGENCY_SWITCH + const EVENT_SWITCH_4 + const EVENT_SWITCH_5 + const EVENT_SWITCH_6 + const EVENT_SWITCH_7 + const EVENT_SWITCH_8 + const EVENT_SWITCH_9 + const EVENT_SWITCH_10 + const EVENT_SWITCH_11 + const EVENT_SWITCH_12 + const EVENT_SWITCH_13 + const EVENT_SWITCH_14 + const EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART + const EVENT_TURNED_OFF_SECURITY_CAMERAS + const EVENT_SECURITY_CAMERA_1 + const EVENT_SECURITY_CAMERA_2 + const EVENT_SECURITY_CAMERA_3 + const EVENT_SECURITY_CAMERA_4 + const EVENT_SECURITY_CAMERA_5 + const EVENT_EXPLODING_TRAP_1 + const EVENT_EXPLODING_TRAP_2 + const EVENT_EXPLODING_TRAP_3 + const EVENT_EXPLODING_TRAP_4 + const EVENT_EXPLODING_TRAP_5 + const EVENT_EXPLODING_TRAP_6 + const EVENT_EXPLODING_TRAP_7 + const EVENT_EXPLODING_TRAP_8 + const EVENT_EXPLODING_TRAP_9 + const EVENT_EXPLODING_TRAP_10 + const EVENT_EXPLODING_TRAP_11 + const EVENT_EXPLODING_TRAP_12 + const EVENT_EXPLODING_TRAP_13 + const EVENT_EXPLODING_TRAP_14 + const EVENT_EXPLODING_TRAP_15 + const EVENT_EXPLODING_TRAP_16 + const EVENT_EXPLODING_TRAP_17 + const EVENT_EXPLODING_TRAP_18 + const EVENT_EXPLODING_TRAP_19 + const EVENT_EXPLODING_TRAP_20 + const EVENT_EXPLODING_TRAP_21 + const EVENT_EXPLODING_TRAP_22 + const EVENT_LEARNED_HAIL_GIOVANNI + const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER + const EVENT_LEARNED_SLOWPOKETAIL + const EVENT_LEARNED_RATICATE_TAIL + const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE + const EVENT_WAREHOUSE_LAYOUT_1 + const EVENT_WAREHOUSE_LAYOUT_2 + const EVENT_WAREHOUSE_LAYOUT_3 + const EVENT_WAREHOUSE_BLOCKED_OFF + const EVENT_308 + const EVENT_309 + const EVENT_WILLS_ROOM_EXIT_OPEN + const EVENT_WILLS_ROOM_ENTRANCE_CLOSED + const EVENT_KOGAS_ROOM_EXIT_OPEN + const EVENT_KOGAS_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_313 + const EVENT_314 + const EVENT_315 + const EVENT_316 + const EVENT_FOUGHT_HO_OH + const EVENT_FOUGHT_LUGIA + const EVENT_BEAT_RIVAL_IN_MT_MOON + const EVENT_MET_BILLS_GRANDPA + const EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA + const EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA + const EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA + const EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA + const EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA + const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA + const EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA + const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA + const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA + const EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA + const EVENT_LISTENED_TO_INITIAL_RADIO + const EVENT_WALL_OPENED_IN_HO_OH_CHAMBER + const EVENT_WALL_OPENED_IN_KABUTO_CHAMBER + const EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER + const EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER + const EVENT_WELCOMED_TO_POKECOM_CENTER + const EVENT_WADE_HAS_BERRY + const EVENT_WADE_HAS_PSNCUREBERRY + const EVENT_WADE_HAS_PRZCUREBERRY + const EVENT_WADE_HAS_BITTER_BERRY + const EVENT_WILTON_HAS_ULTRA_BALL + const EVENT_WILTON_HAS_GREAT_BALL + const EVENT_WILTON_HAS_POKE_BALL + const EVENT_HOLE_IN_BURNED_TOWER + const EVENT_FOUGHT_EUSINE + const EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER + const EVENT_FOUGHT_SUICUNE + const EVENT_GOT_RAINBOW_WING + const EVENT_HUEY_PROTEIN + const EVENT_JOEY_HP_UP + const EVENT_VANCE_CARBOS + const EVENT_PARRY_IRON + const EVENT_ERIN_CALCIUM + const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER + const EVENT_MET_BUENA + 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 + const EVENT_344 + const EVENT_345 + const EVENT_346 + const EVENT_347 + const EVENT_348 + const EVENT_349 + const EVENT_34A + const EVENT_34B + const EVENT_34C + const EVENT_34D + const EVENT_34E + const EVENT_34F + const EVENT_350 + const EVENT_351 + const EVENT_352 + const EVENT_353 + const EVENT_354 + const EVENT_355 + const EVENT_356 + const EVENT_357 + const EVENT_358 + const EVENT_359 + const EVENT_35A + const EVENT_35B + const EVENT_35C + const EVENT_35D + const EVENT_35E + const EVENT_35F + const EVENT_360 + const EVENT_361 + const EVENT_362 + const EVENT_363 + const EVENT_364 + const EVENT_365 + const EVENT_366 + const EVENT_367 + const EVENT_368 + const EVENT_369 + const EVENT_36A + const EVENT_36B + const EVENT_36C + const EVENT_36D + const EVENT_36E + const EVENT_36F + const EVENT_370 + const EVENT_371 + const EVENT_372 + const EVENT_373 + const EVENT_374 + const EVENT_375 + const EVENT_376 + const EVENT_377 + const EVENT_378 + const EVENT_379 + const EVENT_37A + const EVENT_37B + const EVENT_37C + const EVENT_37D + const EVENT_37E + const EVENT_37F + const EVENT_380 + const EVENT_381 + const EVENT_382 + const EVENT_383 + const EVENT_384 + const EVENT_385 + const EVENT_386 + const EVENT_387 + const EVENT_388 + const EVENT_389 + const EVENT_38A + const EVENT_38B + const EVENT_38C + const EVENT_38D + const EVENT_38E + const EVENT_38F + const EVENT_390 + const EVENT_391 + const EVENT_392 + const EVENT_393 + const EVENT_394 + const EVENT_395 + const EVENT_396 + const EVENT_397 + const EVENT_398 + const EVENT_399 + const EVENT_39A + const EVENT_39B + const EVENT_39C + const EVENT_39D + const EVENT_39E + const EVENT_39F + const EVENT_3A0 + const EVENT_3A1 + const EVENT_3A2 + const EVENT_3A3 + const EVENT_3A4 + const EVENT_3A5 + const EVENT_3A6 + const EVENT_3A7 + const EVENT_3A8 + const EVENT_3A9 + const EVENT_3AA + const EVENT_3AB + const EVENT_3AC + const EVENT_3AD + const EVENT_3AE + const EVENT_3AF + const EVENT_3B0 + const EVENT_3B1 + const EVENT_3B2 + const EVENT_3B3 + const EVENT_3B4 + const EVENT_3B5 + const EVENT_3B6 + const EVENT_3B7 + const EVENT_3B8 + const EVENT_3B9 + const EVENT_3BA + const EVENT_3BB + const EVENT_3BC + const EVENT_3BD + const EVENT_3BE + const EVENT_3BF + const EVENT_3C0 + const EVENT_3C1 + const EVENT_3C2 + const EVENT_3C3 + const EVENT_3C4 + const EVENT_3C5 + const EVENT_3C6 + const EVENT_3C7 + const EVENT_3C8 + const EVENT_3C9 + const EVENT_3CA + const EVENT_3CB + const EVENT_3CC + const EVENT_3CD + const EVENT_3CE + const EVENT_3CF + const EVENT_3D0 + const EVENT_3D1 + const EVENT_3D2 + const EVENT_3D3 + const EVENT_3D4 + const EVENT_3D5 + const EVENT_3D6 + const EVENT_3D7 + const EVENT_3D8 + const EVENT_3D9 + const EVENT_3DA + const EVENT_3DB + const EVENT_3DC + const EVENT_3DD + const EVENT_3DE + const EVENT_3DF + const EVENT_3E0 + const EVENT_3E1 + const EVENT_3E2 + const EVENT_3E3 + const EVENT_3E4 + const EVENT_3E5 + const EVENT_3E6 + const EVENT_3E7 + const EVENT_BEAT_SWIMMERF_ELAINE + const EVENT_BEAT_SWIMMERF_PAULA + const EVENT_BEAT_SWIMMERF_KAYLEE + const EVENT_BEAT_SWIMMERF_SUSIE + 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_DAWN + const EVENT_3F4 + const EVENT_BEAT_SWIMMERF_NICOLE + const EVENT_BEAT_SWIMMERF_LORI + const EVENT_3F7 + const EVENT_BEAT_SWIMMERF_NIKKI + const EVENT_BEAT_SWIMMERF_DIANA + const EVENT_BEAT_SWIMMERF_BRIANA + const EVENT_BEAT_BIRD_KEEPER_ROD + const EVENT_BEAT_BIRD_KEEPER_ABE + const EVENT_BEAT_BIRD_KEEPER_BRYAN + const EVENT_BEAT_BIRD_KEEPER_THEO + const EVENT_BEAT_BIRD_KEEPER_TOBY + const EVENT_BEAT_BIRD_KEEPER_DENIS + const EVENT_BEAT_BIRD_KEEPER_VANCE + const EVENT_BEAT_BIRD_KEEPER_HANK + 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_PERRY + const EVENT_BEAT_BIRD_KEEPER_BRET + const EVENT_40B + const EVENT_40C + const EVENT_40D + const EVENT_BEAT_BOARDER_RONALD + const EVENT_BEAT_BOARDER_BRAD + const EVENT_BEAT_BOARDER_DOUGLAS + const EVENT_BEAT_SAGE_CHOW + const EVENT_BEAT_SAGE_NICO + const EVENT_BEAT_SAGE_JIN + const EVENT_BEAT_SAGE_TROY + const EVENT_BEAT_SAGE_JEFFREY + const EVENT_BEAT_SAGE_PING + const EVENT_BEAT_SAGE_EDMOND + const EVENT_BEAT_SAGE_NEAL + const EVENT_BEAT_SAGE_LI + const EVENT_BEAT_CAMPER_ROLAND + const EVENT_BEAT_CAMPER_TODD + const EVENT_BEAT_CAMPER_IVAN + const EVENT_BEAT_CAMPER_ELLIOT + const EVENT_BEAT_CAMPER_BARRY + 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_TED + const EVENT_425 + const EVENT_426 + const EVENT_427 + const EVENT_428 + const EVENT_429 + const EVENT_42A + const EVENT_BEAT_CAMPER_JERRY + const EVENT_BEAT_CAMPER_SPENCER + const EVENT_BEAT_BURGLAR_DUNCAN + const EVENT_BEAT_BURGLAR_EDDIE + const EVENT_BEAT_BURGLAR_COREY + const EVENT_430 + const EVENT_431 + const EVENT_432 + const EVENT_BEAT_BIKER_DWAYNE + const EVENT_BEAT_BIKER_HARRIS + const EVENT_BEAT_BIKER_ZEKE + const EVENT_BEAT_BIKER_CHARLES + const EVENT_BEAT_BIKER_RILEY + const EVENT_BEAT_BIKER_JOEL + const EVENT_BEAT_BIKER_GLENN + const EVENT_BEAT_PSYCHIC_NATHAN + const EVENT_BEAT_PSYCHIC_FRANKLIN + const EVENT_BEAT_PSYCHIC_HERMAN + const EVENT_BEAT_PSYCHIC_FIDEL + const EVENT_BEAT_PSYCHIC_GREG + const EVENT_BEAT_PSYCHIC_NORMAN + const EVENT_BEAT_PSYCHIC_MARK + const EVENT_BEAT_PSYCHIC_PHIL + const EVENT_BEAT_PSYCHIC_RICHARD + const EVENT_BEAT_PSYCHIC_GILBERT + const EVENT_BEAT_PSYCHIC_JARED + const EVENT_BEAT_PSYCHIC_RODNEY + const EVENT_BEAT_FIREBREATHER_OTIS + const EVENT_447 + const EVENT_448 + 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 + const EVENT_BEAT_FISHER_JUSTIN + const EVENT_BEAT_FISHER_RALPH + const EVENT_BEAT_FISHER_ARNOLD + const EVENT_BEAT_FISHER_KYLE + const EVENT_BEAT_FISHER_HENRY + const EVENT_BEAT_FISHER_MARVIN + const EVENT_BEAT_FISHER_TULLY + const EVENT_BEAT_FISHER_ANDRE + const EVENT_BEAT_FISHER_RAYMOND + const EVENT_BEAT_FISHER_WILTON + const EVENT_BEAT_FISHER_EDGAR + const EVENT_BEAT_FISHER_JONAH + 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_SCOTT + const EVENT_463 + const EVENT_BEAT_TWINS_AMY_AND_MAY + const EVENT_BEAT_TWINS_ANN_AND_ANNE + const EVENT_466 + const EVENT_467 + const EVENT_BEAT_TWINS_JO_AND_ZOE + const EVENT_469 + const EVENT_BEAT_TWINS_MEG_AND_PEG + const EVENT_46B + const EVENT_BEAT_SCHOOLBOY_JACK + const EVENT_BEAT_SCHOOLBOY_KIP + const EVENT_BEAT_SCHOOLBOY_ALAN + const EVENT_BEAT_SCHOOLBOY_JOHNNY + const EVENT_BEAT_SCHOOLBOY_DANNY + const EVENT_BEAT_SCHOOLBOY_TOMMY + const EVENT_BEAT_SCHOOLBOY_DUDLEY + const EVENT_BEAT_SCHOOLBOY_JOE + const EVENT_BEAT_SCHOOLBOY_BILLY + 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_PICNICKER_LIZ + const EVENT_BEAT_PICNICKER_GINA + const EVENT_BEAT_PICNICKER_BROOKE + const EVENT_BEAT_PICNICKER_KIM + const EVENT_BEAT_PICNICKER_CINDY + const EVENT_BEAT_PICNICKER_HOPE + const EVENT_BEAT_PICNICKER_SHARON + const EVENT_BEAT_PICNICKER_DEBRA + const EVENT_486 + const EVENT_BEAT_PICNICKER_ERIN + const EVENT_488 + const EVENT_489 + 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_TANYA + const EVENT_BEAT_PICNICKER_TIFFANY + const EVENT_492 + const EVENT_BEAT_GUITARIST_CLYDE + const EVENT_BEAT_GUITARIST_VINCENT + const EVENT_BEAT_JUGGLER_IRWIN + const EVENT_BEAT_JUGGLER_FRITZ + const EVENT_BEAT_JUGGLER_HORTON + const EVENT_498 + const EVENT_499 + const EVENT_BEAT_GENTLEMAN_PRESTON + const EVENT_BEAT_GENTLEMAN_EDWARD + const EVENT_BEAT_GENTLEMAN_GREGORY + const EVENT_49D + const EVENT_BEAT_GENTLEMAN_ALFRED + 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 + const EVENT_BEAT_BLACKBELT_YOSHI + const EVENT_4A6 + 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 + const EVENT_BEAT_BEAUTY_VICTORIA + const EVENT_BEAT_BEAUTY_SAMANTHA + const EVENT_4AF + const EVENT_4B0 + const EVENT_4B1 + 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_JULIA + const EVENT_4BB + const EVENT_BEAT_BEAUTY_VALERIE + const EVENT_BEAT_FALKNER + const EVENT_BEAT_BUGSY + const EVENT_BEAT_WHITNEY + const EVENT_BEAT_MORTY + const EVENT_BEAT_JASMINE + const EVENT_BEAT_CHUCK + const EVENT_BEAT_PRYCE + const EVENT_BEAT_CLAIR + const EVENT_BEAT_BROCK + const EVENT_BEAT_MISTY + const EVENT_BEAT_LTSURGE + const EVENT_BEAT_ERIKA + const EVENT_BEAT_JANINE + const EVENT_BEAT_SABRINA + const EVENT_BEAT_BLAINE + const EVENT_BEAT_BLUE + const EVENT_BEAT_POKEFANM_WILLIAM + const EVENT_BEAT_POKEFANM_DEREK + const EVENT_BEAT_POKEFANM_ROBERT + const EVENT_BEAT_POKEFANM_JOSHUA + const EVENT_BEAT_POKEFANM_CARTER + const EVENT_BEAT_POKEFANM_TREVOR + 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_ALEX + const EVENT_BEAT_POKEFANF_BEVERLY + const EVENT_BEAT_POKEFANF_RUTH + const EVENT_4DB + const EVENT_4DC + const EVENT_BEAT_POKEFANF_GEORGIA + const EVENT_4DE + 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 + const EVENT_BEAT_POKEMANIAC_LARRY + const EVENT_BEAT_POKEMANIAC_ANDREW + const EVENT_BEAT_POKEMANIAC_CALVIN + const EVENT_BEAT_POKEMANIAC_SHANE + const EVENT_BEAT_POKEMANIAC_BEN + 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_ISSAC + const EVENT_BEAT_POKEMANIAC_DONALD + const EVENT_BEAT_POKEMANIAC_ZACH + const EVENT_BEAT_ROCKET_GRUNTM_1 + const EVENT_BEAT_ROCKET_GRUNTM_2 + const EVENT_BEAT_ROCKET_GRUNTM_3 + const EVENT_BEAT_ROCKET_GRUNTM_4 + const EVENT_BEAT_ROCKET_GRUNTM_5 + const EVENT_BEAT_ROCKET_GRUNTM_6 + const EVENT_BEAT_ROCKET_GRUNTM_7 + const EVENT_BEAT_ROCKET_GRUNTM_8 + 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 + const EVENT_BEAT_ROCKET_GRUNTM_15 + 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_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 + const EVENT_BEAT_LASS_CARRIE + const EVENT_BEAT_LASS_BRIDGET + const EVENT_BEAT_LASS_ALICE + const EVENT_BEAT_LASS_KRISE + const EVENT_BEAT_LASS_CONNIE + const EVENT_BEAT_LASS_LINDA + const EVENT_BEAT_LASS_LAURA + const EVENT_BEAT_LASS_SHANNON + 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_HIKER_RUSSELL + const EVENT_BEAT_HIKER_PHILLIP + const EVENT_BEAT_HIKER_LEONARD + const EVENT_BEAT_HIKER_ANTHONY + const EVENT_BEAT_HIKER_BENJAMIN + const EVENT_BEAT_HIKER_ERIK + const EVENT_BEAT_HIKER_MICHAEL + const EVENT_BEAT_HIKER_PARRY + const EVENT_BEAT_HIKER_TIMOTHY + const EVENT_BEAT_HIKER_BAILEY + const EVENT_52F + 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_BUG_CATCHER_DON + const EVENT_BEAT_BUG_CATCHER_ROB + const EVENT_BEAT_BUG_CATCHER_ED + const EVENT_BEAT_BUG_CATCHER_WADE + const EVENT_BEAT_BUG_CATCHER_BENNY + const EVENT_BEAT_BUG_CATCHER_AL + 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_DOUG + const EVENT_544 + const EVENT_545 + const EVENT_BEAT_OFFICER_KEITH + const EVENT_BEAT_OFFICER_DIRK + 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_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_SEAN + const EVENT_BEAT_COOLTRAINERM_KEVIN + const EVENT_559 + const EVENT_BEAT_COOLTRAINERM_ALLEN + const EVENT_BEAT_COOLTRAINERF_GWEN + const EVENT_BEAT_COOLTRAINERF_LOIS + const EVENT_BEAT_COOLTRAINERF_FRAN + const EVENT_BEAT_COOLTRAINERF_LOLA + const EVENT_BEAT_COOLTRAINERF_KATE + const EVENT_BEAT_COOLTRAINERF_IRENE + const EVENT_BEAT_COOLTRAINERF_KELLY + const EVENT_BEAT_COOLTRAINERF_JOYCE + const EVENT_BEAT_COOLTRAINERF_BETH + const EVENT_BEAT_COOLTRAINERF_REENA + const EVENT_BEAT_COOLTRAINERF_MEGAN + const EVENT_566 + 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_ROCKET_EXECUTIVEF_1 + const EVENT_BEAT_ROCKET_EXECUTIVEF_2 + const EVENT_BEAT_ROCKET_EXECUTIVEM_1 + const EVENT_BEAT_ROCKET_EXECUTIVEM_2 + const EVENT_BEAT_ROCKET_EXECUTIVEM_3 + const EVENT_BEAT_ROCKET_EXECUTIVEM_4 + const EVENT_BEAT_SAILOR_EUGENE + const EVENT_BEAT_SAILOR_HUEY + const EVENT_BEAT_SAILOR_TERRELL + const EVENT_BEAT_SAILOR_KENT + const EVENT_BEAT_SAILOR_ERNEST + const EVENT_BEAT_SAILOR_JEFF + const EVENT_BEAT_SAILOR_GARRETT + const EVENT_BEAT_SAILOR_KENNETH + const EVENT_BEAT_SAILOR_STANLY + const EVENT_BEAT_SAILOR_HARRY + const EVENT_57F + const EVENT_580 + 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_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 + const EVENT_BEAT_MEDIUM_MARTHA + const EVENT_BEAT_MEDIUM_GRACE + const EVENT_58D + const EVENT_58E + const EVENT_58F + const EVENT_BEAT_MEDIUM_REBECCA + const EVENT_BEAT_MEDIUM_DORIS + const EVENT_BEAT_SKIER_ROXANNE + const EVENT_BEAT_SKIER_CLARISSA + const EVENT_BEAT_SWIMMERM_HAROLD + const EVENT_BEAT_SWIMMERM_SIMON + const EVENT_BEAT_SWIMMERM_RANDALL + const EVENT_BEAT_SWIMMERM_CHARLIE + const EVENT_BEAT_SWIMMERM_GEORGE + 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_JEROME + const EVENT_BEAT_SWIMMERM_TUCKER + const EVENT_5A3 + const EVENT_BEAT_SWIMMERM_CAMERON + const EVENT_BEAT_SWIMMERM_SETH + const EVENT_5A6 + const EVENT_5A7 + const EVENT_BEAT_SWIMMERM_PARKER + 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_WARREN + const EVENT_BEAT_YOUNGSTER_JIMMY + const EVENT_BEAT_YOUNGSTER_OWEN + const EVENT_BEAT_YOUNGSTER_JASON + const EVENT_BEAT_TEACHER_COLETTE + const EVENT_BEAT_TEACHER_HILLARY + const EVENT_BEAT_TEACHER_SHIRLEY + 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 + const EVENT_BEAT_COOLTRAINERM_DARIN + const EVENT_BEAT_COOLTRAINERF_CARA + const EVENT_BEAT_TWINS_LEA_AND_PIA + const EVENT_BEAT_BUG_CATCHER_WAYNE + const EVENT_BEAT_BEAUTY_OLIVIA + const EVENT_BEAT_POKEFANF_JAIME + const EVENT_BEAT_CAMPER_QUENTIN + const EVENT_BEAT_POKEMANIAC_MILLER + const EVENT_BEAT_SUPER_NERD_HUGH + const EVENT_BEAT_SUPER_NERD_MARKUS + const EVENT_BEAT_POKEFANM_REX + const EVENT_BEAT_POKEFANM_ALLAN + const EVENT_BEAT_SAGE_GAKU + const EVENT_BEAT_SAGE_MASA + const EVENT_BEAT_SAGE_KOJI + const EVENT_5CC + const EVENT_5CD + const EVENT_5CE + const EVENT_5CF + const EVENT_5D0 + const EVENT_5D1 + const EVENT_5D2 + const EVENT_5D3 + const EVENT_5D4 + const EVENT_5D5 + const EVENT_5D6 + const EVENT_5D7 + const EVENT_5D8 + const EVENT_5D9 + const EVENT_5DA + const EVENT_5DB + const EVENT_5DC + const EVENT_5DD + const EVENT_5DE + const EVENT_5DF + const EVENT_5E0 + const EVENT_5E1 + const EVENT_5E2 + const EVENT_5E3 + const EVENT_5E4 + const EVENT_5E5 + const EVENT_5E6 + const EVENT_5E7 + const EVENT_5E8 + const EVENT_5E9 + const EVENT_5EA + const EVENT_5EB + const EVENT_5EC + const EVENT_5ED + const EVENT_5EE + const EVENT_5EF + const EVENT_5F0 + const EVENT_5F1 + const EVENT_5F2 + const EVENT_5F3 + const EVENT_5F4 + const EVENT_5F5 + const EVENT_5F6 + const EVENT_5F7 + const EVENT_5F8 + const EVENT_5F9 + const EVENT_5FA + const EVENT_5FB + const EVENT_5FC + const EVENT_5FD + const EVENT_5FE + const EVENT_5FF + const EVENT_600 + const EVENT_601 + const EVENT_602 + const EVENT_603 + const EVENT_604 + const EVENT_605 + const EVENT_606 + const EVENT_607 + const EVENT_608 + const EVENT_609 + const EVENT_60A + const EVENT_60B + const EVENT_60C + const EVENT_60D + const EVENT_60E + const EVENT_60F + const EVENT_610 + const EVENT_611 + const EVENT_612 + const EVENT_613 + const EVENT_614 + const EVENT_615 + const EVENT_616 + const EVENT_617 + const EVENT_618 + const EVENT_619 + const EVENT_61A + const EVENT_61B + const EVENT_61C + const EVENT_61D + const EVENT_61E + const EVENT_61F + const EVENT_620 + const EVENT_621 + const EVENT_622 + const EVENT_623 + const EVENT_624 + const EVENT_625 + const EVENT_626 + const EVENT_627 + const EVENT_628 + const EVENT_629 + const EVENT_62A + const EVENT_62B + const EVENT_62C + const EVENT_62D + const EVENT_62E + const EVENT_62F + const EVENT_630 + const EVENT_631 + const EVENT_632 + const EVENT_633 + const EVENT_634 + const EVENT_635 + const EVENT_636 + const EVENT_637 + const EVENT_638 + const EVENT_639 + const EVENT_63A + const EVENT_63B + const EVENT_63C + const EVENT_63D + const EVENT_63E + const EVENT_63F + const EVENT_640 + const EVENT_641 + const EVENT_642 + const EVENT_643 + const EVENT_644 + const EVENT_645 + const EVENT_646 + const EVENT_647 + const EVENT_648 + const EVENT_649 + const EVENT_64A + const EVENT_64B + const EVENT_64C + const EVENT_64D + const EVENT_64E + const EVENT_64F + const EVENT_650 + const EVENT_651 + const EVENT_652 + const EVENT_653 + const EVENT_654 + const EVENT_655 + const EVENT_656 + const EVENT_657 + const EVENT_658 + const EVENT_659 + const EVENT_65A + const EVENT_65B + const EVENT_65C + const EVENT_65D + const EVENT_65E + const EVENT_65F + const EVENT_660 + const EVENT_661 + const EVENT_662 + const EVENT_663 + const EVENT_664 + const EVENT_665 + const EVENT_666 + const EVENT_667 + const EVENT_668 + const EVENT_669 + const EVENT_66A + const EVENT_66B + const EVENT_66C + const EVENT_66D + const EVENT_66E + const EVENT_66F + const EVENT_670 + const EVENT_671 + const EVENT_672 + const EVENT_673 + const EVENT_674 + const EVENT_675 + const EVENT_676 + const EVENT_677 + const EVENT_678 + const EVENT_679 + const EVENT_67A + const EVENT_67B + const EVENT_67C + const EVENT_67D + const EVENT_67E + const EVENT_67F + const EVENT_680 + const EVENT_681 + const EVENT_682 + const EVENT_683 + const EVENT_684 + const EVENT_685 + const EVENT_686 + const EVENT_687 + const EVENT_688 + const EVENT_689 + const EVENT_68A + const EVENT_68B + const EVENT_68C + const EVENT_68D + const EVENT_68E + const EVENT_68F + const EVENT_690 + const EVENT_691 + const EVENT_692 + const EVENT_693 + const EVENT_694 + const EVENT_695 + const EVENT_696 + const EVENT_697 + const EVENT_698 + const EVENT_699 + const EVENT_69A + const EVENT_69B + const EVENT_69C + const EVENT_69D + const EVENT_69E + const EVENT_69F + const EVENT_6A0 + const EVENT_6A1 + const EVENT_6A2 + const EVENT_6A3 + const EVENT_6A4 + const EVENT_6A5 + const EVENT_6A6 + const EVENT_6A7 + const EVENT_6A8 + const EVENT_6A9 + const EVENT_6AA + const EVENT_6AB + const EVENT_6AC + const EVENT_6AD + const EVENT_6AE + const EVENT_6AF + const EVENT_6B0 + const EVENT_6B1 + const EVENT_6B2 + const EVENT_6B3 + const EVENT_6B4 + const EVENT_6B5 + const EVENT_6B6 + const EVENT_6B7 + const EVENT_6B8 + const EVENT_6B9 + const EVENT_6BA + const EVENT_6BB + const EVENT_6BC + const EVENT_6BD + const EVENT_6BE + const EVENT_6BF + const EVENT_6C0 + const EVENT_6C1 + const EVENT_6C2 + const EVENT_6C3 + const EVENT_RIVAL_SPROUT_TOWER + const EVENT_6C5 + const EVENT_6C6 + const EVENT_6C7 + const EVENT_6C8 + const EVENT_6C9 + const EVENT_6CA + const EVENT_6CB + const EVENT_6CC + const EVENT_6CD + const EVENT_6CE + const EVENT_6CF + const EVENT_6D0 + const EVENT_6D1 + const EVENT_6D2 + const EVENT_6D3 + const EVENT_6D4 + const EVENT_6D5 + const EVENT_6D6 + const EVENT_6D7 + const EVENT_6D8 + const EVENT_6D9 + const EVENT_6DA + const EVENT_6DB + const EVENT_6DC + const EVENT_6DD + const EVENT_6DE + const EVENT_6DF + const EVENT_6E0 + const EVENT_6E1 + const EVENT_6E2 + const EVENT_6E3 + const EVENT_6E4 + const EVENT_6E5 + const EVENT_6E6 + const EVENT_6E7 + const EVENT_6E8 + const EVENT_6E9 + const EVENT_6EA + const EVENT_6EB + const EVENT_6EC + const EVENT_6ED + const EVENT_6EE + const EVENT_6EF + const EVENT_6F0 + const EVENT_6F1 + const EVENT_6F2 + const EVENT_6F3 + const EVENT_6F4 + const EVENT_6F5 + const EVENT_6F6 + const EVENT_6F7 + const EVENT_6F8 + const EVENT_6F9 + const EVENT_6FA + const EVENT_6FB + const EVENT_6FC + const EVENT_6FD + const EVENT_6FE + 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_703 + const EVENT_704 + const EVENT_705 + const EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + const EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + const EVENT_BOULDER_IN_BLACKTHORN_GYM_3 + const EVENT_709 + const EVENT_70A + const EVENT_70B + const EVENT_70C + const EVENT_BOULDER_IN_ICE_PATH_1 + 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_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_72A + const EVENT_72B + const EVENT_72C + const EVENT_72D + const EVENT_72E + const EVENT_72F + const EVENT_730 + const EVENT_731 + const EVENT_732 + const EVENT_733 + const EVENT_734 + const EVENT_735 + const EVENT_736 + const EVENT_737 + const EVENT_738 + const EVENT_739 + const EVENT_73A + const EVENT_73B + const EVENT_73C + const EVENT_73D + const EVENT_73E + const EVENT_73F + const EVENT_740 + const EVENT_741 + const EVENT_742 + const EVENT_743 + const EVENT_744 + const EVENT_745 + const EVENT_746 + const EVENT_747 + const EVENT_748 + const EVENT_749 + const EVENT_74A + const EVENT_74B + const EVENT_74C + const EVENT_74D + const EVENT_74E + const EVENT_OPENED_MT_SILVER + const EVENT_FOUGHT_SNORLAX + const EVENT_751 + const EVENT_752 + const EVENT_753 + const EVENT_754 + const EVENT_755 + const EVENT_756 + const EVENT_757 + const EVENT_758 + const EVENT_759 + const EVENT_75A + const EVENT_75B + const EVENT_75C + const EVENT_75D + const EVENT_75E + const EVENT_75F + const EVENT_760 + const EVENT_761 + const EVENT_RED_IN_MT_SILVER + const EVENT_763 + const EVENT_764 + const EVENT_765 + const EVENT_766 + const EVENT_RANG_CLEAR_BELL + const EVENT_768 + const EVENT_FLORIA_AT_SUDOWOODO + const EVENT_76A + const EVENT_76B + const EVENT_76C + const EVENT_76D + const EVENT_76E + const EVENT_TRAINERS_IN_CERULEAN_GYM + const EVENT_770 + const EVENT_771 + const EVENT_772 + const EVENT_773 + const EVENT_774 + const EVENT_BLUE_IN_CINNABAR + const EVENT_776 + const EVENT_777 + const EVENT_778 + const EVENT_779 + const EVENT_77A + const EVENT_77B + const EVENT_TELEPORT_GUY + const EVENT_PICKED_UP_FOCUS_BAND + const EVENT_77E + const EVENT_77F + const EVENT_780 + const EVENT_781 + const EVENT_782 + const EVENT_783 + const EVENT_784 + const EVENT_785 + const EVENT_786 + const EVENT_787 + const EVENT_788 + const EVENT_789 + const EVENT_78A + const EVENT_78B + const EVENT_78C + const EVENT_78D + const EVENT_78E + const EVENT_78F + const EVENT_790 + const EVENT_791 + const EVENT_792 + const EVENT_793 + const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + const EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM + const EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + const EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + const EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + const EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM + const EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + const EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + const EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + const EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + const EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + const EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + const EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + const EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM + const EVENT_7A4 + const EVENT_7A5 + const EVENT_7A6 + const EVENT_7A7 + const EVENT_7A8 + const EVENT_7A9 + const EVENT_EUSINE_IN_BURNED_TOWER + const EVENT_7AB + const EVENT_7AC + const EVENT_7AD + const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + const EVENT_SAW_SUICUNE_ON_ROUTE_42 + const EVENT_SAW_SUICUNE_ON_ROUTE_36 + const EVENT_7B1 + const EVENT_7B2 + const EVENT_7B3 + const EVENT_7B4 + const EVENT_7B5 + const EVENT_7B6 + const EVENT_SET_WHEN_FOUGHT_HO_OH + const EVENT_7B8 + const EVENT_7B9 + const EVENT_7BA + const EVENT_7BB + const EVENT_7BC + const EVENT_7BD + const EVENT_7BE + const EVENT_7BF + const EVENT_7C0 + const EVENT_7C1 + const EVENT_7C2 + const EVENT_7C3 + const EVENT_7C4 + const EVENT_7C5 + const EVENT_7C6 + const EVENT_7C7 + const EVENT_7C8 + const EVENT_7C9 + const EVENT_7CA + const EVENT_7CB + const EVENT_7CC + const EVENT_7CD + const EVENT_7CE + const EVENT_7CF + const EVENT_7D0 + const EVENT_7D1 + const EVENT_7D2 + const EVENT_7D3 + const EVENT_7D4 + const EVENT_7D5 + const EVENT_7D6 + const EVENT_7D7 + const EVENT_7D8 + const EVENT_7D9 + const EVENT_7DA + const EVENT_7DB + const EVENT_7DC + const EVENT_7DD + const EVENT_7DE + const EVENT_7DF + const EVENT_7E0 + const EVENT_7E1 + const EVENT_7E2 + const EVENT_7E3 + const EVENT_7E4 + const EVENT_7E5 + const EVENT_7E6 + const EVENT_7E7 + const EVENT_7E8 + const EVENT_7E9 + const EVENT_7EA + const EVENT_7EB + const EVENT_7EC + const EVENT_7ED + const EVENT_7EE + const EVENT_7EF + const EVENT_7F0 + const EVENT_7F1 + const EVENT_7F2 + const EVENT_7F3 + const EVENT_7F4 + const EVENT_7F5 + const EVENT_7F6 + const EVENT_7F7 + const EVENT_7F8 + const EVENT_7F9 + const EVENT_7FA + const EVENT_7FB + const EVENT_7FC + const EVENT_7FD + const EVENT_7FE + const EVENT_7FF + +EVENT_ALWAYS_THERE EQU $ffff diff --git a/constants/std_constants.asm b/constants/std_constants.asm index 19cbf2f72..ef132522c 100644 --- a/constants/std_constants.asm +++ b/constants/std_constants.asm @@ -46,3 +46,8 @@ enum rematchgiftf enum gymstatue1 enum gymstatue2 + enum receiveitem + enum receivetogepiegg + enum pc + enum gamecornercoinvendor + enum happinesschecknpc diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 985bb2089..9c742df00 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1476,7 +1476,7 @@ UnknownScript_0xa0a08: iftrue UnknownScript_0xa0a1d checknite iftrue UnknownScript_0xa0a25 - setevent $026a + setevent EVENT_26A farwritetext UnknownText_0x66f11 keeptextopen jump UnknownScript_0xa0484 diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 9d3969f5f..c712e4d7a 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -14,7 +14,7 @@ MomPhoneScript: ; 0xbceaa jump MomPhoneNoPokemonScript .bcec5 ; 0xbcec5 - checkevent $0007 + checkevent EVENT_007 iftrue MomPhoneHangUpScript farwritetext MomPhoneGreetingText keeptextopen @@ -1080,7 +1080,7 @@ UnknownScript_0xbd784: iftrue UnknownScript_0xbd7c8 checkflag ENGINE_GINA_HAS_LEAF_STONE iftrue UnknownScript_0xbd7c8 - checkevent $0100 + checkevent EVENT_100 iftrue UnknownScript_0xbd7b2 farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd7dd @@ -1233,7 +1233,7 @@ UnknownScript_0xbd8dd: iftrue UnknownScript_0xbd915 farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd91c - checkevent $0101 + checkevent EVENT_101 iftrue UnknownScript_0xbd90d farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd926 @@ -1294,7 +1294,7 @@ UnknownScript_0xbd967: iftrue UnknownScript_0xbd99f farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd9ae - checkevent $0102 + checkevent EVENT_102 iftrue UnknownScript_0xbd997 farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd9bc @@ -1459,7 +1459,7 @@ UnknownScript_0xbdae3: iftrue UnknownScript_0xbdb1b farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbdb22 - checkevent $0103 + checkevent EVENT_103 iftrue UnknownScript_0xbdb13 farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbdb2c @@ -1567,7 +1567,7 @@ UnknownScript_0xbdbd0: iftrue UnknownScript_0xbdc10 farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbdc17 - checkevent $0104 + checkevent EVENT_104 iftrue UnknownScript_0xbdc08 farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbdc69 diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index b3b68e5e5..763ae0908 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -287,16 +287,16 @@ DayToTextScript: db "SATURDAY@" GoldenrodRocketsScript: - clearevent $06cd + clearevent EVENT_6CD end RadioTowerRocketsScript: setflag ENGINE_ROCKETS_IN_RADIO_TOWER - setevent $06cf - setevent $06d1 - clearevent $06ce - clearevent $0025 - setevent $0756 + setevent EVENT_6CF + setevent EVENT_6D1 + clearevent EVENT_6CE + clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER + setevent EVENT_756 specialphonecall $0004 domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 end @@ -304,19 +304,19 @@ RadioTowerRocketsScript: BugContestResultsWarpScript: special WhiteBGMap scall UnknownScript_0xbc380 - setevent $0747 - clearevent $0748 - setevent $02d2 + setevent EVENT_747 + clearevent EVENT_748 + setevent EVENT_2D2 warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4 applymovement $0, MovementData_0xbcea1 BugContestResultsScript: - clearflag $0011 - clearevent $02d2 - clearevent $0313 - clearevent $0314 - clearevent $0315 - clearevent $0316 + clearflag ENGINE_BUG_CONTEST_TIMER + clearevent EVENT_2D2 + clearevent EVENT_313 + clearevent EVENT_314 + clearevent EVENT_315 + clearevent EVENT_316 loadfont farwritetext UnknownText_0x1b05bf closetext @@ -342,7 +342,7 @@ UnknownScript_0xbc2b1: ; 0xbc2b1 keeptextopen UnknownScript_0xbc2b6: - checkevent $0308 + checkevent EVENT_308 iffalse UnknownScript_0xbc2c4 farwritetext UnknownText_0x1b06d9 closetext @@ -357,33 +357,33 @@ UnknownScript_0xbc2d4: loadmovesprites dotrigger $0 domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0 - setevent $0716 - setevent $0717 - setevent $0718 - setevent $0719 - setevent $071a - setevent $071b - setevent $071c - setevent $071d - setevent $071e - setevent $071f - setevent $0720 - setevent $0721 - setevent $0722 - setevent $0723 - setevent $0724 - setevent $0725 - setevent $0726 - setevent $0727 - setevent $0728 - setevent $0729 + setevent EVENT_716 + setevent EVENT_717 + setevent EVENT_718 + setevent EVENT_719 + setevent EVENT_71A + setevent EVENT_71B + setevent EVENT_71C + setevent EVENT_71D + setevent EVENT_71E + setevent EVENT_71F + setevent EVENT_720 + setevent EVENT_721 + setevent EVENT_722 + setevent EVENT_723 + setevent EVENT_724 + setevent EVENT_725 + setevent EVENT_726 + setevent EVENT_727 + setevent EVENT_728 + setevent EVENT_729 setflag ENGINE_51 special PlayMapMusic end ; 0xbc31e UnknownScript_0xbc31e: ; 0xbc31e - setevent $0000 + setevent EVENT_000 itemtotext SUN_STONE, $1 farwritetext UnknownText_0x1b0621 closetext @@ -413,188 +413,188 @@ UnknownScript_0xbc343: ; 0xbc343 UnknownScript_0xbc354: ; 0xbc354 farwritetext UnknownText_0x1b08cc keeptextopen - setevent $0313 + setevent EVENT_313 jump UnknownScript_0xbc2b1 ; 0xbc35f UnknownScript_0xbc35f: ; 0xbc35f farwritetext UnknownText_0x1b08cc keeptextopen - setevent $0314 + setevent EVENT_314 jump UnknownScript_0xbc2b1 ; 0xbc36a UnknownScript_0xbc36a: ; 0xbc36a farwritetext UnknownText_0x1b08cc keeptextopen - setevent $0315 + setevent EVENT_315 jump UnknownScript_0xbc2b1 ; 0xbc375 UnknownScript_0xbc375: ; 0xbc375 farwritetext UnknownText_0x1b08cc keeptextopen - setevent $0316 + setevent EVENT_316 jump UnknownScript_0xbc2a9 ; 0xbc380 UnknownScript_0xbc380: ; 0xbc380 - checkevent $0716 + checkevent EVENT_716 iftrue .skip1 - clearevent $0720 + clearevent EVENT_720 .skip1 - checkevent $0717 + checkevent EVENT_717 iftrue .skip2 - clearevent $0721 + clearevent EVENT_721 .skip2 - checkevent $0718 + checkevent EVENT_718 iftrue .skip3 - clearevent $0722 + clearevent EVENT_722 .skip3 - checkevent $0719 + checkevent EVENT_719 iftrue .skip4 - clearevent $0723 + clearevent EVENT_723 .skip4 - checkevent $071a + checkevent EVENT_71A iftrue .skip5 - clearevent $0724 + clearevent EVENT_724 .skip5 - checkevent $071b + checkevent EVENT_71B iftrue .skip6 - clearevent $0725 + clearevent EVENT_725 .skip6 - checkevent $071c + checkevent EVENT_71C iftrue .skip7 - clearevent $0726 + clearevent EVENT_726 .skip7 - checkevent $071d + checkevent EVENT_71D iftrue .skip8 - clearevent $0727 + clearevent EVENT_727 .skip8 - checkevent $071e + checkevent EVENT_71E iftrue .skip9 - clearevent $0728 + clearevent EVENT_728 .skip9 - checkevent $071f + checkevent EVENT_71F iftrue .skip10 - clearevent $0729 + clearevent EVENT_729 .skip10 end InitializeEventsScript: - setevent $06cb - setevent $06ce - setevent $06cd - setevent $06d0 - setevent $06f3 - setevent $06e9 - setevent $06f4 - setevent $06d5 - setevent $06de - setevent $06dd - setevent $06df - setevent $06c0 - setevent $06e4 - setevent $0025 - setevent $06be - setevent $06bf - setevent $06c1 - setevent $06f9 - setevent $06fd - setevent $06ff - setevent $0700 - setevent $0702 - setevent $0703 - setevent $0704 - setevent $070d - setevent $070e - setevent $070f - setevent $0710 - setevent $0715 - setevent $0716 - setevent $0717 - setevent $0718 - setevent $0719 - setevent $071a - setevent $071b - setevent $071c - setevent $071d - setevent $071e - setevent $071f - setevent $0720 - setevent $0721 - setevent $0722 - setevent $0723 - setevent $0724 - setevent $0725 - setevent $0726 - setevent $0727 - setevent $0728 - setevent $0729 - setevent $072c - setevent $072f - setevent $072d - setevent $0735 - setevent $0736 - setevent $073c - setevent $073d - setevent $0741 - setevent $0742 - setevent $0743 - setevent $0744 - setevent $02a4 - setevent $02af - setevent $0749 - setevent $06d3 - setevent $074d - setevent $0712 - setevent $0713 - setevent $0711 - setevent $06d4 - setevent $0304 - setevent $0307 - setevent $06d8 - setevent $06c3 - setevent $06c2 - setevent $06c6 - setevent $075f - setevent $0731 - setevent $074a - setevent $0762 - setevent $0738 - setevent $073a - setevent $073b - setevent $0733 - setevent $073f - setevent $078d - setevent $0766 - setevent $0768 - setevent $0769 - setevent $076a - setevent $078e - setevent $078f - setevent $0790 - setevent $0791 - setevent $0793 - setevent $07a4 - setevent $07a4 - setevent $07a5 - setevent $06ec - setevent $06ed - setevent $06f0 - setevent $07a9 + setevent EVENT_6CB + setevent EVENT_6CE + setevent EVENT_6CD + setevent EVENT_6D0 + setevent EVENT_6F3 + setevent EVENT_6E9 + setevent EVENT_6F4 + setevent EVENT_6D5 + setevent EVENT_6DE + setevent EVENT_6DD + setevent EVENT_6DF + setevent EVENT_6C0 + setevent EVENT_6E4 + setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER + setevent EVENT_6BE + setevent EVENT_6BF + setevent EVENT_6C1 + setevent EVENT_6F9 + setevent EVENT_6FD + setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + setevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + setevent EVENT_702 + setevent EVENT_703 + setevent EVENT_704 + setevent EVENT_BOULDER_IN_ICE_PATH_1 + setevent EVENT_BOULDER_IN_ICE_PATH_2 + setevent EVENT_BOULDER_IN_ICE_PATH_3 + setevent EVENT_BOULDER_IN_ICE_PATH_4 + setevent EVENT_715 + setevent EVENT_716 + setevent EVENT_717 + setevent EVENT_718 + setevent EVENT_719 + setevent EVENT_71A + setevent EVENT_71B + setevent EVENT_71C + setevent EVENT_71D + setevent EVENT_71E + setevent EVENT_71F + setevent EVENT_720 + setevent EVENT_721 + setevent EVENT_722 + setevent EVENT_723 + setevent EVENT_724 + setevent EVENT_725 + setevent EVENT_726 + setevent EVENT_727 + setevent EVENT_728 + setevent EVENT_729 + setevent EVENT_72C + setevent EVENT_72F + setevent EVENT_72D + setevent EVENT_735 + setevent EVENT_736 + setevent EVENT_73C + setevent EVENT_73D + setevent EVENT_741 + setevent EVENT_742 + setevent EVENT_743 + setevent EVENT_744 + setevent EVENT_2A4 + setevent EVENT_2AF + setevent EVENT_749 + setevent EVENT_6D3 + setevent EVENT_74D + setevent EVENT_MET_BILL + setevent EVENT_713 + setevent EVENT_711 + setevent EVENT_6D4 + setevent EVENT_WAREHOUSE_LAYOUT_1 + setevent EVENT_WAREHOUSE_BLOCKED_OFF + setevent EVENT_6D8 + setevent EVENT_6C3 + setevent EVENT_6C2 + setevent EVENT_6C6 + setevent EVENT_75F + setevent EVENT_731 + setevent EVENT_74A + setevent EVENT_RED_IN_MT_SILVER + setevent EVENT_738 + setevent EVENT_73A + setevent EVENT_73B + setevent EVENT_733 + setevent EVENT_73F + setevent EVENT_78D + setevent EVENT_766 + setevent EVENT_768 + setevent EVENT_FLORIA_AT_SUDOWOODO + setevent EVENT_76A + setevent EVENT_78E + setevent EVENT_78F + setevent EVENT_790 + setevent EVENT_791 + setevent EVENT_793 + setevent EVENT_7A4 + setevent EVENT_7A4 + setevent EVENT_7A5 + setevent EVENT_6EC + setevent EVENT_6ED + setevent EVENT_6F0 + setevent EVENT_7A9 setevent EVENT_EUSINE_IN_BURNED_TOWER - setevent $06c8 - setevent $07ac - setevent $07ad - setevent $07b5 - setevent $07b6 - setevent $07c5 - setevent $07b7 - setevent $07b0 - setevent $07af - setevent $07ae - setevent $07cf + setevent EVENT_6C8 + setevent EVENT_7AC + setevent EVENT_7AD + setevent EVENT_7B5 + setevent EVENT_7B6 + setevent EVENT_7C5 + setevent EVENT_SET_WHEN_FOUGHT_HO_OH + setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 + setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 + setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + setevent EVENT_7CF setflag ENGINE_ROCKET_SIGNAL_ON_CH20 setflag ENGINE_ROCKETS_IN_MAHOGANY variablesprite $4, $52 @@ -606,18 +606,18 @@ InitializeEventsScript: variablesprite $a, $a variablesprite $b, $28 variablesprite $c, $28 - setevent $00fb - setevent $076d - setevent $076c - setevent $076e - setevent $076f - setevent $0773 - setevent $0776 - setevent $0777 - setevent $0779 - setevent $0772 - setevent $077b - setevent $0036 + setevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM + setevent EVENT_76D + setevent EVENT_76C + setevent EVENT_76E + setevent EVENT_TRAINERS_IN_CERULEAN_GYM + setevent EVENT_773 + setevent EVENT_776 + setevent EVENT_777 + setevent EVENT_779 + setevent EVENT_772 + setevent EVENT_77B + setevent EVENT_036 return AskNumber1MScript: @@ -52213,7 +52213,7 @@ EngineFlagAction:: ; 80430 cp $a2 jr c, .read -; Invalid flags are treated as flag $00. +; Invalid flags are treated as flag 00. .invalid xor a diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 51235ee68..b41934f2b 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -451,10 +451,10 @@ AzaleaGym_MapEventHeader: ; people-events db 7 - person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, $ffff - person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, $ffff - person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, $ffff - person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, $ffff - person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, $ffff - person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff + person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 4d8fc7952..406d29483 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, $ffff - person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, $ffff - person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, EVENT_ALWAYS_THERE diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 4ca0411df..dd23fe9ef 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, $ffff - person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, $ffff - person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, $ffff - person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, EVENT_ALWAYS_THERE diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 40df738ed..af257c769 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -51,7 +51,7 @@ UnknownScript_0x198049: writetext UnknownText_0x19814d closetext loadmovesprites - setevent $06bf + setevent EVENT_6BF checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x198071 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -158,8 +158,8 @@ UnknownScript_0x1980e5: verbosegiveitem GS_BALL, 1 spriteface $d, LEFT setflag ENGINE_HAVE_EXAMINED_GS_BALL - clearevent $06ed - setevent $06eb + clearevent EVENT_6ED + setevent EVENT_6EB dotrigger $0 loadmovesprites end @@ -482,15 +482,15 @@ AzaleaTown_MapEventHeader: ; people-events db 12 - person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, $06fa - person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, $ffff - person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, $ffff - person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, $ffff - person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 - person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 - person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 - person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 - person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, $ffff - person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, $06bf - person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, $06fc - person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, $07a4 + person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA + person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, EVENT_ALWAYS_THERE + person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, EVENT_ALWAYS_THERE + person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BF + person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC + person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 67315d2e3..abd9e6026 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, $ffff - person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, $ffff - person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, $ffff - person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, $ffff - person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, $ffff + person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, EVENT_ALWAYS_THERE diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 7b5f809c8..869436e95 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader: ; people-events db 2 - person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791 - person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff + person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_791 + person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_ALWAYS_THERE diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 80ff2c82b..7cb5f0015 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff + person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, EVENT_ALWAYS_THERE diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index d33ed08f4..6e917f1d0 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff + person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, EVENT_ALWAYS_THERE diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 4f0055689..72ec280fe 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -13,7 +13,7 @@ BattleTowerOutside_MapScriptHeader: return .Callback2 - clearevent $07cf + clearevent EVENT_7CF return StandingYoungsterScript_0x9f85f: @@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader: ; people-events db 4 - person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, $ffff - person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, $ffff - person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, $07cf - person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, EVENT_7CF + person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_ALWAYS_THERE diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 967cf7f33..4fc94c08b 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader: GrampsScript_0x189538: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x1896ba checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1896c0 @@ -120,7 +120,7 @@ UnknownScript_0x18963b: verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setevent $0000 + setevent EVENT_000 loadmovesprites end @@ -131,7 +131,7 @@ UnknownScript_0x189652: verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setevent $0000 + setevent EVENT_000 loadmovesprites end @@ -142,7 +142,7 @@ UnknownScript_0x189669: verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setevent $0000 + setevent EVENT_000 loadmovesprites end @@ -153,7 +153,7 @@ UnknownScript_0x189680: verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setevent $0000 + setevent EVENT_000 loadmovesprites end @@ -367,4 +367,4 @@ BillsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, $ffff + person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, EVENT_ALWAYS_THERE diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 1a118d831..3c99973c6 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader: ; people-events db 9 - person_event SPRITE_SUPER_NERD, 16, 22, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, $06e3 - person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, $06e4 - person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, $074c - person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, $074d - person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, $ffff - person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, $ffff - person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, $ffff - person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, SantosScript, $075d - person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, $ffff + person_event SPRITE_SUPER_NERD, 16, 22, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E3 + person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4 + person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, EVENT_74C + person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, EVENT_74D + person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, SantosScript, EVENT_75D + person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, EVENT_ALWAYS_THERE diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index c994e7254..3e31f4c22 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, $ffff + person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, EVENT_ALWAYS_THERE diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 25ecf2f9b..d627e6404 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, $ffff - person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, $ffff + person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, EVENT_ALWAYS_THERE + person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, EVENT_ALWAYS_THERE diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index e994ca66b..0aec7b6ea 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -47,9 +47,9 @@ ClairScript_0x194e24: setevent EVENT_BEAT_COOLTRAINERM_MIKE setevent EVENT_BEAT_COOLTRAINERF_FRAN setevent EVENT_BEAT_COOLTRAINERF_LOLA - clearevent $0736 - setevent $074c - clearevent $074d + clearevent EVENT_736 + setevent EVENT_74C + clearevent EVENT_74D end .FightDone writetext UnknownText_0x195162 @@ -452,8 +452,8 @@ BlackthornGym1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, $ffff - person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, $ffff - person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, $ffff - person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, $ffff - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, $ffff + person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index a7b45f0ee..1107e5f92 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -177,11 +177,11 @@ BlackthornGym2F_MapEventHeader: ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, $ffff - person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, $ffff + person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, EVENT_ALWAYS_THERE person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff - person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff - person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff + person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 610a7b63f..4ccc24828 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, $ffff - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, $ffff - person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, EVENT_ALWAYS_THERE diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index 098efb809..fd6ec0c68 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -15,7 +15,7 @@ TwinScript_0x195b7f: jumptextfaceplayer UnknownText_0x195bfd CooltrainerMScript_0x195b82: - jumpstd $0033 + jumpstd happinesschecknpc UnknownText_0x195b85: text "Deep inside far-" @@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, $ffff - person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, $ffff - person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, $ffff - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, EVENT_ALWAYS_THERE diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index fbac84097..da40c73c8 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -158,4 +158,4 @@ BluesHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, $ffff + person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, EVENT_ALWAYS_THERE diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 2ccf4e6be..32dcb1401 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, $ffff + person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, EVENT_ALWAYS_THERE diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 89f1a8f35..cb771a7e6 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -97,7 +97,7 @@ UnknownScript_0x185c80: closetext loadmovesprites dotrigger $2 - setevent $06c5 + setevent EVENT_6C5 special Functionc48f pause 15 earthquake 50 @@ -311,8 +311,8 @@ BurnedTower1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, $ffff - person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, $0765 - person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, $06c5 - person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, $0764 - person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, $0656 + person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, EVENT_765 + person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, EVENT_6C5 + person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, EVENT_764 + person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, EVENT_656 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 70178189e..60c561709 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -81,10 +81,10 @@ UnknownScript_0x18616b: domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1 domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setevent $07a8 - clearevent $07a9 - setevent $0764 - setevent $0765 + setevent EVENT_7A8 + clearevent EVENT_7A9 + setevent EVENT_764 + setevent EVENT_765 appear $a refreshscreen $0 changeblock $6, $e, $1b @@ -251,12 +251,12 @@ BurnedTowerB1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, $ffff - person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, $074a - person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, $074a - person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, $074a - person_event SPRITE_RAIKOU, 7, 11, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b - person_event SPRITE_ENTEI, 7, 16, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b - person_event SPRITE_SUICUNE, 8, 14, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b - person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, $0657 + person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, EVENT_74A + person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, EVENT_74A + person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, EVENT_74A + person_event SPRITE_RAIKOU, 7, 11, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B + person_event SPRITE_ENTEI, 7, 16, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B + person_event SPRITE_SUICUNE, 8, 14, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B + person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, EVENT_657 person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index a642103dd..5c01cd78d 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -219,8 +219,8 @@ CeladonCafe_MapEventHeader: ; people-events db 5 - person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, $ffff - person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, $ffff - person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, $ffff - person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, $ffff - person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, $ffff + person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, EVENT_ALWAYS_THERE diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 4641777b4..6447f1e37 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -258,12 +258,12 @@ CeladonCity_MapEventHeader: ; people-events db 9 - person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, $ffff - person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, $ffff - person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, $ffff - person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, $ffff - person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, $ffff - person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, $ffff - person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, $ffff - person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, $ffff - person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, $ffff + person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, EVENT_ALWAYS_THERE + person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, EVENT_ALWAYS_THERE diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 0d3d1a31f..74cff6c86 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -89,6 +89,6 @@ CeladonDeptStore1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, $ffff - person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, $ffff - person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, $ffff + person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, EVENT_ALWAYS_THERE diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 5378a834e..e89c6866e 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -82,7 +82,7 @@ CeladonDeptStore2F_MapEventHeader: ; people-events db 4 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, $ffff - person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, $ffff - person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, $ffff - person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, $ffff + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, EVENT_ALWAYS_THERE diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 0a7dbf471..629727652 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -107,8 +107,8 @@ CeladonDeptStore3F_MapEventHeader: ; people-events db 5 - person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, $ffff - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, $ffff - person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, $ffff - person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, $ffff - person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, $ffff + person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, EVENT_ALWAYS_THERE + person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, EVENT_ALWAYS_THERE + person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, EVENT_ALWAYS_THERE diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 1602522fd..6f274d590 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -65,6 +65,6 @@ CeladonDeptStore4F_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, $ffff - person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, $ffff - person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, $ffff + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, EVENT_ALWAYS_THERE diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 67f8c85c8..9fa4ed1da 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEventHeader: ; people-events db 5 - person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, $ffff - person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, $ffff - person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, $ffff - person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, $ffff - person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, $ffff + person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, EVENT_ALWAYS_THERE diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index cf269451a..de5f26531 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -168,5 +168,5 @@ CeladonDeptStore6F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, $ffff - person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, $ffff + person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, EVENT_ALWAYS_THERE diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 2ddf1c445..efa3b9c5d 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -6,7 +6,7 @@ CeladonGameCorner_MapScriptHeader: db 0 ClerkScript_0x7211d: - jumpstd $0032 + jumpstd gamecornercoinvendor ReceptionistScript_0x72120: jumptextfaceplayer UnknownText_0x721d0 @@ -61,7 +61,7 @@ FisherScript_0x72144: end .UnknownScript_0x72172 - jumpstd $002f + jumpstd receiveitem end .coinname @@ -325,12 +325,12 @@ CeladonGameCorner_MapEventHeader: ; people-events db 9 - person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, $ffff - person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, $ffff - person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, $ffff - person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, $ffff - person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, $ffff - person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, $ffff - person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, $ffff - person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, $ffff - person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, $ffff + person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, EVENT_ALWAYS_THERE diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 64159ea76..7fd74ab7f 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -284,5 +284,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader: ; people-events db 2 - person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, $ffff - person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, $ffff + person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, EVENT_ALWAYS_THERE + person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, EVENT_ALWAYS_THERE diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 4f409759d..bd3e79718 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -358,9 +358,9 @@ CeladonGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, $ffff - person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, $ffff - person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, $ffff - person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, $ffff - person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff - person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff + person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, EVENT_ALWAYS_THERE diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 5e8f969b7..8b9914f06 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -91,7 +91,7 @@ CeladonMansion1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, $ffff - person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, $ffff - person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, $ffff - person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, $ffff + person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, EVENT_ALWAYS_THERE + person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, EVENT_ALWAYS_THERE + person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, EVENT_ALWAYS_THERE + person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, EVENT_ALWAYS_THERE diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 1b08d33b9..3c54cd21d 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -206,7 +206,7 @@ CeladonMansion3F_MapEventHeader: ; people-events db 4 - person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, $ffff - person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, $ffff - person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, $ffff - person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, EVENT_ALWAYS_THERE diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index d5c48ff76..651a71221 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -49,4 +49,4 @@ CeladonMansionRoof_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, $ffff + person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, EVENT_ALWAYS_THERE diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index ff8bc8ca6..b8e9e2c54 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, $ffff + person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, EVENT_ALWAYS_THERE diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index 31fd6f96d..b2c29b383 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -9,7 +9,7 @@ NurseScript_0x71e22: jumpstd pokecenternurse GentlemanScript_0x71e25: - jumpstd $0033 + jumpstd happinesschecknpc CooltrainerFScript_0x71e28: jumptextfaceplayer UnknownText_0x71e70 @@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, $ffff - person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, $ffff - person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, $ffff - person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, $ffff - person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, $07b7 + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, EVENT_ALWAYS_THERE + person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 3a8cb4d1b..c3a6e2421 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -300,9 +300,9 @@ CeruleanCity_MapEventHeader: ; people-events db 6 - person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, $ffff - person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, $ffff - person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, $ffff - person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, $ffff - person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, $ffff - person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, $ffff + person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, EVENT_ALWAYS_THERE + person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, EVENT_ALWAYS_THERE diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index a5375ff8d..aaada87fb 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -40,8 +40,8 @@ UnknownScript_0x1883de: playsound SFX_EXIT_BUILDING disappear $2 setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM - clearevent $076c - clearevent $076e + clearevent EVENT_76C + clearevent EVENT_76E dotrigger $0 domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1 domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0 @@ -426,7 +426,7 @@ CeruleanGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_ROCKET, 14, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $076d + person_event SPRITE_ROCKET, 14, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_76D person_event SPRITE_MISTY, 7, 9, $6, $0, 255, 255, $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index c50acac57..41a4877b3 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -30,4 +30,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, EVENT_ALWAYS_THERE diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index c830ea578..545772399 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -57,6 +57,6 @@ CeruleanMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, $ffff - person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, $ffff - person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, EVENT_ALWAYS_THERE diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 422110558..e8dd3e3dd 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -75,6 +75,6 @@ CeruleanPokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, $ffff - person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, $ffff - person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, EVENT_ALWAYS_THERE diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 5d41a5055..b6277533f 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -55,6 +55,6 @@ CeruleanPoliceStation_MapEventHeader: ; people-events db 3 - person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, $ffff - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, $ffff - person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, $ffff + person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, EVENT_ALWAYS_THERE + person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, EVENT_ALWAYS_THERE diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index daf248a7c..8c79c58fb 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -64,7 +64,7 @@ CeruleanTradeSpeechHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, $ffff - person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, $ffff - person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, $ffff - person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, $ffff + person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, EVENT_ALWAYS_THERE + person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, EVENT_ALWAYS_THERE + person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, EVENT_ALWAYS_THERE diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 3b07233d7..cd167320f 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader: ; people-events db 3 - person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, CharcoalKilnBoss, $06f7 - person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, CharcoalKilnApprentice, $06f6 - person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, CharcoalKilnFarfetchd, $06f5 + person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, CharcoalKilnBoss, EVENT_6F7 + person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, CharcoalKilnApprentice, EVENT_6F6 + person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, CharcoalKilnFarfetchd, EVENT_6F5 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index debe2865c..e2cc0e6af 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -85,7 +85,7 @@ CherrygroveCityGuideGent: end .UnknownScript_0x19c097 - jumpstd $002f + jumpstd receiveitem end .mapcardname @@ -570,8 +570,8 @@ CherrygroveCity_MapEventHeader: ; people-events db 5 - person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, $06fe - person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, $06be - person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, $ffff - person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, $ffff - person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, $ffff + person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, EVENT_6FE + person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BE + person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, EVENT_ALWAYS_THERE diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index a6db462aa..9f10b7965 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -56,5 +56,5 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, $ffff - person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, $ffff + person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, EVENT_ALWAYS_THERE diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 0ff43c2ed..6b8dfe881 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -59,5 +59,5 @@ CherrygroveGymSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, $ffff - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, EVENT_ALWAYS_THERE diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 5d717db2b..720f09eca 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -83,6 +83,6 @@ CherrygroveMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, $ffff - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, $ffff - person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, EVENT_ALWAYS_THERE diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 6e7949cfe..e24e8751d 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -80,7 +80,7 @@ CherrygrovePokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, $ffff - person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, $ffff - person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, $ffff - person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, EVENT_ALWAYS_THERE diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index c5f1f6586..8f69b3297 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -403,15 +403,15 @@ CianwoodCity_MapEventHeader: ; people-events db 12 - person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, $ffff - person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, $ffff - person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, $ffff - person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff - person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff - person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff - person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff - person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff - person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff - person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, $ffff - person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, $07ad - person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, $07ae + person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_7AD + person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index badbd7fae..9e2fe7f71 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -62,4 +62,4 @@ CianwoodCityPhotoStudio_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, $ffff + person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, EVENT_ALWAYS_THERE diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 54a023da0..2ec66f0fe 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -377,12 +377,12 @@ CianwoodGym_MapEventHeader: ; people-events db 9 - person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, $ffff - person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, $ffff - person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, $ffff - person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, $ffff - person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, $ffff - person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff - person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff - person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff - person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff + person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index a312d3bd4..7d4805e89 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -75,6 +75,6 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, $ffff - person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, $ffff - person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, $ffff + person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, EVENT_ALWAYS_THERE diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 8fc04f9e6..d11d81d9a 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -90,4 +90,4 @@ CianwoodPharmacy_MapEventHeader: ; people-events db 1 - person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, $ffff + person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, EVENT_ALWAYS_THERE diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 7d60460a2..f37264df2 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -143,7 +143,7 @@ CianwoodPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, $ffff - person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, $ffff - person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, $ffff - person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, EVENT_ALWAYS_THERE diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 13ab7d005..1a5c8663b 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -21,7 +21,7 @@ CinnabarIslandBlue: playsound SFX_WARP_TO applymovement $2, CinnabarIslandBlueTeleport disappear $2 - clearevent $0776 + clearevent EVENT_776 end CinnabarIslandGymSign: diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index f6bff491e..c8fedf946 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -47,6 +47,6 @@ CinnabarPokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, $ffff - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, $ffff - person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, EVENT_ALWAYS_THERE diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 41c7ad14b..1eeaae128 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -83,5 +83,5 @@ Colosseum_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 + person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_000 + person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_001 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 2eaf81970..ded5a3dd1 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -85,6 +85,6 @@ CopycatsHouse1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, $ffff - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, $ffff - person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, EVENT_ALWAYS_THERE + person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, EVENT_ALWAYS_THERE diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 65dabd73d..1d13c57f2 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -108,7 +108,7 @@ Copycat: keeptextopen takeitem LOST_ITEM, 1 setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT - clearevent $0773 + clearevent EVENT_773 jump .Part14 .Part13 @@ -373,9 +373,9 @@ CopycatsHouse2F_MapEventHeader: ; people-events db 6 - person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, Copycat, $06ee - person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, $ffff - person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, CopycatsHouse2FDoll, $0773 - person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, $ffff - person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, $ffff - person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, Copycat, $06ef + person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, Copycat, EVENT_6EE + person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, EVENT_ALWAYS_THERE + person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, CopycatsHouse2FDoll, EVENT_773 + person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, EVENT_ALWAYS_THERE + person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, EVENT_ALWAYS_THERE + person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, Copycat, EVENT_6EF diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 1e1fce5ef..761c408bd 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -425,12 +425,12 @@ DanceTheatre_MapEventHeader: ; people-events db 9 - person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, $ffff - person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, $ffff - person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, $ffff - person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, $ffff - person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, $ffff - person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, $ffff - person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, $ffff - person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, $ffff - person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, $ffff + person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, EVENT_ALWAYS_THERE + person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, EVENT_ALWAYS_THERE + person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, EVENT_ALWAYS_THERE + person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, EVENT_ALWAYS_THERE + person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, EVENT_ALWAYS_THERE + person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, EVENT_ALWAYS_THERE diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 56e342f28..fb73734a3 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -73,6 +73,6 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; people-events db 3 - person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, $ffff - person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, $06a1 - person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, $06a2 + person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, EVENT_6A1 + person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, EVENT_6A2 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index d64582982..85ece7086 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -44,11 +44,11 @@ DarkCaveVioletEntrance_MapEventHeader: ; people-events db 8 - person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, $069e - person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff - person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff - person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff - person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff - person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, $069f - person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, $06a0 - person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, $07ce + person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, EVENT_69E + person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, EVENT_69F + person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, EVENT_6A0 + person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, EVENT_7CE diff --git a/maps/DayCare.asm b/maps/DayCare.asm index cb247592a..40dc44452 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -12,13 +12,13 @@ DayCare_MapScriptHeader: UnknownScript_0x62f7b: checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x62f88 - clearevent $06e5 - setevent $06e6 + clearevent EVENT_6E5 + setevent EVENT_6E6 return UnknownScript_0x62f88: - setevent $06e5 - clearevent $06e6 + setevent EVENT_6E5 + clearevent EVENT_6E6 return GrampsScript_0x62f8f: @@ -175,5 +175,5 @@ DayCare_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, $06e5 - person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, $ffff + person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, EVENT_6E5 + person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, EVENT_ALWAYS_THERE diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 0ba1e16ec..d96073ca3 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -43,4 +43,4 @@ DiglettsCave_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, $ffff + person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, EVENT_ALWAYS_THERE diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 230acb5cd..5cde05b25 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -23,7 +23,7 @@ UnknownScript_0x18d023: writetext UnknownText_0x18d2ea keeptextopen UnknownScript_0x18d030: - setevent $0001 + setevent EVENT_001 writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 @@ -35,7 +35,7 @@ UnknownScript_0x18d030: end UnknownScript_0x18d049: - setevent $0002 + setevent EVENT_002 writetext UnknownText_0x18d3d3 keeptextopen loadmenudata MenuDataHeader_0x18d234 @@ -45,7 +45,7 @@ UnknownScript_0x18d049: if_equal $2, UnknownScript_0x18d0a9 if_equal $3, UnknownScript_0x18d0cb UnknownScript_0x18d061: - setevent $0003 + setevent EVENT_003 writetext UnknownText_0x18d3f3 keeptextopen loadmenudata MenuDataHeader_0x18d258 @@ -55,7 +55,7 @@ UnknownScript_0x18d061: if_equal $2, UnknownScript_0x18d0a9 if_equal $3, UnknownScript_0x18d0a9 UnknownScript_0x18d079: - setevent $0004 + setevent EVENT_004 writetext UnknownText_0x18d420 keeptextopen loadmenudata MenuDataHeader_0x18d283 @@ -65,7 +65,7 @@ UnknownScript_0x18d079: if_equal $2, UnknownScript_0x18d0cb if_equal $3, UnknownScript_0x18d0a9 UnknownScript_0x18d091: - setevent $0005 + setevent EVENT_005 writetext UnknownText_0x18d44a keeptextopen loadmenudata MenuDataHeader_0x18d2a5 @@ -75,17 +75,17 @@ UnknownScript_0x18d091: if_equal $2, UnknownScript_0x18d0a9 if_equal $3, UnknownScript_0x18d0cb UnknownScript_0x18d0a9: - checkevent $0005 + checkevent EVENT_005 iftrue UnknownScript_0x18d100 writetext UnknownText_0x18d82d keeptextopen - checkevent $0004 + checkevent EVENT_004 iftrue UnknownScript_0x18d091 - checkevent $0003 + checkevent EVENT_003 iftrue UnknownScript_0x18d079 - checkevent $0002 + checkevent EVENT_002 iftrue UnknownScript_0x18d061 - checkevent $0001 + checkevent EVENT_001 iftrue UnknownScript_0x18d049 UnknownScript_0x18d0cb: loadmovesprites @@ -101,15 +101,15 @@ UnknownScript_0x18d0cb: loadmovesprites setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG loadfont - checkevent $0005 + checkevent EVENT_005 iftrue UnknownScript_0x18d091 - checkevent $0004 + checkevent EVENT_004 iftrue UnknownScript_0x18d079 - checkevent $0003 + checkevent EVENT_003 iftrue UnknownScript_0x18d061 - checkevent $0002 + checkevent EVENT_002 iftrue UnknownScript_0x18d049 - checkevent $0001 + checkevent EVENT_001 iftrue UnknownScript_0x18d030 UnknownScript_0x18d100: writetext UnknownText_0x18d47c @@ -184,15 +184,15 @@ UnknownScript_0x18d100: playsound SFX_ENTER_DOOR disappear $5 waitbutton - setevent $0000 + setevent EVENT_000 end ElderScript_0x18d1a5: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x18d1f9 - checkevent $0006 + checkevent EVENT_006 iftrue UnknownScript_0x18d1ff checkevent EVENT_GOT_DRATINI iffalse UnknownScript_0x18d1c5 @@ -215,7 +215,7 @@ UnknownScript_0x18d1c5: checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG special SpecialDratini setevent EVENT_GOT_DRATINI - setevent $0006 + setevent EVENT_006 writetext UnknownText_0x18d6ca closetext loadmovesprites @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: ; people-events db 4 - person_event SPRITE_ELDER, 5, 9, $6, $0, 255, 255, $0, 0, ElderScript_0x18d1a5, $0000 - person_event SPRITE_ELDER, 8, 6, $9, $0, 255, 255, $0, 0, ElderScript_0x18d205, $0000 - person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, $0000 - person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, $0790 + person_event SPRITE_ELDER, 5, 9, $6, $0, 255, 255, $0, 0, ElderScript_0x18d1a5, EVENT_000 + person_event SPRITE_ELDER, 8, 6, $9, $0, 255, 255, $0, 0, ElderScript_0x18d205, EVENT_000 + person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, EVENT_000 + person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_790 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 1d99e118c..f3481eeae 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -212,12 +212,12 @@ SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x18c995 writetext UnknownText_0x18cc83 closetext loadmovesprites - setevent $0000 + setevent EVENT_000 special RestartMapMusic end @@ -486,12 +486,12 @@ DragonsDenB1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_POKE_BALL, 20, 39, $1, $0, 255, 255, $0, 0, PokeBallScript_0x18c95a, $06a8 - person_event SPRITE_CLAIR, 34, 18, $7, $0, 255, 255, $90, 0, ObjectEvent, $06d8 - person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, $06c6 - person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, $ffff - person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, $ffff - person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, $ffff - person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, $ffff - person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf - person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0 + person_event SPRITE_POKE_BALL, 20, 39, $1, $0, 255, 255, $0, 0, PokeBallScript_0x18c95a, EVENT_6A8 + person_event SPRITE_CLAIR, 34, 18, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_6D8 + person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, EVENT_6C6 + person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, EVENT_7BF + person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, EVENT_7C0 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 362c9221c..1b4075cc3 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -425,9 +425,9 @@ EarlsPokemonAcademy_MapEventHeader: ; people-events db 6 - person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, AcademyEarl, $06cb - person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, $ffff - person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, $ffff - person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, $ffff - person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, $ffff - person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, $ffff + person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, AcademyEarl, EVENT_6CB + person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, EVENT_ALWAYS_THERE + person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, EVENT_ALWAYS_THERE + person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, EVENT_ALWAYS_THERE + person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, EVENT_ALWAYS_THERE diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 34070ced2..e6e8969c4 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -291,10 +291,10 @@ EcruteakCity_MapEventHeader: ; people-events db 7 - person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, $ffff - person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, $ffff - person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, $ffff - person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, $ffff - person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, $ffff - person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, $ffff - person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, $07a9 + person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, EVENT_7A9 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 94164158f..426b55813 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -37,8 +37,8 @@ MortyScript_0x99d58: checkcode VAR_BADGES scall EcruteakGymTriggerRockets domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1 - setevent $0766 - setevent $0767 + setevent EVENT_766 + setevent EVENT_RANG_CLEAR_BELL .FightDone checkevent EVENT_GOT_TM30_SHADOW_BALL iftrue UnknownScript_0x99db1 @@ -493,10 +493,10 @@ EcruteakGym_MapEventHeader: ; people-events db 7 - person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, $ffff - person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, $ffff - person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, $ffff - person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, $ffff - person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, $ffff - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, $ffff - person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, $07a8 + person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_7A8 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index e4fbf24ab..31e2f6d42 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -29,9 +29,9 @@ UnknownScript_0x9800f: return UnknownScript_0x98022: - clearevent $0766 + clearevent EVENT_766 setevent EVENT_RANG_CLEAR_BELL - setevent $07b1 + setevent EVENT_7B1 checkitem CLEAR_BELL iftrue UnknownScript_0x98032 dotrigger $0 @@ -39,7 +39,7 @@ UnknownScript_0x98032: return UnknownScript_0x98033: - clearevent $07b1 + clearevent EVENT_7B1 return UnknownScript_0x98037: @@ -53,7 +53,7 @@ UnknownScript_0x98037: end UnknownScript_0x9804c: - checkevent $0766 + checkevent EVENT_766 iftrue UnknownScript_0x98061 applymovement $2, MovementData_0x980cc moveperson $3, $5, $6 @@ -86,7 +86,7 @@ UnknownScript_0x98076: UnknownScript_0x9807c: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x980a4 - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x980aa checkitem CLEAR_BELL iftrue UnknownScript_0x98093 @@ -101,8 +101,8 @@ UnknownScript_0x98093: loadmovesprites dotrigger $1 setevent EVENT_RANG_CLEAR_BELL - clearevent $0766 - setevent $0000 + clearevent EVENT_766 + setevent EVENT_000 end UnknownScript_0x980a4: @@ -298,7 +298,7 @@ EcruteakHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAGE, 10, 8, $6, $0, 255, 255, $0, 0, SageScript_0x98062, $0766 + person_event SPRITE_SAGE, 10, 8, $6, $0, 255, 255, $0, 0, SageScript_0x98062, EVENT_766 person_event SPRITE_SAGE, 10, 9, $6, $0, 255, 255, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL - person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, $07b1 - person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, $07b1 + person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, EVENT_7B1 + person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, EVENT_7B1 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 02620be23..31f681311 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -176,5 +176,5 @@ EcruteakItemfinderHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, $ffff - person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, $ffff + person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, EVENT_ALWAYS_THERE + person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, EVENT_ALWAYS_THERE diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 3739bfe42..721ca624b 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -58,5 +58,5 @@ EcruteakLugiaSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, $ffff - person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, $ffff + person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, EVENT_ALWAYS_THERE diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index fc15e339c..2749818c8 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -57,6 +57,6 @@ EcruteakMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, $ffff - person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, $ffff - person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, EVENT_ALWAYS_THERE diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 7493a2bbc..2c0cf32f7 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -219,8 +219,8 @@ EcruteakPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, $ffff - person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, $ffff - person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, $ffff - person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, $ffff - person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, $0713 + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, EVENT_ALWAYS_THERE + person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_713 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 17d3c91fa..fc054e41d 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -99,5 +99,5 @@ ElmsHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, $ffff - person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, $ffff + person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, EVENT_ALWAYS_THERE diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index ea799700b..3f8a494a4 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -270,7 +270,7 @@ ElmDirectionsScript: closetext loadmovesprites setevent EVENT_GOT_A_POKEMON_FROM_ELM - setevent $06be + setevent EVENT_6BE dotrigger $5 domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1 end @@ -339,8 +339,8 @@ ElmAfterTheftScript: setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 - clearevent $0715 - setevent $0714 + clearevent EVENT_715 + setevent EVENT_714 writetext ElmAfterTheftText6 closetext loadmovesprites @@ -508,7 +508,7 @@ UnknownScript_0x78ecb: end UnknownScript_0x78ee2: - jumpstd $002f + jumpstd receiveitem end ElmsAideScript: @@ -1408,9 +1408,9 @@ ElmsLab_MapEventHeader: ; people-events db 6 - person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, $ffff - person_event SPRITE_SCIENTIST, 13, 6, $3, $0, 255, 255, $90, 0, ElmsAideScript, $0701 - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, $0640 - person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, $0641 - person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, $0642 - person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, CopScript, $0702 + person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 13, 6, $3, $0, 255, 255, $90, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, EVENT_640 + person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, EVENT_641 + person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, EVENT_642 + person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, CopScript, EVENT_702 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index ca6e3cbd1..25b5d0ab1 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -28,8 +28,8 @@ UnknownScript_0x7513b: playsound SFX_BOAT earthquake 30 blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW - clearevent $0031 - checkevent $0030 + clearevent EVENT_031 + checkevent EVENT_030 iftrue UnknownScript_0x7515d dotrigger $2 end @@ -41,7 +41,7 @@ UnknownScript_0x7515d: SailorScript_0x75160: faceplayer loadfont - checkevent $0031 + checkevent EVENT_031 iftrue UnknownScript_0x7517a checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue .Olivine @@ -66,7 +66,7 @@ UnknownScript_0x7517a: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - setevent $072b + setevent EVENT_72B domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1 warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11 end @@ -79,7 +79,7 @@ UnknownScript_0x7517a: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - setevent $072a + setevent EVENT_72A domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1 warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17 end @@ -99,7 +99,7 @@ UnknownScript_0x751c7: SailorScript_0x751d0: faceplayer loadfont - checkevent $0030 + checkevent EVENT_030 iftrue UnknownScript_0x751de writetext UnknownText_0x752f9 closetext @@ -310,7 +310,7 @@ FastShip1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, $ffff - person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, $ffff - person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, $ffff - person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, $072c + person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_72C diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 6f130869c..b33d9ff16 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -16,7 +16,7 @@ UnknownScript_0x7673b: end UnknownScript_0x7673c: - checkevent $072f + checkevent EVENT_72F iftrue UnknownScript_0x76766 applymovement $3, MovementData_0x76876 moveperson $2, $1e, $6 @@ -26,7 +26,7 @@ UnknownScript_0x7673c: end UnknownScript_0x76751: - checkevent $072e + checkevent EVENT_72E iftrue UnknownScript_0x76766 applymovement $2, MovementData_0x76871 moveperson $3, $1f, $6 @@ -41,17 +41,17 @@ UnknownScript_0x76766: SailorScript_0x76767: faceplayer loadfont - checkevent $0030 + checkevent EVENT_030 iftrue UnknownScript_0x767a0 - checkevent $0033 + checkevent EVENT_033 iftrue UnknownScript_0x7678d - checkevent $0034 + checkevent EVENT_034 iftrue UnknownScript_0x76787 writetext UnknownText_0x7687b closetext loadmovesprites - setevent $0034 - clearevent $072d + setevent EVENT_034 + clearevent EVENT_72D end UnknownScript_0x76787: @@ -62,7 +62,7 @@ UnknownScript_0x76787: UnknownScript_0x7678d: writetext UnknownText_0x7692e - checkevent $0032 + checkevent EVENT_032 iffalse UnknownScript_0x76799 closetext loadmovesprites @@ -616,15 +616,15 @@ FastShipB1F_MapEventHeader: ; people-events db 12 - person_event SPRITE_SAILOR, 10, 34, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, $072e - person_event SPRITE_SAILOR, 10, 35, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, $072f - person_event SPRITE_SAILOR, 15, 13, $7, $0, 255, 255, $92, 3, TrainerSailorJeff, $0739 - person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a2, 1, TrainerPicnickerDebra, $0739 - person_event SPRITE_SUPER_NERD, 13, 30, $9, $0, 255, 255, $92, 1, TrainerJugglerFritz, $0739 - person_event SPRITE_SAILOR, 8, 21, $9, $0, 255, 255, $92, 4, TrainerSailorGarrett, $073a - person_event SPRITE_FISHER, 12, 29, $7, $0, 255, 255, $a2, 3, TrainerFisherJonah, $073a - person_event SPRITE_BLACK_BELT, 15, 19, $1f, $0, 255, 255, $b2, 3, TrainerBlackbeltWai, $073a - person_event SPRITE_SAILOR, 8, 27, $9, $0, 255, 255, $92, 4, TrainerSailorKenneth, $073b - person_event SPRITE_TEACHER, 15, 13, $7, $0, 255, 255, $82, 3, TrainerTeacherShirley, $073b - person_event SPRITE_YOUNGSTER, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, $073b - person_event SPRITE_YOUNGSTER, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, $073b + person_event SPRITE_SAILOR, 10, 34, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, EVENT_72E + person_event SPRITE_SAILOR, 10, 35, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, EVENT_72F + person_event SPRITE_SAILOR, 15, 13, $7, $0, 255, 255, $92, 3, TrainerSailorJeff, EVENT_739 + person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a2, 1, TrainerPicnickerDebra, EVENT_739 + person_event SPRITE_SUPER_NERD, 13, 30, $9, $0, 255, 255, $92, 1, TrainerJugglerFritz, EVENT_739 + person_event SPRITE_SAILOR, 8, 21, $9, $0, 255, 255, $92, 4, TrainerSailorGarrett, EVENT_73A + person_event SPRITE_FISHER, 12, 29, $7, $0, 255, 255, $a2, 3, TrainerFisherJonah, EVENT_73A + person_event SPRITE_BLACK_BELT, 15, 19, $1f, $0, 255, 255, $b2, 3, TrainerBlackbeltWai, EVENT_73A + person_event SPRITE_SAILOR, 8, 27, $9, $0, 255, 255, $92, 4, TrainerSailorKenneth, EVENT_73B + person_event SPRITE_TEACHER, 15, 13, $7, $0, 255, 255, $82, 3, TrainerTeacherShirley, EVENT_73B + person_event SPRITE_YOUNGSTER, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, EVENT_73B + person_event SPRITE_YOUNGSTER, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, EVENT_73B diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 2fcf12e43..baea1925d 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -184,7 +184,7 @@ SailorScript_0x755f1: writetext UnknownText_0x758b1 closetext loadmovesprites - setevent $0033 + setevent EVENT_033 domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 @@ -374,10 +374,10 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; people-events db 7 - person_event SPRITE_COOLTRAINER_M, 7, 8, $a, $0, 255, 255, $82, 2, TrainerCooltrainermSean, $073a - person_event SPRITE_COOLTRAINER_F, 9, 5, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfCarol, $073a - person_event SPRITE_SUPER_NERD, 9, 5, $7, $0, 255, 255, $92, 3, TrainerPokemaniacEthan, $073b - person_event SPRITE_POKEFAN_M, 21, 8, $7, $0, 255, 255, $b2, 3, TrainerHikerNoland, $0739 - person_event SPRITE_SAILOR, 30, 8, $3, $0, 255, 255, $90, 0, SailorScript_0x755f1, $072d - person_event SPRITE_GENTLEMAN, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, $073a - person_event SPRITE_PHARMACIST, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, $073b + person_event SPRITE_COOLTRAINER_M, 7, 8, $a, $0, 255, 255, $82, 2, TrainerCooltrainermSean, EVENT_73A + person_event SPRITE_COOLTRAINER_F, 9, 5, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfCarol, EVENT_73A + person_event SPRITE_SUPER_NERD, 9, 5, $7, $0, 255, 255, $92, 3, TrainerPokemaniacEthan, EVENT_73B + person_event SPRITE_POKEFAN_M, 21, 8, $7, $0, 255, 255, $b2, 3, TrainerHikerNoland, EVENT_739 + person_event SPRITE_SAILOR, 30, 8, $3, $0, 255, 255, $90, 0, SailorScript_0x755f1, EVENT_72D + person_event SPRITE_GENTLEMAN, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, EVENT_73A + person_event SPRITE_PHARMACIST, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, EVENT_73B diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 2eebaa7c6..600caccf1 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -11,7 +11,7 @@ UnknownScript_0x75ea6: CaptainScript_0x75ea7: faceplayer loadfont - checkevent $0030 + checkevent EVENT_030 iftrue UnknownScript_0x75eb5 writetext UnknownText_0x76012 closetext @@ -67,7 +67,7 @@ UnknownScript_0x75f09: loadfont writetext UnknownText_0x76143 keeptextopen - setevent $072b + setevent EVENT_72B domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 jump UnknownScript_0x75f37 @@ -76,7 +76,7 @@ GentlemanScript_0x75f1f: loadfont checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 - checkevent $0732 + checkevent EVENT_732 iftrue UnknownScript_0x75f58 writetext UnknownText_0x760ae closetext @@ -98,8 +98,8 @@ UnknownScript_0x75f44: loadfont writetext UnknownText_0x76645 closetext - setevent $0031 - setevent $0032 + setevent EVENT_031 + setevent EVENT_032 loadmovesprites end @@ -583,14 +583,14 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; people-events db 11 - person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, $ffff - person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, $0730 - person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, $0731 - person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, $0732 - person_event SPRITE_POKEFAN_M, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, $0739 - person_event SPRITE_TWIN, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, $0739 - person_event SPRITE_TWIN, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, $0739 - person_event SPRITE_SUPER_NERD, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, $073a - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, $073b - person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b - person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a + person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, EVENT_730 + person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, EVENT_731 + person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, EVENT_732 + person_event SPRITE_POKEFAN_M, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, EVENT_739 + person_event SPRITE_TWIN, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, EVENT_739 + person_event SPRITE_TWIN, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, EVENT_739 + person_event SPRITE_SUPER_NERD, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, EVENT_73A + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, EVENT_73B + person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, EVENT_73B + person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, EVENT_73A diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 6eb2fd258..5c3b58a4a 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -139,11 +139,11 @@ FastShipBed: writetext FastShipBedText2 closetext loadmovesprites - checkevent $0031 + checkevent EVENT_031 iftrue UnknownScript_0x75ae1 - checkevent $0032 + checkevent EVENT_032 iftrue UnknownScript_0x75ae2 - checkevent $0030 + checkevent EVENT_030 iftrue UnknownScript_0x75ae2 UnknownScript_0x75ae1: end @@ -151,13 +151,13 @@ UnknownScript_0x75ae1: UnknownScript_0x75ae2: playsound SFX_ELEVATOR_END pause 30 - checkevent $002f + checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue UnknownScript_0x75af7 loadfont writetext FastShipArrivedVermilionText closetext loadmovesprites - setevent $0031 + setevent EVENT_031 end UnknownScript_0x75af7: @@ -165,7 +165,7 @@ UnknownScript_0x75af7: writetext FastShipArrivedOlivineText closetext loadmovesprites - setevent $0031 + setevent EVENT_031 end FastShipCabinsNorthwestCabinTrashcan: @@ -303,7 +303,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; people-events db 4 - person_event SPRITE_FISHER, 19, 5, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherLyle, $0739 - person_event SPRITE_BUG_CATCHER, 19, 10, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherKen, $073b - person_event SPRITE_BUENA, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, $073a - person_event SPRITE_ROCKER, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, $073b + person_event SPRITE_FISHER, 19, 5, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherLyle, EVENT_739 + person_event SPRITE_BUG_CATCHER, 19, 10, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherKen, EVENT_73B + person_event SPRITE_BUENA, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, EVENT_73A + person_event SPRITE_ROCKER, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, EVENT_73B diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 3f2630944..e4695ebae 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -57,5 +57,5 @@ FightingDojo_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, $ffff - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, $077d + person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 123a8b5cf..1f81e0486 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -40,5 +40,5 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, $ffff - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, $ffff + person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, EVENT_ALWAYS_THERE diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index d44b5b188..7b3e34767 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -154,7 +154,7 @@ FuchsiaCity_MapEventHeader: ; people-events db 4 - person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, $ffff - person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, $ffff - person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, $ffff - person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, $ffff + person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, EVENT_ALWAYS_THERE diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index e33dcc54d..061296784 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -391,9 +391,9 @@ FuchsiaGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, $ffff - person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, $ffff - person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, $ffff - person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, $ffff - person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, $ffff - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, $ffff + person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, EVENT_ALWAYS_THERE + person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, EVENT_ALWAYS_THERE + person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, EVENT_ALWAYS_THERE + person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, EVENT_ALWAYS_THERE + person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index f8b073cdc..198ad52c4 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -49,6 +49,6 @@ FuchsiaMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, $ffff - person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, $ffff - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, EVENT_ALWAYS_THERE diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 67b433670..96edf99d2 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -102,7 +102,7 @@ FuchsiaPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, $ffff - person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, $ffff - person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, $ffff - person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, EVENT_ALWAYS_THERE + person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 5f4cbdc01..ecd3836ab 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -125,4 +125,4 @@ GoldenrodBikeShop_MapEventHeader: ; people-events db 1 - person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, $ffff + person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 0e53807e8..ca5deec11 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -258,5 +258,5 @@ GoldenrodBillsHouse_MapEventHeader: ; people-events db 3 person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillsHouseBill, EVENT_MET_BILL - person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, $ffff - person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, $ffff + person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index d49b94514..7384c16f2 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -128,7 +128,7 @@ UnknownScript_0x1989c6: UnknownScript_0x1989ca: playsound SFX_ENTER_DOOR disappear $10 - clearevent $076b + clearevent EVENT_76B setflag ENGINE_5E waitbutton end @@ -581,18 +581,18 @@ GoldenrodCity_MapEventHeader: ; people-events db 15 - person_event SPRITE_POKEFAN_M, 22, 11, $7, $0, 255, 255, $0, 0, PokefanMScript_0x1989e3, $06cf - person_event SPRITE_YOUNGSTER, 21, 34, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1989e6, $06cf - person_event SPRITE_COOLTRAINER_F, 20, 16, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1989e9, $06cf - person_event SPRITE_COOLTRAINER_F, 30, 24, $2, $21, 255, 255, $0, 0, CooltrainerFScript_0x1989fd, $06cf - person_event SPRITE_YOUNGSTER, 21, 23, $2, $11, 255, 255, $80, 0, YoungsterScript_0x198a11, $06cf - person_event SPRITE_LASS, 14, 21, $5, $2, 255, 255, $a0, 0, LassScript_0x198a14, $06cf - person_event SPRITE_GRAMPS, 31, 15, $5, $1, 255, 255, $0, 0, GrampsScript_0x198a17, $06cf - person_event SPRITE_ROCKET, 20, 8, $7, $0, 255, 255, $0, 0, RocketScript_0x198a1a, $06cc - person_event SPRITE_ROCKET, 24, 32, $7, $0, 255, 255, $0, 0, RocketScript_0x198a29, $06cd - person_event SPRITE_ROCKET, 19, 12, $6, $0, 255, 255, $0, 0, RocketScript_0x198a2c, $06cd - person_event SPRITE_ROCKET, 27, 20, $9, $0, 255, 255, $0, 0, RocketScript_0x198a2f, $06ce - person_event SPRITE_ROCKET, 24, 33, $7, $0, 255, 255, $0, 0, RocketScript_0x198a32, $06ce - person_event SPRITE_ROCKET, 11, 33, $6, $0, 255, 255, $0, 0, RocketScript_0x198a35, $06ce - person_event SPRITE_ROCKET, 14, 35, $8, $0, 255, 255, $0, 0, RocketScript_0x198a38, $06ce - person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, MoveTutor, $076a + person_event SPRITE_POKEFAN_M, 22, 11, $7, $0, 255, 255, $0, 0, PokefanMScript_0x1989e3, EVENT_6CF + person_event SPRITE_YOUNGSTER, 21, 34, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1989e6, EVENT_6CF + person_event SPRITE_COOLTRAINER_F, 20, 16, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1989e9, EVENT_6CF + person_event SPRITE_COOLTRAINER_F, 30, 24, $2, $21, 255, 255, $0, 0, CooltrainerFScript_0x1989fd, EVENT_6CF + person_event SPRITE_YOUNGSTER, 21, 23, $2, $11, 255, 255, $80, 0, YoungsterScript_0x198a11, EVENT_6CF + person_event SPRITE_LASS, 14, 21, $5, $2, 255, 255, $a0, 0, LassScript_0x198a14, EVENT_6CF + person_event SPRITE_GRAMPS, 31, 15, $5, $1, 255, 255, $0, 0, GrampsScript_0x198a17, EVENT_6CF + person_event SPRITE_ROCKET, 20, 8, $7, $0, 255, 255, $0, 0, RocketScript_0x198a1a, EVENT_6CC + person_event SPRITE_ROCKET, 24, 32, $7, $0, 255, 255, $0, 0, RocketScript_0x198a29, EVENT_6CD + person_event SPRITE_ROCKET, 19, 12, $6, $0, 255, 255, $0, 0, RocketScript_0x198a2c, EVENT_6CD + person_event SPRITE_ROCKET, 27, 20, $9, $0, 255, 255, $0, 0, RocketScript_0x198a2f, EVENT_6CE + person_event SPRITE_ROCKET, 24, 33, $7, $0, 255, 255, $0, 0, RocketScript_0x198a32, EVENT_6CE + person_event SPRITE_ROCKET, 11, 33, $6, $0, 255, 255, $0, 0, RocketScript_0x198a35, EVENT_6CE + person_event SPRITE_ROCKET, 14, 35, $8, $0, 255, 255, $0, 0, RocketScript_0x198a38, EVENT_6CE + person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, MoveTutor, EVENT_76A diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 0545b0641..819772671 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -93,7 +93,7 @@ GoldenrodDeptStore1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, $ffff - person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, $ffff - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, $ffff - person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, $ffff + person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index f1a0089f6..cd03146ec 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -113,8 +113,8 @@ GoldenrodDeptStore2F_MapEventHeader: ; people-events db 5 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, $ffff - person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, $ffff - person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, $ffff - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, $ffff - person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, $ffff + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 77a01a9c6..75ff6c73f 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -71,6 +71,6 @@ GoldenrodDeptStore3F_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, $ffff - person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, $ffff - person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, $ffff + person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 214865c77..a0472e231 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -91,7 +91,7 @@ GoldenrodDeptStore4F_MapEventHeader: ; people-events db 4 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, $ffff - person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, $ffff - person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, $ffff - person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, $ffff + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, EVENT_ALWAYS_THERE + person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index b25b21f82..53ea5a8ab 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -232,9 +232,9 @@ GoldenrodDeptStore5F_MapEventHeader: ; people-events db 6 - person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, $ffff - person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, $ffff - person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, $ffff - person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, $ffff - person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, $ffff - person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, $0763 + person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, EVENT_763 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 54dd4770c..7973d26c1 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -169,5 +169,5 @@ GoldenrodDeptStore6F_MapEventHeader: ; people-events db 2 - person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, $ffff - person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, $ffff + person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index bcea8ce1c..72441d379 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -12,7 +12,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader: dbw 5, UnknownScript_0x7d7ac UnknownScript_0x7d781: - checkevent $004a + checkevent EVENT_04A iftrue UnknownScript_0x7d78a jump UnknownScript_0x7d791 @@ -121,11 +121,11 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; people-events db 8 - person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c3, $0675 - person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c5, $0676 - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c7, $0677 - person_event SPRITE_POKE_BALL, 19, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c9, $0678 - person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, $ffff - person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, $ffff - person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, $ffff - person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, $ffff + person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c3, EVENT_675 + person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c5, EVENT_676 + person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c7, EVENT_677 + person_event SPRITE_POKE_BALL, 19, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c9, EVENT_678 + person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, EVENT_ALWAYS_THERE + person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index ef00784fb..360718aa4 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -24,13 +24,13 @@ UnknownScript_0x56722: UnknownScript_0x5672b: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue UnknownScript_0x56738 - setevent $06f0 - clearevent $06f1 + setevent EVENT_6F0 + clearevent EVENT_6F1 return UnknownScript_0x56738: - clearevent $06f0 - setevent $06f1 + clearevent EVENT_6F0 + setevent EVENT_6F1 return ClerkScript_0x5673f: @@ -225,11 +225,11 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; people-events db 8 - person_event SPRITE_CLERK, 8, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x5673f, $06f0 - person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, $ffff - person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, $ffff - person_event SPRITE_TWIN, 8, 7, $2, $11, 255, 255, $a0, 0, TwinScript_0x56754, $06f1 - person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x56757, $06f1 - person_event SPRITE_POKEFAN_M, 4, 11, $5, $1, 255, 255, $0, 0, PokefanMScript_0x5676a, $06f0 - person_event SPRITE_TEACHER, 7, 9, $2, $11, 255, 255, $a0, 0, TeacherScript_0x5676d, $06f0 - person_event SPRITE_BUG_CATCHER, 10, 5, $7, $0, 255, 255, $80, 0, BugCatcherScript_0x56770, $06f0 + person_event SPRITE_CLERK, 8, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x5673f, EVENT_6F0 + person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 8, 7, $2, $11, 255, 255, $a0, 0, TwinScript_0x56754, EVENT_6F1 + person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x56757, EVENT_6F1 + person_event SPRITE_POKEFAN_M, 4, 11, $5, $1, 255, 255, $0, 0, PokefanMScript_0x5676a, EVENT_6F0 + person_event SPRITE_TEACHER, 7, 9, $2, $11, 255, 255, $a0, 0, TeacherScript_0x5676d, EVENT_6F0 + person_event SPRITE_BUG_CATCHER, 10, 5, $7, $0, 255, 255, $80, 0, BugCatcherScript_0x56770, EVENT_6F0 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index b1e43d244..e9a889726 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -12,7 +12,7 @@ TeacherScript_0x5535d: iftrue UnknownScript_0x55399 checkevent EVENT_MET_FLORIA iffalse UnknownScript_0x5539f - checkevent $00ba + checkevent EVENT_0BA iffalse UnknownScript_0x5538f checkflag ENGINE_PLAINBADGE iffalse UnknownScript_0x5539c @@ -24,7 +24,7 @@ TeacherScript_0x5535d: setevent EVENT_GOT_SQUIRTBOTTLE loadmovesprites setevent EVENT_FLORIA_AT_SUDOWOODO - clearevent $0768 + clearevent EVENT_768 end UnknownScript_0x5538f: @@ -54,8 +54,8 @@ LassScript_0x553a2: writetext UnknownText_0x55561 closetext loadmovesprites - setevent $00ba - setevent $0768 + setevent EVENT_0BA + setevent EVENT_768 clearevent EVENT_FLORIA_AT_SUDOWOODO end @@ -172,5 +172,5 @@ GoldenrodFlowerShop_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, $ffff - person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, $0768 + person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, EVENT_768 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 7d52ce129..b8e388fa4 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -38,7 +38,7 @@ PokefanMScript_0x56c1a: end ClerkScript_0x56c25: - jumpstd $0032 + jumpstd gamecornercoinvendor ReceptionistScript_0x56c28: faceplayer @@ -479,15 +479,15 @@ GoldenrodGameCorner_MapEventHeader: ; people-events db 12 - person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, $ffff - person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, $ffff - person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, $ffff - person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, $ffff - person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, $ffff - person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, $ffff - person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, $ffff - person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, $ffff - person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, $ffff - person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, $ffff - person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, $ffff - person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, $076b + person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, EVENT_ALWAYS_THERE + person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, EVENT_ALWAYS_THERE + person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, EVENT_76B diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 3fc01d33e..c56ee77e4 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -457,9 +457,9 @@ GoldenrodGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, $ffff - person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, $ffff - person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, $ffff - person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, $ffff - person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, $ffff - person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, $ffff + person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 1e2da5600..bbe08d289 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -151,6 +151,6 @@ GoldenrodHappinessRater_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, $ffff - person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, $ffff - person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, $ffff + person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 75df129e3..419c83576 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -182,5 +182,5 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, $ffff - person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, $0749 + person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, EVENT_749 diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index cca4a0cd8..2e58990a7 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -41,4 +41,4 @@ GoldenrodNameRatersHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, $ffff + person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 7a9c53a03..1cd094667 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -67,5 +67,5 @@ GoldenrodPPSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, $ffff - person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, $ffff + person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index e22be7d28..f163a714e 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -818,8 +818,8 @@ GoldenrodPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, $ffff - person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, $ffff - person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, $ffff - person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, $ffff - person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, EVENT_ALWAYS_THERE + person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, EVENT_ALWAYS_THERE + person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, EVENT_ALWAYS_THERE diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index d92c91211..21c24273b 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -283,6 +283,6 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: ; people-events db 3 - person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, $ffff - person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, $ffff - person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, $ffff + person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, EVENT_ALWAYS_THERE diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 886c69898..e0bb35286 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -43,4 +43,4 @@ GuideGentsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GuideGentsHouseGuideGent, $06ff + person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 9f8e62431..fabd99201 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -35,8 +35,8 @@ UnknownScript_0x181454: setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER clearevent EVENT_RED_IN_MT_SILVER - setevent $0737 - clearevent $0738 + setevent EVENT_737 + clearevent EVENT_738 domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM @@ -126,4 +126,4 @@ HallOfFame_MapEventHeader: ; people-events db 1 - person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $ffff + person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_ALWAYS_THERE diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 1cb089c6e..9ed1bb265 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -33,6 +33,6 @@ IcePath1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 11, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e472, $0688 - person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, $0689 - person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, $07be + person_event SPRITE_POKE_BALL, 11, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e472, EVENT_688 + person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, EVENT_689 + person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, EVENT_7BE diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 4493f4743..90f574d36 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -108,8 +108,8 @@ IcePathB1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $0709 - person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070a - person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070b - person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070c - person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, $068a + person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_709 + person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70A + person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70B + person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70C + person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, EVENT_68A diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index f21e3383b..b7643ab56 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -31,4 +31,4 @@ IcePathB2FBlackthornSide_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d + person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, EVENT_68D diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 92e4552d6..1f6c826d3 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -46,9 +46,9 @@ IcePathB2FMahoganySide_MapEventHeader: ; people-events db 6 - person_event SPRITE_BOULDER, 7, 15, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $070d - person_event SPRITE_BOULDER, 11, 8, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $070e - person_event SPRITE_BOULDER, 16, 7, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $070f - person_event SPRITE_BOULDER, 17, 16, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $0710 - person_event SPRITE_POKE_BALL, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, $068b - person_event SPRITE_POKE_BALL, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, $068c + person_event SPRITE_BOULDER, 7, 15, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1 + person_event SPRITE_BOULDER, 11, 8, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2 + person_event SPRITE_BOULDER, 16, 7, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3 + person_event SPRITE_BOULDER, 17, 16, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4 + person_event SPRITE_POKE_BALL, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, EVENT_68B + person_event SPRITE_POKE_BALL, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, EVENT_68C diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index b235879c3..3691fcf99 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -28,5 +28,5 @@ IcePathB3F_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, $068e - person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, $ffff + person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, EVENT_68E + person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, EVENT_ALWAYS_THERE diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index a7062ebed..16c93c457 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -293,7 +293,7 @@ UnknownScript_0x6ed50: appear $2 loadvar FarfetchdPosition, $a appear $4 - setevent $06f7 + setevent EVENT_6F7 setevent EVENT_HERDED_FARFETCHD end @@ -344,12 +344,12 @@ BlackBeltScript_0x6edae: writetext UnknownText_0x6f141 closetext loadmovesprites - setevent $06e9 - setevent $06f3 - setevent $06f4 - clearevent $06f5 - clearevent $06f6 - clearevent $06f7 + setevent EVENT_6E9 + setevent EVENT_6F3 + setevent EVENT_6F4 + clearevent EVENT_6F5 + clearevent EVENT_6F6 + clearevent EVENT_6F7 end UnknownScript_0x6edd8: @@ -460,9 +460,9 @@ UnknownScript_0x6ee38: UnknownScript_0x6ee42: takeitem GS_BALL, 1 clearevent EVENT_FOREST_IS_RESTLESS - setevent $07a4 + setevent EVENT_7A4 disappear $8 - clearevent $06eb + clearevent EVENT_6EB writetext UnknownText_0x6f43b closetext loadmovesprites @@ -473,7 +473,7 @@ UnknownScript_0x6ee42: pause 30 spriteface $0, DOWN pause 20 - clearflag $0064 + clearflag ENGINE_HAVE_EXAMINED_GS_BALL special Function4989a loadpokedata CELEBI, 30 startbattle @@ -969,14 +969,14 @@ IlexForest_MapEventHeader: ; people-events db 11 - person_event SPRITE_BIRD, 35, 18, $3, $0, 255, 255, $b0, 0, BirdScript_0x6eb8f, $06e9 - person_event SPRITE_YOUNGSTER, 32, 11, $6, $0, 255, 255, $a0, 0, YoungsterScript_0x6eb7b, $06f3 - person_event SPRITE_BLACK_BELT, 32, 9, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x6edae, $06f4 - person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, $ffff - person_event SPRITE_POKE_BALL, 36, 24, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee10, $0671 - person_event SPRITE_KURT, 33, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, $07a5 - person_event SPRITE_LASS, 28, 7, $9, $0, 255, 255, $a0, 0, LassScript_0x6ee0d, $06ed - person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, $ffff - person_event SPRITE_POKE_BALL, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, $07b9 - person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, $07ba - person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, $07bb + person_event SPRITE_BIRD, 35, 18, $3, $0, 255, 255, $b0, 0, BirdScript_0x6eb8f, EVENT_6E9 + person_event SPRITE_YOUNGSTER, 32, 11, $6, $0, 255, 255, $a0, 0, YoungsterScript_0x6eb7b, EVENT_6F3 + person_event SPRITE_BLACK_BELT, 32, 9, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x6edae, EVENT_6F4 + person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 36, 24, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee10, EVENT_671 + person_event SPRITE_KURT, 33, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_7A5 + person_event SPRITE_LASS, 28, 7, $9, $0, 255, 255, $a0, 0, LassScript_0x6ee0d, EVENT_6ED + person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, EVENT_7B9 + person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, EVENT_7BA + person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, EVENT_7BB diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index c08dc3aef..827adf1f1 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -45,5 +45,5 @@ IlexForestAzaleaGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, $ffff - person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, EVENT_ALWAYS_THERE diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 3dd120d54..e7f881dc3 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -22,7 +22,7 @@ UnknownScript_0x18000a: domaptrigger GROUP_KARENS_ROOM, MAP_KARENS_ROOM, $0 domaptrigger GROUP_LANCES_ROOM, MAP_LANCES_ROOM, $0 domaptrigger GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $0 - clearevent $0309 + clearevent EVENT_309 clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED clearevent EVENT_KOGAS_ROOM_EXIT_OPEN @@ -31,13 +31,13 @@ UnknownScript_0x18000a: clearevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED clearevent EVENT_KARENS_ROOM_EXIT_OPEN clearevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - clearevent $0312 + clearevent EVENT_312 clearevent EVENT_BEAT_ELITE_4_WILL clearevent EVENT_BEAT_ELITE_4_KOGA clearevent EVENT_BEAT_ELITE_4_BRUNO clearevent EVENT_BEAT_ELITE_4_KAREN clearevent EVENT_BEAT_CHAMPION_LANCE - setevent $075f + setevent EVENT_75F return UnknownScript_0x180053: @@ -86,7 +86,7 @@ UnknownScript_0x1800ce: writetext UnknownText_0x1801f5 closetext loadmovesprites - setevent $077b + setevent EVENT_77B checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x1800f3 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -319,9 +319,9 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, $ffff - person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, $ffff - person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, $ffff - person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, $077b + person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, EVENT_ALWAYS_THERE + person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_77B person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, TeleportGuyScript, EVENT_TELEPORT_GUY person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 41e15c6d9..ec487103a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -153,4 +153,4 @@ KarensRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, $ffff + person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, EVENT_ALWAYS_THERE diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index c69bf469a..46d0b6340 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -150,4 +150,4 @@ KogasRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, $ffff + person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, EVENT_ALWAYS_THERE diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index adb65e97e..eb0e121fb 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -16,13 +16,13 @@ UnknownScript_0x7a4d7: end UnknownScript_0x7a4d8: - setevent $0000 + setevent EVENT_000 UnknownScript_0x7a4db: playmusic MUSIC_MOM showemote $0, $2, 15 spriteface $0, LEFT - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x7a4f2 applymovement $2, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 @@ -39,8 +39,8 @@ UnknownScript_0x7a4f6: setflag ENGINE_PHONE_CARD addcellnum $1 dotrigger $1 - setevent $06c7 - clearevent $06c8 + setevent EVENT_6C7 + clearevent EVENT_6C8 writetext UnknownText_0x7a6bd keeptextopen special Function90913 @@ -77,9 +77,9 @@ UnknownScript_0x7a549: writetext UnknownText_0x7a850 closetext loadmovesprites - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x7a55d - checkevent $0001 + checkevent EVENT_001 iffalse UnknownScript_0x7a564 jump UnknownScript_0x7a56b @@ -104,16 +104,16 @@ GearName: db "#GEAR@" UnknownScript_0x7a57e: - jumpstd $002f + jumpstd receiveitem end MomScript_0x7a582: faceplayer - setevent $0001 + setevent EVENT_001 checktriggers iffalse UnknownScript_0x7a572 loadfont - checkevent $0076 + checkevent EVENT_076 iftrue UnknownScript_0x7a5af checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue UnknownScript_0x7a5b8 @@ -139,7 +139,7 @@ UnknownScript_0x7a5af: end UnknownScript_0x7a5b5: - setevent $0076 + setevent EVENT_076 UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST special Function16218 @@ -404,8 +404,8 @@ KrissHouse1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_MOM, 8, 11, $8, $0, 255, 255, $0, 0, MomScript_0x7a582, $06c7 - person_event SPRITE_MOM, 6, 6, $7, $0, 255, 1, $0, 0, MomScript_0x7a582, $06c8 - person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, $06c8 - person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, $06c8 - person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, NeighborScript, $0792 + person_event SPRITE_MOM, 8, 11, $8, $0, 255, 255, $0, 0, MomScript_0x7a582, EVENT_6C7 + person_event SPRITE_MOM, 6, 6, $7, $0, 255, 1, $0, 0, MomScript_0x7a582, EVENT_6C8 + person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, EVENT_6C8 + person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, EVENT_6C8 + person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, NeighborScript, EVENT_792 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index cf1e5f9ce..ff0ea80c3 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -16,8 +16,8 @@ UnknownScript_0x7abb3: UnknownScript_0x7abb4: special Function27043 - setevent $0007 - checkevent $0036 + setevent EVENT_007 + checkevent EVENT_036 iftrue UnknownScript_0x7abc4 jumpstd initializeevents return @@ -132,7 +132,7 @@ KrissHouse2F_MapEventHeader: ; people-events db 4 - person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, GameConsole, $0741 - person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1, $0742 - person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2, $0743 - person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDoll, $0744 + person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, GameConsole, EVENT_741 + person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1, EVENT_742 + person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2, EVENT_743 + person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDoll, EVENT_744 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index e06ea97da..9412a9aca 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -114,5 +114,5 @@ KrissNeighborsHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, $ffff - person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, KrissNeighbor, $0793 + person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, KrissNeighbor, EVENT_793 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index db75bdb5e..43479f6e4 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -33,7 +33,7 @@ UnknownScript_0x18e177: KurtScript_0x18e178: faceplayer loadfont - checkevent $0035 + checkevent EVENT_035 iftrue UnknownScript_0x18e1cc checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18e1bf @@ -41,7 +41,7 @@ KurtScript_0x18e178: closetext loadmovesprites special Functionc48f - setevent $06fa + setevent EVENT_6FA checkcode VAR_FACING if_equal $1, UnknownScript_0x18e1ab spriteface $0, DOWN @@ -68,30 +68,30 @@ UnknownScript_0x18e1bf: keeptextopen verbosegiveitem LURE_BALL, 1 iffalse UnknownScript_0x18e2b2 - setevent $0035 + setevent EVENT_035 UnknownScript_0x18e1cc: - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x18e29f - checkevent $0258 + checkevent EVENT_258 iftrue UnknownScript_0x18e2b4 - checkevent $0259 + checkevent EVENT_259 iftrue UnknownScript_0x18e2ca - checkevent $025a + checkevent EVENT_25A iftrue UnknownScript_0x18e2e0 - checkevent $025b + checkevent EVENT_25B iftrue UnknownScript_0x18e2f6 - checkevent $025c + checkevent EVENT_25C iftrue UnknownScript_0x18e30c - checkevent $025d + checkevent EVENT_25D iftrue UnknownScript_0x18e322 - checkevent $025e + checkevent EVENT_25E iftrue UnknownScript_0x18e338 checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT iftrue UnknownScript_0x18e34e UnknownScript_0x18e202: - checkevent $0001 + checkevent EVENT_001 iftrue UnknownScript_0x18e212 - checkevent $0002 + checkevent EVENT_002 iftrue UnknownScript_0x18e212 writetext UnknownText_0x18e6c9 closetext @@ -110,9 +110,9 @@ UnknownScript_0x18e212: iftrue UnknownScript_0x18e249 checkitem PNK_APRICORN iftrue UnknownScript_0x18e249 - checkevent $0001 + checkevent EVENT_001 iftrue UnknownScript_0x18e2ae - checkevent $0002 + checkevent EVENT_002 iftrue UnknownScript_0x18e243 loadmovesprites end @@ -126,7 +126,7 @@ UnknownScript_0x18e243: UnknownScript_0x18e249: writetext UnknownText_0x18e736 keeptextopen - setevent $0002 + setevent EVENT_002 special Function88018 if_equal $0, UnknownScript_0x18e2a5 if_equal $59, UnknownScript_0x18e275 @@ -135,35 +135,35 @@ UnknownScript_0x18e249: if_equal $61, UnknownScript_0x18e287 if_equal $63, UnknownScript_0x18e28d if_equal $65, UnknownScript_0x18e293 - setevent $0258 + setevent EVENT_258 jump UnknownScript_0x18e299 UnknownScript_0x18e275: - setevent $0259 + setevent EVENT_259 jump UnknownScript_0x18e299 UnknownScript_0x18e27b: - setevent $025a + setevent EVENT_25A jump UnknownScript_0x18e299 UnknownScript_0x18e281: - setevent $025b + setevent EVENT_25B jump UnknownScript_0x18e299 UnknownScript_0x18e287: - setevent $025c + setevent EVENT_25C jump UnknownScript_0x18e299 UnknownScript_0x18e28d: - setevent $025d + setevent EVENT_25D jump UnknownScript_0x18e299 UnknownScript_0x18e293: - setevent $025e + setevent EVENT_25E jump UnknownScript_0x18e299 UnknownScript_0x18e299: - setevent $0000 + setevent EVENT_000 setflag ENGINE_KURT_MAKING_BALLS UnknownScript_0x18e29f: writetext UnknownText_0x18e779 @@ -178,7 +178,7 @@ UnknownScript_0x18e2a5: end UnknownScript_0x18e2ab: - setevent $0001 + setevent EVENT_001 UnknownScript_0x18e2ae: writetext UnknownText_0x18e82a closetext @@ -194,7 +194,7 @@ UnknownScript_0x18e2b4: verbosegiveitem2 LEVEL_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2c4: - clearevent $0258 + clearevent EVENT_258 jump UnknownScript_0x18e2ab UnknownScript_0x18e2ca: @@ -205,7 +205,7 @@ UnknownScript_0x18e2ca: verbosegiveitem2 LURE_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2da: - clearevent $0259 + clearevent EVENT_259 jump UnknownScript_0x18e2ab UnknownScript_0x18e2e0: @@ -216,7 +216,7 @@ UnknownScript_0x18e2e0: verbosegiveitem2 MOON_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2f0: - clearevent $025a + clearevent EVENT_25A jump UnknownScript_0x18e2ab UnknownScript_0x18e2f6: @@ -227,7 +227,7 @@ UnknownScript_0x18e2f6: verbosegiveitem2 FRIEND_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e306: - clearevent $025b + clearevent EVENT_25B jump UnknownScript_0x18e2ab UnknownScript_0x18e30c: @@ -238,7 +238,7 @@ UnknownScript_0x18e30c: verbosegiveitem2 FAST_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e31c: - clearevent $025c + clearevent EVENT_25C jump UnknownScript_0x18e2ab UnknownScript_0x18e322: @@ -249,7 +249,7 @@ UnknownScript_0x18e322: verbosegiveitem2 HEAVY_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e332: - clearevent $025d + clearevent EVENT_25D jump UnknownScript_0x18e2ab UnknownScript_0x18e338: @@ -260,7 +260,7 @@ UnknownScript_0x18e338: verbosegiveitem2 LOVE_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e348: - clearevent $025e + clearevent EVENT_25E jump UnknownScript_0x18e2ab UnknownScript_0x18e34e: @@ -310,7 +310,7 @@ UnknownScript_0x18e3a2: UnknownScript_0x18e3ac: playsound SFX_EXIT_BUILDING disappear $2 - clearevent $07a4 + clearevent EVENT_7A4 waitbutton special RestartMapMusic domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $2 @@ -349,17 +349,17 @@ UnknownScript_0x18e3e0: KurtsGranddaughter1: faceplayer - checkevent $0000 + checkevent EVENT_000 iftrue KurtsGranddaughter2Subscript - checkevent $0001 + checkevent EVENT_001 iftrue KurtsGranddaughterFunScript checkevent EVENT_FOREST_IS_RESTLESS iftrue .Lonely - checkevent $0030 + checkevent EVENT_030 iftrue .Dad checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .SlowpokeBack - checkevent $06fa + checkevent EVENT_6FA iftrue .Lonely loadfont writetext KurtsGranddaughterSlowpokeGoneText @@ -702,8 +702,8 @@ KurtsHouse_MapEventHeader: ; people-events db 5 - person_event SPRITE_KURT, 6, 7, $6, $0, 255, 255, $0, 0, KurtScript_0x18e178, $073e - person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, KurtsGranddaughter1, $078c - person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, KurtsHouseSlowpoke, $06fd - person_event SPRITE_KURT, 7, 18, $7, $0, 255, 255, $0, 0, KurtScript_0x18e3bd, $073f - person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, KurtsGranddaughter2, $078d + person_event SPRITE_KURT, 6, 7, $6, $0, 255, 255, $0, 0, KurtScript_0x18e178, EVENT_73E + person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, KurtsGranddaughter1, EVENT_78C + person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, KurtsHouseSlowpoke, EVENT_6FD + person_event SPRITE_KURT, 7, 18, $7, $0, 255, 255, $0, 0, KurtScript_0x18e3bd, EVENT_73F + person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, KurtsGranddaughter2, EVENT_78D diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 88837a5c7..ef2326fac 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -51,7 +51,7 @@ UnknownScript_0x70035: playsound SFX_WARP_TO applymovement $2, MovementData_0x70155 disappear $2 - clearevent $06d5 + clearevent EVENT_6D5 setevent EVENT_DECIDED_TO_HELP_LANCE domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1 end @@ -576,15 +576,15 @@ LakeofRage_MapEventHeader: ; people-events db 12 - person_event SPRITE_LANCE, 32, 25, $7, $0, 255, 255, $0, 0, LanceScript_0x70022, $06d4 - person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, $ffff - person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, $ffff - person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, $ffff - person_event SPRITE_FISHER, 27, 34, $8, $0, 255, 255, $92, 1, TrainerFisherAndre, $0735 - person_event SPRITE_FISHER, 30, 28, $7, $0, 255, 255, $92, 1, TrainerFisherRaymond, $0735 - person_event SPRITE_COOLTRAINER_M, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, $0735 - person_event SPRITE_COOLTRAINER_F, 11, 40, $8, $0, 255, 255, $82, 0, TrainerCooltrainerfLois, $0735 - person_event SPRITE_GYARADOS, 26, 22, $16, $0, 255, 255, $80, 0, GyaradosScript_0x70063, $0751 - person_event SPRITE_SUPER_NERD, 8, 8, $6, $0, 255, 255, $0, 0, WesleyScript, $075c - person_event SPRITE_POKE_BALL, 14, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x70148, $0645 - person_event SPRITE_POKE_BALL, 6, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7014a, $0646 + person_event SPRITE_LANCE, 32, 25, $7, $0, 255, 255, $0, 0, LanceScript_0x70022, EVENT_6D4 + person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 27, 34, $8, $0, 255, 255, $92, 1, TrainerFisherAndre, EVENT_735 + person_event SPRITE_FISHER, 30, 28, $7, $0, 255, 255, $92, 1, TrainerFisherRaymond, EVENT_735 + person_event SPRITE_COOLTRAINER_M, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, EVENT_735 + person_event SPRITE_COOLTRAINER_F, 11, 40, $8, $0, 255, 255, $82, 0, TrainerCooltrainerfLois, EVENT_735 + person_event SPRITE_GYARADOS, 26, 22, $16, $0, 255, 255, $80, 0, GyaradosScript_0x70063, EVENT_751 + person_event SPRITE_SUPER_NERD, 8, 8, $6, $0, 255, 255, $0, 0, WesleyScript, EVENT_75C + person_event SPRITE_POKE_BALL, 14, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x70148, EVENT_645 + person_event SPRITE_POKE_BALL, 6, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7014a, EVENT_646 diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 264d78506..5df41dc83 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -83,4 +83,4 @@ LakeofRageHiddenPowerHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, $ffff + person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, EVENT_ALWAYS_THERE diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 12ad989c2..03964ac96 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -8,18 +8,18 @@ LakeofRageMagikarpHouse_MapScriptHeader: FishingGuruScript_0x19a6ae: faceplayer loadfont - checkevent $003a + checkevent EVENT_03A iftrue UnknownScript_0x19a6fe - checkevent $0039 + checkevent EVENT_039 iftrue UnknownScript_0x19a6e0 checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19a6d7 - checkevent $0038 + checkevent EVENT_038 iftrue UnknownScript_0x19a6d1 writetext UnknownText_0x19a72e closetext loadmovesprites - setevent $0038 + setevent EVENT_038 end UnknownScript_0x19a6d1: @@ -32,7 +32,7 @@ UnknownScript_0x19a6d7: writetext UnknownText_0x19a890 closetext loadmovesprites - setevent $0039 + setevent EVENT_039 end UnknownScript_0x19a6e0: @@ -55,12 +55,12 @@ UnknownScript_0x19a6fe: writetext UnknownText_0x19a9c3 closetext loadmovesprites - clearevent $003a + clearevent EVENT_03A end UnknownScript_0x19a711: loadmovesprites - setevent $003a + setevent EVENT_03A end UnknownScript_0x19a716: @@ -221,4 +221,4 @@ LakeofRageMagikarpHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, $ffff + person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, EVENT_ALWAYS_THERE diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index bb0d19d7f..4bc8a6753 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -25,7 +25,7 @@ UnknownScript_0x180e3e: iffalse UnknownScript_0x180e48 changeblock $4, $16, $34 UnknownScript_0x180e48: - checkevent $0312 + checkevent EVENT_312 iffalse UnknownScript_0x180e52 changeblock $4, $0, $b UnknownScript_0x180e52: @@ -358,6 +358,6 @@ LancesRoom_MapEventHeader: ; people-events db 3 - person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, $ffff - person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f - person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f + person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_75F + person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_75F diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index d570fa62b..031867a0e 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -39,7 +39,7 @@ GentlemanScript_0x7ee6c: end .UnknownScript_0x7ee94 - jumpstd $002f + jumpstd receiveitem end .expncardname @@ -233,8 +233,8 @@ LavRadioTower1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, $ffff - person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, $ffff - person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, $ffff - person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, $ffff - person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, $ffff + person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, EVENT_ALWAYS_THERE diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index b098321d2..e7025b84f 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -59,6 +59,6 @@ LavenderMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, $ffff - person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, $ffff - person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, EVENT_ALWAYS_THERE diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 0b3a9d28a..d8ce14c30 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -40,4 +40,4 @@ LavenderNameRater_MapEventHeader: ; people-events db 1 - person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, $ffff + person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, EVENT_ALWAYS_THERE diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 09a35856d..b8ee2481d 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -92,7 +92,7 @@ LavenderPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, $ffff - person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, $ffff - person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, $ffff - person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, EVENT_ALWAYS_THERE diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 05f6dc376..4a1587b37 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -129,7 +129,7 @@ LavenderTown_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, $ffff - person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, $ffff - person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, $ffff - person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, $ffff + person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, EVENT_ALWAYS_THERE diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 5395b789b..3ff32dd67 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -44,4 +44,4 @@ LavenderTownSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, $ffff + person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, EVENT_ALWAYS_THERE diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 9420095f5..0383e289c 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -462,10 +462,10 @@ MahoganyGym_MapEventHeader: ; people-events db 7 - person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, $ffff - person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, $ffff - person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, $ffff - person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, $ffff - person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, $ffff - person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff + person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index cee3fbf9c..e74d77437 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -236,8 +236,8 @@ MahoganyMart1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_PHARMACIST, 7, 8, $6, $0, 255, 255, $0, 0, PharmacistScript_0x6c367, $06da - person_event SPRITE_BLACK_BELT, 10, 5, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x6c37b, $06da - person_event SPRITE_LANCE, 10, 8, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 - person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 - person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, $0736 + person_event SPRITE_PHARMACIST, 7, 8, $6, $0, 255, 255, $0, 0, PharmacistScript_0x6c367, EVENT_6DA + person_event SPRITE_BLACK_BELT, 10, 5, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x6c37b, EVENT_6DA + person_event SPRITE_LANCE, 10, 8, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D5 + person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D5 + person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, EVENT_736 diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index 669b278c5..8a78f1dc7 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -65,7 +65,7 @@ MahoganyPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, $ffff - person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, $ffff - person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, $ffff - person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, EVENT_ALWAYS_THERE diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index f81a64fd9..955ad751e 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -73,5 +73,5 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, $ffff - person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, $ffff + person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, EVENT_ALWAYS_THERE diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index a0a38117c..90f6b297f 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -268,7 +268,7 @@ MahoganyTown_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 12, 23, $6, $0, 255, 255, $0, 0, PokefanMScript_0x19002e, $0756 - person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, $ffff - person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, $0757 - person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, $0736 + person_event SPRITE_POKEFAN_M, 12, 23, $6, $0, 255, 255, $0, 0, PokefanMScript_0x19002e, EVENT_756 + person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, EVENT_757 + person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, EVENT_736 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index c517bf6cb..3d53e1508 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -212,4 +212,4 @@ ManiasHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, $ffff + person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, EVENT_ALWAYS_THERE diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 56f38500e..4e1701e17 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -182,4 +182,4 @@ MountMoon_MapEventHeader: ; people-events db 1 - person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, $077a + person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_77A diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index cbb4351e4..150663802 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -38,7 +38,7 @@ MountMoonGiftShop_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, $ffff - person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, $ffff - person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, $ffff - person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, $ffff + person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, EVENT_ALWAYS_THERE diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 85dffc9cb..cd424a320 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -18,7 +18,7 @@ UnknownScript_0x77092: end UnknownScript_0x77093: - setevent $00ec + setevent EVENT_0EC return UnknownScript_0x77097: @@ -68,7 +68,7 @@ UnknownScript_0x7709a: disappear $2 disappear $3 stopfollow - clearevent $00ec + clearevent EVENT_0EC setflag ENGINE_MT_MOON_SQUARE_CLEFAIRY end @@ -156,6 +156,6 @@ MountMoonSquare_MapEventHeader: ; people-events db 3 - person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, MtMoonSquareRock, $0778 + person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_779 + person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_779 + person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, MtMoonSquareRock, EVENT_778 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 04e1048b8..6fdf6f011 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -160,13 +160,13 @@ MountMortar1FInside_MapEventHeader: ; people-events db 10 - person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, $ffff - person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, $067d - person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, $067e - person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, $067f - person_event SPRITE_POKE_BALL, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, $07a6 - person_event SPRITE_POKE_BALL, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, $07a7 - person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, $ffff - person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, $ffff - person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, $07c8 - person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, $07c9 + person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, EVENT_67D + person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, EVENT_67E + person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, EVENT_67F + person_event SPRITE_POKE_BALL, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, EVENT_7A6 + person_event SPRITE_POKE_BALL, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, EVENT_7A7 + person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, EVENT_7C8 + person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, EVENT_7C9 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 54639c5e8..838a2bbf2 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -41,5 +41,5 @@ MountMortar1FOutside_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKE_BALL, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, $067b - person_event SPRITE_POKE_BALL, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, $067c + person_event SPRITE_POKE_BALL, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, EVENT_67B + person_event SPRITE_POKE_BALL, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, EVENT_67C diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 84b15b5d5..90baf5be7 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -93,10 +93,10 @@ MountMortar2FInside_MapEventHeader: ; people-events db 7 - person_event SPRITE_POKE_BALL, 26, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0de, $0680 - person_event SPRITE_POKE_BALL, 37, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e0, $0681 - person_event SPRITE_POKE_BALL, 21, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e2, $0682 - person_event SPRITE_POKE_BALL, 9, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e4, $0683 - person_event SPRITE_POKE_BALL, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, $0684 - person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, $0685 - person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, $ffff + person_event SPRITE_POKE_BALL, 26, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0de, EVENT_680 + person_event SPRITE_POKE_BALL, 37, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e0, EVENT_681 + person_event SPRITE_POKE_BALL, 21, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e2, EVENT_682 + person_event SPRITE_POKE_BALL, 9, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e4, EVENT_683 + person_event SPRITE_POKE_BALL, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, EVENT_684 + person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, EVENT_685 + person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, EVENT_ALWAYS_THERE diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 5b7ca93c9..fe74309f5 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -145,10 +145,10 @@ MountMortarB1F_MapEventHeader: ; people-events db 7 - person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, $0686 - person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, $0687 - person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, $ffff - person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, $ffff - person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, $07ca - person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, $07cb - person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, $07cc + person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, EVENT_686 + person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, EVENT_687 + person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, EVENT_7CA + person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, EVENT_7CB + person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, EVENT_7CC diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index c0844492e..71534cedf 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -35,4 +35,4 @@ MoveDeletersHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, $ffff + person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, EVENT_ALWAYS_THERE diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index cb04537ef..a37864af8 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -91,8 +91,8 @@ MrFujisHouse_MapEventHeader: ; people-events db 5 - person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, $ffff - person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, $ffff - person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, $ffff - person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, $ffff - person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, $ffff + person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, EVENT_ALWAYS_THERE + person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, EVENT_ALWAYS_THERE + person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, EVENT_ALWAYS_THERE + person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, EVENT_ALWAYS_THERE diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 3574ce76e..d6d9dd29f 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -120,27 +120,27 @@ UnknownScript_0x196ec9: writetext UnknownText_0x197134 closetext loadmovesprites - setevent $06bd - setevent $0792 - clearevent $0793 + setevent EVENT_6BD + setevent EVENT_792 + clearevent EVENT_793 dotrigger $1 domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 specialphonecall $2 - clearevent $0702 + clearevent EVENT_702 checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x196f49 checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x196f4d - setevent $0641 + setevent EVENT_641 end UnknownScript_0x196f49: - setevent $0642 + setevent EVENT_642 end UnknownScript_0x196f4d: - setevent $0640 + setevent EVENT_640 end MapMrPokemonsHouseSignpost1Script: @@ -392,5 +392,5 @@ MrPokemonsHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, $ffff - person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c9 + person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, EVENT_ALWAYS_THERE + person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C9 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 89b5d529a..2e507fb1c 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -63,4 +63,4 @@ MrPsychicsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, $ffff + person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, EVENT_ALWAYS_THERE diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index cba020701..06deebd64 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -586,17 +586,17 @@ NationalPark_MapEventHeader: ; people-events db 14 - person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, $ffff - person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, $ffff - person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, $ffff - person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, $ffff - person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, $ffff - person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, $ffff - person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, $ffff - person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, $ffff - person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, $ffff - person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, $ffff - person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, $ffff - person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, $0658 - person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, $ffff - person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, $0659 + person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, EVENT_ALWAYS_THERE + person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, EVENT_658 + person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, EVENT_659 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 78db86217..990a26a99 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -231,15 +231,15 @@ NationalParkBugContest_MapEventHeader: ; people-events db 12 - person_event SPRITE_YOUNGSTER, 33, 23, $2, $22, 255, 255, $80, 0, YoungsterScript_0x5c8ec, $0716 - person_event SPRITE_YOUNGSTER, 26, 32, $2, $22, 255, 255, $a0, 0, YoungsterScript_0x5c8f4, $0717 - person_event SPRITE_ROCKER, 22, 13, $7, $0, 255, 255, $90, 0, RockerScript_0x5c8fc, $0718 - person_event SPRITE_POKEFAN_M, 17, 11, $4, $1, 255, 255, $b0, 0, PokefanMScript_0x5c904, $0719 - person_event SPRITE_YOUNGSTER, 13, 27, $3, $0, 255, 255, $80, 0, YoungsterScript_0x5c90c, $071a - person_event SPRITE_YOUNGSTER, 17, 31, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x5c914, $071b - person_event SPRITE_LASS, 27, 11, $5, $2, 255, 255, $90, 0, LassScript_0x5c91c, $071c - person_event SPRITE_YOUNGSTER, 31, 15, $2, $11, 255, 255, $80, 0, YoungsterScript_0x5c924, $071d - person_event SPRITE_YOUNGSTER, 12, 20, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x5c92c, $071e - person_event SPRITE_YOUNGSTER, 38, 21, $2, $33, 255, 255, $90, 0, YoungsterScript_0x5c934, $071f - person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, $0658 - person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, $0659 + person_event SPRITE_YOUNGSTER, 33, 23, $2, $22, 255, 255, $80, 0, YoungsterScript_0x5c8ec, EVENT_716 + person_event SPRITE_YOUNGSTER, 26, 32, $2, $22, 255, 255, $a0, 0, YoungsterScript_0x5c8f4, EVENT_717 + person_event SPRITE_ROCKER, 22, 13, $7, $0, 255, 255, $90, 0, RockerScript_0x5c8fc, EVENT_718 + person_event SPRITE_POKEFAN_M, 17, 11, $4, $1, 255, 255, $b0, 0, PokefanMScript_0x5c904, EVENT_719 + person_event SPRITE_YOUNGSTER, 13, 27, $3, $0, 255, 255, $80, 0, YoungsterScript_0x5c90c, EVENT_71A + person_event SPRITE_YOUNGSTER, 17, 31, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x5c914, EVENT_71B + person_event SPRITE_LASS, 27, 11, $5, $2, 255, 255, $90, 0, LassScript_0x5c91c, EVENT_71C + person_event SPRITE_YOUNGSTER, 31, 15, $2, $11, 255, 255, $80, 0, YoungsterScript_0x5c924, EVENT_71D + person_event SPRITE_YOUNGSTER, 12, 20, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x5c92c, EVENT_71E + person_event SPRITE_YOUNGSTER, 38, 21, $2, $33, 255, 255, $90, 0, YoungsterScript_0x5c934, EVENT_71F + person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, EVENT_658 + person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, EVENT_659 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 73a03df26..c5c22b1f7 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -20,7 +20,7 @@ NewBarkTown_MapScriptHeader: .FlyPoint setflag ENGINE_FLYPOINT_NEW_BARK - clearevent $0076 + clearevent EVENT_076 return UnknownScript_0x1a8016: @@ -305,6 +305,6 @@ NewBarkTown_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, $ffff - person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, $ffff - person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, $06bd + person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, EVENT_ALWAYS_THERE + person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, EVENT_6BD diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 0c0bb6044..88fd61743 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -283,7 +283,7 @@ OaksLab_MapEventHeader: ; people-events db 4 - person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, $ffff - person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, $ffff - person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, $ffff - person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, $ffff + person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, EVENT_ALWAYS_THERE diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 0d36fc6ae..b004c1aa4 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -90,6 +90,6 @@ OlivineCafe_MapEventHeader: ; people-events db 3 - person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, $ffff - person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, $ffff - person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, $ffff + person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, EVENT_ALWAYS_THERE diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 160e8cf5e..74529a650 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -320,7 +320,7 @@ OlivineCity_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, $ffff - person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, $ffff - person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, $ffff - person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c3 + person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, EVENT_ALWAYS_THERE + person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, EVENT_ALWAYS_THERE + person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C3 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 964c61437..499c4d2cb 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -96,4 +96,4 @@ OlivineGoodRodHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, $ffff + person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, EVENT_ALWAYS_THERE diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index e836b672d..80e1d7069 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -212,5 +212,5 @@ OlivineGym_MapEventHeader: ; people-events db 2 - person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, $06d3 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, $ffff + person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, EVENT_6D3 + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index f3ed8be89..c63a94ab2 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -54,5 +54,5 @@ OlivineHouseBeta_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, $ffff - person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, $ffff + person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, EVENT_ALWAYS_THERE + person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, EVENT_ALWAYS_THERE diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index bd453e9cb..94b5b8cdd 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -52,5 +52,5 @@ OlivineLighthouse1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, $ffff - person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, $ffff + person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, EVENT_ALWAYS_THERE diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index decae23a5..adedbd308 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -141,7 +141,7 @@ UnknownScript_0x5b03f: verbosegiveitem PROTEIN, 1 iffalse UnknownScript_0x5b06f clearevent EVENT_HUEY_PROTEIN - setevent $0265 + setevent EVENT_GOT_PROTEIN_FROM_HUEY jump UnknownScript_0x5b05f UnknownScript_0x5b053: @@ -253,5 +253,5 @@ OlivineLighthouse2F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, $ffff - person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, $ffff + person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, EVENT_ALWAYS_THERE diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index b72ed9382..b638988f0 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -178,7 +178,7 @@ OlivineLighthouse3F_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, $ffff - person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, $ffff - person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, $ffff - person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, $0664 + person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, EVENT_664 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 02740a2d2..dc4b17f00 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -134,5 +134,5 @@ OlivineLighthouse4F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, $ffff - person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, $ffff + person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, EVENT_ALWAYS_THERE diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 85cd67a7a..c334a9834 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -140,8 +140,8 @@ OlivineLighthouse5F_MapEventHeader: ; people-events db 5 - person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, $ffff - person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, $ffff - person_event SPRITE_POKE_BALL, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, $0665 - person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, $0666 - person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, $0667 + person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, EVENT_665 + person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, EVENT_666 + person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, EVENT_667 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 650f31c6b..494061e54 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -63,7 +63,7 @@ UnknownScript_0x60bab: closetext loadmovesprites setevent EVENT_JASMINE_RETURNED_TO_GYM - clearevent $06d3 + clearevent EVENT_6D3 checkcode VAR_FACING if_equal $0, UnknownScript_0x60c17 if_equal $3, UnknownScript_0x60c1e @@ -270,6 +270,6 @@ OlivineLighthouse6F_MapEventHeader: ; people-events db 3 - person_event SPRITE_JASMINE, 12, 12, $6, $0, 255, 255, $80, 0, JasmineScript_0x60b91, $06d2 - person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, $ffff - person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, $0668 + person_event SPRITE_JASMINE, 12, 12, $6, $0, 255, 255, $80, 0, JasmineScript_0x60b91, EVENT_6D2 + person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, EVENT_668 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 75cbf02b6..b863ced50 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -57,6 +57,6 @@ OlivineMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, $ffff - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, $ffff - person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, EVENT_ALWAYS_THERE diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 0ed6d437b..3e027c791 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -9,7 +9,7 @@ NurseScript_0x9c002: jumpstd pokecenternurse FishingGuruScript_0x9c005: - jumpstd $0033 + jumpstd happinesschecknpc FisherScript_0x9c008: jumptextfaceplayer UnknownText_0x9c00e @@ -59,7 +59,7 @@ OlivinePokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, $ffff - person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, $ffff - person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, $ffff - person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, EVENT_ALWAYS_THERE diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 3eaf5f524..aac3ba7c4 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -20,14 +20,14 @@ UnknownScript_0x748b1: applymovement $0, MovementData_0x74a32 appear $2 dotrigger $0 - setevent $0000 + setevent EVENT_000 blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY end SailorScript_0x748c0: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 closetext @@ -41,10 +41,10 @@ SailorScript_0x748c0: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - checkevent $0030 + checkevent EVENT_030 iffalse UnknownScript_0x7490a - clearevent $073a - setevent $073b + clearevent EVENT_73A + setevent EVENT_73B clearevent EVENT_BEAT_COOLTRAINERM_SEAN clearevent EVENT_BEAT_COOLTRAINERF_CAROL clearevent EVENT_BEAT_GENTLEMAN_EDWARD @@ -55,7 +55,7 @@ SailorScript_0x748c0: clearevent EVENT_BEAT_FISHER_JONAH clearevent EVENT_BEAT_BLACKBELT_WAI UnknownScript_0x7490a: - clearevent $002f + clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear $2 domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1 @@ -69,13 +69,13 @@ UnknownScript_0x74919: UnknownScript_0x7491f: spriteface $4, RIGHT - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x7498b - checkevent $0001 + checkevent EVENT_001 iftrue UnknownScript_0x7498b spriteface $0, LEFT loadfont - checkevent $0030 + checkevent EVENT_030 iffalse UnknownScript_0x7494e checkcode VAR_WEEKDAY if_equal SUNDAY, UnknownScript_0x74977 @@ -94,7 +94,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent $0001 + setevent EVENT_001 applymovement $0, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -138,9 +138,9 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x74919 - checkevent $0030 + checkevent EVENT_030 iffalse UnknownScript_0x749c0 checkcode VAR_WEEKDAY if_equal SUNDAY, UnknownScript_0x749f2 @@ -159,7 +159,7 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent $0001 + setevent EVENT_001 checkcode VAR_FACING if_equal $3, UnknownScript_0x749e5 applymovement $0, MovementData_0x74a3f @@ -398,10 +398,10 @@ OlivinePort_MapEventHeader: ; people-events db 7 - person_event SPRITE_SAILOR, 27, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x748c0, $072a - person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, $0737 - person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, $0738 - person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, $0737 - person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, $0737 - person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, $0738 - person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, $0738 + person_event SPRITE_SAILOR, 27, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x748c0, EVENT_72A + person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, EVENT_737 + person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, EVENT_738 + person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, EVENT_737 + person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, EVENT_737 + person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, EVENT_738 + person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, EVENT_738 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index d9a90a868..8c9ad1538 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -36,4 +36,4 @@ OlivinePortPassage_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, $0733 + person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, EVENT_733 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 94b83501f..0336d4315 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -54,5 +54,5 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, $ffff - person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, $ffff + person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, EVENT_ALWAYS_THERE diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index b59b41076..292b921b3 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -35,4 +35,4 @@ OlivineVoltorbHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, $ffff + person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, EVENT_ALWAYS_THERE diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index be633dac0..4546c151a 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -89,5 +89,5 @@ PalletTown_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, $ffff - person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, $ffff + person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, EVENT_ALWAYS_THERE diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 808936031..796f1ca31 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -174,8 +174,8 @@ PewterCity_MapEventHeader: ; people-events db 5 - person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, $ffff - person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, $ffff - person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, $ffff - person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, $ffff - person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, $ffff + person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, EVENT_ALWAYS_THERE diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 2c55a55bf..b463de131 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -238,6 +238,6 @@ PewterGym_MapEventHeader: ; people-events db 3 - person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, $ffff - person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, $ffff - person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, $ffff + person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 1cbeeb439..7602cc0e8 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -57,6 +57,6 @@ PewterMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, $ffff - person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, $ffff - person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, EVENT_ALWAYS_THERE diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index f021e84be..2be909c76 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -41,5 +41,5 @@ PewterNidoranSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, $ffff - person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, $ffff + person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, EVENT_ALWAYS_THERE + person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, EVENT_ALWAYS_THERE diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index 402d7cc8d..bb912252d 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -78,8 +78,8 @@ PewterPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, $ffff - person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, $ffff - person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, $ffff - person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, $ffff - person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, EVENT_ALWAYS_THERE + person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, EVENT_ALWAYS_THERE diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index e6d3ee25c..985a4323c 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -36,4 +36,4 @@ PewterSnoozeSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, $ffff + person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, EVENT_ALWAYS_THERE diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index e3ee7c9be..433a5e85d 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -16,8 +16,8 @@ PokeCenter2F_MapScriptHeader: UnknownScript_0x19285f: special Functionc2f6 if_equal $0, UnknownScript_0x192872 - clearevent $0711 - checkevent $0001 + clearevent EVENT_711 + checkevent EVENT_001 iftrue UnknownScript_0x192872 priorityjump UnknownScript_0x192887 @@ -46,7 +46,7 @@ UnknownScript_0x192883: UnknownScript_0x192887: appear $5 - setevent $0001 + setevent EVENT_001 end UnknownScript_0x19288d: @@ -588,7 +588,7 @@ MapPokeCenter2FSignpost0Script: OfficerScript_0x192c9a: faceplayer loadfont - checkevent $0711 + checkevent EVENT_711 iftrue UnknownScript_0x192cb8 writetext UnknownText_0x193190 yesorno @@ -599,7 +599,7 @@ OfficerScript_0x192c9a: special Functionc309 iffalse UnknownScript_0x192cbe itemnotify - setevent $0711 + setevent EVENT_711 UnknownScript_0x192cb8: writetext UnknownText_0x1931d2 closetext @@ -1040,7 +1040,7 @@ PokeCenter2F_MapEventHeader: ; people-events db 4 - person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, $ffff - person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, $ffff - person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, $ffff - person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, $0711 + person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, EVENT_ALWAYS_THERE + person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, EVENT_ALWAYS_THERE + person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, EVENT_711 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 4f39d13b2..d9fd546c7 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -30,4 +30,4 @@ PokeSeersHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, $ffff + person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, EVENT_ALWAYS_THERE diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index e8ec61587..2905ef956 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -307,9 +307,9 @@ PokemonFanClub_MapEventHeader: ; people-events db 6 - person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, $ffff - person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, $ffff - person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, $ffff - person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, $ffff - person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, $0774 - person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, $ffff + person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, EVENT_ALWAYS_THERE + person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, EVENT_774 + person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, EVENT_ALWAYS_THERE diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 888358013..06e60921f 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -139,7 +139,7 @@ PowerPlantManager: closetext loadmovesprites setevent EVENT_MET_MANAGER_AT_POWER_PLANT - clearevent $076d + clearevent EVENT_76D clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1 dotrigger $1 @@ -156,11 +156,11 @@ UnknownScript_0x188e93: keeptextopen takeitem MACHINE_PART, 1 setevent EVENT_RETURNED_MACHINE_PART - clearevent $0772 - setevent $0771 - setevent $076c + clearevent EVENT_772 + setevent EVENT_771 + setevent EVENT_76C setevent EVENT_RESTORED_POWER_TO_KANTO - clearevent $0749 + clearevent EVENT_749 UnknownScript_0x188eac: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 @@ -401,10 +401,10 @@ PowerPlant_MapEventHeader: ; people-events db 7 - person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, $ffff - person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, $ffff - person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, $ffff - person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, $ffff - person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, $ffff - person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, $ffff - person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, $ffff + person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, EVENT_ALWAYS_THERE diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 715c2a8be..57beb1f22 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -155,7 +155,7 @@ RadioCardText: db "RADIO CARD@" UnknownScript_0x5ce3e: - jumpstd $002f + jumpstd receiveitem end UnknownScript_0x5ce42: @@ -500,9 +500,9 @@ RadioTower1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, $ffff - person_event SPRITE_LASS, 8, 20, $8, $0, 255, 255, $80, 0, LassScript_0x5ce51, $06cf - person_event SPRITE_YOUNGSTER, 8, 19, $9, $0, 255, 255, $90, 0, YoungsterScript_0x5ce54, $06cf - person_event SPRITE_ROCKET, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, $06ce - person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $90, 0, GentlemanScript_0x5cd3d, $06cf - person_event SPRITE_COOLTRAINER_F, 10, 16, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x5cdd5, $06cf + person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 20, $8, $0, 255, 255, $80, 0, LassScript_0x5ce51, EVENT_6CF + person_event SPRITE_YOUNGSTER, 8, 19, $9, $0, 255, 255, $90, 0, YoungsterScript_0x5ce54, EVENT_6CF + person_event SPRITE_ROCKET, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, EVENT_6CE + person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $90, 0, GentlemanScript_0x5cd3d, EVENT_6CF + person_event SPRITE_COOLTRAINER_F, 10, 16, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x5cdd5, EVENT_6CF diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 4bc3e51e4..826e8a9cb 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -784,14 +784,14 @@ RadioTower2F_MapEventHeader: ; people-events db 11 - person_event SPRITE_SUPER_NERD, 10, 10, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x5d6fe, $06cf - person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, $ffff - person_event SPRITE_ROCKET, 8, 5, $7, $0, 255, 255, $2, 3, TrainerGruntM4, $06ce - person_event SPRITE_ROCKET, 8, 12, $6, $0, 255, 255, $2, 3, TrainerGruntM5, $06ce - person_event SPRITE_ROCKET, 5, 8, $6, $0, 255, 255, $2, 2, TrainerGruntM6, $06ce - person_event SPRITE_ROCKET_GIRL, 9, 14, $7, $0, 255, 255, $82, 3, TrainerGruntF2, $06ce - person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, $06d1 - person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, $06d0 - person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, $ffff - person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, $ffff - person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, $06cf + person_event SPRITE_SUPER_NERD, 10, 10, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x5d6fe, EVENT_6CF + person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKET, 8, 5, $7, $0, 255, 255, $2, 3, TrainerGruntM4, EVENT_6CE + person_event SPRITE_ROCKET, 8, 12, $6, $0, 255, 255, $2, 3, TrainerGruntM5, EVENT_6CE + person_event SPRITE_ROCKET, 5, 8, $6, $0, 255, 255, $2, 2, TrainerGruntM6, EVENT_6CE + person_event SPRITE_ROCKET_GIRL, 9, 14, $7, $0, 255, 255, $82, 3, TrainerGruntF2, EVENT_6CE + person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, EVENT_6D1 + person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, EVENT_6D0 + person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, EVENT_6CF diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 00da6fea7..a81ab5a86 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -407,10 +407,10 @@ RadioTower3F_MapEventHeader: ; people-events db 7 - person_event SPRITE_SUPER_NERD, 8, 11, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x5e553, $06d0 - person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, $ffff - person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, $ffff - person_event SPRITE_ROCKET, 5, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM7, $06ce - person_event SPRITE_ROCKET, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, $06ce - person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, $06ce - person_event SPRITE_SCIENTIST, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, $06ce + person_event SPRITE_SUPER_NERD, 8, 11, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x5e553, EVENT_6D0 + person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKET, 5, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM7, EVENT_6CE + person_event SPRITE_ROCKET, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, EVENT_6CE + person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, EVENT_6CE + person_event SPRITE_SCIENTIST, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, EVENT_6CE diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 147b60141..6828c65d4 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -321,10 +321,10 @@ RadioTower4F_MapEventHeader: ; people-events db 7 - person_event SPRITE_FISHER, 8, 10, $7, $0, 255, 255, $80, 0, FisherScript_0x5eb82, $06d0 - person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, $ffff - person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, $ffff - person_event SPRITE_ROCKET, 10, 9, $1f, $0, 255, 255, $2, 3, TrainerGruntM10, $06ce - person_event SPRITE_ROCKET, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, $06ce - person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, $06ce - person_event SPRITE_SCIENTIST, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, $06ce + person_event SPRITE_FISHER, 8, 10, $7, $0, 255, 255, $80, 0, FisherScript_0x5eb82, EVENT_6D0 + person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, EVENT_ALWAYS_THERE + person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKET, 10, 9, $1f, $0, 255, 255, $2, 3, TrainerGruntM10, EVENT_6CE + person_event SPRITE_ROCKET, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, EVENT_6CE + person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, EVENT_6CE + person_event SPRITE_SCIENTIST, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, EVENT_6CE diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c2b44aa6a..57442a0ca 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -114,16 +114,16 @@ UnknownScript_0x6006e: special Function8c0ab setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER - clearflag $0013 - setevent $06cc - setevent $06cd - setevent $06ce - clearevent $0736 - clearflag $0017 - clearevent $06cf - clearevent $06d0 - setevent $06e3 - clearevent $06e4 + clearflag ENGINE_ROCKETS_IN_RADIO_TOWER + setevent EVENT_6CC + setevent EVENT_6CD + setevent EVENT_6CE + clearevent EVENT_736 + clearflag ENGINE_ROCKETS_IN_MAHOGANY + clearevent EVENT_6CF + clearevent EVENT_6D0 + setevent EVENT_6E3 + clearevent EVENT_6E4 special PlayMapMusic disappear $2 moveperson $2, $c, $0 @@ -140,7 +140,7 @@ UnknownScript_0x6006e: dotrigger $2 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL - setevent $0761 + setevent EVENT_761 jump UnknownScript_0x600f1 UnknownScript_0x600f1: @@ -455,8 +455,8 @@ RadioTower5F_MapEventHeader: ; people-events db 5 - person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, $ffff - person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, $06ce - person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, $06ce - person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, $06d0 - person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, $07cd + person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6CE + person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, EVENT_6CE + person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, EVENT_6D0 + person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, EVENT_7CD diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 1f0178a1b..cfb28b1d3 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -94,4 +94,4 @@ RedsHouse1F_MapEventHeader: ; people-events db 1 - person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, $ffff + person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, EVENT_ALWAYS_THERE diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 8e3f19cf0..5082a7626 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -44,5 +44,5 @@ RockTunnel1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, $077e - person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, $077f + person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, EVENT_77E + person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, EVENT_77F diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 4e9dce978..f59302e7b 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -39,6 +39,6 @@ RockTunnelB1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74409, $0780 - person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, $0781 - person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, $0782 + person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74409, EVENT_780 + person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, EVENT_781 + person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, EVENT_782 diff --git a/maps/Route1.asm b/maps/Route1.asm index ee4aae675..1356c16a6 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -123,6 +123,6 @@ Route1_MapEventHeader: ; people-events db 3 - person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, $ffff - person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, $ffff - person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, $ffff + person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, EVENT_ALWAYS_THERE diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 8665e56e6..e45e9c590 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -92,7 +92,7 @@ Route10PokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, $ffff - person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, $ffff - person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, $ffff - person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, EVENT_ALWAYS_THERE diff --git a/maps/Route10South.asm b/maps/Route10South.asm index a9955dfb2..282697549 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -120,5 +120,5 @@ Route10South_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, $ffff - person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, $ffff + person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, EVENT_ALWAYS_THERE diff --git a/maps/Route11.asm b/maps/Route11.asm index 1701042b4..bbdb1ca05 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -221,8 +221,8 @@ Route11_MapEventHeader: ; people-events db 5 - person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, $ffff - person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, $ffff - person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, $ffff - person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff - person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, $ffff + person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, EVENT_ALWAYS_THERE diff --git a/maps/Route12.asm b/maps/Route12.asm index 0d5f3a9d1..738863f3e 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -243,9 +243,9 @@ Route12_MapEventHeader: ; people-events db 6 - person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, $ffff - person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, $ffff - person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, $ffff - person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, $ffff - person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, $0788 - person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, $0789 + person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, EVENT_788 + person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, EVENT_789 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index e9464b905..2a2d1e6f1 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -93,4 +93,4 @@ Route12SuperRodHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, $ffff + person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, EVENT_ALWAYS_THERE diff --git a/maps/Route13.asm b/maps/Route13.asm index 42675df8a..0751af7c1 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -285,8 +285,8 @@ Route13_MapEventHeader: ; people-events db 5 - person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, $ffff - person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, $ffff - person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, $ffff - person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, $ffff - person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, $ffff + person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, EVENT_ALWAYS_THERE diff --git a/maps/Route14.asm b/maps/Route14.asm index c535dbed2..9e6d51a81 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -172,7 +172,7 @@ Route14_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, $ffff - person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, $ffff - person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, $ffff - person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, $ffff + person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, EVENT_ALWAYS_THERE diff --git a/maps/Route15.asm b/maps/Route15.asm index 0e967c390..4b05124d0 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -306,10 +306,10 @@ Route15_MapEventHeader: ; people-events db 7 - person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, $ffff - person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, $ffff - person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, $ffff - person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, $ffff - person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, $ffff - person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff - person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a + person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, EVENT_78A diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 33922bd6f..0a785fcaa 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -35,4 +35,4 @@ Route15FuchsiaGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, EVENT_ALWAYS_THERE diff --git a/maps/Route16.asm b/maps/Route16.asm index 65d1d4532..80dd4a4cd 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -18,7 +18,7 @@ UnknownScript_0x1ad318: return UnknownScript_0x1ad328: - clearflag $0019 + clearflag ENGINE_ALWAYS_ON_BIKE return MapRoute16Signpost0Script: diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 6660d163a..1f76b6d9e 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -38,4 +38,4 @@ Route16FuchsiaSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, $ffff + person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, EVENT_ALWAYS_THERE diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index e28408a54..137056aa5 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -80,4 +80,4 @@ Route16Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, EVENT_ALWAYS_THERE diff --git a/maps/Route17.asm b/maps/Route17.asm index e5fd5d867..c49958fbc 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -216,7 +216,7 @@ Route17_MapEventHeader: ; people-events db 4 - person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, $ffff - person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, $ffff - person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, $ffff - person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, $ffff + person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, EVENT_ALWAYS_THERE + person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, EVENT_ALWAYS_THERE + person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, EVENT_ALWAYS_THERE + person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, EVENT_ALWAYS_THERE diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index e55ecadb5..419e9a723 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -71,4 +71,4 @@ Route1718Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, EVENT_ALWAYS_THERE diff --git a/maps/Route18.asm b/maps/Route18.asm index bc30f3933..7cee09d74 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -123,5 +123,5 @@ Route18_MapEventHeader: ; people-events db 2 - person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, $ffff - person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, $ffff + person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, EVENT_ALWAYS_THERE diff --git a/maps/Route19.asm b/maps/Route19.asm index 0b8d2c445..608dbad13 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -311,9 +311,9 @@ Route19_MapEventHeader: ; people-events db 6 - person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, $ffff - person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, $ffff - person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, $ffff - person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, $ffff - person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, $ffff - person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, $ffff + person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, EVENT_ALWAYS_THERE diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 1b32a8183..d79aafc3a 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -61,4 +61,4 @@ Route19FuchsiaGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, EVENT_ALWAYS_THERE diff --git a/maps/Route2.asm b/maps/Route2.asm index 6741bb50b..1c7edf586 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -218,11 +218,11 @@ Route2_MapEventHeader: ; people-events db 8 - person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, $ffff - person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, $ffff - person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, $ffff - person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, $0783 - person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, $0784 - person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, $0785 - person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786 - person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, $ffff + person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, EVENT_783 + person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, EVENT_784 + person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, EVENT_785 + person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, EVENT_786 + person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, EVENT_ALWAYS_THERE diff --git a/maps/Route20.asm b/maps/Route20.asm index 817f40884..1a4dac787 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -175,6 +175,6 @@ Route20_MapEventHeader: ; people-events db 3 - person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, $ffff - person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, $ffff - person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, $ffff + person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, EVENT_ALWAYS_THERE diff --git a/maps/Route21.asm b/maps/Route21.asm index e3a321365..1c82fb161 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -147,6 +147,6 @@ Route21_MapEventHeader: ; people-events db 3 - person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, $ffff - person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff - person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff + person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, EVENT_ALWAYS_THERE diff --git a/maps/Route24.asm b/maps/Route24.asm index f3447901a..e02b1cff3 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -130,4 +130,4 @@ Route24_MapEventHeader: ; people-events db 1 - person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, $076c + person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, EVENT_76C diff --git a/maps/Route25.asm b/maps/Route25.asm index 23a68f5d6..a0f257cc3 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -552,14 +552,14 @@ Route25_MapEventHeader: ; people-events db 11 - person_event SPRITE_MISTY, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, $076e - person_event SPRITE_COOLTRAINER_M, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, $076e - person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, $ffff - person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, $ffff - person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, $ffff - person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, $ffff - person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, $ffff - person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, $ffff - person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, $ffff - person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, $ffff - person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, $078b + person_event SPRITE_MISTY, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, EVENT_76E + person_event SPRITE_COOLTRAINER_M, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_76E + person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, EVENT_78B diff --git a/maps/Route26.asm b/maps/Route26.asm index 781528b64..7ae9c6fd1 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -517,11 +517,11 @@ Route26_MapEventHeader: ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, $ffff - person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, $ffff - person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, $ffff - person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, $ffff - person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, $ffff - person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, $ffff - person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, $ffff - person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, $06aa + person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index cd319509d..0c3378c6a 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -84,4 +84,4 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, $ffff + person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, EVENT_ALWAYS_THERE diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 8af2ee5d3..c9d14e7ee 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -64,4 +64,4 @@ Route26HealSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, $ffff + person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, EVENT_ALWAYS_THERE diff --git a/maps/Route27.asm b/maps/Route27.asm index 7969b906e..a653a6338 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -575,12 +575,12 @@ Route27_MapEventHeader: ; people-events db 9 - person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, $ffff - person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, $ffff - person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, $ffff - person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, $ffff - person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, $ffff - person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, $ffff - person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, $06ab - person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, $06ac - person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, $ffff + person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, EVENT_6AB + person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, EVENT_6AC + person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, EVENT_ALWAYS_THERE diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 27eb988ba..e25cf8331 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -109,4 +109,4 @@ Route27SandstormHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, $ffff + person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, EVENT_ALWAYS_THERE diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index b75c97427..181289a86 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -87,5 +87,5 @@ Route28FamousSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, $ffff - person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, $ffff + person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, EVENT_ALWAYS_THERE + person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, EVENT_ALWAYS_THERE diff --git a/maps/Route29.asm b/maps/Route29.asm index ddf029dce..6bfeee660 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -430,11 +430,11 @@ Route29_MapEventHeader: ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, $ffff - person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, $ffff - person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, $ffff - person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, $ffff - person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, $ffff - person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, $ffff - person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TuscanyScript, $0759 - person_event SPRITE_POKE_BALL, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, $06ad + person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TuscanyScript, EVENT_759 + person_event SPRITE_POKE_BALL, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, EVENT_6AD diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index da827c1d2..6eca79acb 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -51,5 +51,5 @@ Route2946Gate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, $ffff - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, EVENT_ALWAYS_THERE diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 271ee83a3..6cc1a1359 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -41,4 +41,4 @@ Route2Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, $ffff + person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, EVENT_ALWAYS_THERE diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index be04b1495..31910c71d 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -66,4 +66,4 @@ Route2NuggetSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, $ffff + person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, EVENT_ALWAYS_THERE diff --git a/maps/Route3.asm b/maps/Route3.asm index f7a93a54b..aa2200915 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -207,7 +207,7 @@ Route3_MapEventHeader: ; people-events db 4 - person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, $ffff - person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, $ffff - person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff - person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff + person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, EVENT_ALWAYS_THERE diff --git a/maps/Route30.asm b/maps/Route30.asm index 2283688c9..885c80a69 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -148,7 +148,7 @@ UnknownScript_0x1a176f: verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x1a179f clearevent EVENT_JOEY_HP_UP - setevent $0266 + setevent EVENT_GOT_HP_UP_FROM_JOEY jump UnknownScript_0x1a178f UnknownScript_0x1a1783: @@ -465,14 +465,14 @@ Route30_MapEventHeader: ; people-events db 11 - person_event SPRITE_YOUNGSTER, 30, 9, $7, $0, 255, 255, $90, 0, YoungsterScript_0x1a1673, $0714 - person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey, $0715 - person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, $ffff - person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, $ffff - person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, $ffff - person_event SPRITE_MONSTER, 28, 9, $6, $0, 255, 255, $80, 0, ObjectEvent, $0714 - person_event SPRITE_MONSTER, 29, 9, $7, $0, 255, 255, $90, 0, ObjectEvent, $0714 - person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, $ffff - person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, $ffff - person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, $ffff - person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, $07b8 + person_event SPRITE_YOUNGSTER, 30, 9, $7, $0, 255, 255, $90, 0, YoungsterScript_0x1a1673, EVENT_714 + person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey, EVENT_715 + person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, EVENT_ALWAYS_THERE + person_event SPRITE_MONSTER, 28, 9, $6, $0, 255, 255, $80, 0, ObjectEvent, EVENT_714 + person_event SPRITE_MONSTER, 29, 9, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_714 + person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, EVENT_7B8 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 89f01de32..575801af3 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -62,4 +62,4 @@ Route30BerrySpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, EVENT_ALWAYS_THERE diff --git a/maps/Route31.asm b/maps/Route31.asm index 266bf8ac7..4b528f5b6 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -446,10 +446,10 @@ Route31_MapEventHeader: ; people-events db 7 - person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, $ffff - person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, $ffff - person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, $ffff - person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, $ffff - person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, $ffff - person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, $06ae - person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, $06af + person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, EVENT_6AE + person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, EVENT_6AF diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index d7626b058..898df844d 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -42,5 +42,5 @@ Route31VioletGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, $ffff - person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, EVENT_ALWAYS_THERE diff --git a/maps/Route32.asm b/maps/Route32.asm index fe53dac19..9c5f0f9c3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1076,17 +1076,17 @@ Route32_MapEventHeader: ; people-events db 14 - person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, $ffff - person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, $ffff - person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, $ffff - person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, $ffff - person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, $ffff - person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, $ffff - person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, $ffff - person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, $ffff - person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, $ffff - person_event SPRITE_FISHER, 74, 11, $6, $0, 255, 255, $0, 0, FisherScript_0x1904f2, $06fc - person_event SPRITE_POKE_BALL, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, $06b0 - person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, $ffff - person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, FriedaScript, $0758 - person_event SPRITE_POKE_BALL, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, $06b1 + person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 74, 11, $6, $0, 255, 255, $0, 0, FisherScript_0x1904f2, EVENT_6FC + person_event SPRITE_POKE_BALL, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, EVENT_6B0 + person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, FriedaScript, EVENT_758 + person_event SPRITE_POKE_BALL, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, EVENT_6B1 diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index a8cd81175..0bf6bc4c2 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -107,6 +107,6 @@ Route32PokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, $ffff - person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, $ffff - person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, EVENT_ALWAYS_THERE diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 77c1ad347..0763577a6 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, $ffff - person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, $ffff - person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, EVENT_ALWAYS_THERE diff --git a/maps/Route33.asm b/maps/Route33.asm index fc4cf9586..c253e359d 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -222,6 +222,6 @@ Route33_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, $ffff - person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, $ffff - person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, $ffff + person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, EVENT_ALWAYS_THERE diff --git a/maps/Route34.asm b/maps/Route34.asm index 58871957f..611fb5cea 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -12,33 +12,33 @@ Route34_MapScriptHeader: UnknownScript_0x78005: checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x78014 - clearevent $06e5 - setevent $06e6 + clearevent EVENT_6E5 + setevent EVENT_6E6 jump UnknownScript_0x7801d UnknownScript_0x78014: - setevent $06e5 - clearevent $06e6 + setevent EVENT_6E5 + clearevent EVENT_6E6 jump UnknownScript_0x7801d UnknownScript_0x7801d: checkflag ENGINE_DAYCARE_MAN_HAS_MON iffalse UnknownScript_0x78029 - clearevent $06e7 + clearevent EVENT_6E7 jump UnknownScript_0x7802f UnknownScript_0x78029: - setevent $06e7 + setevent EVENT_6E7 jump UnknownScript_0x7802f UnknownScript_0x7802f: checkflag ENGINE_DAYCARE_LADY_HAS_MON iffalse UnknownScript_0x78039 - clearevent $06e8 + clearevent EVENT_6E8 return UnknownScript_0x78039: - setevent $06e8 + setevent EVENT_6E8 return GrampsScript_0x7803d: @@ -328,7 +328,7 @@ UnknownScript_0x78213: verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x78225 clearflag ENGINE_GINA_HAS_LEAF_STONE - setevent $0100 + setevent EVENT_100 jump UnknownScript_0x78234 UnknownScript_0x78225: @@ -905,16 +905,16 @@ Route34_MapEventHeader: ; people-events db 13 - person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, $ffff - person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, $ffff - person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, $ffff - person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, $ffff - person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, $ffff - person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, $ffff - person_event SPRITE_GRAMPS, 20, 19, $6, $0, 255, 255, $0, 0, GrampsScript_0x7803d, $06e6 - person_event SPRITE_DAYCARE_MON_1, 22, 18, $16, $22, 255, 255, $0, 0, DaycareMon1Script_0x78065, $06e7 - person_event SPRITE_DAYCARE_MON_2, 23, 21, $16, $22, 255, 255, $0, 0, DaycareMon2Script_0x7806b, $06e8 - person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, $ffff - person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, $ffff - person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, $ffff - person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, $07bc + person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 20, 19, $6, $0, 255, 255, $0, 0, GrampsScript_0x7803d, EVENT_6E6 + person_event SPRITE_DAYCARE_MON_1, 22, 18, $16, $22, 255, 255, $0, 0, DaycareMon1Script_0x78065, EVENT_6E7 + person_event SPRITE_DAYCARE_MON_2, 23, 21, $16, $22, 255, 255, $0, 0, DaycareMon2Script_0x7806b, EVENT_6E8 + person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, EVENT_7BC diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index d3d5e1bdf..da2aecc6d 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -152,7 +152,7 @@ Route34IlexForestGate_MapEventHeader: ; people-events db 4 - person_event SPRITE_TEACHER, 7, 13, $8, $0, 255, 255, $90, 0, TeacherScript_0x62d63, $06ea - person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, $ffff - person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, $06eb - person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, $06ec + person_event SPRITE_TEACHER, 7, 13, $8, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EA + person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, EVENT_6EB + person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EC diff --git a/maps/Route35.asm b/maps/Route35.asm index 1f5b6143d..178662f47 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -597,14 +597,14 @@ Route35_MapEventHeader: ; people-events db 11 - person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, $ffff - person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, $ffff - person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, $ffff - person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, $ffff - person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, $ffff - person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, $ffff - person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, $ffff - person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, $ffff - person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, $ffff - person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, $ffff - person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, $06b2 + person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, EVENT_6B2 diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 8740ab213..91885ee73 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -209,6 +209,6 @@ Route35Goldenrodgate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, $ffff - person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, $ffff - person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, EVENT_ALWAYS_THERE diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 29edbc46a..0f454c405 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -97,7 +97,7 @@ OfficerScript_0x6a204: checkcode VAR_PARTYCOUNT if_greater_than $1, UnknownScript_0x6a271 special Function13a12 - clearevent $0308 + clearevent EVENT_308 UnknownScript_0x6a234: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic @@ -142,7 +142,7 @@ UnknownScript_0x6a27d: ; 6a27d iffalse UnknownScript_0x6a2a9 special Function13a12 iftrue UnknownScript_0x6a2af - setevent $0308 + setevent EVENT_308 writetext UnknownText_0x6a537 keeptextopen writetext UnknownText_0x6a56b @@ -458,6 +458,6 @@ Route35NationalParkgate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 5, 6, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6a204, $0745 - person_event SPRITE_YOUNGSTER, 9, 10, $2, $11, 255, 255, $80, 0, YoungsterScript_0x6a2d8, $0734 - person_event SPRITE_OFFICER, 7, 4, $9, $0, 255, 255, $a0, 0, OfficerScript_0x6a2ca, $0746 + person_event SPRITE_OFFICER, 5, 6, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6a204, EVENT_745 + person_event SPRITE_YOUNGSTER, 9, 10, $2, $11, 255, 255, $80, 0, YoungsterScript_0x6a2d8, EVENT_734 + person_event SPRITE_OFFICER, 7, 4, $9, $0, 255, 255, $a0, 0, OfficerScript_0x6a2ca, EVENT_746 diff --git a/maps/Route36.asm b/maps/Route36.asm index ca8dfbb7d..ea6dd1983 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -96,13 +96,13 @@ UnknownScript_0x19407b: LassScript_0x19408c: faceplayer loadfont - checkevent $00ba + checkevent EVENT_0BA iftrue UnknownScript_0x1940b3 setevent EVENT_MET_FLORIA writetext UnknownText_0x1942f1 closetext loadmovesprites - clearevent $0768 + clearevent EVENT_768 checkcode VAR_FACING if_equal $1, UnknownScript_0x1940ac applymovement $9, MovementData_0x19424e @@ -273,7 +273,7 @@ UnknownScript_0x1941b4: verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1941c6 clearflag ENGINE_ALAN_HAS_FIRE_STONE - setevent $0101 + setevent EVENT_101 jump UnknownScript_0x1941d5 UnknownScript_0x1941c6: @@ -711,12 +711,12 @@ Route36_MapEventHeader: ; people-events db 9 - person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, $ffff - person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, $ffff - person_event SPRITE_WEIRD_TREE, 13, 39, $17, $0, 255, 255, $0, 0, WeirdTreeScript_0x19403c, $06f8 - person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, $ffff - person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, $ffff - person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, $ffff - person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, ArthurScript, $075a + person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, EVENT_ALWAYS_THERE + person_event SPRITE_WEIRD_TREE, 13, 39, $17, $0, 255, 255, $0, 0, WeirdTreeScript_0x19403c, EVENT_6F8 + person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, ArthurScript, EVENT_75A person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO - person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, $07b0 + person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 1c824088e..d7fe698a7 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -37,7 +37,7 @@ UnknownScript_0x6ab20: return UnknownScript_0x6ab23: - checkevent $02d2 + checkevent EVENT_2D2 iftrue UnknownScript_0x6ab46 checkcode VAR_WEEKDAY if_equal TUESDAY, UnknownScript_0x6ab42 @@ -89,43 +89,43 @@ UnknownScript_0x6ab76: end UnknownScript_0x6ab8c: - checkevent $0716 + checkevent EVENT_716 iftrue UnknownScript_0x6ab94 appear $3 UnknownScript_0x6ab94: - checkevent $0717 + checkevent EVENT_717 iftrue UnknownScript_0x6ab9c appear $4 UnknownScript_0x6ab9c: - checkevent $0718 + checkevent EVENT_718 iftrue UnknownScript_0x6aba4 appear $5 UnknownScript_0x6aba4: - checkevent $0719 + checkevent EVENT_719 iftrue UnknownScript_0x6abac appear $6 UnknownScript_0x6abac: - checkevent $071a + checkevent EVENT_71A iftrue UnknownScript_0x6abb4 appear $7 UnknownScript_0x6abb4: - checkevent $071b + checkevent EVENT_71B iftrue UnknownScript_0x6abbc appear $8 UnknownScript_0x6abbc: - checkevent $071c + checkevent EVENT_71C iftrue UnknownScript_0x6abc4 appear $9 UnknownScript_0x6abc4: - checkevent $071d + checkevent EVENT_71D iftrue UnknownScript_0x6abcc appear $a UnknownScript_0x6abcc: - checkevent $071e + checkevent EVENT_71E iftrue UnknownScript_0x6abd4 appear $b UnknownScript_0x6abd4: - checkevent $071f + checkevent EVENT_71F iftrue UnknownScript_0x6abdc appear $c UnknownScript_0x6abdc: @@ -149,7 +149,7 @@ OfficerScript_0x6abe0: checkcode VAR_PARTYCOUNT if_greater_than $1, UnknownScript_0x6ac41 special Function13a12 - clearevent $0308 + clearevent EVENT_308 UnknownScript_0x6ac10: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic @@ -185,7 +185,7 @@ UnknownScript_0x6ac4d: iffalse UnknownScript_0x6ac79 special Function13a12 iftrue UnknownScript_0x6ac7f - setevent $0308 + setevent EVENT_308 writetext UnknownText_0x6b021 keeptextopen writetext UnknownText_0x6b055 @@ -225,13 +225,13 @@ UnknownScript_0x6ac8b: end UnknownScript_0x6ac91: - checkevent $0313 + checkevent EVENT_313 iftrue UnknownScript_0x6acaf - checkevent $0314 + checkevent EVENT_314 iftrue UnknownScript_0x6acbe - checkevent $0315 + checkevent EVENT_315 iftrue UnknownScript_0x6accd - checkevent $0316 + checkevent EVENT_316 iftrue UnknownScript_0x6acdc writetext UnknownText_0x6b32b closetext @@ -243,7 +243,7 @@ UnknownScript_0x6acaf: keeptextopen verbosegiveitem SUN_STONE, 1 iffalse UnknownScript_0x6aceb - clearevent $0313 + clearevent EVENT_313 loadmovesprites end @@ -252,7 +252,7 @@ UnknownScript_0x6acbe: keeptextopen verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x6aceb - clearevent $0314 + clearevent EVENT_314 loadmovesprites end @@ -261,7 +261,7 @@ UnknownScript_0x6accd: keeptextopen verbosegiveitem GOLD_BERRY, 1 iffalse UnknownScript_0x6aceb - clearevent $0315 + clearevent EVENT_315 loadmovesprites end @@ -270,7 +270,7 @@ UnknownScript_0x6acdc: keeptextopen verbosegiveitem BERRY, 1 iffalse UnknownScript_0x6aceb - clearevent $0316 + clearevent EVENT_316 loadmovesprites end @@ -300,7 +300,7 @@ UnknownScript_0x6ad02: YoungsterScript_0x6ad06: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 closetext @@ -316,7 +316,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f closetext @@ -332,7 +332,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 closetext @@ -348,7 +348,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da closetext @@ -364,7 +364,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e closetext @@ -380,7 +380,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 closetext @@ -396,7 +396,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b closetext @@ -412,7 +412,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 closetext @@ -428,7 +428,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b closetext @@ -444,7 +444,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f closetext @@ -862,15 +862,15 @@ Route36NationalParkgate_MapEventHeader: ; people-events db 12 - person_event SPRITE_OFFICER, 7, 4, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6abe0, $0747 - person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad06, $0720 - person_event SPRITE_YOUNGSTER, 9, 8, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad1a, $0721 - person_event SPRITE_ROCKER, 10, 6, $7, $0, 255, 255, $90, 0, RockerScript_0x6ad2e, $0722 - person_event SPRITE_POKEFAN_M, 9, 10, $7, $0, 255, 255, $b0, 0, PokefanMScript_0x6ad42, $0723 - person_event SPRITE_YOUNGSTER, 11, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad56, $0724 - person_event SPRITE_YOUNGSTER, 10, 9, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad6a, $0725 - person_event SPRITE_LASS, 10, 7, $7, $0, 255, 255, $90, 0, LassScript_0x6ad7e, $0726 - person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad92, $0727 - person_event SPRITE_YOUNGSTER, 11, 10, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ada6, $0728 - person_event SPRITE_YOUNGSTER, 10, 10, $7, $0, 255, 255, $90, 0, YoungsterScript_0x6adba, $0729 - person_event SPRITE_OFFICER, 6, 7, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6acf4, $0748 + person_event SPRITE_OFFICER, 7, 4, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6abe0, EVENT_747 + person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad06, EVENT_720 + person_event SPRITE_YOUNGSTER, 9, 8, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad1a, EVENT_721 + person_event SPRITE_ROCKER, 10, 6, $7, $0, 255, 255, $90, 0, RockerScript_0x6ad2e, EVENT_722 + person_event SPRITE_POKEFAN_M, 9, 10, $7, $0, 255, 255, $b0, 0, PokefanMScript_0x6ad42, EVENT_723 + person_event SPRITE_YOUNGSTER, 11, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad56, EVENT_724 + person_event SPRITE_YOUNGSTER, 10, 9, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad6a, EVENT_725 + person_event SPRITE_LASS, 10, 7, $7, $0, 255, 255, $90, 0, LassScript_0x6ad7e, EVENT_726 + person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad92, EVENT_727 + person_event SPRITE_YOUNGSTER, 11, 10, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ada6, EVENT_728 + person_event SPRITE_YOUNGSTER, 10, 10, $7, $0, 255, 255, $90, 0, YoungsterScript_0x6adba, EVENT_729 + person_event SPRITE_OFFICER, 6, 7, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6acf4, EVENT_748 diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 4e2935a2d..1ea9ea9d1 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -49,5 +49,5 @@ Route36RuinsofAlphgate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, $ffff - person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, EVENT_ALWAYS_THERE diff --git a/maps/Route37.asm b/maps/Route37.asm index 0796e331f..0bce00e08 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -298,10 +298,10 @@ Route37_MapEventHeader: ; people-events db 7 - person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, $ffff - person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, $ffff - person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, $ffff - person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, $ffff - person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, SunnyScript, $075b - person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, $ffff - person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, $ffff + person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, EVENT_ALWAYS_THERE + person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, SunnyScript, EVENT_75B + person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, EVENT_ALWAYS_THERE diff --git a/maps/Route38.asm b/maps/Route38.asm index 694c0cb7d..e16c8748d 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -171,7 +171,7 @@ UnknownScript_0x1a1df6: verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1a1e08 clearflag ENGINE_LIZ_HAS_THUNDERSTONE - setevent $0102 + setevent EVENT_102 jump UnknownScript_0x1a1e17 UnknownScript_0x1a1e08: @@ -578,10 +578,10 @@ Route38_MapEventHeader: ; people-events db 7 - person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, $ffff - person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, $ffff - person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, $ffff - person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, $ffff - person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, $ffff - person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, $ffff - person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, EVENT_ALWAYS_THERE + person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, EVENT_ALWAYS_THERE diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 2d9d0a1a0..b7dbf4c4c 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -40,4 +40,4 @@ Route38EcruteakGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, EVENT_ALWAYS_THERE diff --git a/maps/Route39.asm b/maps/Route39.asm index 14716f87e..0fcdccdff 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -418,13 +418,13 @@ Route39_MapEventHeader: ; people-events db 10 - person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, $ffff - person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, $ffff - person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, $ffff - person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, $ffff - person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, $ffff - person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, $ffff - person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, $ffff - person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, $ffff - person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, $ffff - person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, $ffff + person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, EVENT_ALWAYS_THERE + person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE + person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE + person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE + person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE + person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, EVENT_ALWAYS_THERE diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 9575094fd..61614638c 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -200,6 +200,6 @@ Route39Barn_MapEventHeader: ; people-events db 3 - person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, $ffff - person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, $ffff - person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, $ffff + person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, EVENT_ALWAYS_THERE + person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, EVENT_ALWAYS_THERE diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index e63ac8b96..ff07f1bc0 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -207,5 +207,5 @@ Route39Farmhouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, $ffff - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, $ffff + person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, EVENT_ALWAYS_THERE diff --git a/maps/Route4.asm b/maps/Route4.asm index a9e2bea3c..d05500032 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -182,7 +182,7 @@ Route4_MapEventHeader: ; people-events db 4 - person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, $ffff - person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, $ffff - person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, $ffff - person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, $0787 + person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, EVENT_787 diff --git a/maps/Route40.asm b/maps/Route40.asm index c3f5b0667..bdc3fdd64 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -10,7 +10,7 @@ Route40_MapScriptHeader: dbw 2, MonicaCallback MonicaCallback: - clearevent $07cf + clearevent EVENT_7CF checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears disappear $a @@ -409,15 +409,15 @@ Route40_MapEventHeader: ; people-events db 12 - person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, $ffff - person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, $ffff - person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, $ffff - person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, $ffff - person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff - person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff - person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff - person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, $ffff - person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, $075e - person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, $ffff - person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, $ffff - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, $07cf + person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, EVENT_ALWAYS_THERE + person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, EVENT_75E + person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, EVENT_ALWAYS_THERE + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, EVENT_7CF diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 51fe3c899..2497ff22a 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -10,7 +10,7 @@ Route40BattleTowerGate_MapScriptHeader: dbw 2, UnknownScript_0x9f665 UnknownScript_0x9f665: - clearevent $07cf + clearevent EVENT_7CF return RockerScript_0x9f669: @@ -88,5 +88,5 @@ Route40BattleTowerGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, $07cf - person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, $ffff + person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, EVENT_7CF + person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, EVENT_ALWAYS_THERE diff --git a/maps/Route41.asm b/maps/Route41.asm index 33fa378ca..b005f9bbb 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -510,13 +510,13 @@ Route41_MapEventHeader: ; people-events db 10 - person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, $ffff - person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, $ffff - person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, $ffff - person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, $ffff - person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, $ffff - person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, $ffff - person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, $ffff - person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, $ffff - person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, $ffff - person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, $ffff + person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, EVENT_ALWAYS_THERE + person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, EVENT_ALWAYS_THERE + person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, EVENT_ALWAYS_THERE + person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, EVENT_ALWAYS_THERE + person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, EVENT_ALWAYS_THERE diff --git a/maps/Route42.asm b/maps/Route42.asm index 2f56ecf7d..51fe3fbd0 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -127,7 +127,7 @@ UnknownScript_0x1a92dc: verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1a92ee clearflag ENGINE_TULLY_HAS_WATER_STONE - setevent $0103 + setevent EVENT_103 jump UnknownScript_0x1a92fd UnknownScript_0x1a92ee: @@ -385,12 +385,12 @@ Route42_MapEventHeader: ; people-events db 9 - person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, $ffff - person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, $ffff - person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, $ffff - person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, $ffff - person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, $ffff - person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, $ffff - person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, $06b3 - person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, $06b4 - person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, $07af + person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, EVENT_6B3 + person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, EVENT_6B4 + person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index d501d1d79..4716ee622 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -35,4 +35,4 @@ Route42EcruteakGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, EVENT_ALWAYS_THERE diff --git a/maps/Route43.asm b/maps/Route43.asm index 264ac1a22..fdc699f36 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -350,7 +350,7 @@ UnknownScript_0x19d21e: verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x19d230 clearflag ENGINE_TIFFANY_HAS_PINK_BOW - setevent $0104 + setevent EVENT_104 jump UnknownScript_0x19d245 UnknownScript_0x19d230: @@ -612,11 +612,11 @@ Route43_MapEventHeader: ; people-events db 8 - person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, $ffff - person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, $ffff - person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, $ffff - person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, $ffff - person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, $ffff - person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, $ffff - person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, $ffff - person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, $06b5 + person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, EVENT_6B5 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 9e9310d6e..9067119ce 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -264,6 +264,6 @@ Route43Gate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ac85, $0735 - person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc - person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ac85, EVENT_735 + person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, EVENT_6DC + person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, EVENT_6DC diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index e73539073..35ca6c7e9 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -54,4 +54,4 @@ Route43MahoganyGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, EVENT_ALWAYS_THERE diff --git a/maps/Route44.asm b/maps/Route44.asm index 9d64736e4..9ba4f2766 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -626,14 +626,14 @@ Route44_MapEventHeader: ; people-events db 11 - person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, $ffff - person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, $ffff - person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, $ffff - person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, $ffff - person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, $ffff - person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, $ffff - person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, $ffff - person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, $ffff - person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, $06b6 - person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, $06b7 - person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, $07bd + person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, EVENT_6B6 + person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, EVENT_6B7 + person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, EVENT_7BD diff --git a/maps/Route45.asm b/maps/Route45.asm index f16cecd45..ea1db1892 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -56,12 +56,12 @@ UnknownScript_0x19e0e4: iftrue UnknownScript_0x19e10c checknite iftrue UnknownScript_0x19e112 - checkevent $026a + checkevent EVENT_26A iffalse UnknownScript_0x19e127 scall UnknownScript_0x19e137 verbosegiveitem PP_UP, 1 iffalse UnknownScript_0x19e118 - clearevent $026a + clearevent EVENT_26A special Function11485 jump UnknownScript_0x19e127 @@ -648,16 +648,16 @@ Route45_MapEventHeader: ; people-events db 13 - person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, $ffff - person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, $ffff - person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, $ffff - person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, $ffff - person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, $ffff - person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, $ffff - person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, $ffff - person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, $ffff - person_event SPRITE_POKE_BALL, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, $06b8 - person_event SPRITE_POKE_BALL, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, $06b9 - person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, $06ba - person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, $06bb - person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, $ffff + person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, EVENT_6B8 + person_event SPRITE_POKE_BALL, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, EVENT_6B9 + person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, EVENT_6BA + person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, EVENT_6BB + person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, EVENT_ALWAYS_THERE diff --git a/maps/Route46.asm b/maps/Route46.asm index 1074b41d3..477daa274 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -309,9 +309,9 @@ Route46_MapEventHeader: ; people-events db 6 - person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, $ffff - person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, $ffff - person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, $ffff - person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, $ffff - person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, $ffff - person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc + person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, EVENT_6BC diff --git a/maps/Route5.asm b/maps/Route5.asm index 1c41e55e5..c8b429505 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -57,4 +57,4 @@ Route5_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, $0771 + person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, EVENT_771 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 917b41ad9..cdaf384d6 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -75,5 +75,5 @@ Route5CleanseTagSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, $ffff - person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, $ffff + person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, EVENT_ALWAYS_THERE diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 121e98200..5503bf9f7 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -36,4 +36,4 @@ Route5SaffronCityGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, EVENT_ALWAYS_THERE diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index 79301d662..eff082181 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -34,4 +34,4 @@ Route5UndergroundEntrance_MapEventHeader: ; people-events db 1 - person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, $ffff + person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, EVENT_ALWAYS_THERE diff --git a/maps/Route6.asm b/maps/Route6.asm index 865e56d6a..8399d1648 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -136,6 +136,6 @@ Route6_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, $0771 - person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff - person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff + person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, EVENT_771 + person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, EVENT_ALWAYS_THERE diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 076247a73..290427057 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -75,4 +75,4 @@ Route6SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, EVENT_ALWAYS_THERE diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 59ef6acf9..830ec2642 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -61,4 +61,4 @@ Route7SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, EVENT_ALWAYS_THERE diff --git a/maps/Route8.asm b/maps/Route8.asm index 14aa33835..83e0a5d4d 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -263,9 +263,9 @@ Route8_MapEventHeader: ; people-events db 6 - person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, $ffff - person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, $ffff - person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, $ffff - person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, $ffff - person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, $ffff - person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, $ffff + person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, EVENT_ALWAYS_THERE + person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, EVENT_ALWAYS_THERE + person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, EVENT_ALWAYS_THERE diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 5a4ad54ec..f9a806cb6 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -35,4 +35,4 @@ Route8SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, EVENT_ALWAYS_THERE diff --git a/maps/Route9.asm b/maps/Route9.asm index 48028975c..5126879d6 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -313,9 +313,9 @@ Route9_MapEventHeader: ; people-events db 6 - person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, $ffff - person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, $ffff - person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, $ffff - person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, $ffff - person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, $ffff - person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, $ffff + person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, EVENT_ALWAYS_THERE diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 35a8393b2..d9fd82bd4 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -30,7 +30,7 @@ UnknownScript_0x58db9: iftrue UnknownScript_0x58dc3 changeblock $4, $0, $2e UnknownScript_0x58dc3: - checkevent $02a3 + checkevent EVENT_2A3 iffalse UnknownScript_0x58dca return @@ -61,8 +61,8 @@ MapRuinsofAlphAerodactylChamberSignpost2Script: end UnknownScript_0x58df7: - setevent $0705 - setevent $02a3 + setevent EVENT_705 + setevent EVENT_2A3 setflag ENGINE_UNLOCKED_UNOWNS_3 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 799360db9..e93f8a438 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -47,7 +47,7 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab6, $07a0 - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab8, $07a1 - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, $07a2 - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, $07a3 + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 508cb7d21..ec375ecb6 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -31,7 +31,7 @@ UnknownScript_0x5857c: iftrue UnknownScript_0x58586 changeblock $4, $0, $2e UnknownScript_0x58586: - checkevent $02a0 + checkevent EVENT_2A0 iffalse UnknownScript_0x5858d return @@ -62,8 +62,8 @@ MapRuinsofAlphHoOhChamberSignpost2Script: end UnknownScript_0x585ba: - setevent $0705 - setevent $02a0 + setevent EVENT_705 + setevent EVENT_2A0 setflag ENGINE_UNLOCKED_UNOWNS_4 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 7bb3b7c70..c3e2e1657 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -47,7 +47,7 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59918, $0794 - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991a, $0795 - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, $0796 - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, $0797 + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 513f78ad1..1ce89c0ec 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -25,7 +25,7 @@ UnknownScript_0x58f6e: loadmovesprites dotrigger $0 setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - clearevent $078e + clearevent EVENT_78E end FisherScript_0x58f7d: @@ -125,6 +125,6 @@ RuinsofAlphInnerChamber_MapEventHeader: ; people-events db 3 - person_event SPRITE_FISHER, 11, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x58f7d, $0705 - person_event SPRITE_TEACHER, 17, 18, $2, $11, 255, 255, $0, 0, TeacherScript_0x58f80, $0705 - person_event SPRITE_GRAMPS, 23, 15, $7, $0, 255, 255, $b0, 0, GrampsScript_0x58f83, $0705 + person_event SPRITE_FISHER, 11, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x58f7d, EVENT_705 + person_event SPRITE_TEACHER, 17, 18, $2, $11, 255, 255, $0, 0, TeacherScript_0x58f80, EVENT_705 + person_event SPRITE_GRAMPS, 23, 15, $7, $0, 255, 255, $b0, 0, GrampsScript_0x58f83, EVENT_705 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index fa0337a12..34950409c 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -32,7 +32,7 @@ UnknownScript_0x58737: iftrue UnknownScript_0x58741 changeblock $4, $0, $2e UnknownScript_0x58741: - checkevent $02a1 + checkevent EVENT_2A1 iffalse UnknownScript_0x58748 return @@ -66,10 +66,10 @@ MapRuinsofAlphKabutoChamberSignpost2Script: end UnknownScript_0x58778: - setevent $0705 - setevent $02a1 + setevent EVENT_705 + setevent EVENT_2A1 setflag ENGINE_UNLOCKED_UNOWNS_1 - setevent $074e + setevent EVENT_74E domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote $0, $0, 15 @@ -92,7 +92,7 @@ ScientistScript_0x587a8: if_equal 26, UnknownScript_0x587cf checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587c9 - checkevent $02a1 + checkevent EVENT_2A1 iffalse UnknownScript_0x587c0 writetext UnknownText_0x589b8 keeptextopen @@ -284,5 +284,5 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, $074e - person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, $ffff + person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, EVENT_74E + person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, EVENT_ALWAYS_THERE diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index 07569b80a..cbbb8503d 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -47,7 +47,7 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a2, $0798 - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a4, $0799 - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, $079a - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, $079b + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 9833267f9..8f5cae4d8 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -31,7 +31,7 @@ UnknownScript_0x58bf8: iftrue UnknownScript_0x58c02 changeblock $4, $0, $2e UnknownScript_0x58c02: - checkevent $02a2 + checkevent EVENT_2A2 iffalse UnknownScript_0x58c09 return @@ -62,8 +62,8 @@ MapRuinsofAlphOmanyteChamberSignpost2Script: end UnknownScript_0x58c36: - setevent $0705 - setevent $02a2 + setevent EVENT_705 + setevent EVENT_2A2 setflag ENGINE_UNLOCKED_UNOWNS_2 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index d6203fea7..2d920e170 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -47,7 +47,7 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2c, $079c - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2e, $079d - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, $079e - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, $079f + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 55dd13cb2..b667ef956 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -343,8 +343,8 @@ RuinsofAlphOutside_MapEventHeader: ; people-events db 5 - person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, $ffff - person_event SPRITE_SCIENTIST, 19, 15, $7, $0, 255, 255, $0, 0, ScientistScript_0x58043, $0703 - person_event SPRITE_FISHER, 21, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x58061, $078e - person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, $078f - person_event SPRITE_YOUNGSTER, 12, 16, $7, $0, 255, 255, $80, 0, YoungsterScript_0x5807e, $078f + person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 19, 15, $7, $0, 255, 255, $0, 0, ScientistScript_0x58043, EVENT_703 + person_event SPRITE_FISHER, 21, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x58061, EVENT_78E + person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, EVENT_78F + person_event SPRITE_YOUNGSTER, 12, 16, $7, $0, 255, 255, $80, 0, YoungsterScript_0x5807e, EVENT_78F diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index a6df87fac..172f2deac 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -105,7 +105,7 @@ UnknownScript_0x5920b: writetext UnknownText_0x594cb closetext loadmovesprites - clearevent $078f + clearevent EVENT_78F end ScientistScript_0x59214: @@ -134,7 +134,7 @@ UnknownScript_0x5922e: MapRuinsofAlphResearchCenterSignpost1Script: loadfont - checkevent $0704 + checkevent EVENT_704 iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59247 @@ -152,7 +152,7 @@ UnknownScript_0x59247: MapRuinsofAlphResearchCenterSignpost2Script: loadfont - checkevent $0704 + checkevent EVENT_704 iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59260 @@ -412,6 +412,6 @@ RuinsofAlphResearchCenter_MapEventHeader: ; people-events db 3 - person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, $ffff - person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, $ffff - person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, $0704 + person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, EVENT_704 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 2e3cb0c69..9bb07b23a 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -94,4 +94,4 @@ SafariZoneWardensHome_MapEventHeader: ; people-events db 1 - person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, $ffff + person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, EVENT_ALWAYS_THERE diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 6179555a4..616a83203 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -295,11 +295,11 @@ SaffronCity_MapEventHeader: ; people-events db 8 - person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, $ffff - person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, $ffff - person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, $ffff - person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, $ffff - person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, $ffff - person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, $ffff - person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, $ffff - person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, $ffff + person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, EVENT_ALWAYS_THERE diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index be8b02ceb..781e65e49 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -394,9 +394,9 @@ SaffronGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, $ffff - person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, $ffff - person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, $ffff - person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, $ffff - person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff - person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff + person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 62225d944..ad42a2d61 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -49,6 +49,6 @@ SaffronMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, $ffff - person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, $ffff - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, EVENT_ALWAYS_THERE diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 9940fc0e4..a2d3d8493 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -123,7 +123,7 @@ SaffronPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, $ffff - person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, $ffff - person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, $ffff - person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, EVENT_ALWAYS_THERE diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index a219aa663..30abb5c97 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -231,7 +231,7 @@ SaffronTrainStation_MapEventHeader: ; people-events db 4 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, $ffff - person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, $ffff - person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, $0772 - person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, $0772 + person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, EVENT_772 + person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, EVENT_772 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 2f325690c..4854ea1bf 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -171,5 +171,5 @@ SeafoamGym_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, $ffff - person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, $0777 + person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, EVENT_777 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 4e7c59a97..d835c65d4 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -68,5 +68,5 @@ SilphCo1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, $ffff - person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, $ffff + person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, EVENT_ALWAYS_THERE diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index b54146006..b00daa197 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -28,5 +28,5 @@ SilverCaveItemRooms_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, $069c - person_event SPRITE_POKE_BALL, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, $069d + person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, EVENT_69C + person_event SPRITE_POKE_BALL, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, EVENT_69D diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index 4cd05d652..cf7edbb8e 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -43,5 +43,5 @@ SilverCavePokeCenter1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, $ffff - person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, EVENT_ALWAYS_THERE diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 8b85f8c94..5bd516f5b 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -46,7 +46,7 @@ SilverCaveRoom1_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKE_BALL, 13, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c554, $0699 - person_event SPRITE_POKE_BALL, 33, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c556, $069a - person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, $069b - person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, $07c1 + person_event SPRITE_POKE_BALL, 13, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c554, EVENT_699 + person_event SPRITE_POKE_BALL, 33, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c556, EVENT_69A + person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, EVENT_69B + person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, EVENT_7C1 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 6f36101ca..5a7b870a2 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -39,6 +39,6 @@ SilverCaveRoom2_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 14, 28, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b2, $07c2 - person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, $07c3 - person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, $07c4 + person_event SPRITE_POKE_BALL, 14, 28, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b2, EVENT_7C2 + person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, EVENT_7C3 + person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, EVENT_7C4 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 8d03d8fd1..4ee14d49a 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -79,15 +79,15 @@ GruntM1Script: setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite $6, $4 domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 - clearevent $06f3 - clearevent $06e9 - setevent $06f5 - setevent $06f6 - setevent $06fb - setevent $0740 - clearevent $06f9 - clearevent $06fd - clearevent $073e + clearevent EVENT_6F3 + clearevent EVENT_6E9 + setevent EVENT_6F5 + setevent EVENT_6F6 + setevent EVENT_6FB + setevent EVENT_740 + clearevent EVENT_6F9 + clearevent EVENT_6FD + clearevent EVENT_73E special Function8c084 special HealParty pause 15 @@ -390,12 +390,12 @@ SlowpokeWellB1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_ROCKET, 11, 19, $6, $0, 255, 255, $2, 3, TrainerGruntM29, $06fc - person_event SPRITE_ROCKET, 6, 9, $6, $0, 255, 255, $2, 1, TrainerGruntM1, $06fc - person_event SPRITE_ROCKET, 10, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM2, $06fc - person_event SPRITE_ROCKET_GIRL, 8, 14, $9, $0, 255, 255, $82, 4, TrainerGruntF1, $06fc - person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, $06fb - person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, $06fb - person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, $0740 - person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, $ffff - person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, $0662 + person_event SPRITE_ROCKET, 11, 19, $6, $0, 255, 255, $2, 3, TrainerGruntM29, EVENT_6FC + person_event SPRITE_ROCKET, 6, 9, $6, $0, 255, 255, $2, 1, TrainerGruntM1, EVENT_6FC + person_event SPRITE_ROCKET, 10, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM2, EVENT_6FC + person_event SPRITE_ROCKET_GIRL, 8, 14, $9, $0, 255, 255, $82, 4, TrainerGruntF1, EVENT_6FC + person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, EVENT_6FB + person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, EVENT_6FB + person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, EVENT_740 + person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, EVENT_662 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 51ba26736..d7ea706d4 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -73,5 +73,5 @@ SlowpokeWellB2F_MapEventHeader: ; people-events db 2 - person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, $ffff - person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, $0663 + person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, EVENT_663 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index adc0993eb..0228b8e3e 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -83,7 +83,7 @@ SoulHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, $ffff - person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, $ffff - person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, $ffff - person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, $ffff + person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, EVENT_ALWAYS_THERE diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 3db615df6..1efac515b 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -132,9 +132,9 @@ SproutTower1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, $ffff - person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, $ffff - person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, $ffff - person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, $ffff - person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, $ffff - person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, $0647 + person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, EVENT_647 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index ff8050dad..83f73ab92 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -131,6 +131,6 @@ SproutTower2F_MapEventHeader: ; people-events db 3 - person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, $ffff - person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, $ffff - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, $0648 + person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, EVENT_648 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 78781a587..7487a81f5 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -393,10 +393,10 @@ SproutTower3F_MapEventHeader: ; people-events db 7 - person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, $ffff - person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, $ffff - person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, $ffff - person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, $ffff - person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, $0649 - person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, $064a + person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, EVENT_649 + person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, EVENT_64A person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 2698dfe37..21881ef03 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -23,7 +23,7 @@ SecurityCamera1a: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_6DA iftrue NoSecurityCamera showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -48,7 +48,7 @@ SecurityCamera1b: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_6DA iftrue NoSecurityCamera showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -73,7 +73,7 @@ SecurityCamera2a: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_6DA iftrue NoSecurityCamera showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -99,7 +99,7 @@ SecurityCamera2b: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_6DA iftrue NoSecurityCamera showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -125,7 +125,7 @@ SecurityCamera3a: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_6DA iftrue NoSecurityCamera showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -151,7 +151,7 @@ SecurityCamera3b: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_6DA iftrue NoSecurityCamera showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -177,7 +177,7 @@ SecurityCamera4: checkevent EVENT_SECURITY_CAMERA_4 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_6DA iftrue NoSecurityCamera showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -203,7 +203,7 @@ SecurityCamera5: checkevent EVENT_SECURITY_CAMERA_5 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent $06da + checkevent EVENT_6DA iftrue NoSecurityCamera showemote $0, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -819,9 +819,9 @@ TeamRocketBaseB1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_ROCKET, 4, 4, $6, $0, 255, 255, $0, 0, ObjectEvent, $06d9 - person_event SPRITE_ROCKET, 8, 6, $9, $0, 255, 255, $2, 3, TrainerGruntM16, $06da - person_event SPRITE_SCIENTIST, 16, 22, $8, $0, 255, 255, $92, 3, TrainerScientistJed, $06da - person_event SPRITE_POKE_BALL, 10, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac4, $0669 - person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, $066a - person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, $066b + person_event SPRITE_ROCKET, 4, 4, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D9 + person_event SPRITE_ROCKET, 8, 6, $9, $0, 255, 255, $2, 3, TrainerGruntM16, EVENT_6DA + person_event SPRITE_SCIENTIST, 16, 22, $8, $0, 255, 255, $92, 3, TrainerScientistJed, EVENT_6DA + person_event SPRITE_POKE_BALL, 10, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac4, EVENT_669 + person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, EVENT_66A + person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, EVENT_66B diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index a4f477456..7b0b7bb39 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -89,9 +89,9 @@ UnknownScript_0x6cfac: loadtrainer EXECUTIVEF, 2 startbattle disappear $5 - setevent $06dd - setevent $06de - setevent $06d6 + setevent EVENT_6DD + setevent EVENT_6DE + setevent EVENT_6D6 returnafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 loadfont @@ -108,7 +108,7 @@ UnknownScript_0x6cfac: pause 15 special Function8c0ab dotrigger $2 - clearevent $06d6 + clearevent EVENT_6D6 spriteface $4, DOWN loadfont writetext UnknownText_0x6d5d8 @@ -165,7 +165,7 @@ UnknownScript_0x6d091: closetext loadmovesprites dotrigger $1 - setevent $004c + setevent EVENT_04C checkcode VAR_FACING if_equal $3, UnknownScript_0x6d0be applymovement $4, MovementData_0x6d212 @@ -265,11 +265,11 @@ VoltorbScript_0x6d101: iftrue UnknownScript_0x6d182 disappear $6 disappear $9 - checkevent $06e0 + checkevent EVENT_6E0 iffalse UnknownScript_0x6d182 - checkevent $06e1 + checkevent EVENT_6E1 iffalse UnknownScript_0x6d182 - checkevent $06e2 + checkevent EVENT_6E2 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -283,11 +283,11 @@ VoltorbScript_0x6d12c: iftrue UnknownScript_0x6d182 disappear $7 disappear $a - checkevent $06e0 + checkevent EVENT_6E0 iffalse UnknownScript_0x6d182 - checkevent $06e1 + checkevent EVENT_6E1 iffalse UnknownScript_0x6d182 - checkevent $06e2 + checkevent EVENT_6E2 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -301,11 +301,11 @@ VoltorbScript_0x6d157: iftrue UnknownScript_0x6d182 disappear $8 disappear $b - checkevent $06e0 + checkevent EVENT_6E0 iffalse UnknownScript_0x6d182 - checkevent $06e1 + checkevent EVENT_6E1 iffalse UnknownScript_0x6d182 - checkevent $06e2 + checkevent EVENT_6E2 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -338,11 +338,11 @@ UnknownScript_0x6d184: applymovement $4, MovementData_0x6d283 disappear $4 setevent EVENT_CLEARED_ROCKET_HIDEOUT - clearflag $000e - setevent $06dc - setevent $0757 + clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 + setevent EVENT_6DC + setevent EVENT_757 dotrigger $3 - clearevent $0735 + clearevent EVENT_735 setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 setevent EVENT_SECURITY_CAMERA_2 @@ -1001,17 +1001,17 @@ TeamRocketBaseB2F_MapEventHeader: ; people-events db 14 - person_event SPRITE_ROCKET, 20, 24, $7, $0, 255, 255, $0, 0, ObjectEvent, $06de - person_event SPRITE_ROCKET_GIRL, 20, 24, $7, $0, 255, 255, $80, 0, ObjectEvent, $06dd - person_event SPRITE_LANCE, 17, 9, $6, $0, 255, 255, $0, 0, ObjectEvent, $06d6 - person_event SPRITE_DRAGON, 17, 13, $9, $0, 255, 255, $0, 0, ObjectEvent, $06df - person_event SPRITE_VOLTORB, 9, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d101, $06e0 - person_event SPRITE_VOLTORB, 11, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d12c, $06e1 - person_event SPRITE_VOLTORB, 13, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d157, $06e2 - person_event SPRITE_VOLTORB, 9, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e0 - person_event SPRITE_VOLTORB, 11, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e1 - person_event SPRITE_VOLTORB, 13, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e2 - person_event SPRITE_ROCKET, 17, 29, $6, $0, 255, 255, $2, 3, TrainerGruntM17, $06da - person_event SPRITE_ROCKET, 5, 8, $a, $0, 255, 255, $2, 1, TrainerGruntM18, $06da - person_event SPRITE_ROCKET, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, $06da - person_event SPRITE_POKE_BALL, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, $066c + person_event SPRITE_ROCKET, 20, 24, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DE + person_event SPRITE_ROCKET_GIRL, 20, 24, $7, $0, 255, 255, $80, 0, ObjectEvent, EVENT_6DD + person_event SPRITE_LANCE, 17, 9, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D6 + person_event SPRITE_DRAGON, 17, 13, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DF + person_event SPRITE_VOLTORB, 9, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d101, EVENT_6E0 + person_event SPRITE_VOLTORB, 11, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d12c, EVENT_6E1 + person_event SPRITE_VOLTORB, 13, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d157, EVENT_6E2 + person_event SPRITE_VOLTORB, 9, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E0 + person_event SPRITE_VOLTORB, 11, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E1 + person_event SPRITE_VOLTORB, 13, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E2 + person_event SPRITE_ROCKET, 17, 29, $6, $0, 255, 255, $2, 3, TrainerGruntM17, EVENT_6DA + person_event SPRITE_ROCKET, 5, 8, $a, $0, 255, 255, $2, 1, TrainerGruntM18, EVENT_6DA + person_event SPRITE_ROCKET, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, EVENT_6DA + person_event SPRITE_POKE_BALL, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, EVENT_66C diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 49dc74f0a..71b883128 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -651,17 +651,17 @@ TeamRocketBaseB3F_MapEventHeader: ; people-events db 14 - person_event SPRITE_LANCE, 18, 29, $6, $0, 255, 255, $0, 0, LanceScript_0x6dffc, $06d7 - person_event SPRITE_ROCKET, 7, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, $06db - person_event SPRITE_MOLTRES, 6, 11, $16, $0, 255, 255, $90, 0, MoltresScript_0x6e091, $06da - person_event SPRITE_ROCKET_GIRL, 11, 25, $7, $0, 255, 255, $82, 0, TrainerGruntF5, $06da - person_event SPRITE_ROCKET, 18, 9, $a, $0, 255, 255, $2, 3, TrainerGruntM28, $06da - person_event SPRITE_SCIENTIST, 15, 27, $7, $0, 255, 255, $92, 0, TrainerScientistRoss, $06da - person_event SPRITE_SCIENTIST, 19, 15, $9, $0, 255, 255, $92, 3, TrainerScientistMitch, $06da - person_event SPRITE_ROCKET, 18, 28, $6, $0, 255, 255, $0, 0, RocketScript_0x6e048, $06da - person_event SPRITE_SILVER, 9, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c0 - person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e120, $066d - person_event SPRITE_POKE_BALL, 16, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e122, $066e - person_event SPRITE_POKE_BALL, 13, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e124, $066f - person_event SPRITE_POKE_BALL, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, $0670 - person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, $0654 + person_event SPRITE_LANCE, 18, 29, $6, $0, 255, 255, $0, 0, LanceScript_0x6dffc, EVENT_6D7 + person_event SPRITE_ROCKET, 7, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DB + person_event SPRITE_MOLTRES, 6, 11, $16, $0, 255, 255, $90, 0, MoltresScript_0x6e091, EVENT_6DA + person_event SPRITE_ROCKET_GIRL, 11, 25, $7, $0, 255, 255, $82, 0, TrainerGruntF5, EVENT_6DA + person_event SPRITE_ROCKET, 18, 9, $a, $0, 255, 255, $2, 3, TrainerGruntM28, EVENT_6DA + person_event SPRITE_SCIENTIST, 15, 27, $7, $0, 255, 255, $92, 0, TrainerScientistRoss, EVENT_6DA + person_event SPRITE_SCIENTIST, 19, 15, $9, $0, 255, 255, $92, 3, TrainerScientistMitch, EVENT_6DA + person_event SPRITE_ROCKET, 18, 28, $6, $0, 255, 255, $0, 0, RocketScript_0x6e048, EVENT_6DA + person_event SPRITE_SILVER, 9, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C0 + person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e120, EVENT_66D + person_event SPRITE_POKE_BALL, 16, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e122, EVENT_66E + person_event SPRITE_POKE_BALL, 13, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e124, EVENT_66F + person_event SPRITE_POKE_BALL, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, EVENT_670 + person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, EVENT_654 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 34238b55e..a3eb749e2 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0001 + person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x19351a, EVENT_000 + person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x19351a, EVENT_001 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index e121fb5d1..8daae5af4 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -29,8 +29,8 @@ UnknownScript_0x18502f: iffalse UnknownScript_0x185050 special SpecialBeastsCheck iffalse UnknownScript_0x185050 - clearevent $07c5 - setevent $07b6 + clearevent EVENT_7C5 + setevent EVENT_7B6 UnknownScript_0x185047: checkevent EVENT_FOUGHT_HO_OH iffalse UnknownScript_0x18504f @@ -66,8 +66,8 @@ UnknownScript_0x185077: disappear $2 disappear $3 disappear $4 - clearevent $07b6 - setevent $07c5 + clearevent EVENT_7B6 + setevent EVENT_7C5 return UnknownScript_0x185084: @@ -534,13 +534,13 @@ TinTower1F_MapEventHeader: ; people-events db 10 - person_event SPRITE_SUICUNE, 13, 13, $1, $0, 255, 255, $90, 0, ObjectEvent, $07b2 - person_event SPRITE_RAIKOU, 13, 11, $1, $0, 255, 255, $b0, 0, ObjectEvent, $07b4 - person_event SPRITE_ENTEI, 13, 16, $1, $0, 255, 255, $80, 0, ObjectEvent, $07b3 - person_event SPRITE_SUPER_NERD, 7, 12, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x1851c8, $07b5 - person_event SPRITE_SAGE, 13, 9, $3, $0, 255, 255, $0, 0, SageScript_0x185173, $07b6 - person_event SPRITE_SAGE, 15, 15, $3, $0, 255, 255, $0, 0, SageScript_0x185176, $07b6 - person_event SPRITE_SAGE, 10, 18, $3, $0, 255, 255, $0, 0, SageScript_0x185179, $07b6 - person_event SPRITE_SAGE, 6, 8, $4, $10, 255, 255, $0, 0, SageScript_0x18517c, $07c5 - person_event SPRITE_SAGE, 5, 13, $6, $0, 255, 255, $0, 0, SageScript_0x185188, $07c5 - person_event SPRITE_SAGE, 6, 18, $5, $1, 255, 255, $0, 0, SageScript_0x1851bc, $07c5 + person_event SPRITE_SUICUNE, 13, 13, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_7B2 + person_event SPRITE_RAIKOU, 13, 11, $1, $0, 255, 255, $b0, 0, ObjectEvent, EVENT_7B4 + person_event SPRITE_ENTEI, 13, 16, $1, $0, 255, 255, $80, 0, ObjectEvent, EVENT_7B3 + person_event SPRITE_SUPER_NERD, 7, 12, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x1851c8, EVENT_7B5 + person_event SPRITE_SAGE, 13, 9, $3, $0, 255, 255, $0, 0, SageScript_0x185173, EVENT_7B6 + person_event SPRITE_SAGE, 15, 15, $3, $0, 255, 255, $0, 0, SageScript_0x185176, EVENT_7B6 + person_event SPRITE_SAGE, 10, 18, $3, $0, 255, 255, $0, 0, SageScript_0x185179, EVENT_7B6 + person_event SPRITE_SAGE, 6, 8, $4, $10, 255, 255, $0, 0, SageScript_0x18517c, EVENT_7C5 + person_event SPRITE_SAGE, 5, 13, $6, $0, 255, 255, $0, 0, SageScript_0x185188, EVENT_7C5 + person_event SPRITE_SAGE, 6, 18, $5, $1, 255, 255, $0, 0, SageScript_0x1851bc, EVENT_7C5 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 95913b5cf..2bb75172c 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -25,4 +25,4 @@ TinTower3F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, $064b + person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, EVENT_64B diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index aeb78c56e..873ba660f 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -39,6 +39,6 @@ TinTower4F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a58, $064c - person_event SPRITE_POKE_BALL, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, $064d - person_event SPRITE_POKE_BALL, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, $064e + person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a58, EVENT_64C + person_event SPRITE_POKE_BALL, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, EVENT_64D + person_event SPRITE_POKE_BALL, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, EVENT_64E diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index d6cec5813..e92d5859d 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -39,4 +39,4 @@ TinTower5F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, $064f + person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, EVENT_64F diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index b36eb4fed..3bddb4071 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -25,4 +25,4 @@ TinTower6F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, $07c6 + person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, EVENT_7C6 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 7a26cd570..79e7f6477 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -28,4 +28,4 @@ TinTower7F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, $0650 + person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, EVENT_650 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 68e267913..10b3d6cd4 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -35,6 +35,6 @@ TinTower8F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b35, $0651 - person_event SPRITE_POKE_BALL, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, $0652 - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, $0653 + person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b35, EVENT_651 + person_event SPRITE_POKE_BALL, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, EVENT_652 + person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, EVENT_653 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index db4b330e3..75673d3b0 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -38,4 +38,4 @@ TinTower9F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, $07c7 + person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, EVENT_7C7 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 30695faa6..38d01485a 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -60,4 +60,4 @@ TinTowerRoof_MapEventHeader: ; people-events db 1 - person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, $073c + person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, EVENT_73C diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index a03186584..0855535a6 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -25,4 +25,4 @@ TohjoFalls_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, $06a9 + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, EVENT_6A9 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index ead0e163f..b454d7d2a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -73,5 +73,5 @@ TradeCenter_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 + person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_000 + person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_001 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index cfada34da..17f729299 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -151,8 +151,8 @@ TrainerHouse1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, $ffff - person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, $ffff - person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, $ffff - person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, $ffff - person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, $ffff + person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, EVENT_ALWAYS_THERE diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index fe539100b..294ca69be 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -184,5 +184,5 @@ TrainerHouseB1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, $ffff - person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, $ffff + person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_ALWAYS_THERE + person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, EVENT_ALWAYS_THERE diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index b84b9a99c..2329b1320 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -116,9 +116,9 @@ UnknownScript_0x7caaa: end UnknownScript_0x7cad4: - checkevent $06c5 + checkevent EVENT_6C5 iftrue UnknownScript_0x7cae1 - setevent $06c5 + setevent EVENT_6C5 domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1 UnknownScript_0x7cae1: playmusic MUSIC_RIVAL_ENCOUNTER @@ -126,7 +126,7 @@ UnknownScript_0x7cae1: writetext UnknownText_0x7ce9d closetext loadmovesprites - setevent $06c1 + setevent EVENT_6C1 checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x7cb09 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -1021,14 +1021,14 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: ; people-events db 11 - person_event SPRITE_PHARMACIST, 16, 13, $9, $0, 255, 255, $a2, 2, TrainerBurglarDuncan, $06ce - person_event SPRITE_PHARMACIST, 12, 8, $8, $0, 255, 255, $a2, 2, TrainerBurglarEddie, $06ce - person_event SPRITE_ROCKET, 6, 21, $6, $0, 255, 255, $2, 3, TrainerGruntM13, $06ce - person_event SPRITE_ROCKET, 6, 15, $6, $0, 255, 255, $2, 3, TrainerGruntM11, $06ce - person_event SPRITE_ROCKET, 6, 7, $6, $0, 255, 255, $2, 3, TrainerGruntM25, $06ce - person_event SPRITE_ROCKET_GIRL, 16, 23, $6, $0, 255, 255, $82, 1, TrainerGruntF3, $06ce - person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, $ffff - person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, $ffff - person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, $0673 - person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, $0674 - person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c1 + person_event SPRITE_PHARMACIST, 16, 13, $9, $0, 255, 255, $a2, 2, TrainerBurglarDuncan, EVENT_6CE + person_event SPRITE_PHARMACIST, 12, 8, $8, $0, 255, 255, $a2, 2, TrainerBurglarEddie, EVENT_6CE + person_event SPRITE_ROCKET, 6, 21, $6, $0, 255, 255, $2, 3, TrainerGruntM13, EVENT_6CE + person_event SPRITE_ROCKET, 6, 15, $6, $0, 255, 255, $2, 3, TrainerGruntM11, EVENT_6CE + person_event SPRITE_ROCKET, 6, 7, $6, $0, 255, 255, $2, 3, TrainerGruntM25, EVENT_6CE + person_event SPRITE_ROCKET_GIRL, 16, 23, $6, $0, 255, 255, $82, 1, TrainerGruntF3, EVENT_6CE + person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, EVENT_673 + person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, EVENT_674 + person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C1 diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index a1de24533..ab0b3e355 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -113,12 +113,12 @@ GruntM15Script: GentlemanScript_0x7d9bf: faceplayer loadfont - checkevent $004a + checkevent EVENT_04A iftrue UnknownScript_0x7d9de writetext UnknownText_0x7dbc6 keeptextopen verbosegiveitem CARD_KEY, 1 - setevent $004a + setevent EVENT_04A setevent EVENT_WAREHOUSE_LAYOUT_1 clearevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_WAREHOUSE_LAYOUT_3 @@ -270,10 +270,10 @@ UndergroundWarehouse_MapEventHeader: ; people-events db 7 - person_event SPRITE_ROCKET, 12, 13, $7, $0, 255, 255, $2, 3, TrainerGruntM24, $06ce - person_event SPRITE_ROCKET, 19, 12, $7, $0, 255, 255, $2, 3, TrainerGruntM14, $06ce - person_event SPRITE_ROCKET, 7, 18, $9, $0, 255, 255, $2, 4, TrainerGruntM15, $06ce - person_event SPRITE_GENTLEMAN, 12, 16, $3, $0, 255, 255, $0, 0, GentlemanScript_0x7d9bf, $06ce - person_event SPRITE_POKE_BALL, 19, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e4, $0679 - person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, $067a - person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, $0655 + person_event SPRITE_ROCKET, 12, 13, $7, $0, 255, 255, $2, 3, TrainerGruntM24, EVENT_6CE + person_event SPRITE_ROCKET, 19, 12, $7, $0, 255, 255, $2, 3, TrainerGruntM14, EVENT_6CE + person_event SPRITE_ROCKET, 7, 18, $9, $0, 255, 255, $2, 4, TrainerGruntM15, EVENT_6CE + person_event SPRITE_GENTLEMAN, 12, 16, $3, $0, 255, 255, $0, 0, GentlemanScript_0x7d9bf, EVENT_6CE + person_event SPRITE_POKE_BALL, 19, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e4, EVENT_679 + person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, EVENT_67A + person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, EVENT_655 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 4a9e7b357..641b0677c 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -287,12 +287,12 @@ UnionCave1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, $ffff - person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, $ffff - person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, $ffff - person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, $ffff - person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, $ffff - person_event SPRITE_POKE_BALL, 25, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c00, $065a - person_event SPRITE_POKE_BALL, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, $065b - person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, $065c - person_event SPRITE_POKE_BALL, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, $065d + person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 25, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c00, EVENT_65A + person_event SPRITE_POKE_BALL, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, EVENT_65B + person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, EVENT_65C + person_event SPRITE_POKE_BALL, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, EVENT_65D diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index a2ceb107a..400246a67 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -227,10 +227,10 @@ UnionCaveB1F_MapEventHeader: ; people-events db 7 - person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, $ffff - person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, $ffff - person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, $ffff - person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, $ffff - person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, $065e - person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, $ffff - person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, $065f + person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, EVENT_65E + person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, EVENT_65F diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index c47ff8284..4d1050cfa 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -200,9 +200,9 @@ UnionCaveB2F_MapEventHeader: ; people-events db 6 - person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, $ffff - person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, $ffff - person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, $ffff - person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, $0660 - person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, $0661 - person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, $0760 + person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, EVENT_660 + person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, EVENT_661 + person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, EVENT_760 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 5c6ffdb8b..0c7c7efb6 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -295,9 +295,9 @@ VermilionCity_MapEventHeader: ; people-events db 6 - person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, $ffff - person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, $ffff - person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, $ffff - person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, $ffff - person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, VermilionSnorlax, $0770 - person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, $ffff + person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, EVENT_ALWAYS_THERE + person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, EVENT_ALWAYS_THERE + person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, VermilionSnorlax, EVENT_770 + person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, EVENT_ALWAYS_THERE diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 3be2b211c..5e4f2ef47 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -335,8 +335,8 @@ VermilionGym_MapEventHeader: ; people-events db 5 - person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, $ffff - person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, $ffff - person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, $ffff - person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, $ffff - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, $ffff + person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index e9b5363bf..40a1043ae 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -34,4 +34,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, $ffff + person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, EVENT_ALWAYS_THERE diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 11b2a7f67..87b5015cc 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -65,4 +65,4 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, $ffff + person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, EVENT_ALWAYS_THERE diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index f413788c4..ebe8bffb8 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -48,5 +48,5 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, $ffff - person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, $ffff + person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, EVENT_ALWAYS_THERE diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 53c4c9bd6..4a5dbc153 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -48,6 +48,6 @@ VermilionMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, $ffff - person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, $ffff - person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, EVENT_ALWAYS_THERE + person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, EVENT_ALWAYS_THERE diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 3f08b0e38..bfb076429 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -88,7 +88,7 @@ VermilionPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, $ffff - person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, $ffff - person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, $ffff - person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, EVENT_ALWAYS_THERE diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 09e639be3..f79a45cc2 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -27,19 +27,19 @@ UnknownScript_0x74da6: applymovement $0, MovementData_0x74ef3 appear $2 dotrigger $0 - setevent $0731 - setevent $0730 - setevent $0739 - clearevent $0733 - setevent $0030 - setevent $0000 + setevent EVENT_731 + setevent EVENT_730 + setevent EVENT_739 + clearevent EVENT_733 + setevent EVENT_030 + setevent EVENT_000 blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY end SailorScript_0x74dc4: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 closetext @@ -53,8 +53,8 @@ SailorScript_0x74dc4: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - setevent $073a - clearevent $073b + setevent EVENT_73A + clearevent EVENT_73B clearevent EVENT_BEAT_POKEMANIAC_ETHAN clearevent EVENT_BEAT_BURGLAR_COREY clearevent EVENT_BEAT_BUG_CATCHER_KEN @@ -65,7 +65,7 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_TEACHER_SHIRLEY clearevent EVENT_BEAT_SCHOOLBOY_NATE clearevent EVENT_BEAT_SCHOOLBOY_RICKY - setevent $002f + setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear $2 domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1 @@ -79,9 +79,9 @@ UnknownScript_0x74e1a: UnknownScript_0x74e20: spriteface $3, RIGHT - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x74e86 - checkevent $0001 + checkevent EVENT_001 iftrue UnknownScript_0x74e86 spriteface $0, LEFT loadfont @@ -101,7 +101,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent $0001 + setevent EVENT_001 applymovement $0, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -145,7 +145,7 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer loadfont - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74eda @@ -163,7 +163,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent $0001 + setevent EVENT_001 applymovement $0, MovementData_0x74efe jump SailorScript_0x74dc4 @@ -318,6 +318,6 @@ VermilionPort_MapEventHeader: ; people-events db 3 - person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, $072b - person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, $ffff - person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, $ffff + person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, EVENT_72B + person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, EVENT_ALWAYS_THERE diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 06f8e7c26..8a439c153 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -35,4 +35,4 @@ VermilionPortPassage_MapEventHeader: ; people-events db 1 - person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, $ffff + person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, EVENT_ALWAYS_THERE diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 40977c9dd..c858b1192 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -51,7 +51,7 @@ UnknownScript_0x744d4: writetext UnknownText_0x7455f closetext loadmovesprites - setevent $06c2 + setevent EVENT_6C2 checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -265,9 +265,9 @@ VictoryRoad_MapEventHeader: ; people-events db 6 - person_event SPRITE_SILVER, 17, 22, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c2 - person_event SPRITE_POKE_BALL, 32, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x74529, $06a3 - person_event SPRITE_POKE_BALL, 52, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452b, $06a4 - person_event SPRITE_POKE_BALL, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, $06a5 - person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, $06a6 - person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, $06a7 + person_event SPRITE_SILVER, 17, 22, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C2 + person_event SPRITE_POKE_BALL, 32, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x74529, EVENT_6A3 + person_event SPRITE_POKE_BALL, 52, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452b, EVENT_6A4 + person_event SPRITE_POKE_BALL, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, EVENT_6A5 + person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, EVENT_6A6 + person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, EVENT_6A7 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 9c151a029..304ae51c9 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -118,6 +118,6 @@ VictoryRoadGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, $ffff + person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, EVENT_ALWAYS_THERE person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, $0750 + person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 5f617a8ab..f86b5a66d 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -46,7 +46,7 @@ UnknownScript_0x1a83d1: applymovement $2, MovementData_0x1a8463 playsound SFX_ENTER_DOOR disappear $2 - clearevent $06cb + clearevent EVENT_6CB waitbutton end @@ -302,11 +302,11 @@ VioletCity_MapEventHeader: ; people-events db 8 - person_event SPRITE_FISHER, 20, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x1a83bb, $06ca - person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, $ffff - person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, $ffff - person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, $ffff - person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, $ffff - person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, $ffff - person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, $0643 - person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, $0644 + person_event SPRITE_FISHER, 20, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x1a83bb, EVENT_6CA + person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, EVENT_643 + person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, EVENT_644 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 003461f36..6bb46309a 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -326,7 +326,7 @@ VioletGym_MapEventHeader: ; people-events db 4 - person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, $ffff - person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, $ffff - person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, $ffff - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, $ffff + person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, EVENT_ALWAYS_THERE diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index ebc0466ed..b138d7cdf 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -60,6 +60,6 @@ VioletMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, $ffff - person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, $ffff - person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, EVENT_ALWAYS_THERE diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 5a09d4434..24a71d3cd 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -56,6 +56,6 @@ VioletNicknameSpeechHouse_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, $ffff - person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, $ffff - person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, $ffff + person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, EVENT_ALWAYS_THERE + person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, EVENT_ALWAYS_THERE diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index ddd8f22b7..dda589cf2 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -45,5 +45,5 @@ VioletOnixTradeHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, $ffff - person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, EVENT_ALWAYS_THERE diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 1a80b06cb..0eef444d6 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -51,7 +51,7 @@ UnknownScript_0x694d7: db "EGG@" UnknownScript_0x69527: - jumpstd $0030 + jumpstd receivetogepiegg end UnknownScript_0x6952b: @@ -226,8 +226,8 @@ VioletPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, $ffff - person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, $ffff - person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, $ffff - person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, $ffff - person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, $0700 + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, EVENT_ALWAYS_THERE + person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 1820f9089..a038b1242 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -237,7 +237,7 @@ ViridianCity_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, $ffff - person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, $ffff - person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, $ffff - person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, $ffff + person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, EVENT_ALWAYS_THERE diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 27750116e..b6d2c985e 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -183,5 +183,5 @@ ViridianGym_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, $0776 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, $0776 + person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, EVENT_776 + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, EVENT_776 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 4d9a397ee..33578e8b3 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -48,6 +48,6 @@ ViridianMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, $ffff - person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, $ffff - person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, EVENT_ALWAYS_THERE diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 5d5ab4de4..8d07ee74d 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -72,7 +72,7 @@ ViridianNicknameSpeechHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, $ffff - person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, $ffff - person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, $ffff - person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, $ffff + person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, EVENT_ALWAYS_THERE + person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, EVENT_ALWAYS_THERE + person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, EVENT_ALWAYS_THERE diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index 0ea854fb3..fb8ee3f73 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -83,7 +83,7 @@ ViridianPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, $ffff - person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, $ffff - person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, $ffff - person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, EVENT_ALWAYS_THERE diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 6a69998c9..b18d3f5cb 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -265,21 +265,21 @@ UnknownScript_0x7c173: jump UnknownScript_0x7c1c1 UnknownScript_0x7c1a9: - setevent $0000 - clearevent $0001 - clearevent $0002 + setevent EVENT_000 + clearevent EVENT_001 + clearevent EVENT_002 jump UnknownScript_0x7c1cd UnknownScript_0x7c1b5: - clearevent $0000 - setevent $0001 - clearevent $0002 + clearevent EVENT_000 + setevent EVENT_001 + clearevent EVENT_002 jump UnknownScript_0x7c1cd UnknownScript_0x7c1c1: - clearevent $0000 - clearevent $0001 - setevent $0002 + clearevent EVENT_000 + clearevent EVENT_001 + setevent EVENT_002 jump UnknownScript_0x7c1cd UnknownScript_0x7c1cd: @@ -296,9 +296,9 @@ UnknownScript_0x7c1cd: loadfont writetext UnknownText_0x7c6d8 closetext - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x7c2bb - checkevent $0001 + checkevent EVENT_001 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -348,21 +348,21 @@ UnknownScript_0x7c220: jump UnknownScript_0x7c26e UnknownScript_0x7c256: - setevent $0000 - clearevent $0001 - clearevent $0002 + setevent EVENT_000 + clearevent EVENT_001 + clearevent EVENT_002 jump UnknownScript_0x7c27a UnknownScript_0x7c262: - clearevent $0000 - setevent $0001 - clearevent $0002 + clearevent EVENT_000 + setevent EVENT_001 + clearevent EVENT_002 jump UnknownScript_0x7c27a UnknownScript_0x7c26e: - clearevent $0000 - clearevent $0001 - setevent $0002 + clearevent EVENT_000 + clearevent EVENT_001 + setevent EVENT_002 jump UnknownScript_0x7c27a UnknownScript_0x7c27a: @@ -379,9 +379,9 @@ UnknownScript_0x7c27a: loadfont writetext UnknownText_0x7c82a closetext - checkevent $0000 + checkevent EVENT_000 iftrue UnknownScript_0x7c2bb - checkevent $0001 + checkevent EVENT_001 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -734,12 +734,12 @@ WarehouseEntrance_MapEventHeader: ; people-events db 9 - person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, $ffff - person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, $ffff - person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, $ffff - person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, $ffff - person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7c306, $0672 - person_event SPRITE_GRAMPS, 15, 11, $8, $0, 255, 255, $b0, 0, GrampsScript_0x7c146, $0753 - person_event SPRITE_SUPER_NERD, 18, 11, $8, $0, 255, 255, $90, 0, SuperNerdScript_0x7c161, $0754 - person_event SPRITE_SUPER_NERD, 19, 11, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x7c20e, $0755 - person_event SPRITE_GRANNY, 25, 11, $8, $0, 255, 255, $b0, 0, GrannyScript_0x7c132, $0752 + person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, EVENT_ALWAYS_THERE + person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7c306, EVENT_672 + person_event SPRITE_GRAMPS, 15, 11, $8, $0, 255, 255, $b0, 0, GrampsScript_0x7c146, EVENT_753 + person_event SPRITE_SUPER_NERD, 18, 11, $8, $0, 255, 255, $90, 0, SuperNerdScript_0x7c161, EVENT_754 + person_event SPRITE_SUPER_NERD, 19, 11, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x7c20e, EVENT_755 + person_event SPRITE_GRANNY, 25, 11, $8, $0, 255, 255, $b0, 0, GrannyScript_0x7c132, EVENT_752 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index d6db57542..813d98509 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -65,9 +65,9 @@ WhirlIslandB1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c410, $0691 - person_event SPRITE_POKE_BALL, 22, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c412, $0692 - person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, $0693 - person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, $0694 - person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, $0695 - person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, $ffff + person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c410, EVENT_691 + person_event SPRITE_POKE_BALL, 22, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c412, EVENT_692 + person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, EVENT_693 + person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, EVENT_694 + person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, EVENT_695 + person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, EVENT_ALWAYS_THERE diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index f36323803..e8cbe7b26 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -33,6 +33,6 @@ WhirlIslandB2F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 15, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4b8, $0696 - person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, $0697 - person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, $0698 + person_event SPRITE_POKE_BALL, 15, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4b8, EVENT_696 + person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, EVENT_697 + person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, EVENT_698 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index d99f3b5b7..ae55569e2 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -59,4 +59,4 @@ WhirlIslandLugiaChamber_MapEventHeader: ; people-events db 1 - person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, $073d + person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, EVENT_73D diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 6a5de6e23..18b838024 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -26,4 +26,4 @@ WhirlIslandNE_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, $068f + person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, EVENT_68F diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 5a59fa9b0..c270ff8f9 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -28,4 +28,4 @@ WhirlIslandSW_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, $0690 + person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, EVENT_690 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index b73262669..8e8be9f39 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -21,7 +21,7 @@ UnknownScript_0x1804ca: end UnknownScript_0x1804cb: - checkevent $0309 + checkevent EVENT_309 iffalse UnknownScript_0x1804d5 changeblock $4, $e, $2a UnknownScript_0x1804d5: @@ -40,7 +40,7 @@ UnknownScript_0x1804e0: reloadmappart loadmovesprites dotrigger $1 - setevent $0309 + setevent EVENT_309 waitbutton end @@ -148,4 +148,4 @@ WillsRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, $ffff + person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, EVENT_ALWAYS_THERE diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index adfbe99ab..e8dafe2d1 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -26,18 +26,18 @@ UnknownScript_0x98574: iftrue UnknownScript_0x9858c checkitem CLEAR_BELL iftrue UnknownScript_0x9858c - clearevent $07ab - setevent $07ac + clearevent EVENT_7AB + setevent EVENT_7AC return UnknownScript_0x9858c: - setevent $07ab - clearevent $07ac + setevent EVENT_7AB + clearevent EVENT_7AC return UnknownScript_0x98593: - setevent $07ab - setevent $07ac + setevent EVENT_7AB + setevent EVENT_7AC return SageScript_0x9859a: @@ -408,9 +408,9 @@ WiseTriosRoom_MapEventHeader: ; people-events db 6 - person_event SPRITE_SAGE, 6, 10, $3, $0, 255, 255, $0, 0, SageScript_0x9859a, $07ab - person_event SPRITE_SAGE, 11, 10, $5, $1, 255, 255, $0, 0, SageScript_0x9859d, $07ab - person_event SPRITE_SAGE, 9, 11, $8, $0, 255, 255, $0, 0, SageScript_0x985a0, $07ab - person_event SPRITE_SAGE, 6, 8, $6, $0, 255, 255, $2, 2, TrainerSageGaku, $07ac - person_event SPRITE_SAGE, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, $07ac - person_event SPRITE_SAGE, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, $07ac + person_event SPRITE_SAGE, 6, 10, $3, $0, 255, 255, $0, 0, SageScript_0x9859a, EVENT_7AB + person_event SPRITE_SAGE, 11, 10, $5, $1, 255, 255, $0, 0, SageScript_0x9859d, EVENT_7AB + person_event SPRITE_SAGE, 9, 11, $8, $0, 255, 255, $0, 0, SageScript_0x985a0, EVENT_7AB + person_event SPRITE_SAGE, 6, 8, $6, $0, 255, 255, $2, 2, TrainerSageGaku, EVENT_7AC + person_event SPRITE_SAGE, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, EVENT_7AC + person_event SPRITE_SAGE, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, EVENT_7AC |