diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 15:46:38 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 16:00:53 -0400 |
| commit | e674869018ffe8f9be2351b2b569eb7300910e6a (patch) | |
| tree | 77c5dae1a972a4bd03e448f0514341fe5ce927b7 | |
| parent | 0fcef5fc087dc30817410d7692d53e2c382828d5 (diff) | |
Updated signpost items and person_event flags
176 files changed, 1602 insertions, 1633 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index a2291e3c6..2ff70a57d 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -94,7 +94,7 @@ const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT const ENGINE_TEA_IN_BLUES_HOUSE const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT - const ENGINE_5E + const ENGINE_DAILY_MOVE_TUTOR const ENGINE_5F const ENGINE_60 const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 873769ef4..f7a2c7f52 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -126,66 +126,67 @@ 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_TIN_TOWER_4F_HIDDEN_MAX_POTION + const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE + const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS +; Signpost items + const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER const EVENT_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_NATIONAL_PARK_HIDDEN_FULL_HEAL + const EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION + const EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE + const EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL + const EVENT_ILEX_FOREST_HIDDEN_ETHER + const EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION + const EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL + const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL + const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION + const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE + const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION + const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE + const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION + const EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL + const EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE + const EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE + const EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION + const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS + const EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL + const EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY + const EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL + const EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE + const EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT + const EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL + const EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER + const EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION + const EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL + const EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE + const EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION + const EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER + const EVENT_ROUTE_28_HIDDEN_RARE_CANDY + const EVENT_ROUTE_30_HIDDEN_POTION + const EVENT_ROUTE_32_HIDDEN_GREAT_BALL + const EVENT_ROUTE_32_HIDDEN_SUPER_POTION + const EVENT_ROUTE_34_HIDDEN_RARE_CANDY + const EVENT_ROUTE_34_HIDDEN_SUPER_POTION + const EVENT_ROUTE_37_HIDDEN_ETHER + const EVENT_ROUTE_39_HIDDEN_NUGGET + const EVENT_ROUTE_40_HIDDEN_HYPER_POTION + const EVENT_ROUTE_41_HIDDEN_MAX_ETHER + const EVENT_ROUTE_42_HIDDEN_MAX_POTION + const EVENT_ROUTE_44_HIDDEN_ELIXER + const EVENT_ROUTE_45_HIDDEN_PP_UP + const EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION + const EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL + const EVENT_CIANWOOD_CITY_HIDDEN_REVIVE + const EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER + const EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION + const EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE + const EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY + const EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION + const EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE const EVENT_MET_FLORIA const EVENT_0BA const EVENT_BUGGING_KURT_TOO_MUCH @@ -229,34 +230,34 @@ 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_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE + const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE + const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL + const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY + const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND + const EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION + const EVENT_OLIVINE_PORT_HIDDEN_PROTEIN + const EVENT_VERMILION_PORT_HIDDEN_IRON + const EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE + const EVENT_ROUTE_2_HIDDEN_MAX_ETHER + const EVENT_ROUTE_2_HIDDEN_FULL_HEAL + const EVENT_ROUTE_2_HIDDEN_FULL_RESTORE + const EVENT_ROUTE_2_HIDDEN_REVIVE + const EVENT_ROUTE_4_HIDDEN_ULTRA_BALL + const EVENT_ROUTE_9_HIDDEN_ETHER + const EVENT_ROUTE_12_HIDDEN_ELIXER + const EVENT_ROUTE_13_HIDDEN_CALCIUM + const EVENT_ROUTE_11_HIDDEN_REVIVE + const EVENT_ROUTE_17_HIDDEN_MAX_ETHER + const EVENT_ROUTE_17_HIDDEN_MAX_ELIXER + const EVENT_ROUTE_25_HIDDEN_POTION 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_VERMILION_CITY_HIDDEN_FULL_HEAL + const EVENT_CELADON_CITY_HIDDEN_PP_UP + const EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY + const EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL const EVENT_100 const EVENT_101 const EVENT_102 @@ -1651,220 +1652,222 @@ ; Sprite visibility: When these events are cleared, the sprite becomes visible; when set, the sprite is hidden. ; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility. ; The map script command macros `setevent` and `clearevent` set/clear these flags, and their effects will be seen when the map is reloaded. +; Johto items: 0x640 const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB - const EVENT_643 - const EVENT_644 - const EVENT_645 - 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_VIOLET_CITY_PP_UP + const EVENT_VIOLET_CITY_RARE_CANDY + const EVENT_LAKE_OF_RAGE_ELIXER + const EVENT_LAKE_OF_RAGE_TM_DETECT + const EVENT_SPROUT_TOWER1F_PARLYZ_HEAL + const EVENT_SPROUT_TOWER2F_X_ACCURACY + const EVENT_SPROUT_TOWER_3F_POTION + const EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + const EVENT_TIN_TOWER_3F_FULL_HEAL + const EVENT_TIN_TOWER_4F_ULTRA_BALL + const EVENT_TIN_TOWER_4F_PP_UP + const EVENT_TIN_TOWER_4F_ESCAPE_ROPE + const EVENT_TIN_TOWER_5F_RARE_CANDY + const EVENT_TIN_TOWER_7F_MAX_REVIVE + const EVENT_TIN_TOWER_8F_NUGGET + const EVENT_TIN_TOWER_8F_MAX_ELIXER + const EVENT_TIN_TOWER_8F_FULL_RESTORE + const EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL + const EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL + const EVENT_BURNED_TOWER_1F_HP_UP + const EVENT_BURNED_TOWER_B1F_TM_ENDURE + const EVENT_NATIONAL_PARK_PARLYZ_HEAL + const EVENT_NATIONAL_PARK_TM_DIG + const EVENT_UNION_CAVE_1F_GREAT_BALL + const EVENT_UNION_CAVE_1F_X_ATTACK + const EVENT_UNION_CAVE_1F_POTION + const EVENT_UNION_CAVE_1F_AWAKENING + const EVENT_UNION_CAVE_B1F_TM_SWIFT + const EVENT_UNION_CAVE_B1F_X_DEFEND + const EVENT_UNION_CAVE_B2F_ELIXER + const EVENT_UNION_CAVE_B2F_HYPER_POTION + const EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION + const EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE + const EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER + const EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + const EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + const EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER + const EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION + const EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + const EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + const EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC + const EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF + const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + const EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + const EVENT_ILEX_FOREST_REVIVE + const EVENT_WAREHOUSE_ENTRANCE_COIN_CASE + const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL + const EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + const EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + const EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + const EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL + const EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER + const EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + const EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + const EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE + const EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + const EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + const EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + const EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + const EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + const EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + const EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + const EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + const EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE + const EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + const EVENT_MOUNT_MORTAR_B1F_CARBOS + const EVENT_ICE_PATH_1F_HM_WATERFALL + const EVENT_ICE_PATH_1F_PP_UP + const EVENT_ICE_PATH_B1F_IRON + const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION + const EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST + const EVENT_ICE_PATH_B3F_NEVERMELTICE + const EVENT_WHIRL_ISLAND_NE_ULTRA_BALL + const EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + const EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + const EVENT_WHIRL_ISLAND_B1F_CARBOS + const EVENT_WHIRL_ISLAND_B1F_CALCIUM + const EVENT_WHIRL_ISLAND_B1F_NUGGET + const EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + const EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + const EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + const EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER + const EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + const EVENT_SILVER_CAVE_ROOM_1_PROTEIN + const EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + const EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + const EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + const EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + const EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE + const EVENT_VICTORY_ROAD_TM_EARTHQUAKE + const EVENT_VICTORY_ROAD_MAX_REVIVE + const EVENT_VICTORY_ROAD_FULL_RESTORE + const EVENT_VICTORY_ROAD_FULL_HEAL + const EVENT_VICTORY_ROAD_HP_UP + const EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + const EVENT_TOHJO_FALLS_MOON_STONE + const EVENT_ROUTE_26_MAX_ELIXER + const EVENT_ROUTE_27_TM_SOLARBEAM + const EVENT_ROUTE_27_RARE_CANDY + const EVENT_ROUTE_29_POTION + const EVENT_ROUTE_31_POTION + const EVENT_ROUTE_31_POKE_BALL + const EVENT_ROUTE_32_GREAT_BALL + const EVENT_ROUTE_32_REPEL + const EVENT_ROUTE_35_TM_ROLLOUT + const EVENT_ROUTE_42_ULTRA_BALL + const EVENT_ROUTE_42_SUPER_POTION + const EVENT_ROUTE_43_MAX_ETHER + const EVENT_ROUTE_44_MAX_REVIVE + const EVENT_ROUTE_44_ULTRA_BALL + const EVENT_ROUTE_45_NUGGET + const EVENT_ROUTE_45_REVIVE + const EVENT_ROUTE_45_ELIXER + const EVENT_ROUTE_45_MAX_POTION + const EVENT_ROUTE_46_X_SPEED +; Johto people + const EVENT_RIVAL_NEW_BARK_TOWN + const EVENT_RIVAL_CHERRYGROVE_CITY + const EVENT_RIVAL_AZALEA_TOWN + const EVENT_RIVAL_TEAM_ROCKET_BASE + const EVENT_RIVAL_UNDERGROUND_PATH + const EVENT_RIVAL_VICTORY_ROAD + const EVENT_RIVAL_OLIVINE_CITY 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_RIVAL_BURNED_TOWER + const EVENT_RIVAL_DRAGONS_DEN + const EVENT_KRISS_HOUSE_MOM_1 + const EVENT_KRISS_HOUSE_MOM_2 + const EVENT_MR_POKEMONS_HOUSE_OAK + const EVENT_VIOLET_CITY_EARL + const EVENT_EARLS_ACADEMY_EARL + const EVENT_GOLDENROD_CITY_ROCKET_SCOUT + const EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + const EVENT_RADIO_TOWER_ROCKET_TAKEOVER + const EVENT_GOLDENROD_CITY_CIVILIANS + const EVENT_RADIO_TOWER_CIVILIANS_AFTER + const EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + const EVENT_OLIVINE_LIGHTHOUSE_JASMINE + const EVENT_OLIVINE_GYM_JASMINE + const EVENT_LAKE_OF_RAGE_LANCE + const EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + const EVENT_TEAM_ROCKET_BASE_B2F_LANCE + const EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS + const EVENT_DRAGONS_DEN_CLAIR + const EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + const EVENT_TEAM_ROCKET_BASE_POPULATION + const EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + const EVENT_ROUTE_43_GATE_ROCKETS + const EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + const EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + const EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + const EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + const EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + const EVENT_DAYCARE_MAN_IN_DAYCARE + const EVENT_DAYCARE_MAN_ON_ROUTE_34 + const EVENT_DAYCARE_MON_1 + const EVENT_DAYCARE_MON_2 + const EVENT_ILEX_FOREST_FARFETCHD + const EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + const EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + const EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + const EVENT_ILEX_FOREST_LASS + const EVENT_COPYCAT_1 + const EVENT_COPYCAT_2 const EVENT_GOLDENROD_SALE_OFF const EVENT_GOLDENROD_SALE_ON const EVENT_6F2 - const EVENT_6F3 - const EVENT_6F4 + const EVENT_ILEX_FOREST_APPRENTICE + const EVENT_ILEX_FOREST_CHARCOAL_MASTER 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_ROUTE_36_SUDOWOODO + const EVENT_AZALEA_TOWN_SLOWPOKES + const EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + const EVENT_SLOWPOKE_WELL_SLOWPOKES + const EVENT_SLOWPOKE_WELL_ROCKETS + const EVENT_KURTS_HOUSE_SLOWPOKE + const EVENT_GUIDE_GENT_IN_HIS_HOUSE const EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER const EVENT_ELMS_AIDE_IN_LAB const EVENT_COP_IN_ELMS_LAB - const EVENT_703 - const EVENT_704 - const EVENT_705 + const EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + const EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + const EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS 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_BOULDER_IN_ICE_PATH_1A + const EVENT_BOULDER_IN_ICE_PATH_2A + const EVENT_BOULDER_IN_ICE_PATH_3A + const EVENT_BOULDER_IN_ICE_PATH_4A const EVENT_MYSTERY_GIFT_DELIVERY_GUY const EVENT_MET_BILL - const EVENT_713 - const EVENT_714 - const EVENT_715 + const EVENT_ECRUTEAK_POKE_CENTER_BILL + const EVENT_ROUTE_30_BATTLE + const EVENT_ROUTE_30_YOUNGSTER_JOEY const EVENT_BUG_CATCHING_CONTESTANT_1A const EVENT_BUG_CATCHING_CONTESTANT_2A const EVENT_BUG_CATCHING_CONTESTANT_3A @@ -1885,112 +1888,114 @@ const EVENT_BUG_CATCHING_CONTESTANT_8B const EVENT_BUG_CATCHING_CONTESTANT_9B const EVENT_BUG_CATCHING_CONTESTANT_10B - const EVENT_72A - const EVENT_72B - const EVENT_72C - 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_OLIVINE_PORT_SAILOR_AT_GANGWAY + const EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + const EVENT_FAST_SHIP_1F_GENTLEMAN + const EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + const EVENT_FAST_SHIP_B1F_SAILOR_LEFT + const EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + const EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + const EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + const EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + const EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + const EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + const EVENT_LAKE_OF_RAGE_CIVILIANS + const EVENT_MAHOGANY_MART_OWNERS const EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME const EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - 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_FAST_SHIP_PASSENGERS_FIRST_TRIP + const EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + const EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + const EVENT_TIN_TOWER_ROOF_HO_OH + const EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + const EVENT_KURTS_HOUSE_KURT_1 + const EVENT_KURTS_HOUSE_KURT_2 + const EVENT_SLOWPOKE_WELL_KURT + const EVENT_KRISS_HOUSE_2F_CONSOLE + const EVENT_KRISS_HOUSE_2F_DOLL_1 + const EVENT_KRISS_HOUSE_2F_DOLL_2 + const EVENT_KRISS_HOUSE_2F_BIG_DOLL + const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + const EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN + const EVENT_BURNED_TOWER_B1F_BEASTS_1 + const EVENT_BURNED_TOWER_B1F_BEASTS_2 + const EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + const EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN + const EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST 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_LAKE_OF_RAGE_RED_GYARADOS + const EVENT_WAREHOUSE_ENTRANCE_GRANNY + const EVENT_WAREHOUSE_ENTRANCE_GRAMPS + const EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER + const EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER + const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST + const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + const EVENT_ROUTE_32_FRIEDA_OF_FRIDAY + const EVENT_ROUTE_29_TUSCANY_OF_TUESDAY + const EVENT_ROUTE_36_ARTHUR_OF_THURSDAY + const EVENT_ROUTE_37_SUNNY_OF_SUNDAY + const EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + const EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY + const EVENT_ROUTE_40_MONICA_OF_MONDAY + const EVENT_LANCES_ROOM_OAK_AND_MARY + const EVENT_UNION_CAVE_B2F_LAPRAS 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_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY + const EVENT_BURNED_TOWER_MORTY + const EVENT_BURNED_TOWER_1F_EUSINE + const EVENT_RANG_CLEAR_BELL_1 + const EVENT_RANG_CLEAR_BELL_2 + const EVENT_FLORIA_AT_FLOWER_SHOP const EVENT_FLORIA_AT_SUDOWOODO - const EVENT_76A - const EVENT_76B - const EVENT_76C - const EVENT_76D - const EVENT_76E + const EVENT_GOLDENROD_CITY_MOVE_TUTOR + const EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR +; Kanto people + const EVENT_ROUTE_24_ROCKET + const EVENT_CERULEAN_GYM_ROCKET + const EVENT_ROUTE_25_MISTY_BOYFRIEND const EVENT_TRAINERS_IN_CERULEAN_GYM - const EVENT_770 - const EVENT_771 - const EVENT_772 - const EVENT_773 - const EVENT_774 + const EVENT_VERMILION_CITY_SNORLAX + const EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + const EVENT_SAFFRON_TRAIN_STATION_POPULATION + const EVENT_COPYCATS_HOUSE_2F_DOLL + const EVENT_VERMILION_FAN_CLUB_DOLL 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_VIRIDIAN_GYM_BLUE + const EVENT_SEAFOAM_GYM_GYM_GUY + const EVENT_MT_MOON_SQUARE_ROCK + const EVENT_MT_MOON_SQUARE_CLEFAIRY + const EVENT_MT_MOON_RIVAL + const EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL 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_ROCK_TUNNEL_1F_ELIXER + const EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING + const EVENT_ROCK_TUNNEL_B1F_IRON + const EVENT_ROCK_TUNNEL_B1F_PP_UP + const EVENT_ROCK_TUNNEL_B1F_REVIVE + const EVENT_ROUTE_2_DIRE_HIT + const EVENT_ROUTE_2_MAX_POTION + const EVENT_ROUTE_2_CARBOS + const EVENT_ROUTE_2_ELIXER + const EVENT_ROUTE_4_HP_UP + const EVENT_ROUTE_12_CALCIUM + const EVENT_ROUTE_12_NUGGET + const EVENT_ROUTE_15_PP_UP + const EVENT_ROUTE_25_PROTEIN +; New to Crystal + const EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + const EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 + const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + const EVENT_DRAGON_SHRINE_CLAIR + const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + const EVENT_KRISS_HOUSE_1F_NEIGHBOR + const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR 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 @@ -2007,49 +2012,49 @@ 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_AZALEA_TOWN_KURT + const EVENT_ILEX_FOREST_KURT + const EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + const EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET + const EVENT_ECRUTEAK_GYM_GRAMPS + const EVENT_ECRUTEAK_CITY_GRAMPS const EVENT_EUSINE_IN_BURNED_TOWER - const EVENT_7AB - const EVENT_7AC - const EVENT_7AD + const EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + const EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + const EVENT_CIANWOOD_CITY_EUSINE 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_ECRUTEAK_HOUSE_WANDERING_SAGE + const EVENT_TIN_TOWER_1F_SUICUNE + const EVENT_TIN_TOWER_1F_ENTEI + const EVENT_TIN_TOWER_1F_RAIKOU + const EVENT_TIN_TOWER_1F_EUSINE + const EVENT_TIN_TOWER_1F_WISE_TRIO_1 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_ROUTE_30_ANTIDOTE + const EVENT_ILEX_FOREST_X_ATTACK + const EVENT_ILEX_FOREST_ANTIDOTE + const EVENT_ILEX_FOREST_ETHER + const EVENT_ROUTE_34_NUGGET + const EVENT_ROUTE_44_MAX_REPEL + const EVENT_ICE_PATH_1F_PROTEIN + const EVENT_DRAGONS_DEN_B1F_CALCIUM + const EVENT_DRAGONS_DEN_B1F_MAX_ELIXER + const EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL + const EVENT_SILVER_CAVE_ROOM_2_CALCIUM + const EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + const EVENT_SILVER_CAVE_ROOM_2_PP_UP + const EVENT_TIN_TOWER_1F_WISE_TRIO_2 + const EVENT_TIN_TOWER_6F_MAX_POTION + const EVENT_TIN_TOWER_9F_HP_UP + const EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + const EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL + const EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + const EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + const EVENT_MOUNT_MORTAR_B1F_PP_UP + const EVENT_RADIO_TOWER_5F_ULTRA_BALL + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT + const EVENT_BATTLE_TOWER_OUTSIDE_SAILOR NUM_EVENTS EQU const_value diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ed4a781f5..6f5b71310 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -233,7 +233,7 @@ MAP_N_A EQU -1 mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 - mapgroup DAY_CARE, 4, 5 + mapgroup DAYCARE, 4, 5 newgroup mapgroup ROUTE_6, 9, 10 @@ -700,9 +700,9 @@ const_value SET 1 const OBJECT_32 ; 33-39 are not used - +; map object struct const_def - const MAPOBJECT_VRAM_ID ; 0 + const MAPOBJECT_OBJECT_STRUCT_ID ; 0 const MAPOBJECT_SPRITE ; 1 const MAPOBJECT_Y_COORD ; 2 const MAPOBJECT_X_COORD ; 3 @@ -712,9 +712,9 @@ const_value SET 1 const MAPOBJECT_TIMEOFDAY ; 7 const MAPOBJECT_COLOR ; 8 const MAPOBJECT_RANGE ; 9 - const MAPOBJECT_POINTER_LO ; a + const MAPOBJECT_SCRIPT_POINTER ; a const MAPOBJECT_POINTER_HI ; b - const MAPOBJECT_FLAG_LO ; c + const MAPOBJECT_EVENT_FLAG ; c const MAPOBJECT_FLAG_HI ; d const MAPOBJECT_E ; unused const MAPOBJECT_F ; unused @@ -725,6 +725,10 @@ MAPOBJECT_SCREEN_WIDTH EQU 12 OBJECT_STRUCT_3_DATA_WIDTH EQU 6 OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 +OW_DOWN EQU $0 +OW_RIGHT EQU $4 +OW_UP EQU $8 +OW_LEFT EQU $c const_def const EMOTE_SHOCK ; 0 @@ -748,5 +752,5 @@ OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 const SIGNPOST_LEFT const SIGNPOST_IFSET const SIGNPOST_IFNOTSET - const SIGNPOST_ITEMIFSET + const SIGNPOST_ITEM const SIGNPOST_COPY diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm new file mode 100644 index 000000000..eadfa7d78 --- /dev/null +++ b/constants/phone_constants.asm @@ -0,0 +1,43 @@ + +PHONE_SCHOOLBOY_JACK EQU $05 +PHONE_POKEFAN_BEVERLY EQU $06 +PHONE_SAILOR_HUEY EQU $07 + +PHONE_COOLTRAINERM_GAVEN EQU $0b +PHONE_COOLTRAINERF_BETH EQU $0c +PHONE_BIRDKEEPER_JOSE EQU $0d +PHONE_COOLTRAINERF_REENA EQU $0e +PHONE_YOUNGSTER_JOEY EQU $0f +PHONE_BUG_CATCHER_WADE EQU $10 +PHONE_FISHER_RALPH EQU $11 +PHONE_PICNICKER_LIZ EQU $12 +PHONE_HIKER_ANTHONY EQU $13 +PHONE_CAMPER_TODD EQU $14 +PHONE_PICNICKER_GINA EQU $15 +PHONE_JUGGLER_IRWIN EQU $16 +PHONE_BUG_CATCHER_ARNIE EQU $17 +PHONE_SCHOOLBOY_ALAN EQU $18 + +PHONE_LASS_DANA EQU $1a +PHONE_SCHOOLBOY_CHAD EQU $1b +PHONE_POKEFANM_DEREK EQU $1c +PHONE_FISHER_TULLY EQU $1d +PHONE_POKEMANIAC_BRENT EQU $1e +PHONE_PICNICKER_TIFFANY EQU $1f +PHONE_BIRDKEEPER_VANCE EQU $20 +PHONE_FISHER_WILTON EQU $21 +PHONE_BLACKBELT_KENJI EQU $22 +PHONE_HIKER_PARRY EQU $23 +PHONE_PICNICKER_ERIN EQU $24 + + const_def + const ELMCALL_NONE + const ELMCALL_POKERUS + const ELMCALL_ROBBED + const ELMCALL_ASSISTANT + const ELMCALL_WEIRDBROADCAST + const ELMCALL_SSTICKET + const ELMCALL_UNKNOWN + const MOMCALL_WORRIED + const ELMCALL_MASTERBALL + diff --git a/engine/events.asm b/engine/events.asm index 9435b4c49..1b85c7f7c 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -245,7 +245,7 @@ Function967d1: ; 967d1 ; 967e1 Function967e1: ; 967e1 - callba Function5920 + callba RefreshMapAppearDisappear callba Functiond4d2 callba Functionb8098 ret @@ -648,7 +648,7 @@ TryObjectEvent: ; 969b5 ; 96a04 .zero ; 96a04 - ld hl, MAPOBJECT_POINTER_LO + ld hl, MAPOBJECT_SCRIPT_POINTER add hl, bc ld a, [hli] ld h, [hl] @@ -660,7 +660,7 @@ TryObjectEvent: ; 969b5 ; 96a12 .one ; 96a12 - ld hl, MAPOBJECT_POINTER_LO + ld hl, MAPOBJECT_SCRIPT_POINTER add hl, bc ld a, [hli] ld h, [hl] diff --git a/engine/map_objects.asm b/engine/map_objects.asm index c44d40df7..dab1e2d38 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2761,7 +2761,7 @@ Function5602: ; 5602 call Function5629 .ok - call Function5920 + call RefreshMapAppearDisappear ret ; 561d @@ -2769,7 +2769,7 @@ Function561d: ; 561d call Function5645 ld a, 0 call Function5629 - call Function5920 + call RefreshMapAppearDisappear ret ; 5629 @@ -2777,7 +2777,7 @@ Function5629: ; 5629 cp $10 ret nc call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -3320,7 +3320,7 @@ Function5903: ; 5903 db 6, 7, 8, 9 ; 5920 -Function5920:: ; 5920 +RefreshMapAppearDisappear:: ; 5920 ld a, [VramState] bit 0, a ret z diff --git a/engine/scripting.asm b/engine/scripting.asm index ea620e6f8..4e99d5927 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1253,10 +1253,10 @@ Script_appear: ; 0x972dd call GetScriptByte call GetScriptPerson - call Function1956 + call _CopyObjectStruct ld a, [$ffaf] - ld b, $0 - call Function9730b + ld b, 0 ; clear + call ApplyEventActionAppearDisappear ret ; 0x972ee @@ -1267,35 +1267,35 @@ Script_disappear: ; 0x972ee call GetScriptByte call GetScriptPerson - cp $fe - jr nz, .asm_972fa ; 0x972f6 $2 + cp -2 + jr nz, .skip ; 0x972f6 $2 ld a, [$ffe0] -.asm_972fa - call Function199f +.skip + call DeleteObjectStruct ld a, [$ffaf] - ld b, $1 - call Function9730b - callba Function5920 + ld b, 1 ; set + call ApplyEventActionAppearDisappear + callba RefreshMapAppearDisappear ret ; 0x9730b -Function9730b: ; 0x9730b +ApplyEventActionAppearDisappear: ; 0x9730b push bc call GetMapObject - ld hl, $000c + ld hl, MAPOBJECT_EVENT_FLAG add hl, bc pop bc ld e, [hl] inc hl ld d, [hl] - ld a, $ff + ld a, -1 cp e - jr nz, .asm_97321 ; 0x9731a $5 + jr nz, .okay ; 0x9731a $5 cp d - jr nz, .asm_97321 ; 0x9731d $2 + jr nz, .okay ; 0x9731d $2 xor a ret -.asm_97321 +.okay call EventFlagAction ret ; 0x97325 diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index d367ab956..db2843e44 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -287,25 +287,25 @@ DayToTextScript: db "SATURDAY@" GoldenrodRocketsScript: - clearevent EVENT_6CD + clearevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER end RadioTowerRocketsScript: setflag ENGINE_ROCKETS_IN_RADIO_TOWER - setevent EVENT_6CF - setevent EVENT_6D1 - clearevent EVENT_6CE + setevent EVENT_GOLDENROD_CITY_CIVILIANS + setevent EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + clearevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER - setevent EVENT_756 + setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST specialphonecall ELMCALL_WEIRDBROADCAST domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 end BugContestResultsWarpScript: special WhiteBGMap - scall BugContestResults_EnsureNoDuplicateSprites - setevent EVENT_747 - clearevent EVENT_748 + scall BugContestResults_CopyContestantsToResults + setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY setevent EVENT_2D2 warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4 applymovement $0, Movement_ContestResults_WalkAfterWarp @@ -438,7 +438,7 @@ BugContestResults_NoRoomForBerry ; 0xbc375 jump BugContestResults_DidNotWin ; 0xbc380 -BugContestResults_EnsureNoDuplicateSprites ; 0xbc380 +BugContestResults_CopyContestantsToResults ; 0xbc380 checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue .skip1 clearevent EVENT_BUG_CATCHING_CONTESTANT_1B @@ -482,35 +482,35 @@ BugContestResults_EnsureNoDuplicateSprites ; 0xbc380 end InitializeEventsScript: - 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_EARLS_ACADEMY_EARL + setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER + setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + setevent EVENT_RADIO_TOWER_CIVILIANS_AFTER + setevent EVENT_ILEX_FOREST_APPRENTICE + setevent EVENT_ILEX_FOREST_FARFETCHD + setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER + setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + setevent EVENT_RIVAL_TEAM_ROCKET_BASE + setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM 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_RIVAL_CHERRYGROVE_CITY + setevent EVENT_RIVAL_AZALEA_TOWN + setevent EVENT_RIVAL_UNDERGROUND_PATH + setevent EVENT_AZALEA_TOWN_SLOWPOKES + setevent EVENT_KURTS_HOUSE_SLOWPOKE setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE setevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER setevent EVENT_COP_IN_ELMS_LAB - 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_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + setevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + setevent EVENT_BOULDER_IN_ICE_PATH_1A + setevent EVENT_BOULDER_IN_ICE_PATH_2A + setevent EVENT_BOULDER_IN_ICE_PATH_3A + setevent EVENT_BOULDER_IN_ICE_PATH_4A + setevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_3A @@ -531,70 +531,70 @@ InitializeEventsScript: setevent EVENT_BUG_CATCHING_CONTESTANT_8B setevent EVENT_BUG_CATCHING_CONTESTANT_9B setevent EVENT_BUG_CATCHING_CONTESTANT_10B - 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_FAST_SHIP_1F_GENTLEMAN + setevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + setevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + setevent EVENT_LAKE_OF_RAGE_CIVILIANS + setevent EVENT_MAHOGANY_MART_OWNERS + setevent EVENT_TIN_TOWER_ROOF_HO_OH + setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + setevent EVENT_KRISS_HOUSE_2F_CONSOLE + setevent EVENT_KRISS_HOUSE_2F_DOLL_1 + setevent EVENT_KRISS_HOUSE_2F_DOLL_2 + setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL setevent EVENT_2A4 setevent EVENT_2AF - setevent EVENT_749 - setevent EVENT_6D3 - setevent EVENT_74D + setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN + setevent EVENT_OLIVINE_GYM_JASMINE + setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN setevent EVENT_MET_BILL - setevent EVENT_713 + setevent EVENT_ECRUTEAK_POKE_CENTER_BILL setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY - setevent EVENT_6D4 + setevent EVENT_LAKE_OF_RAGE_LANCE 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_DRAGONS_DEN_CLAIR + setevent EVENT_RIVAL_OLIVINE_CITY + setevent EVENT_RIVAL_VICTORY_ROAD + setevent EVENT_RIVAL_DRAGONS_DEN + setevent EVENT_LANCES_ROOM_OAK_AND_MARY + setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + setevent EVENT_BURNED_TOWER_B1F_BEASTS_1 setevent EVENT_RED_IN_MT_SILVER setevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - setevent EVENT_73A - setevent EVENT_73B - setevent EVENT_733 - setevent EVENT_73F - setevent EVENT_78D - setevent EVENT_766 - setevent EVENT_768 + setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + setevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + setevent EVENT_KURTS_HOUSE_KURT_2 + setevent EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 + setevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_FLORIA_AT_FLOWER_SHOP 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_GOLDENROD_CITY_MOVE_TUTOR + setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + setevent EVENT_DRAGON_SHRINE_CLAIR + setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + setevent EVENT_AZALEA_TOWN_KURT + setevent EVENT_AZALEA_TOWN_KURT + setevent EVENT_ILEX_FOREST_KURT + setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + setevent EVENT_ILEX_FOREST_LASS setevent EVENT_GOLDENROD_SALE_OFF - setevent EVENT_7A9 + setevent EVENT_ECRUTEAK_CITY_GRAMPS setevent EVENT_EUSINE_IN_BURNED_TOWER - setevent EVENT_6C8 - setevent EVENT_7AC - setevent EVENT_7AD - setevent EVENT_7B5 - setevent EVENT_7B6 - setevent EVENT_7C5 + setevent EVENT_KRISS_HOUSE_MOM_2 + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + setevent EVENT_CIANWOOD_CITY_EUSINE + setevent EVENT_TIN_TOWER_1F_EUSINE + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 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 + setevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR setflag ENGINE_ROCKET_SIGNAL_ON_CH20 setflag ENGINE_ROCKETS_IN_MAHOGANY variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO @@ -607,16 +607,16 @@ InitializeEventsScript: variablesprite SPRITE_COPYCAT, SPRITE_LASS variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS setevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - setevent EVENT_76D - setevent EVENT_76C - setevent EVENT_76E + setevent EVENT_CERULEAN_GYM_ROCKET + setevent EVENT_ROUTE_24_ROCKET + setevent EVENT_ROUTE_25_MISTY_BOYFRIEND 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_COPYCATS_HOUSE_2F_DOLL + setevent EVENT_VIRIDIAN_GYM_BLUE + setevent EVENT_SEAFOAM_GYM_GYM_GUY + setevent EVENT_MT_MOON_SQUARE_CLEFAIRY + setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION + setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL setevent EVENT_036 return @@ -1497,11 +1497,11 @@ FacingPlayerDistance:: ; 36ad ; Return carry if the sprite at bc is facing the player, ; and its distance in d. - ld hl, $0010 ; x + ld hl, OBJECT_MAP_X ; x add hl, bc ld d, [hl] - ld hl, $0011 ; y + ld hl, OBJECT_MAP_Y ; y add hl, bc ld e, [hl] @@ -1570,7 +1570,7 @@ Function36f5:: ; 36f5 add hl, bc ld a, [hl] call GetMapObject - ld hl, $000a + ld hl, OBJECT_STEP_DURATION add hl, bc ld a, [hli] ld h, [hl] @@ -1580,7 +1580,7 @@ Function36f5:: ; 36f5 ld d, h ld e, l push de - ld b, $2 + ld b, $2 ; check call EventFlagAction pop de ld a, c @@ -1593,19 +1593,19 @@ Function36f5:: ; 36f5 Function3718:: ; 3718 ld a, [BattleType] cp BATTLETYPE_CANLOSE - jr .asm_3724 + jr .canlose ld hl, WalkingTile - jr .asm_3731 + jr .ok -.asm_3724 +.canlose ld a, [wd0ee] ld hl, WalkingTile and $f - jr z, .asm_3731 + jr z, .ok ld hl, wd048 + 1 -.asm_3731 +.ok ld a, [hli] ld h, [hl] ld l, a diff --git a/home/map_objects.asm b/home/map_objects.asm index 509492033..2874cbdf3 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -22,7 +22,7 @@ Function180e:: ; 180e ld c, SPRITE_GFX_LIST_CAPACITY - 1 ld b, a ld a, [hConnectionStripLength] - cp $0 + cp 0 jr z, .nope ld a, b .loop @@ -235,7 +235,7 @@ Function18de:: ; 18de ; Sets carry if the object is not visible on the screen. ld [hConnectionStripLength], a call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -327,25 +327,25 @@ Function18f5:: ; 18f5 Function194d:: ; 194d ld [hConnectionStripLength], a call GetMapObject - call Function80e7 + call CopyObjectStruct ret ; 1956 -Function1956:: ; 1956 +_CopyObjectStruct:: ; 1956 ld [hConnectionStripLength], a call Function271e ld a, [hConnectionStripLength] call GetMapObject - callba Function80e7 + callba CopyObjectStruct ret ; 1967 Function1967:: ; 1967 ld [hConnectionStripLength], a call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -375,7 +375,7 @@ Function1985:: ; 1985 ret ; 199f -Function199f:: ; 199f +DeleteObjectStruct:: ; 199f call Function1967 call Function2712 ret @@ -397,7 +397,7 @@ Function19a6:: ; 19a6 Function19b8:: ; 19b8 call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] push af @@ -620,7 +620,7 @@ DrawOnMap:: ; 1ad2 bit 0, a ret z callba Function55e0 - callba Function5920 + callba RefreshMapAppearDisappear ret ; 1ae5 diff --git a/macros/trainer.asm b/macros/trainer.asm new file mode 100644 index 000000000..610de1c13 --- /dev/null +++ b/macros/trainer.asm @@ -0,0 +1,4 @@ +trainerclass: MACRO
+ enum \1
+const_value = 1
+ENDM
@@ -207,7 +207,7 @@ _ResetWRAM: ; 5bae ld [wCurBox], a ld [wd4b4], a - call Function5ca6 + call SetDefaultBoxNames ld a, 1 call GetSRAMBank @@ -301,10 +301,10 @@ Function5ca1: ; 5ca1 ret ; 5ca6 -Function5ca6: ; 5ca6 +SetDefaultBoxNames: ; 5ca6 ld hl, wBoxNames ld c, 0 -.asm_5cab +.loop push hl ld de, .Box call CopyName2 @@ -312,12 +312,12 @@ Function5ca6: ; 5ca6 ld a, c inc a cp 10 - jr c, .asm_5cbe + jr c, .less sub 10 ld [hl], "1" inc hl -.asm_5cbe +.less add "0" ld [hli], a ld [hl], "@" @@ -327,7 +327,7 @@ Function5ca6: ; 5ca6 inc c ld a, c cp NUM_BOXES - jr c, .asm_5cab + jr c, .loop ret .Box @@ -3291,7 +3291,7 @@ Function80b8: ; 80b8 ; 80e7 -Function80e7:: ; 80e7 +CopyObjectStruct:: ; 80e7 call Function2707 and a ret nz @@ -3332,7 +3332,7 @@ Function8116: ; 8116 Function811d: ; 811d ld a, [$ffb0] - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld [hl], a ld a, [$ffaf] @@ -3350,12 +3350,12 @@ Function811d: ; 811d add hl, bc ld a, [hl] and $f0 - jr z, .asm_814e + jr z, .no_color swap a and $7 ld [wc2f3], a -.asm_814e +.no_color ld hl, MAPOBJECT_FACING add hl, bc ld a, [hl] @@ -3389,7 +3389,7 @@ Function8177: ; 8177 ld a, [hl] and a jr z, .next - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -3415,7 +3415,7 @@ Function8177: ; 8177 cp MAPOBJECT_SCREEN_HEIGHT jr nc, .next push bc - call Function80e7 + call CopyObjectStruct pop bc jp c, Function81c9 @@ -3479,7 +3479,7 @@ Function81ea: ; 81ea ld a, d cp [hl] jr nz, .next - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -3494,7 +3494,7 @@ Function81ea: ; 81ea jr nc, .next push de push bc - call Function80e7 + call CopyObjectStruct pop bc pop de @@ -3537,7 +3537,7 @@ Function823e: ; 823e ld a, e cp [hl] jr nz, .next - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -3552,7 +3552,7 @@ Function823e: ; 823e jr nc, .next push de push bc - call Function80e7 + call CopyObjectStruct pop bc pop de @@ -3688,7 +3688,7 @@ Function8341: ; 8341 push bc ld a, c call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] call GetObjectStruct @@ -3697,7 +3697,7 @@ Function8341: ; 8341 pop bc ld a, b call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] call GetObjectStruct @@ -23302,7 +23302,7 @@ Function16f7a: ; 16f7a (5:6f7a) jr nz, .nottogepi ; set the event flag for hatching togepi ld de, EVENT_TOGEPI_HATCHED - ld b, $1 + ld b, $1 ; set call EventFlagAction .nottogepi @@ -25223,14 +25223,14 @@ Function2454f: ; 2454f ld bc, MapObjects ld de, wd81e xor a -.asm_24561 +.loop push af push bc push de call Function245a7 - jr c, .asm_2456c + jr c, .next call Function2457d -.asm_2456c +.next pop de ld [de], a inc de @@ -25242,44 +25242,44 @@ Function2454f: ; 2454f pop af inc a cp $10 - jr nz, .asm_24561 + jr nz, .loop ret Function2457d: ; 2457d (9:457d) - ld hl, $1 + ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] and a - jr z, .asm_245a3 - ld hl, $c + jr z, .minus_one + ld hl, MAPOBJECT_EVENT_FLAG add hl, bc ld a, [hli] ld e, a ld a, [hl] ld d, a - cp $ff - jr nz, .asm_24598 + cp -1 + jr nz, .clear ld a, e - cp $ff - jr z, .asm_245a1 - jr .asm_245a3 -.asm_24598 - ld b, $2 + cp -1 + jr z, .zero + jr .minus_one +.clear + ld b, $2 ; clear call EventFlagAction ld a, c and a - jr nz, .asm_245a3 -.asm_245a1 + jr nz, .minus_one +.zero xor a ret -.asm_245a3 - ld a, $ff +.minus_one + ld a, -1 scf ret Function245a7: ; 245a7 (9:45a7) call Function18f5 - ld a, $ff + ld a, -1 ret c xor a ret @@ -25302,26 +25302,26 @@ Function245af:: ; 245af ; 245cb Function245cb:: ; 245cb -.asm_245cb +.loop call Function24609 jp c, Function245d6 call z, Function245e1 - jr .asm_245cb + jr .loop ; 245d6 Function245d6: ; 245d6 call Function1ff8 ld [wcf73], a - ld a, $0 + ld a, 0 ld [$ffaa], a ret ; 245e1 Function245e1: ; 245e1 call Function245f1 - ld a, $1 + ld a, 1 ld [hBGMapMode], a - ld c, $3 + ld c, 3 call DelayFrames xor a ld [hBGMapMode], a @@ -49467,35 +49467,35 @@ UnknownScript_0x507af: ; 0x507af _BasementKey: ; 507b4 ld a, [MapGroup] cp GROUP_WAREHOUSE_ENTRANCE - jr nz, .asm_507db + jr nz, .nope ld a, [MapNumber] cp MAP_WAREHOUSE_ENTRANCE - jr nz, .asm_507db + jr nz, .nope call GetFacingTileCoord ld a, d cp 22 - jr nz, .asm_507db + jr nz, .nope ld a, e cp 10 - jr nz, .asm_507db + jr nz, .nope - ld hl, UnknownScript_0x507e1 + ld hl, UnlockBasementDoorScript call Function31cd - ld a, $1 + ld a, 1 ld [wd0ec], a ret -.asm_507db +.nope ld a, $0 ld [wd0ec], a ret ; 507e1 -UnknownScript_0x507e1: ; 0x507e1 +UnlockBasementDoorScript: ; 0x507e1 loadmovesprites - farjump MapWarehouseEntranceSignpost0Script + farjump BasementDoorScript ; 0x507e6 @@ -49505,7 +49505,7 @@ _SacredAsh: ; 507e6 call CheckAnyFaintedMon ret nc - ld hl, UnknownScript_0x50821 + ld hl, SacredAshScript call Function31cd ld a, $1 ld [wd0ec], a @@ -49548,7 +49548,7 @@ CheckAnyFaintedMon: ; 507fb ret ; 50821 -UnknownScript_0x50821: ; 0x50821 +SacredAshScript: ; 0x50821 special HealParty reloadmappart playsound SFX_WARP_TO diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index bd1e506ba..cba5ebbfe 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -51,7 +51,7 @@ UnknownScript_0x198049: writetext UnknownText_0x19814d closetext loadmovesprites - setevent EVENT_6BF + setevent EVENT_RIVAL_AZALEA_TOWN 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 EVENT_6ED - setevent EVENT_6EB + clearevent EVENT_ILEX_FOREST_LASS + setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS dotrigger $0 loadmovesprites end @@ -201,8 +201,7 @@ WhiteApricornTree: fruittree $14 MapAzaleaTownSignpostItem8: - dw $00b1 - db FULL_HEAL + dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x198134: @@ -478,19 +477,19 @@ AzaleaTown_MapEventHeader: signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign - signpost 6, 31, SIGNPOST_ITEMIFSET, MapAzaleaTownSignpostItem8 + signpost 6, 31, SIGNPOST_ITEM, MapAzaleaTownSignpostItem8 ; people-events db 12 - person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA + person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET person_event SPRITE_GRAMPS, 13, 25, DOWN << 2 | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1 person_event SPRITE_TEACHER, 17, 19, UP << 2 | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1 person_event SPRITE_YOUNGSTER, 13, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1 - person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_FRUIT_TREE, 6, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1 - person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6BF - person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC - person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4 + person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN + person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index f2c19cc93..709504693 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, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_791 + person_event SPRITE_YOUNGSTER, 4, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER person_event SPRITE_RECEPTIONIST, 10, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 7542f2131..3d10ef549 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -13,7 +13,7 @@ BattleTowerOutside_MapScriptHeader: return .Callback2 - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return StandingYoungsterScript_0x9f85f: @@ -144,5 +144,5 @@ BattleTowerOutside_MapEventHeader: db 4 person_event SPRITE_STANDING_YOUNGSTER, 16, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1 person_event SPRITE_BUENA, 15, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1 - person_event SPRITE_SAILOR, 22, 16, UP << 2 | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_7CF + person_event SPRITE_SAILOR, 22, 16, UP << 2 | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR person_event SPRITE_LASS, 28, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 49f850a4e..59e7456f8 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, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E3 - person_event SPRITE_SUPER_NERD, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4 - person_event SPRITE_GRAMPS, 6, 24, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_74C - person_event SPRITE_GRAMPS, 6, 25, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_74D + person_event SPRITE_SUPER_NERD, 16, 22, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + person_event SPRITE_SUPER_NERD, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + person_event SPRITE_GRAMPS, 6, 24, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + person_event SPRITE_GRAMPS, 6, 25, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN person_event SPRITE_BLACK_BELT, 35, 28, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1 person_event SPRITE_COOLTRAINER_F, 29, 13, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1 person_event SPRITE_YOUNGSTER, 19, 17, UP << 2 | $1, $1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1 - person_event SPRITE_YOUNGSTER, 24, 26, UP << 2 | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_75D + person_event SPRITE_YOUNGSTER, 24, 26, UP << 2 | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY person_event SPRITE_COOLTRAINER_F, 23, 39, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 5c9d7acf3..9ab5cb56e 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 EVENT_736 - setevent EVENT_74C - clearevent EVENT_74D + clearevent EVENT_MAHOGANY_MART_OWNERS + setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN end .FightDone writetext UnknownText_0x195162 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 4843820ff..b87acda50 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -97,7 +97,7 @@ UnknownScript_0x185c80: closetext loadmovesprites dotrigger $2 - setevent EVENT_6C5 + setevent EVENT_RIVAL_BURNED_TOWER special Functionc48f pause 15 earthquake 50 @@ -129,13 +129,11 @@ BurnedTower1FRock: jumpstd smashrock MapBurnedTower1FSignpostItem0: - dw $0080 - db ETHER + dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER MapBurnedTower1FSignpostItem1: - dw $00ff - db ULTRA_BALL + dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL ItemFragment_0x185ccb: @@ -306,13 +304,13 @@ BurnedTower1F_MapEventHeader: ; signposts db 2 - signpost 7, 8, SIGNPOST_ITEMIFSET, MapBurnedTower1FSignpostItem0 - signpost 11, 13, SIGNPOST_ITEMIFSET, MapBurnedTower1FSignpostItem1 + signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0 + signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1 ; people-events db 5 person_event SPRITE_ROCK, 8, 19, LEFT << 2 | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 16, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_765 - person_event SPRITE_SILVER, 13, 12, LEFT << 2 | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_6C5 - person_event SPRITE_MORTY, 18, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_764 - person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_656 + person_event SPRITE_SUPER_NERD, 16, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE + person_event SPRITE_SILVER, 13, 12, LEFT << 2 | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER + person_event SPRITE_MORTY, 18, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY + person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 7bb1bdb02..0be2b4395 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 EVENT_7A8 - clearevent EVENT_7A9 - setevent EVENT_764 - setevent EVENT_765 + setevent EVENT_ECRUTEAK_GYM_GRAMPS + clearevent EVENT_ECRUTEAK_CITY_GRAMPS + setevent EVENT_BURNED_TOWER_MORTY + setevent EVENT_BURNED_TOWER_1F_EUSINE appear $a refreshscreen $0 changeblock $6, $e, $1b @@ -252,11 +252,11 @@ BurnedTowerB1F_MapEventHeader: ; people-events db 9 person_event SPRITE_BOULDER, 12, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1 - person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_74A - person_event SPRITE_ENTEI, 7, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_74A - person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_74A - person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B - person_event SPRITE_ENTEI, 7, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B - person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B - person_event SPRITE_POKE_BALL, 8, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_657 + person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_ENTEI, 7, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_ENTEI, 7, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_POKE_BALL, 8, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE person_event SPRITE_SUPER_NERD, 16, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 988e54ede..f14579644 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -66,8 +66,7 @@ CeladonCityPokeCenterSign: jumpstd pokecentersign MapCeladonCitySignpostItem7: - dw $00fd - db PP_UP + dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP UnknownText_0x1a9f7d: text "This POLIWRATH is" @@ -254,7 +253,7 @@ CeladonCity_MapEventHeader: signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign - signpost 21, 37, SIGNPOST_ITEMIFSET, MapCeladonCitySignpostItem7 + signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7 ; people-events db 9 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 3a60b2230..b1214d2c2 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -141,8 +141,7 @@ CeruleanCityMartSign: jumpstd martsign MapCeruleanCitySignpostItem8: - dw EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY - db BERSERK_GENE + dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE UnknownText_0x1840bc: text "KANTO's POWER" @@ -296,7 +295,7 @@ CeruleanCity_MapEventHeader: signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign - signpost 12, 2, SIGNPOST_ITEMIFSET, MapCeruleanCitySignpostItem8 + signpost 12, 2, SIGNPOST_ITEM, MapCeruleanCitySignpostItem8 ; people-events db 6 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 952e3251e..3e7e94728 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 EVENT_76C - clearevent EVENT_76E + clearevent EVENT_ROUTE_24_ROCKET + clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND dotrigger $0 domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1 domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0 @@ -177,8 +177,7 @@ CeruleanGymGuyScript: end MapCeruleanGymSignpostItem0: - dw $00fb - db MACHINE_PART + dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART CeruleanGymStatue1: @@ -420,13 +419,13 @@ CeruleanGym_MapEventHeader: ; signposts db 3 - signpost 8, 3, SIGNPOST_ITEMIFSET, MapCeruleanGymSignpostItem0 + signpost 8, 3, SIGNPOST_ITEM, MapCeruleanGymSignpostItem0 signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 ; people-events db 6 - person_event SPRITE_ROCKET, 14, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_76D + person_event SPRITE_ROCKET, 14, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET person_event SPRITE_MISTY, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM person_event SPRITE_SWIMMER_GIRL, 10, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM person_event SPRITE_SWIMMER_GIRL, 13, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 0429f25a8..975b9180c 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -570,8 +570,8 @@ CherrygroveCity_MapEventHeader: ; people-events db 5 - person_event SPRITE_GRAMPS, 10, 36, UP << 2 | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_6FE - person_event SPRITE_SILVER, 10, 43, DOWN << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6BE + person_event SPRITE_GRAMPS, 10, 36, UP << 2 | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE + person_event SPRITE_SILVER, 10, 43, DOWN << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY person_event SPRITE_TEACHER, 16, 31, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x19c146, -1 person_event SPRITE_YOUNGSTER, 11, 27, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19c15a, -1 person_event SPRITE_FISHER, 16, 11, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MysticWaterGuy, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 80886aa07..47b8e5a97 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -135,12 +135,10 @@ CianwoodCityRock: jumpstd smashrock MapCianwoodCitySignpostItem6: - dw $00b2 - db REVIVE + dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE MapCianwoodCitySignpostItem7: - dw $00b3 - db MAX_ETHER + dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: db $39 ; movement @@ -398,8 +396,8 @@ CianwoodCity_MapEventHeader: signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign - signpost 19, 4, SIGNPOST_ITEMIFSET, MapCianwoodCitySignpostItem6 - signpost 29, 5, SIGNPOST_ITEMIFSET, MapCianwoodCitySignpostItem7 + signpost 19, 4, SIGNPOST_ITEM, MapCianwoodCitySignpostItem6 + signpost 29, 5, SIGNPOST_ITEM, MapCianwoodCitySignpostItem7 ; people-events db 12 @@ -413,5 +411,5 @@ CianwoodCity_MapEventHeader: person_event SPRITE_ROCK, 31, 14, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 23, 8, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 person_event SPRITE_POKEFAN_F, 50, 14, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanFScript_0x1a0084, -1 - person_event SPRITE_SUPER_NERD, 25, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_7AD + person_event SPRITE_SUPER_NERD, 25, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE person_event SPRITE_SUICUNE, 18, 14, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index fd154f439..16dd7a066 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -21,7 +21,7 @@ CinnabarIslandBlue: playsound SFX_WARP_TO applymovement $2, CinnabarIslandBlueTeleport disappear $2 - clearevent EVENT_776 + clearevent EVENT_VIRIDIAN_GYM_BLUE end CinnabarIslandGymSign: @@ -34,8 +34,7 @@ CinnabarIslandPokeCenterSign: jumpstd pokecentersign MapCinnabarIslandSignpostItem3: - dw $00fe - db RARE_CANDY + dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY CinnabarIslandBlueTeleport: teleport_from @@ -143,7 +142,7 @@ CinnabarIsland_MapEventHeader: signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign - signpost 1, 9, SIGNPOST_ITEMIFSET, MapCinnabarIslandSignpostItem3 + signpost 1, 9, SIGNPOST_ITEM, MapCinnabarIslandSignpostItem3 ; people-events db 1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index d38321a88..67fb3a093 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 EVENT_773 + clearevent EVENT_COPYCATS_HOUSE_2F_DOLL jump .Part14 .Part13 @@ -373,9 +373,9 @@ CopycatsHouse2F_MapEventHeader: ; people-events db 6 - person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_6EE + person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_COPYCAT_1 person_event SPRITE_MOLTRES, 8, 10, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CopycatsDodrio, -1 - person_event SPRITE_FAIRY, 5, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CopycatsHouse2FDoll, EVENT_773 + person_event SPRITE_FAIRY, 5, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL person_event SPRITE_MONSTER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CopycatsHouse2FDoll, -1 person_event SPRITE_BIRD, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, Copycat, EVENT_6EF + person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, Copycat, EVENT_COPYCAT_2 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index aed85322e..6e1216fd1 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -74,5 +74,5 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; people-events db 3 person_event SPRITE_PHARMACIST, 7, 11, DOWN << 2 | $3, $0, -1, -1, $0, 0, PharmacistScript_0x18c720, -1 - person_event SPRITE_POKE_BALL, 28, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_6A1 - person_event SPRITE_POKE_BALL, 26, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73d, EVENT_6A2 + person_event SPRITE_POKE_BALL, 28, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + person_event SPRITE_POKE_BALL, 26, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 6bc09411b..2215775f1 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -21,8 +21,7 @@ DarkCaveVioletEntranceRock: jumpstd smashrock MapDarkCaveVioletEntranceSignpostItem0: - dw $009d - db ELIXER + dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER DarkCaveVioletEntrance_MapEventHeader: @@ -40,15 +39,15 @@ DarkCaveVioletEntrance_MapEventHeader: ; signposts db 1 - signpost 3, 26, SIGNPOST_ITEMIFSET, MapDarkCaveVioletEntranceSignpostItem0 + signpost 3, 26, SIGNPOST_ITEM, MapDarkCaveVioletEntranceSignpostItem0 ; people-events db 8 - person_event SPRITE_POKE_BALL, 12, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_69E + person_event SPRITE_POKE_BALL, 12, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION person_event SPRITE_ROCK, 18, 20, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 10, 31, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 18, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 35, 40, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_POKE_BALL, 26, 40, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c690, EVENT_69F - person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c692, EVENT_6A0 - person_event SPRITE_POKE_BALL, 32, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c694, EVENT_7CE + person_event SPRITE_POKE_BALL, 26, 40, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + person_event SPRITE_POKE_BALL, 32, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT diff --git a/maps/DayCare.asm b/maps/DayCare.asm index f6d03dada..22f7b4258 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 EVENT_6E5 - setevent EVENT_6E6 + clearevent EVENT_DAYCARE_MAN_IN_DAYCARE + setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 return UnknownScript_0x62f88: - setevent EVENT_6E5 - clearevent EVENT_6E6 + setevent EVENT_DAYCARE_MAN_IN_DAYCARE + clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 return GrampsScript_0x62f8f: @@ -175,5 +175,5 @@ DayCare_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRAMPS, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_6E5 + person_event SPRITE_GRAMPS, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE person_event SPRITE_GRANNY, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrannyScript_0x62fc3, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 62c2cd46e..ca65ef0bb 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -9,8 +9,7 @@ PokefanMScript_0x74002: jumptextfaceplayer UnknownText_0x74008 MapDiglettsCaveSignpostItem0: - dw $00e4 - db MAX_REVIVE + dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x74008: @@ -39,7 +38,7 @@ DiglettsCave_MapEventHeader: ; signposts db 1 - signpost 11, 6, SIGNPOST_ITEMIFSET, MapDiglettsCaveSignpostItem0 + signpost 11, 6, SIGNPOST_ITEM, MapDiglettsCaveSignpostItem0 ; people-events db 1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index e8fdc5016..798b8d4a6 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -684,4 +684,4 @@ DragonShrine_MapEventHeader: person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 - person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790 + person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 4481d3597..a1eece6bf 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -238,16 +238,13 @@ ItemFragment_0x18c9a3: db MAX_ELIXER, 1 MapDragonsDenB1FSignpostItem1: - dw $00a0 - db REVIVE + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE MapDragonsDenB1FSignpostItem2: - dw $00a1 - db MAX_POTION + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION MapDragonsDenB1FSignpostItem3: - dw $00a2 - db MAX_ELIXER + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER MovementData_0x18c9ae: slow_step_right @@ -480,18 +477,18 @@ DragonsDenB1F_MapEventHeader: ; signposts db 4 signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script - signpost 29, 33, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem1 - signpost 17, 21, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem2 - signpost 15, 31, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem3 + signpost 29, 33, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem1 + signpost 17, 21, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem2 + signpost 15, 31, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem3 ; people-events db 9 - person_event SPRITE_POKE_BALL, 20, 39, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_6A8 - person_event SPRITE_CLAIR, 34, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_6D8 - person_event SPRITE_SILVER, 27, 24, DOWN << 2 | $2, $22, -1, -1, $0, 0, SilverScript_0x18c97e, EVENT_6C6 + person_event SPRITE_POKE_BALL, 20, 39, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + person_event SPRITE_CLAIR, 34, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR + person_event SPRITE_SILVER, 27, 24, DOWN << 2 | $2, $22, -1, -1, $0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN person_event SPRITE_COOLTRAINER_M, 12, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermDarin, -1 person_event SPRITE_COOLTRAINER_F, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCara, -1 person_event SPRITE_TWIN, 21, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia1, -1 person_event SPRITE_TWIN, 22, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia2, -1 - person_event SPRITE_POKE_BALL, 8, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a1, EVENT_7BF - person_event SPRITE_POKE_BALL, 24, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a3, EVENT_7C0 + person_event SPRITE_POKE_BALL, 8, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 24, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 841804c4d..1f8bd3329 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -425,7 +425,7 @@ EarlsPokemonAcademy_MapEventHeader: ; people-events db 6 - person_event SPRITE_FISHER, 6, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_6CB + person_event SPRITE_FISHER, 6, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x68a83, -1 person_event SPRITE_GAMEBOY_KID, 15, 7, UP << 2 | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x68a86, -1 person_event SPRITE_GAMEBOY_KID, 15, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x68a91, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index ce7d15d97..ef49d7e13 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -81,8 +81,7 @@ EcruteakCityMartSign: jumpstd martsign MapEcruteakCitySignpostItem7: - dw $00b4 - db HYPER_POTION + dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. @@ -287,7 +286,7 @@ EcruteakCity_MapEventHeader: signpost 10, 2, SIGNPOST_READ, BurnedTowerSign signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign - signpost 14, 23, SIGNPOST_ITEMIFSET, MapEcruteakCitySignpostItem7 + signpost 14, 23, SIGNPOST_ITEM, MapEcruteakCitySignpostItem7 ; people-events db 7 @@ -297,4 +296,4 @@ EcruteakCity_MapEventHeader: person_event SPRITE_LASS, 13, 7, UP << 2 | $3, $0, -1, -1, $0, 0, LassScript_0x1a4015, -1 person_event SPRITE_FISHER, 26, 13, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a4029, -1 person_event SPRITE_YOUNGSTER, 18, 14, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a403d, -1 - person_event SPRITE_GRAMPS, 11, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_7A9 + person_event SPRITE_GRAMPS, 11, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index a30fbe9a4..c816119e6 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 EVENT_766 - setevent EVENT_RANG_CLEAR_BELL + setevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_RANG_CLEAR_BELL_2 .FightDone checkevent EVENT_GOT_TM30_SHADOW_BALL iftrue UnknownScript_0x99db1 @@ -499,4 +499,4 @@ EcruteakGym_MapEventHeader: person_event SPRITE_GRANNY, 9, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumMartha, -1 person_event SPRITE_GRANNY, 13, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumGrace, -1 person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, EcruteakGymGuyScript, -1 - person_event SPRITE_GRAMPS, 18, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_7A8 + person_event SPRITE_GRAMPS, 18, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 066b9125b..ff33be5cf 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -3,48 +3,48 @@ EcruteakHouse_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9800d, $0000 - dw UnknownScript_0x9800e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks - dbw 2, UnknownScript_0x9800f + dbw 2, .InitializeSages -UnknownScript_0x9800d: +.Trigger1: end -UnknownScript_0x9800e: +.Trigger2: end -UnknownScript_0x9800f: +.InitializeSages: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x98033 + iftrue .DontBlockTower checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x98033 + iftrue .DontBlockTower checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x98022 + iftrue .BlockTower return -UnknownScript_0x98022: - clearevent EVENT_766 - setevent EVENT_RANG_CLEAR_BELL - setevent EVENT_7B1 +.BlockTower: + clearevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_RANG_CLEAR_BELL_2 + setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE checkitem CLEAR_BELL - iftrue UnknownScript_0x98032 + iftrue .NoClearBell dotrigger $0 -UnknownScript_0x98032: +.NoClearBell: return -UnknownScript_0x98033: - clearevent EVENT_7B1 +.DontBlockTower: + clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE return -UnknownScript_0x98037: - checkevent EVENT_RANG_CLEAR_BELL - iftrue UnknownScript_0x98061 +EcruteakHouse_XYTrigger1: + checkevent EVENT_RANG_CLEAR_BELL_2 + iftrue EcruteakHouse_XYTrigger_DontMove applymovement $3, MovementData_0x980c7 moveperson $2, $4, $6 appear $2 @@ -52,9 +52,9 @@ UnknownScript_0x98037: disappear $3 end -UnknownScript_0x9804c: - checkevent EVENT_766 - iftrue UnknownScript_0x98061 +EcruteakHouse_XYTrigger2: + checkevent EVENT_RANG_CLEAR_BELL_1 + iftrue EcruteakHouse_XYTrigger_DontMove applymovement $2, MovementData_0x980cc moveperson $3, $5, $6 appear $3 @@ -62,56 +62,56 @@ UnknownScript_0x9804c: disappear $2 end -UnknownScript_0x98061: +EcruteakHouse_XYTrigger_DontMove: end SageScript_0x98062: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x9807c + iftrue .CheckForClearBell checkflag ENGINE_FOGBADGE - iftrue UnknownScript_0x98076 + iftrue .BlockPassage_GotFogBadge writetext UnknownText_0x980d1 closetext loadmovesprites end -UnknownScript_0x98076: +.BlockPassage_GotFogBadge: writetext UnknownText_0x98131 closetext loadmovesprites end -UnknownScript_0x9807c: +.CheckForClearBell: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x980a4 + iftrue .AllowedThrough checkevent EVENT_000 - iftrue UnknownScript_0x980aa + iftrue .Event000 checkitem CLEAR_BELL - iftrue UnknownScript_0x98093 + iftrue .RingClearBell writetext UnknownText_0x981a4 closetext loadmovesprites end -UnknownScript_0x98093: +.RingClearBell: writetext UnknownText_0x98250 closetext loadmovesprites dotrigger $1 - setevent EVENT_RANG_CLEAR_BELL - clearevent EVENT_766 + setevent EVENT_RANG_CLEAR_BELL_2 + clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_000 end -UnknownScript_0x980a4: +.AllowedThrough: writetext UnknownText_0x9837e closetext loadmovesprites end -UnknownScript_0x980aa: +.Event000: writetext UnknownText_0x98391 closetext loadmovesprites @@ -121,13 +121,13 @@ SageScript_0x980b0: faceplayer loadfont checkevent EVENT_GOT_CLEAR_BELL - iftrue UnknownScript_0x980be + iftrue .GotClearBell writetext UnknownText_0x9840b closetext loadmovesprites end -UnknownScript_0x980be: +.GotClearBell: writetext UnknownText_0x9846f closetext loadmovesprites @@ -290,15 +290,15 @@ EcruteakHouse_MapEventHeader: ; xy triggers db 2 - xy_trigger 0, $7, $4, $0, UnknownScript_0x98037, $0, $0 - xy_trigger 0, $7, $5, $0, UnknownScript_0x9804c, $0, $0 + xy_trigger 0, $7, $4, $0, EcruteakHouse_XYTrigger1, $0, $0 + xy_trigger 0, $7, $5, $0, EcruteakHouse_XYTrigger2, $0, $0 ; signposts db 0 ; people-events db 4 - person_event SPRITE_SAGE, 10, 8, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_766 - person_event SPRITE_SAGE, 10, 9, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL - person_event SPRITE_SAGE, 13, 10, DOWN << 2 | $2, $11, -1, -1, $0, 0, SageScript_0x980b0, EVENT_7B1 - person_event SPRITE_GRAMPS, 15, 7, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x980c4, EVENT_7B1 + person_event SPRITE_SAGE, 10, 8, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 + person_event SPRITE_SAGE, 10, 9, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 + person_event SPRITE_SAGE, 13, 10, DOWN << 2 | $2, $11, -1, -1, $0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + person_event SPRITE_GRAMPS, 15, 7, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index c6981b7f2..7903eabbd 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -223,4 +223,4 @@ EcruteakPokeCenter1F_MapEventHeader: person_event SPRITE_POKEFAN_M, 10, 11, LEFT << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x98eb3, -1 person_event SPRITE_COOLTRAINER_F, 8, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, CooltrainerFScript_0x98ebf, -1 person_event SPRITE_GYM_GUY, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x98ec2, -1 - person_event SPRITE_BILL, 11, 4, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_713 + person_event SPRITE_BILL, 11, 4, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 663b08ff3..8efa83678 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -270,7 +270,7 @@ ElmDirectionsScript: closetext loadmovesprites setevent EVENT_GOT_A_POKEMON_FROM_ELM - setevent EVENT_6BE + setevent EVENT_RIVAL_CHERRYGROVE_CITY 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 EVENT_715 - setevent EVENT_714 + clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY + setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 closetext loadmovesprites diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index a1aaa629a..8ee6218aa 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -66,7 +66,7 @@ UnknownScript_0x7517a: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - setevent EVENT_72B + setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY 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 EVENT_72A + setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1 warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17 end @@ -313,4 +313,4 @@ FastShip1F_MapEventHeader: person_event SPRITE_SAILOR, 6, 29, UP << 2 | $2, $0, -1, -1, $0, 0, SailorScript_0x75160, -1 person_event SPRITE_SAILOR, 11, 18, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x751d0, -1 person_event SPRITE_SAILOR, 21, 26, UP << 2 | $1, $2, -1, -1, $0, 0, SailorScript_0x751e4, -1 - person_event SPRITE_GENTLEMAN, 10, 23, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_72C + person_event SPRITE_GENTLEMAN, 10, 23, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index e0942c54f..9f469d5c3 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -16,7 +16,7 @@ UnknownScript_0x7673b: end UnknownScript_0x7673c: - checkevent EVENT_72F + checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 applymovement $3, MovementData_0x76876 moveperson $2, $1e, $6 @@ -26,7 +26,7 @@ UnknownScript_0x7673c: end UnknownScript_0x76751: - checkevent EVENT_72E + checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 applymovement $2, MovementData_0x76871 moveperson $3, $1f, $6 @@ -51,7 +51,7 @@ SailorScript_0x76767: closetext loadmovesprites setevent EVENT_034 - clearevent EVENT_72D + clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR end UnknownScript_0x76787: @@ -616,15 +616,15 @@ FastShipB1F_MapEventHeader: ; people-events db 12 - person_event SPRITE_SAILOR, 10, 34, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_72E - person_event SPRITE_SAILOR, 10, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_72F - person_event SPRITE_SAILOR, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorJeff, EVENT_739 - person_event SPRITE_LASS, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerDebra, EVENT_739 - person_event SPRITE_SUPER_NERD, 13, 30, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerJugglerFritz, EVENT_739 - person_event SPRITE_SAILOR, 8, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorGarrett, EVENT_73A - person_event SPRITE_FISHER, 12, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherJonah, EVENT_73A - person_event SPRITE_BLACK_BELT, 15, 19, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltWai, EVENT_73A - person_event SPRITE_SAILOR, 8, 27, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorKenneth, EVENT_73B - person_event SPRITE_TEACHER, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherShirley, EVENT_73B - person_event SPRITE_YOUNGSTER, 13, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyNate, EVENT_73B - person_event SPRITE_YOUNGSTER, 15, 18, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyRicky, EVENT_73B + person_event SPRITE_SAILOR, 10, 34, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT + person_event SPRITE_SAILOR, 10, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + person_event SPRITE_SAILOR, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_LASS, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SUPER_NERD, 13, 30, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SAILOR, 8, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_FISHER, 12, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_BLACK_BELT, 15, 19, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_SAILOR, 8, 27, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_TEACHER, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_YOUNGSTER, 13, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_YOUNGSTER, 15, 18, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 1cfce4c95..78110d9d7 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -374,10 +374,10 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; people-events db 7 - person_event SPRITE_COOLTRAINER_M, 7, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_73A - person_event SPRITE_COOLTRAINER_F, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_73A - person_event SPRITE_SUPER_NERD, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacEthan, EVENT_73B - person_event SPRITE_POKEFAN_M, 21, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerNoland, EVENT_739 - person_event SPRITE_SAILOR, 30, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x755f1, EVENT_72D - person_event SPRITE_GENTLEMAN, 34, 11, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerGentlemanEdward, EVENT_73A - person_event SPRITE_PHARMACIST, 34, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerBurglarCorey, EVENT_73B + person_event SPRITE_COOLTRAINER_M, 7, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_COOLTRAINER_F, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_SUPER_NERD, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_POKEFAN_M, 21, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SAILOR, 30, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + person_event SPRITE_GENTLEMAN, 34, 11, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_PHARMACIST, 34, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index a3c9ed360..a46c3dc0d 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -67,7 +67,7 @@ UnknownScript_0x75f09: loadfont writetext UnknownText_0x76143 keeptextopen - setevent EVENT_72B + setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY 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 EVENT_732 + checkevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 iftrue UnknownScript_0x75f58 writetext UnknownText_0x760ae closetext @@ -584,13 +584,13 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; people-events db 11 person_event SPRITE_CAPTAIN, 29, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CaptainScript_0x75ea7, -1 - person_event SPRITE_GENTLEMAN, 21, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_730 - person_event SPRITE_TWIN, 21, 7, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75f6d, EVENT_731 - person_event SPRITE_TWIN, 29, 6, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75ebb, EVENT_732 - person_event SPRITE_POKEFAN_M, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerPokefanmColin, EVENT_739 - person_event SPRITE_TWIN, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg1, EVENT_739 - person_event SPRITE_TWIN, 8, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg2, EVENT_739 - person_event SPRITE_SUPER_NERD, 9, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerPsychicRodney, EVENT_73A - person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJeremy, EVENT_73B - person_event SPRITE_POKEFAN_F, 9, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerPokefanfGeorgia, EVENT_73B - person_event SPRITE_SUPER_NERD, 19, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdShawn, EVENT_73A + person_event SPRITE_GENTLEMAN, 21, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + person_event SPRITE_TWIN, 21, 7, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + person_event SPRITE_TWIN, 29, 6, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + person_event SPRITE_POKEFAN_M, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_TWIN, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_TWIN, 8, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SUPER_NERD, 9, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_POKEFAN_F, 9, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_SUPER_NERD, 19, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index cc199c381..2b888eeca 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -303,7 +303,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; people-events db 4 - person_event SPRITE_FISHER, 19, 5, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_739 - person_event SPRITE_BUG_CATCHER, 19, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_73B - person_event SPRITE_BUENA, 30, 5, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyCassie, EVENT_73A - person_event SPRITE_ROCKER, 32, 7, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerGuitaristClyde, EVENT_73B + person_event SPRITE_FISHER, 19, 5, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_BUG_CATCHER, 19, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_BUENA, 30, 5, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_ROCKER, 32, 7, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index e1c6d62d8..ba32d2c0e 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -31,7 +31,7 @@ GoldenrodCity_MapScriptHeader: return .MoveTutorAppear - checkflag ENGINE_5E + checkflag ENGINE_DAILY_MOVE_TUTOR iftrue .MoveTutorDone appear $10 .MoveTutorDone @@ -42,52 +42,52 @@ MoveTutor: loadfont writetext UnknownText_0x199042 yesorno - iffalse UnknownScript_0x19899a + iffalse .Refused special Function24b25 writetext UnknownText_0x199090 yesorno - iffalse UnknownScript_0x1989a0 + iffalse .Refused2 checkcoins 4000 - if_equal $2, UnknownScript_0x1989dd + if_equal $2, .NotEnoughMoney writetext UnknownText_0x1990ce - loadmenudata MenuDataHeader_0x198967 + loadmenudata .MoveMenuDataHeader interpretmenu2 writebackup - if_equal $1, UnknownScript_0x19893a - if_equal $2, UnknownScript_0x198949 - if_equal $3, UnknownScript_0x198958 - jump UnknownScript_0x1989d7 + if_equal $1, .Flamethrower + if_equal $2, .Thunderbolt + if_equal $3, .IceBeam + jump .Incompatible -UnknownScript_0x19893a: +.Flamethrower: writebyte $1 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -UnknownScript_0x198949: +.Thunderbolt: writebyte $2 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -UnknownScript_0x198958: +.IceBeam: writebyte $3 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -MenuDataHeader_0x198967: +.MoveMenuDataHeader: db $40 ; flags db 02, 00 ; start coords db 11, 15 ; end coords - dw MenuData2_0x19896f + dw .MenuData2 db 1 ; default option -MenuData2_0x19896f: +.MenuData2: db $80 ; flags db 4 ; items db "FLAMETHROWER@" @@ -96,19 +96,19 @@ MenuData2_0x19896f: db "CANCEL@" -UnknownScript_0x19899a: +.Refused: writetext UnknownText_0x1990b4 closetext loadmovesprites end -UnknownScript_0x1989a0: +.Refused2: writetext UnknownText_0x199107 closetext loadmovesprites end -UnknownScript_0x1989a6: +.TeachMove: writetext UnknownText_0x19913a keeptextopen takecoins 4000 @@ -119,27 +119,27 @@ UnknownScript_0x1989a6: closetext loadmovesprites checkcode VAR_FACING - if_equal $2, UnknownScript_0x1989c6 + if_equal $2, .WalkAroundPlayer applymovement $10, MovementData_0x198a5f - jump UnknownScript_0x1989ca + jump .GoInside -UnknownScript_0x1989c6: +.WalkAroundPlayer: applymovement $10, MovementData_0x198a63 -UnknownScript_0x1989ca: +.GoInside: playsound SFX_ENTER_DOOR disappear $10 - clearevent EVENT_76B - setflag ENGINE_5E + clearevent EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR + setflag ENGINE_DAILY_MOVE_TUTOR waitbutton end -UnknownScript_0x1989d7: +.Incompatible: writetext UnknownText_0x1991a4 closetext loadmovesprites end -UnknownScript_0x1989dd: +.NotEnoughMoney: writetext UnknownText_0x1991ac closetext loadmovesprites @@ -155,13 +155,13 @@ CooltrainerFScript_0x1989e9: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x1989f7 + iftrue .ClearedRadioTower writetext UnknownText_0x198ae6 closetext loadmovesprites end -UnknownScript_0x1989f7: +.ClearedRadioTower: writetext UnknownText_0x198b2d closetext loadmovesprites @@ -171,13 +171,13 @@ CooltrainerFScript_0x1989fd: faceplayer loadfont checkflag ENGINE_RADIO_CARD - iftrue UnknownScript_0x198a0b + iftrue .GotRadioCard writetext UnknownText_0x198b73 closetext loadmovesprites end -UnknownScript_0x198a0b: +.GotRadioCard: writetext UnknownText_0x198c14 closetext loadmovesprites @@ -581,18 +581,18 @@ GoldenrodCity_MapEventHeader: ; people-events db 15 - person_event SPRITE_POKEFAN_M, 22, 11, UP << 2 | $3, $0, -1, -1, $0, 0, PokefanMScript_0x1989e3, EVENT_6CF - person_event SPRITE_YOUNGSTER, 21, 34, DOWN << 2 | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1989e6, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 20, 16, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1989e9, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 30, 24, DOWN << 2 | $2, $21, -1, -1, $0, 0, CooltrainerFScript_0x1989fd, EVENT_6CF - person_event SPRITE_YOUNGSTER, 21, 23, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x198a11, EVENT_6CF - person_event SPRITE_LASS, 14, 21, UP << 2 | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x198a14, EVENT_6CF - person_event SPRITE_GRAMPS, 31, 15, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x198a17, EVENT_6CF - person_event SPRITE_ROCKET, 20, 8, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a1a, EVENT_6CC - person_event SPRITE_ROCKET, 24, 32, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a29, EVENT_6CD - person_event SPRITE_ROCKET, 19, 12, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a2c, EVENT_6CD - person_event SPRITE_ROCKET, 27, 20, LEFT << 2 | $1, $0, -1, -1, $0, 0, RocketScript_0x198a2f, EVENT_6CE - person_event SPRITE_ROCKET, 24, 33, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a32, EVENT_6CE - person_event SPRITE_ROCKET, 11, 33, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a35, EVENT_6CE - person_event SPRITE_ROCKET, 14, 35, LEFT << 2 | $0, $0, -1, -1, $0, 0, RocketScript_0x198a38, EVENT_6CE - person_event SPRITE_POKEFAN_M, 26, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MoveTutor, EVENT_76A + person_event SPRITE_POKEFAN_M, 22, 11, UP << 2 | $3, $0, -1, -1, $0, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 21, 34, DOWN << 2 | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 20, 16, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 30, 24, DOWN << 2 | $2, $21, -1, -1, $0, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 21, 23, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_LASS, 14, 21, UP << 2 | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_GRAMPS, 31, 15, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_ROCKET, 20, 8, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + person_event SPRITE_ROCKET, 24, 32, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 19, 12, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 27, 20, LEFT << 2 | $1, $0, -1, -1, $0, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 24, 33, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 11, 33, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 14, 35, LEFT << 2 | $0, $0, -1, -1, $0, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_POKEFAN_M, 26, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index f134c10d8..7612897a4 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -237,4 +237,4 @@ GoldenrodDeptStore5F_MapEventHeader: person_event SPRITE_COOLTRAINER_M, 7, 10, DOWN << 2 | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x56133, -1 person_event SPRITE_POKEFAN_M, 9, 17, DOWN << 2 | $2, $22, -1, -1, $0, 0, PokefanMScript_0x5613a, -1 person_event SPRITE_TWIN, 5, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56118, -1 - person_event SPRITE_RECEPTIONIST, 9, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x560ce, EVENT_763 + person_event SPRITE_RECEPTIONIST, 9, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 7a5ce8806..2f878907e 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -121,10 +121,10 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; people-events db 8 - person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c3, EVENT_675 - person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c5, EVENT_676 - person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c7, EVENT_677 - person_event SPRITE_POKE_BALL, 19, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c9, EVENT_678 + person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + person_event SPRITE_POKE_BALL, 19, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL person_event SPRITE_BLACK_BELT, 14, 13, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x7d7b0, -1 person_event SPRITE_BLACK_BELT, 12, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackBeltScript_0x7d7b3, -1 person_event SPRITE_BLACK_BELT, 17, 10, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x7d7b6, -1 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 335668ae0..72965848a 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -24,7 +24,7 @@ TeacherScript_0x5535d: setevent EVENT_GOT_SQUIRTBOTTLE loadmovesprites setevent EVENT_FLORIA_AT_SUDOWOODO - clearevent EVENT_768 + clearevent EVENT_FLORIA_AT_FLOWER_SHOP end UnknownScript_0x5538f: @@ -55,7 +55,7 @@ LassScript_0x553a2: closetext loadmovesprites setevent EVENT_0BA - setevent EVENT_768 + setevent EVENT_FLORIA_AT_FLOWER_SHOP clearevent EVENT_FLORIA_AT_SUDOWOODO end @@ -173,4 +173,4 @@ GoldenrodFlowerShop_MapEventHeader: ; people-events db 2 person_event SPRITE_TEACHER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x5535d, -1 - person_event SPRITE_LASS, 10, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_768 + person_event SPRITE_LASS, 10, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 81a96e61a..963d0655d 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -22,7 +22,7 @@ UnknownScript_0x56c0e: return UnknownScript_0x56c11: - checkflag ENGINE_5E + checkflag ENGINE_DAILY_MOVE_TUTOR iftrue UnknownScript_0x56c19 disappear $d UnknownScript_0x56c19: ;0x56c19 @@ -490,4 +490,4 @@ GoldenrodGameCorner_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 7, 14, DOWN << 2 | $2, $12, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x56e1d, -1 person_event SPRITE_GENTLEMAN, 14, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x56e20, -1 person_event SPRITE_POKEFAN_M, 13, 6, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x56e2b, -1 - person_event SPRITE_POKEFAN_M, 14, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x56c1a, EVENT_76B + person_event SPRITE_POKEFAN_M, 14, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x56c1a, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 8a020c2e7..833602886 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -183,4 +183,4 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; people-events db 2 person_event SPRITE_OFFICER, 13, 13, UP << 2 | $2, $0, -1, -1, $0, 0, OfficerScript_0x550ec, -1 - person_event SPRITE_GENTLEMAN, 18, 15, DOWN << 2 | $2, $22, -1, -1, $0, 0, GentlemanScript_0x55143, EVENT_749 + person_event SPRITE_GENTLEMAN, 18, 15, DOWN << 2 | $2, $22, -1, -1, $0, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index c3ffce2f8..29dee8019 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_688 - person_event SPRITE_POKE_BALL, 27, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_689 - person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_7BE + person_event SPRITE_POKE_BALL, 11, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_ICE_PATH_1F_HM_WATERFALL + person_event SPRITE_POKE_BALL, 27, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP + person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 34d9bef47..4294ceda3 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -34,22 +34,22 @@ StoneTable_0x7e4c7: UnknownScript_0x7e4d8: disappear 2 - clearevent EVENT_BOULDER_IN_ICE_PATH_1 + clearevent EVENT_BOULDER_IN_ICE_PATH_1A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4e0: disappear 3 - clearevent EVENT_BOULDER_IN_ICE_PATH_2 + clearevent EVENT_BOULDER_IN_ICE_PATH_2A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4e8: disappear 4 - clearevent EVENT_BOULDER_IN_ICE_PATH_3 + clearevent EVENT_BOULDER_IN_ICE_PATH_3A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4f0: disappear 5 - clearevent EVENT_BOULDER_IN_ICE_PATH_4 + clearevent EVENT_BOULDER_IN_ICE_PATH_4A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4f8: @@ -74,8 +74,7 @@ ItemFragment_0x7e50d: db IRON, 1 MapIcePathB1FSignpostItem0: - dw $0094 - db MAX_POTION + dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION UnknownText_0x7e512: @@ -104,12 +103,12 @@ IcePathB1F_MapEventHeader: ; signposts db 1 - signpost 30, 17, SIGNPOST_ITEMIFSET, MapIcePathB1FSignpostItem0 + signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0 ; people-events db 5 - person_event SPRITE_BOULDER, 11, 15, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_709 - person_event SPRITE_BOULDER, 12, 11, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70A - person_event SPRITE_BOULDER, 13, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70B - person_event SPRITE_BOULDER, 11, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70C - person_event SPRITE_POKE_BALL, 39, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e50d, EVENT_68A + person_event SPRITE_BOULDER, 11, 15, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 + person_event SPRITE_BOULDER, 12, 11, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 + person_event SPRITE_BOULDER, 13, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 + person_event SPRITE_BOULDER, 11, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 + person_event SPRITE_POKE_BALL, 39, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 623a50ad8..903063c4e 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -9,8 +9,7 @@ ItemFragment_0x7e646: db TM_REST, 1 MapIcePathB2FBlackthornSideSignpostItem0: - dw $0096 - db ICE_HEAL + dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL IcePathB2FBlackthornSide_MapEventHeader: @@ -27,8 +26,8 @@ IcePathB2FBlackthornSide_MapEventHeader: ; signposts db 1 - signpost 10, 2, SIGNPOST_ITEMIFSET, MapIcePathB2FBlackthornSideSignpostItem0 + signpost 10, 2, SIGNPOST_ITEM, MapIcePathB2FBlackthornSideSignpostItem0 ; people-events db 1 - person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e646, EVENT_68D + person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e646, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 00dab155b..6a039d1e9 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -15,8 +15,7 @@ ItemFragment_0x7e5a8: db MAX_POTION, 1 MapIcePathB2FMahoganySideSignpostItem0: - dw $0095 - db CARBOS + dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS UnknownText_0x7e5ad: @@ -42,13 +41,13 @@ IcePathB2FMahoganySide_MapEventHeader: ; signposts db 1 - signpost 17, 0, SIGNPOST_ITEMIFSET, MapIcePathB2FMahoganySideSignpostItem0 + signpost 17, 0, SIGNPOST_ITEM, MapIcePathB2FMahoganySideSignpostItem0 ; people-events db 6 - person_event SPRITE_BOULDER, 7, 15, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1 - person_event SPRITE_BOULDER, 11, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2 - person_event SPRITE_BOULDER, 16, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3 - person_event SPRITE_BOULDER, 17, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4 - person_event SPRITE_POKE_BALL, 13, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a6, EVENT_68B - person_event SPRITE_POKE_BALL, 6, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a8, EVENT_68C + person_event SPRITE_BOULDER, 7, 15, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A + person_event SPRITE_BOULDER, 11, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A + person_event SPRITE_BOULDER, 16, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A + person_event SPRITE_BOULDER, 17, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A + person_event SPRITE_POKE_BALL, 13, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a6, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + person_event SPRITE_POKE_BALL, 6, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a8, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index a8fca6f09..bc9c8085b 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e66f, EVENT_68E + person_event SPRITE_POKE_BALL, 11, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE person_event SPRITE_ROCK, 10, 10, LEFT << 2 | $10, $0, -1, -1, $0, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index a0e40c51f..6a7757db9 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -344,9 +344,9 @@ BlackBeltScript_0x6edae: writetext UnknownText_0x6f141 closetext loadmovesprites - setevent EVENT_6E9 - setevent EVENT_6F3 - setevent EVENT_6F4 + setevent EVENT_ILEX_FOREST_FARFETCHD + setevent EVENT_ILEX_FOREST_APPRENTICE + setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER clearevent EVENT_6F5 clearevent EVENT_6F6 clearevent EVENT_6F7 @@ -418,18 +418,15 @@ ItemFragment_0x6ee16: db ETHER, 1 MapIlexForestSignpostItem1: - dw $0088 - db ETHER + dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER MapIlexForestSignpostItem2: - dw $0089 - db SUPER_POTION + dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION MapIlexForestSignpostItem3: - dw $008a - db FULL_HEAL + dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL IlexForestBoulder: ; unused @@ -460,9 +457,9 @@ UnknownScript_0x6ee38: UnknownScript_0x6ee42: takeitem GS_BALL, 1 clearevent EVENT_FOREST_IS_RESTLESS - setevent EVENT_7A4 + setevent EVENT_AZALEA_TOWN_KURT disappear $8 - clearevent EVENT_6EB + clearevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS writetext UnknownText_0x6f43b closetext loadmovesprites @@ -962,21 +959,21 @@ IlexForest_MapEventHeader: ; signposts db 5 signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script - signpost 7, 11, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem1 - signpost 14, 22, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem2 - signpost 17, 1, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem3 + signpost 7, 11, SIGNPOST_ITEM, MapIlexForestSignpostItem1 + signpost 14, 22, SIGNPOST_ITEM, MapIlexForestSignpostItem2 + signpost 17, 1, SIGNPOST_ITEM, MapIlexForestSignpostItem3 signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script ; people-events db 11 - person_event SPRITE_BIRD, 35, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x6eb8f, EVENT_6E9 - person_event SPRITE_YOUNGSTER, 32, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6eb7b, EVENT_6F3 - person_event SPRITE_BLACK_BELT, 32, 9, LEFT << 2 | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x6edae, EVENT_6F4 + person_event SPRITE_BIRD, 35, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD + person_event SPRITE_YOUNGSTER, 32, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE + person_event SPRITE_BLACK_BELT, 32, 9, LEFT << 2 | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER person_event SPRITE_ROCKER, 18, 19, LEFT << 2 | $1, $0, -1, -1, $0, 0, RockerScript_0x6edde, -1 - person_event SPRITE_POKE_BALL, 36, 24, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee10, EVENT_671 - person_event SPRITE_KURT, 33, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_7A5 - person_event SPRITE_LASS, 28, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x6ee0d, EVENT_6ED + person_event SPRITE_POKE_BALL, 36, 24, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE + person_event SPRITE_KURT, 33, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT + person_event SPRITE_LASS, 28, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x6ee0d, EVENT_ILEX_FOREST_LASS person_event SPRITE_YOUNGSTER, 5, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerBug_catcherWayne, -1 - person_event SPRITE_POKE_BALL, 21, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee12, EVENT_7B9 - person_event SPRITE_POKE_BALL, 11, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee14, EVENT_7BA - person_event SPRITE_POKE_BALL, 5, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee16, EVENT_7BB + person_event SPRITE_POKE_BALL, 21, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK + person_event SPRITE_POKE_BALL, 11, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE + person_event SPRITE_POKE_BALL, 5, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index be28f2155..d5025f029 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -37,7 +37,7 @@ UnknownScript_0x18000a: clearevent EVENT_BEAT_ELITE_4_BRUNO clearevent EVENT_BEAT_ELITE_4_KAREN clearevent EVENT_BEAT_CHAMPION_LANCE - setevent EVENT_75F + setevent EVENT_LANCES_ROOM_OAK_AND_MARY return UnknownScript_0x180053: @@ -86,7 +86,7 @@ UnknownScript_0x1800ce: writetext UnknownText_0x1801f5 closetext loadmovesprites - setevent EVENT_77B + setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x1800f3 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -322,6 +322,6 @@ IndigoPlateauPokeCenter1F_MapEventHeader: person_event SPRITE_NURSE, 11, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18012c, -1 person_event SPRITE_CLERK, 11, 15, UP << 2 | $2, $0, -1, -1, $0, 0, ClerkScript_0x18012f, -1 person_event SPRITE_COOLTRAINER_M, 15, 15, DOWN << 2 | $2, $22, -1, -1, $0, 0, CooltrainerMScript_0x180136, -1 - person_event SPRITE_SILVER, 13, 20, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_77B + person_event SPRITE_SILVER, 13, 20, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL person_event SPRITE_GRAMPS, 13, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeleportGuyScript, EVENT_TELEPORT_GUY person_event SPRITE_JYNX, 13, 4, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 5ad19236f..f12214fdb 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -39,8 +39,8 @@ UnknownScript_0x7a4f6: setflag ENGINE_PHONE_CARD addcellnum $1 dotrigger $1 - setevent EVENT_6C7 - clearevent EVENT_6C8 + setevent EVENT_KRISS_HOUSE_MOM_1 + clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd keeptextopen special Function90913 @@ -404,8 +404,8 @@ KrissHouse1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, MomScript_0x7a582, EVENT_6C7 - person_event SPRITE_MOM, 6, 6, UP << 2 | $3, $0, -1, 1, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, 2, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_MOM, 6, 4, UP << 2 | $3, $0, -1, 4, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_POKEFAN_F, 8, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, NeighborScript, EVENT_792 + person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 + person_event SPRITE_MOM, 6, 6, UP << 2 | $3, $0, -1, 1, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, 2, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 6, 4, UP << 2 | $3, $0, -1, 4, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_POKEFAN_F, 8, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 17a55ba6d..f53281589 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -132,7 +132,7 @@ KrissHouse2F_MapEventHeader: ; people-events db 4 - person_event SPRITE_CONSOLE, 6, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, GameConsole, EVENT_741 - person_event SPRITE_DOLL_1, 8, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll1, EVENT_742 - person_event SPRITE_DOLL_2, 8, 9, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll2, EVENT_743 - person_event SPRITE_BIG_DOLL, 5, 4, DOWN << 2 | $21, $0, -1, -1, $0, 0, BigDoll, EVENT_744 + person_event SPRITE_CONSOLE, 6, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE + person_event SPRITE_DOLL_1, 8, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 + person_event SPRITE_DOLL_2, 8, 9, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 + person_event SPRITE_BIG_DOLL, 5, 4, DOWN << 2 | $21, $0, -1, -1, $0, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index cda93dd3d..783110cb9 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -115,4 +115,4 @@ KrissNeighborsHouse_MapEventHeader: ; people-events db 2 person_event SPRITE_COOLTRAINER_F, 7, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighborsDaughter, -1 - person_event SPRITE_POKEFAN_F, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighbor, EVENT_793 + person_event SPRITE_POKEFAN_F, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index ae065d727..a5d83fe61 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -41,7 +41,7 @@ KurtScript_0x18e178: closetext loadmovesprites special Functionc48f - setevent EVENT_6FA + setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING if_equal $1, UnknownScript_0x18e1ab spriteface $0, DOWN @@ -310,7 +310,7 @@ UnknownScript_0x18e3a2: UnknownScript_0x18e3ac: playsound SFX_EXIT_BUILDING disappear $2 - clearevent EVENT_7A4 + clearevent EVENT_AZALEA_TOWN_KURT waitbutton special RestartMapMusic domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $2 @@ -359,7 +359,7 @@ KurtsGranddaughter1: iftrue .Dad checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .SlowpokeBack - checkevent EVENT_6FA + checkevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET iftrue .Lonely loadfont writetext KurtsGranddaughterSlowpokeGoneText @@ -702,8 +702,8 @@ KurtsHouse_MapEventHeader: ; people-events db 5 - person_event SPRITE_KURT, 6, 7, UP << 2 | $2, $0, -1, -1, $0, 0, KurtScript_0x18e178, EVENT_73E - person_event SPRITE_TWIN, 7, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, KurtsGranddaughter1, EVENT_78C - person_event SPRITE_SLOWPOKE, 7, 10, DOWN << 2 | $1, $0, -1, -1, $0, 0, KurtsHouseSlowpoke, EVENT_6FD - person_event SPRITE_KURT, 7, 18, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x18e3bd, EVENT_73F - person_event SPRITE_TWIN, 8, 15, LEFT << 2 | $1, $0, -1, -1, $0, 0, KurtsGranddaughter2, EVENT_78D + person_event SPRITE_KURT, 6, 7, UP << 2 | $2, $0, -1, -1, $0, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 + person_event SPRITE_TWIN, 7, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + person_event SPRITE_SLOWPOKE, 7, 10, DOWN << 2 | $1, $0, -1, -1, $0, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE + person_event SPRITE_KURT, 7, 18, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 + person_event SPRITE_TWIN, 8, 15, LEFT << 2 | $1, $0, -1, -1, $0, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index b4514695d..b593b4857 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 EVENT_6D5 + clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1 end @@ -287,18 +287,15 @@ ItemFragment_0x7014a: db TM_DETECT, 1 MapLakeofRageSignpostItem2: - dw $00b5 - db FULL_RESTORE + dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE MapLakeofRageSignpostItem3: - dw $00b6 - db RARE_CANDY + dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY MapLakeofRageSignpostItem4: - dw $00b7 - db MAX_POTION + dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x70155: @@ -570,21 +567,21 @@ LakeofRage_MapEventHeader: db 5 signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script - signpost 28, 11, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem2 - signpost 4, 4, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem3 - signpost 5, 35, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem4 + signpost 28, 11, SIGNPOST_ITEM, MapLakeofRageSignpostItem2 + signpost 4, 4, SIGNPOST_ITEM, MapLakeofRageSignpostItem3 + signpost 5, 35, SIGNPOST_ITEM, MapLakeofRageSignpostItem4 ; people-events db 12 - person_event SPRITE_LANCE, 32, 25, UP << 2 | $3, $0, -1, -1, $0, 0, LanceScript_0x70022, EVENT_6D4 + person_event SPRITE_LANCE, 32, 25, UP << 2 | $3, $0, -1, -1, $0, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE person_event SPRITE_GRAMPS, 30, 24, UP << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x7008e, -1 person_event SPRITE_SUPER_NERD, 17, 40, LEFT << 2 | $0, $0, -1, -1, $0, 0, SuperNerdScript_0x700a2, -1 person_event SPRITE_COOLTRAINER_F, 33, 29, UP << 2 | $1, $1, -1, -1, $0, 0, CooltrainerFScript_0x700a5, -1 - person_event SPRITE_FISHER, 27, 34, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherAndre, EVENT_735 - person_event SPRITE_FISHER, 30, 28, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherRaymond, EVENT_735 - person_event SPRITE_COOLTRAINER_M, 19, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermAaron, EVENT_735 - person_event SPRITE_COOLTRAINER_F, 11, 40, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerCooltrainerfLois, EVENT_735 - person_event SPRITE_GYARADOS, 26, 22, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GyaradosScript_0x70063, EVENT_751 - person_event SPRITE_SUPER_NERD, 8, 8, UP << 2 | $2, $0, -1, -1, $0, 0, WesleyScript, EVENT_75C - person_event SPRITE_POKE_BALL, 14, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x70148, EVENT_645 - person_event SPRITE_POKE_BALL, 6, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7014a, EVENT_646 + person_event SPRITE_FISHER, 27, 34, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_FISHER, 30, 28, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_COOLTRAINER_M, 19, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 11, 40, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_GYARADOS, 26, 22, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS + person_event SPRITE_SUPER_NERD, 8, 8, UP << 2 | $2, $0, -1, -1, $0, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + person_event SPRITE_POKE_BALL, 14, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER + person_event SPRITE_POKE_BALL, 6, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 29cb5bc70..cb016f434 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -359,5 +359,5 @@ LancesRoom_MapEventHeader: ; people-events db 3 person_event SPRITE_LANCE, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x180e7b, -1 - person_event SPRITE_TEACHER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_75F - person_event SPRITE_OAK, 11, 8, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_75F + person_event SPRITE_TEACHER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + person_event SPRITE_OAK, 11, 8, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index ae938c099..03e02a75f 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, UP << 2 | $2, $0, -1, -1, $0, 0, PharmacistScript_0x6c367, EVENT_6DA - person_event SPRITE_BLACK_BELT, 10, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, BlackBeltScript_0x6c37b, EVENT_6DA - person_event SPRITE_LANCE, 10, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D5 - person_event SPRITE_DRAGON, 10, 7, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D5 - person_event SPRITE_GRANNY, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrannyScript_0x6c3ee, EVENT_736 + person_event SPRITE_PHARMACIST, 7, 8, UP << 2 | $2, $0, -1, -1, $0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_BLACK_BELT, 10, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_LANCE, 10, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_DRAGON, 10, 7, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_GRANNY, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index afa02f1c9..249002182 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, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x19002e, EVENT_756 + person_event SPRITE_POKEFAN_M, 12, 23, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST person_event SPRITE_GRAMPS, 13, 10, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 18, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x190092, EVENT_757 - person_event SPRITE_LASS, 12, 16, UP << 2 | $2, $0, -1, -1, $0, 0, LassScript_0x190095, EVENT_736 + person_event SPRITE_FISHER, 18, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + person_event SPRITE_LASS, 12, 16, UP << 2 | $2, $0, -1, -1, $0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index ebd064561..1a6b7b12b 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, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_77A + person_event SPRITE_SILVER, 7, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index a6359c118..af142f728 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -18,7 +18,7 @@ UnknownScript_0x77092: end UnknownScript_0x77093: - setevent EVENT_0EC + setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE return UnknownScript_0x77097: @@ -27,11 +27,11 @@ UnknownScript_0x77097: UnknownScript_0x7709a: checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY - iftrue UnknownScript_0x77117 + iftrue .NoDancing checkcode VAR_WEEKDAY - if_not_equal MONDAY, UnknownScript_0x77117 + if_not_equal MONDAY, .NoDancing checknite - iffalse UnknownScript_0x77117 + iffalse .NoDancing appear $2 appear $3 applymovement $0, MovementData_0x77121 @@ -68,16 +68,15 @@ UnknownScript_0x7709a: disappear $2 disappear $3 stopfollow - clearevent EVENT_0EC + clearevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE setflag ENGINE_MT_MOON_SQUARE_CLEFAIRY end -UnknownScript_0x77117: +.NoDancing: end MapMountMoonSquareSignpostItem0: - dw $00ec - db MOON_STONE + dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE MapMountMoonSquareSignpost1Script: @@ -151,11 +150,11 @@ MountMoonSquare_MapEventHeader: ; signposts db 2 - signpost 7, 7, SIGNPOST_ITEMIFSET, MapMountMoonSquareSignpostItem0 + signpost 7, 7, SIGNPOST_ITEM, MapMountMoonSquareSignpostItem0 signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script ; people-events db 3 - person_event SPRITE_FAIRY, 10, 10, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_779 - person_event SPRITE_FAIRY, 10, 11, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_779 - person_event SPRITE_ROCK, 11, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, MtMoonSquareRock, EVENT_778 + person_event SPRITE_FAIRY, 10, 10, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + person_event SPRITE_FAIRY, 10, 11, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + person_event SPRITE_ROCK, 11, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 6501b70ef..5f9fd0df7 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -84,8 +84,7 @@ ItemFragment_0x7de88: db ULTRA_BALL, 1 MapMountMortar1FInsideSignpostItem0: - dw $0091 - db MAX_REPEL + dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL PokemaniacMillerSeenText: @@ -156,17 +155,17 @@ MountMortar1FInside_MapEventHeader: ; signposts db 1 - signpost 11, 30, SIGNPOST_ITEMIFSET, MapMountMortar1FInsideSignpostItem0 + signpost 11, 30, SIGNPOST_ITEM, MapMountMortar1FInsideSignpostItem0 ; people-events db 10 person_event SPRITE_BOULDER, 47, 25, LEFT << 2 | $11, $0, -1, -1, $0, 0, MountMortar1FBoulder, -1 - person_event SPRITE_POKE_BALL, 42, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7c, EVENT_67D - person_event SPRITE_POKE_BALL, 14, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7e, EVENT_67E - person_event SPRITE_POKE_BALL, 31, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de80, EVENT_67F - person_event SPRITE_POKE_BALL, 24, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de82, EVENT_7A6 - person_event SPRITE_POKE_BALL, 23, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de84, EVENT_7A7 + person_event SPRITE_POKE_BALL, 42, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 14, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + person_event SPRITE_POKE_BALL, 31, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + person_event SPRITE_POKE_BALL, 24, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 23, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET person_event SPRITE_SUPER_NERD, 47, 37, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacMiller, -1 person_event SPRITE_SUPER_NERD, 32, 28, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdMarkus, -1 - person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de86, EVENT_7C8 - person_event SPRITE_POKE_BALL, 21, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de88, EVENT_7C9 + person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + person_event SPRITE_POKE_BALL, 21, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 4d5ba3a2d..fc312fcc4 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -12,8 +12,7 @@ ItemFragment_0x7ddf8: db REVIVE, 1 MapMountMortar1FOutsideSignpostItem0: - dw $0090 - db HYPER_POTION + dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION MountMortar1FOutside_MapEventHeader: @@ -37,9 +36,9 @@ MountMortar1FOutside_MapEventHeader: ; signposts db 1 - signpost 22, 25, SIGNPOST_ITEMIFSET, MapMountMortar1FOutsideSignpostItem0 + signpost 22, 25, SIGNPOST_ITEM, MapMountMortar1FOutsideSignpostItem0 ; people-events db 2 - person_event SPRITE_POKE_BALL, 19, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf6, EVENT_67B - person_event SPRITE_POKE_BALL, 22, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf8, EVENT_67C + person_event SPRITE_POKE_BALL, 19, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + person_event SPRITE_POKE_BALL, 22, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 560da0b01..5ed548be5 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -51,8 +51,7 @@ ItemFragment_0x7e0e8: db ESCAPE_ROPE, 1 MapMountMortar2FInsideSignpostItem0: - dw $0092 - db FULL_RESTORE + dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE SupernerdHughSeenText: @@ -89,14 +88,14 @@ MountMortar2FInside_MapEventHeader: ; signposts db 1 - signpost 8, 24, SIGNPOST_ITEMIFSET, MapMountMortar2FInsideSignpostItem0 + signpost 8, 24, SIGNPOST_ITEM, MapMountMortar2FInsideSignpostItem0 ; people-events db 7 - person_event SPRITE_POKE_BALL, 26, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0de, EVENT_680 - person_event SPRITE_POKE_BALL, 37, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e0, EVENT_681 - person_event SPRITE_POKE_BALL, 21, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e2, EVENT_682 - person_event SPRITE_POKE_BALL, 9, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e4, EVENT_683 - person_event SPRITE_POKE_BALL, 15, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e6, EVENT_684 - person_event SPRITE_POKE_BALL, 9, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e8, EVENT_685 + person_event SPRITE_POKE_BALL, 26, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 37, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + person_event SPRITE_POKE_BALL, 21, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e2, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + person_event SPRITE_POKE_BALL, 9, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + person_event SPRITE_POKE_BALL, 15, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + person_event SPRITE_POKE_BALL, 9, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE person_event SPRITE_SUPER_NERD, 30, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index d8d42a630..e1bfd11a7 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -63,8 +63,7 @@ ItemFragment_0x7e248: db PP_UP, 1 MapMountMortarB1FSignpostItem0: - dw $0093 - db MAX_REVIVE + dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x7e24d: @@ -141,14 +140,14 @@ MountMortarB1F_MapEventHeader: ; signposts db 1 - signpost 6, 4, SIGNPOST_ITEMIFSET, MapMountMortarB1FSignpostItem0 + signpost 6, 4, SIGNPOST_ITEM, MapMountMortarB1FSignpostItem0 ; people-events db 7 - person_event SPRITE_POKE_BALL, 16, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_686 - person_event SPRITE_POKE_BALL, 20, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_687 + person_event SPRITE_POKE_BALL, 16, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 20, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS person_event SPRITE_BOULDER, 14, 13, LEFT << 2 | $11, $0, -1, -1, $0, 0, MountMortarB1FBoulder, -1 person_event SPRITE_BLACK_BELT, 8, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlackBeltScript_0x7e1f6, -1 - person_event SPRITE_POKE_BALL, 28, 38, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e244, EVENT_7CA - person_event SPRITE_POKE_BALL, 7, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e246, EVENT_7CB - person_event SPRITE_POKE_BALL, 30, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e248, EVENT_7CC + person_event SPRITE_POKE_BALL, 28, 38, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 7, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + person_event SPRITE_POKE_BALL, 30, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 44a8d3a70..6716aea56 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -120,9 +120,9 @@ UnknownScript_0x196ec9: writetext UnknownText_0x197134 closetext loadmovesprites - setevent EVENT_6BD - setevent EVENT_792 - clearevent EVENT_793 + setevent EVENT_RIVAL_NEW_BARK_TOWN + setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR + clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR dotrigger $1 domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 @@ -393,4 +393,4 @@ MrPokemonsHouse_MapEventHeader: ; people-events db 2 person_event SPRITE_GENTLEMAN, 9, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, GentlemanScript_0x196e97, -1 - person_event SPRITE_OAK, 9, 10, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C9 + person_event SPRITE_OAK, 9, 10, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 43ea38f40..e9c596df7 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -353,8 +353,7 @@ ItemFragment_0x5c1ce: db TM_DIG, 1 MapNationalParkSignpostItem2: - dw $0084 - db FULL_HEAL + dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c1d3: @@ -581,7 +580,7 @@ NationalPark_MapEventHeader: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script - signpost 47, 6, SIGNPOST_ITEMIFSET, MapNationalParkSignpostItem2 + signpost 47, 6, SIGNPOST_ITEM, MapNationalParkSignpostItem2 signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script ; people-events @@ -597,6 +596,6 @@ NationalPark_MapEventHeader: person_event SPRITE_POKEFAN_F, 33, 22, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerPokefanfBeverly1, -1 person_event SPRITE_POKEFAN_M, 13, 20, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerPokefanmWilliam, -1 person_event SPRITE_LASS, 18, 12, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassKrise, -1 - person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1cc, EVENT_658 + person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL person_event SPRITE_GAMEBOY_KID, 10, 30, UP << 2 | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x5c037, -1 - person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1ce, EVENT_659 + person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index a965a436b..f91e7be51 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -101,8 +101,7 @@ ItemFragment_0x5c947: db TM_DIG, 1 MapNationalParkBugContestSignpostItem2: - dw $0084 - db FULL_HEAL + dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c94c: @@ -226,7 +225,7 @@ NationalParkBugContest_MapEventHeader: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script - signpost 47, 6, SIGNPOST_ITEMIFSET, MapNationalParkBugContestSignpostItem2 + signpost 47, 6, SIGNPOST_ITEM, MapNationalParkBugContestSignpostItem2 signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script ; people-events @@ -241,5 +240,5 @@ NationalParkBugContest_MapEventHeader: person_event SPRITE_YOUNGSTER, 31, 15, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A person_event SPRITE_YOUNGSTER, 12, 20, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A person_event SPRITE_YOUNGSTER, 38, 21, DOWN << 2 | $2, $33, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A - person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c945, EVENT_658 - person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c947, EVENT_659 + person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL + person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 4b459cbbd..fa794e9e6 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -307,4 +307,4 @@ NewBarkTown_MapEventHeader: db 3 person_event SPRITE_TEACHER, 12, 10, DOWN << 2 | $3, $1, -1, -1, $0, 0, TeacherScript_0x1a806f, -1 person_event SPRITE_FISHER, 13, 16, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a809b, -1 - person_event SPRITE_SILVER, 6, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, SilverScript_0x1a809e, EVENT_6BD + person_event SPRITE_SILVER, 6, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, SilverScript_0x1a809e, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index c98c79fd5..3d0c4a1e9 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -323,4 +323,4 @@ OlivineCity_MapEventHeader: person_event SPRITE_SAILOR, 31, 30, UP << 2 | $0, $10, -1, -1, $0, 0, SailorScript_0x1a88a3, -1 person_event SPRITE_STANDING_YOUNGSTER, 17, 24, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x1a88a6, -1 person_event SPRITE_SAILOR, 25, 21, DOWN << 2 | $2, $11, -1, -1, $0, 0, SailorScript_0x1a88ba, -1 - person_event SPRITE_OLIVINE_RIVAL, 15, 14, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C3 + person_event SPRITE_OLIVINE_RIVAL, 15, 14, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index c97e22ffe..5900c1d18 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, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x9c12f, EVENT_6D3 + person_event SPRITE_JASMINE, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index f7fac288c..ef5439cfb 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -181,4 +181,4 @@ OlivineLighthouse3F_MapEventHeader: person_event SPRITE_SAILOR, 6, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSailorTerrell, -1 person_event SPRITE_GENTLEMAN, 9, 17, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerGentlemanPreston, -1 person_event SPRITE_YOUNGSTER, 13, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperTheo, -1 - person_event SPRITE_POKE_BALL, 6, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5b279, EVENT_664 + person_event SPRITE_POKE_BALL, 6, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 9210bd164..ec7b83ca9 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -69,8 +69,7 @@ ItemFragment_0x609ae: db TM_SWAGGER, 1 MapOlivineLighthouse5FSignpostItem0: - dw $0085 - db HYPER_POTION + dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION SailorErnestSeenText: @@ -136,12 +135,12 @@ OlivineLighthouse5F_MapEventHeader: ; signposts db 1 - signpost 13, 3, SIGNPOST_ITEMIFSET, MapOlivineLighthouse5FSignpostItem0 + signpost 13, 3, SIGNPOST_ITEM, MapOlivineLighthouse5FSignpostItem0 ; people-events db 5 person_event SPRITE_SAILOR, 15, 12, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorErnest, -1 person_event SPRITE_YOUNGSTER, 7, 12, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerBird_keeperDenis, -1 - person_event SPRITE_POKE_BALL, 16, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609aa, EVENT_665 - person_event SPRITE_POKE_BALL, 19, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ac, EVENT_666 - person_event SPRITE_POKE_BALL, 17, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ae, EVENT_667 + person_event SPRITE_POKE_BALL, 16, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + person_event SPRITE_POKE_BALL, 19, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + person_event SPRITE_POKE_BALL, 17, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 2cd2d3f41..eab641ba6 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -63,7 +63,7 @@ UnknownScript_0x60bab: closetext loadmovesprites setevent EVENT_JASMINE_RETURNED_TO_GYM - clearevent EVENT_6D3 + clearevent EVENT_OLIVINE_GYM_JASMINE 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, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x60b91, EVENT_6D2 + person_event SPRITE_JASMINE, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE person_event SPRITE_MONSTER, 12, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MonsterScript_0x60c3a, -1 - person_event SPRITE_POKE_BALL, 8, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x60c66, EVENT_668 + person_event SPRITE_POKE_BALL, 8, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 1c71aad5b..94595e1f8 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -43,8 +43,8 @@ SailorScript_0x748c0: waitbutton checkevent EVENT_030 iffalse UnknownScript_0x7490a - clearevent EVENT_73A - setevent EVENT_73B + clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_COOLTRAINERM_SEAN clearevent EVENT_BEAT_COOLTRAINERF_CAROL clearevent EVENT_BEAT_GENTLEMAN_EDWARD @@ -227,8 +227,7 @@ CooltrainerFScript_0x74a22: end MapOlivinePortSignpostItem0: - dw $00ea - db PROTEIN + dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN MovementData_0x74a30: @@ -394,11 +393,11 @@ OlivinePort_MapEventHeader: ; signposts db 1 - signpost 22, 1, SIGNPOST_ITEMIFSET, MapOlivinePortSignpostItem0 + signpost 22, 1, SIGNPOST_ITEM, MapOlivinePortSignpostItem0 ; people-events db 7 - person_event SPRITE_SAILOR, 27, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x748c0, EVENT_72A + person_event SPRITE_SAILOR, 27, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY person_event SPRITE_SAILOR, 19, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME person_event SPRITE_SAILOR, 19, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME person_event SPRITE_FISHING_GURU, 18, 8, UP << 2 | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 0d28c1df3..b4ee06672 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, LEFT << 2 | $0, $0, -1, -1, $0, 0, PokefanMScript_0x76fac, EVENT_733 + person_event SPRITE_POKEFAN_M, 5, 21, LEFT << 2 | $0, $0, -1, -1, $0, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 5b8df0ede..1e785dc29 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -311,5 +311,5 @@ PokemonFanClub_MapEventHeader: person_event SPRITE_RECEPTIONIST, 5, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x191821, -1 person_event SPRITE_FISHER, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, FisherScript_0x191824, -1 person_event SPRITE_TEACHER, 6, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, TeacherScript_0x19186b, -1 - person_event SPRITE_FAIRY, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, FairyScript_0x19186e, EVENT_774 + person_event SPRITE_FAIRY, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, FairyScript_0x19186e, EVENT_VERMILION_FAN_CLUB_DOLL person_event SPRITE_ODDISH, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OddishScript_0x191871, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 409a51395..1a0bc3d60 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -139,7 +139,7 @@ PowerPlantManager: closetext loadmovesprites setevent EVENT_MET_MANAGER_AT_POWER_PLANT - clearevent EVENT_76D + clearevent EVENT_CERULEAN_GYM_ROCKET 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 EVENT_772 - setevent EVENT_771 - setevent EVENT_76C + clearevent EVENT_SAFFRON_TRAIN_STATION_POPULATION + setevent EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + setevent EVENT_ROUTE_24_ROCKET setevent EVENT_RESTORED_POWER_TO_KANTO - clearevent EVENT_749 + clearevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN UnknownScript_0x188eac: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 35eaa8e94..4244eb31e 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -501,8 +501,8 @@ RadioTower1F_MapEventHeader: ; people-events db 6 person_event SPRITE_RECEPTIONIST, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 8, 20, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x5ce51, EVENT_6CF - person_event SPRITE_YOUNGSTER, 8, 19, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5ce54, EVENT_6CF - person_event SPRITE_ROCKET, 5, 18, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM3, EVENT_6CE - person_event SPRITE_GENTLEMAN, 10, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x5cd3d, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 10, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5cdd5, EVENT_6CF + person_event SPRITE_LASS, 8, 20, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 8, 19, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_ROCKET, 5, 18, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_GENTLEMAN, 10, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 10, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 0363e1afe..afd3e39bb 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, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x5d6fe, EVENT_6CF + person_event SPRITE_SUPER_NERD, 10, 10, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_TEACHER, 6, 21, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x5d701, -1 - person_event SPRITE_ROCKET, 8, 5, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM4, EVENT_6CE - person_event SPRITE_ROCKET, 8, 12, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM5, EVENT_6CE - person_event SPRITE_ROCKET, 5, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerGruntM6, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 9, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerGruntF2, EVENT_6CE - person_event SPRITE_BLACK_BELT, 5, 4, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d71f, EVENT_6D1 - person_event SPRITE_BLACK_BELT, 5, 5, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d722, EVENT_6D0 + person_event SPRITE_ROCKET, 8, 5, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 8, 12, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 5, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 9, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_BLACK_BELT, 5, 4, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + person_event SPRITE_BLACK_BELT, 5, 5, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_JIGGLYPUFF, 5, 16, UP << 2 | $12, $0, -1, -1, $0, 0, JigglypuffScript_0x5d715, -1 person_event SPRITE_BUENA, 9, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Buena, -1 - person_event SPRITE_RECEPTIONIST, 11, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x5d8ff, EVENT_6CF + person_event SPRITE_RECEPTIONIST, 11, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 8cf57820f..4572bf872 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, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x5e553, EVENT_6D0 + person_event SPRITE_SUPER_NERD, 8, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_GYM_GUY, 8, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GymGuyScript_0x5e556, -1 person_event SPRITE_COOLTRAINER_F, 7, 15, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5e56a, -1 - person_event SPRITE_ROCKET, 5, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM7, EVENT_6CE - person_event SPRITE_ROCKET, 6, 10, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM8, EVENT_6CE - person_event SPRITE_ROCKET, 10, 20, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM9, EVENT_6CE - person_event SPRITE_SCIENTIST, 10, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerScientistMarc, EVENT_6CE + person_event SPRITE_ROCKET, 5, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 10, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 10, 20, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_SCIENTIST, 10, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 921df243c..c5c459d2a 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, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x5eb82, EVENT_6D0 + person_event SPRITE_FISHER, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_TEACHER, 10, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5eb85, -1 person_event SPRITE_GROWLITHE, 11, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrowlitheScript_0x5ebb2, -1 - person_event SPRITE_ROCKET, 10, 9, RIGHT << 2 | $13, $0, -1, -1, $2, 3, TrainerGruntM10, EVENT_6CE - person_event SPRITE_ROCKET, 5, 18, LEFT << 2 | $0, $2, -1, -1, $2, 2, TrainerExecutivem2, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 8, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF4, EVENT_6CE - person_event SPRITE_SCIENTIST, 6, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerScientistRich, EVENT_6CE + person_event SPRITE_ROCKET, 10, 9, RIGHT << 2 | $13, $0, -1, -1, $2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 5, 18, LEFT << 2 | $0, $2, -1, -1, $2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 8, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_SCIENTIST, 6, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 2604cc4e4..27ca29c88 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -115,15 +115,15 @@ UnknownScript_0x6006e: setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER - setevent EVENT_6CC - setevent EVENT_6CD - setevent EVENT_6CE - clearevent EVENT_736 + setevent EVENT_GOLDENROD_CITY_ROCKET_SCOUT + setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER + clearevent EVENT_MAHOGANY_MART_OWNERS clearflag ENGINE_ROCKETS_IN_MAHOGANY - clearevent EVENT_6CF - clearevent EVENT_6D0 - setevent EVENT_6E3 - clearevent EVENT_6E4 + clearevent EVENT_GOLDENROD_CITY_CIVILIANS + clearevent EVENT_RADIO_TOWER_CIVILIANS_AFTER + setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic disappear $2 moveperson $2, $c, $0 @@ -456,7 +456,7 @@ RadioTower5F_MapEventHeader: ; people-events db 5 person_event SPRITE_GENTLEMAN, 10, 7, DOWN << 2 | $3, $0, -1, -1, $0, 0, Director, -1 - person_event SPRITE_ROCKET, 9, 17, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 6, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerExecutivef1, EVENT_6CE - person_event SPRITE_ROCKER, 9, 17, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Ben, EVENT_6D0 - person_event SPRITE_POKE_BALL, 9, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x600fe, EVENT_7CD + person_event SPRITE_ROCKET, 9, 17, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 6, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKER, 9, 17, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_POKE_BALL, 9, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 9273dacf2..41fffb482 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -12,13 +12,11 @@ ItemFragment_0x743b7: db TM_STEEL_WING, 1 MapRockTunnel1FSignpostItem0: - dw $00e7 - db X_ACCURACY + dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY MapRockTunnel1FSignpostItem1: - dw $00e8 - db X_DEFEND + dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND RockTunnel1F_MapEventHeader: @@ -39,10 +37,10 @@ RockTunnel1F_MapEventHeader: ; signposts db 2 - signpost 4, 24, SIGNPOST_ITEMIFSET, MapRockTunnel1FSignpostItem0 - signpost 15, 21, SIGNPOST_ITEMIFSET, MapRockTunnel1FSignpostItem1 + signpost 4, 24, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem0 + signpost 15, 21, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem1 ; people-events db 2 - person_event SPRITE_POKE_BALL, 22, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b5, EVENT_77E - person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b7, EVENT_77F + person_event SPRITE_POKE_BALL, 22, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER + person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 275572cf1..cc82ff680 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -15,8 +15,7 @@ ItemFragment_0x7440d: db REVIVE, 1 MapRockTunnelB1FSignpostItem0: - dw $00e9 - db MAX_POTION + dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION RockTunnelB1F_MapEventHeader: @@ -35,10 +34,10 @@ RockTunnelB1F_MapEventHeader: ; signposts db 1 - signpost 14, 4, SIGNPOST_ITEMIFSET, MapRockTunnelB1FSignpostItem0 + signpost 14, 4, SIGNPOST_ITEM, MapRockTunnelB1FSignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74409, EVENT_780 - person_event SPRITE_POKE_BALL, 21, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440b, EVENT_781 - person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440d, EVENT_782 + person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON + person_event SPRITE_POKE_BALL, 21, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP + person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route11.asm b/maps/Route11.asm index be306934a..4f809febc 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -120,8 +120,7 @@ FruitTreeScript_0x68055: fruittree $18 MapRoute11SignpostItem1: - dw $00f5 - db REVIVE + dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE YoungsterOwenSeenText: @@ -217,7 +216,7 @@ Route11_MapEventHeader: ; signposts db 2 signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script - signpost 5, 32, SIGNPOST_ITEMIFSET, MapRoute11SignpostItem1 + signpost 5, 32, SIGNPOST_ITEM, MapRoute11SignpostItem1 ; people-events db 5 diff --git a/maps/Route12.asm b/maps/Route12.asm index 304595709..a13cec780 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -126,8 +126,7 @@ ItemFragment_0x1a700d: db NUGGET, 1 MapRoute12SignpostItem2: - dw $00f3 - db ELIXER + dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER FisherMartinSeenText: @@ -239,7 +238,7 @@ Route12_MapEventHeader: db 3 signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script - signpost 13, 14, SIGNPOST_ITEMIFSET, MapRoute12SignpostItem2 + signpost 13, 14, SIGNPOST_ITEM, MapRoute12SignpostItem2 ; people-events db 6 @@ -247,5 +246,5 @@ Route12_MapEventHeader: person_event SPRITE_FISHER, 27, 18, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherStephen, -1 person_event SPRITE_FISHER, 42, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerFisherBarney, -1 person_event SPRITE_FISHER, 11, 10, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherKyle, -1 - person_event SPRITE_POKE_BALL, 47, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700b, EVENT_788 - person_event SPRITE_POKE_BALL, 55, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700d, EVENT_789 + person_event SPRITE_POKE_BALL, 47, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM + person_event SPRITE_POKE_BALL, 55, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route13.asm b/maps/Route13.asm index 29fe2a27c..c8627721d 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -150,8 +150,7 @@ MapRoute13Signpost2Script: jumptext UnknownText_0x1a277d MapRoute13SignpostItem3: - dw $00f4 - db CALCIUM + dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM PokefanmAlexSeenText: @@ -281,7 +280,7 @@ Route13_MapEventHeader: signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script - signpost 13, 30, SIGNPOST_ITEMIFSET, MapRoute13SignpostItem3 + signpost 13, 30, SIGNPOST_ITEM, MapRoute13SignpostItem3 ; people-events db 5 diff --git a/maps/Route15.asm b/maps/Route15.asm index b59aa9edc..bcb5129f2 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -312,4 +312,4 @@ Route15_MapEventHeader: person_event SPRITE_YOUNGSTER, 14, 31, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyBilly, -1 person_event SPRITE_TEACHER, 16, 34, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerTeacherColette, -1 person_event SPRITE_TEACHER, 14, 24, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherHillary, -1 - person_event SPRITE_POKE_BALL, 9, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1aa5e4, EVENT_78A + person_event SPRITE_POKE_BALL, 9, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route17.asm b/maps/Route17.asm index 8b38ec9a1..2c7e2a605 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -123,13 +123,11 @@ BikerGlennScript: end MapRoute17SignpostItem0: - dw $00f6 - db MAX_ETHER + dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER MapRoute17SignpostItem1: - dw $00f7 - db MAX_ELIXER + dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER BikerRileySeenText: @@ -211,8 +209,8 @@ Route17_MapEventHeader: ; signposts db 2 - signpost 54, 9, SIGNPOST_ITEMIFSET, MapRoute17SignpostItem0 - signpost 77, 8, SIGNPOST_ITEMIFSET, MapRoute17SignpostItem1 + signpost 54, 9, SIGNPOST_ITEM, MapRoute17SignpostItem0 + signpost 77, 8, SIGNPOST_ITEM, MapRoute17SignpostItem1 ; people-events db 4 diff --git a/maps/Route2.asm b/maps/Route2.asm index f9929d677..6268a1f8a 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -108,24 +108,16 @@ FruitTreeScript_0x1ac306: fruittree $19 MapRoute2SignpostItem2: - dw $00ed - db MAX_ETHER - + dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER MapRoute2SignpostItem3: - dw $00ee - db FULL_HEAL - + dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL MapRoute2SignpostItem4: - dw $00ef - db FULL_RESTORE - + dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE MapRoute2SignpostItem5: - dw $00f0 - db REVIVE - + dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE Bug_catcherRobSeenText: text "My bug #MON are" @@ -211,18 +203,18 @@ Route2_MapEventHeader: db 6 signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script - signpost 23, 7, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem2 - signpost 14, 4, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem3 - signpost 27, 4, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem4 - signpost 30, 11, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem5 + signpost 23, 7, SIGNPOST_ITEM, MapRoute2SignpostItem2 + signpost 14, 4, SIGNPOST_ITEM, MapRoute2SignpostItem3 + signpost 27, 4, SIGNPOST_ITEM, MapRoute2SignpostItem4 + signpost 30, 11, SIGNPOST_ITEM, MapRoute2SignpostItem5 ; people-events db 8 person_event SPRITE_BUG_CATCHER, 49, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherRob, -1 person_event SPRITE_BUG_CATCHER, 8, 10, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherEd, -1 person_event SPRITE_BUG_CATCHER, 44, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDoug, -1 - person_event SPRITE_POKE_BALL, 33, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac2fe, EVENT_783 - person_event SPRITE_POKE_BALL, 27, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac300, EVENT_784 - person_event SPRITE_POKE_BALL, 6, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac302, EVENT_785 - person_event SPRITE_POKE_BALL, 54, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac304, EVENT_786 + person_event SPRITE_POKE_BALL, 33, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT + person_event SPRITE_POKE_BALL, 27, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION + person_event SPRITE_POKE_BALL, 6, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS + person_event SPRITE_POKE_BALL, 54, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER person_event SPRITE_FRUIT_TREE, 18, 14, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route24.asm b/maps/Route24.asm index f39d76daf..113796839 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, DOWN << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x1adbfa, EVENT_76C + person_event SPRITE_ROCKET, 11, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index b1a114541..7c21304f6 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -292,8 +292,7 @@ ItemFragment_0x19efe3: db PROTEIN, 1 MapRoute25SignpostItem1: - dw $00f8 - db POTION + dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION MovementData_0x19efe8: @@ -548,12 +547,12 @@ Route25_MapEventHeader: ; signposts db 2 signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script - signpost 5, 4, SIGNPOST_ITEMIFSET, MapRoute25SignpostItem1 + signpost 5, 4, SIGNPOST_ITEM, MapRoute25SignpostItem1 ; people-events db 11 - person_event SPRITE_MISTY, 13, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_76E - person_event SPRITE_COOLTRAINER_M, 14, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_76E + person_event SPRITE_MISTY, 13, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + person_event SPRITE_COOLTRAINER_M, 14, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND person_event SPRITE_YOUNGSTER, 12, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyDudley, -1 person_event SPRITE_LASS, 15, 20, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassEllen, -1 person_event SPRITE_YOUNGSTER, 12, 25, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyJoe, -1 @@ -562,4 +561,4 @@ Route25_MapEventHeader: person_event SPRITE_LASS, 15, 32, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassShannon, -1 person_event SPRITE_SUPER_NERD, 11, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerSupernerdPat, -1 person_event SPRITE_COOLTRAINER_M, 12, 41, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x19efac, -1 - person_event SPRITE_POKE_BALL, 8, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19efe3, EVENT_78B + person_event SPRITE_POKE_BALL, 8, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index 0b498de64..a059989e1 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -524,4 +524,4 @@ Route26_MapEventHeader: person_event SPRITE_YOUNGSTER, 83, 17, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPsychicRichard, -1 person_event SPRITE_FISHER, 96, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherScott, -1 person_event SPRITE_FRUIT_TREE, 58, 18, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a4ec2, -1 - person_event SPRITE_POKE_BALL, 19, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA + person_event SPRITE_POKE_BALL, 19, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route27.asm b/maps/Route27.asm index eb3a1121a..c17ad1e8f 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -581,6 +581,6 @@ Route27_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 10, 41, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfMegan, -1 person_event SPRITE_YOUNGSTER, 11, 69, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicGilbert, -1 person_event SPRITE_YOUNGSTER, 17, 62, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperJose2, -1 - person_event SPRITE_POKE_BALL, 16, 64, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a62, EVENT_6AB - person_event SPRITE_POKE_BALL, 16, 57, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a64, EVENT_6AC + person_event SPRITE_POKE_BALL, 16, 64, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM + person_event SPRITE_POKE_BALL, 16, 57, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY person_event SPRITE_FISHER, 14, 25, DOWN << 2 | $3, $0, -1, -1, $0, 3, FisherScript_0x1a089c, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 68afae6e6..192a0c65d 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -9,8 +9,7 @@ MapRoute28Signpost0Script: jumptext UnknownText_0x1a5413 MapRoute28SignpostItem1: - dw $00a3 - db RARE_CANDY + dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY UnknownText_0x1a5413: @@ -32,7 +31,7 @@ Route28_MapEventHeader: ; signposts db 2 signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script - signpost 2, 25, SIGNPOST_ITEMIFSET, MapRoute28SignpostItem1 + signpost 2, 25, SIGNPOST_ITEM, MapRoute28SignpostItem1 ; people-events db 0 diff --git a/maps/Route29.asm b/maps/Route29.asm index b5a9710fe..5cfbaaa73 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -436,5 +436,5 @@ Route29_MapEventHeader: person_event SPRITE_FRUIT_TREE, 6, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a1089, -1 person_event SPRITE_FISHER, 7, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x1a102e, -1 person_event SPRITE_COOLTRAINER_M, 8, 17, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x1a1031, -1 - person_event SPRITE_TEACHER, 16, 33, DOWN << 2 | $3, $0, -1, -1, $0, 0, TuscanyScript, EVENT_759 - person_event SPRITE_POKE_BALL, 6, 52, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a108b, EVENT_6AD + person_event SPRITE_TEACHER, 16, 33, DOWN << 2 | $3, $0, -1, -1, $0, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY + person_event SPRITE_POKE_BALL, 6, 52, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION diff --git a/maps/Route30.asm b/maps/Route30.asm index 94efe9c5f..bd7e67a9f 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -283,8 +283,7 @@ FruitTreeScript_0x1a17f9: fruittree $5 MapRoute30SignpostItem4: - dw $00a4 - db POTION + dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION MovementData_0x1a17fe: @@ -461,18 +460,18 @@ Route30_MapEventHeader: signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script signpost 5, 15, SIGNPOST_READ, MapRoute30Signpost2Script signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script - signpost 9, 14, SIGNPOST_ITEMIFSET, MapRoute30SignpostItem4 + signpost 9, 14, SIGNPOST_ITEM, MapRoute30SignpostItem4 ; people-events db 11 - person_event SPRITE_YOUNGSTER, 30, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a1673, EVENT_714 - person_event SPRITE_YOUNGSTER, 32, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJoey, EVENT_715 + person_event SPRITE_YOUNGSTER, 30, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE + person_event SPRITE_YOUNGSTER, 32, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY person_event SPRITE_YOUNGSTER, 27, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerYoungsterMikey, -1 person_event SPRITE_BUG_CATCHER, 11, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDon, -1 person_event SPRITE_YOUNGSTER, 34, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a17d2, -1 - person_event SPRITE_MONSTER, 28, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_714 - person_event SPRITE_MONSTER, 29, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_714 + person_event SPRITE_MONSTER, 28, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + person_event SPRITE_MONSTER, 29, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE person_event SPRITE_FRUIT_TREE, 43, 9, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a17f7, -1 person_event SPRITE_FRUIT_TREE, 9, 15, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a17f9, -1 person_event SPRITE_COOLTRAINER_F, 17, 6, UP << 2 | $2, $0, -1, -1, $0, 0, CooltrainerFScript_0x1a17e6, -1 - person_event SPRITE_POKE_BALL, 39, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a17f5, EVENT_7B8 + person_event SPRITE_POKE_BALL, 39, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE diff --git a/maps/Route31.asm b/maps/Route31.asm index ddbc7cd8b..3deaca873 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -451,5 +451,5 @@ Route31_MapEventHeader: person_event SPRITE_BUG_CATCHER, 17, 25, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherWade1, -1 person_event SPRITE_COOLTRAINER_M, 12, 37, DOWN << 2 | $2, $11, -1, -1, $0, 0, CooltrainerMScript_0x1a55f6, -1 person_event SPRITE_FRUIT_TREE, 11, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a55f9, -1 - person_event SPRITE_POKE_BALL, 9, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fb, EVENT_6AE - person_event SPRITE_POKE_BALL, 19, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fd, EVENT_6AF + person_event SPRITE_POKE_BALL, 9, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION + person_event SPRITE_POKE_BALL, 19, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL diff --git a/maps/Route32.asm b/maps/Route32.asm index 6aaa55f83..fbfa8ecee 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -623,13 +623,11 @@ Route32PokeCenterSign: jumpstd pokecentersign MapRoute32SignpostItem4: - dw $00a5 - db GREAT_BALL + dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL MapRoute32SignpostItem5: - dw $00a6 - db SUPER_POTION + dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION MovementData_0x190789: @@ -1071,8 +1069,8 @@ Route32_MapEventHeader: signpost 1, 9, SIGNPOST_READ, Route32RuinsSign signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign - signpost 67, 12, SIGNPOST_ITEMIFSET, MapRoute32SignpostItem4 - signpost 40, 11, SIGNPOST_ITEMIFSET, MapRoute32SignpostItem5 + signpost 67, 12, SIGNPOST_ITEM, MapRoute32SignpostItem4 + signpost 40, 11, SIGNPOST_ITEM, MapRoute32SignpostItem5 ; people-events db 14 @@ -1085,8 +1083,8 @@ Route32_MapEventHeader: person_event SPRITE_LASS, 34, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerLiz1, -1 person_event SPRITE_COOLTRAINER_M, 12, 23, LEFT << 2 | $0, $0, -1, -1, $0, 0, CooltrainerMScript_0x19046f, -1 person_event SPRITE_YOUNGSTER, 86, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperPeter, -1 - person_event SPRITE_FISHER, 74, 11, UP << 2 | $2, $0, -1, -1, $0, 0, FisherScript_0x1904f2, EVENT_6FC - person_event SPRITE_POKE_BALL, 57, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190773, EVENT_6B0 + person_event SPRITE_FISHER, 74, 11, UP << 2 | $2, $0, -1, -1, $0, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_POKE_BALL, 57, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190773, EVENT_ROUTE_32_GREAT_BALL person_event SPRITE_FISHER, 17, 19, LEFT << 2 | $1, $0, -1, -1, $0, 0, FisherScript_0x1904ce, -1 - person_event SPRITE_LASS, 71, 16, LEFT << 2 | $0, $0, -1, -1, $0, 0, FriedaScript, EVENT_758 - person_event SPRITE_POKE_BALL, 34, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190775, EVENT_6B1 + person_event SPRITE_LASS, 71, 16, LEFT << 2 | $0, $0, -1, -1, $0, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY + person_event SPRITE_POKE_BALL, 34, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL diff --git a/maps/Route34.asm b/maps/Route34.asm index 1d3a1fa4f..d8d12e745 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 EVENT_6E5 - setevent EVENT_6E6 + clearevent EVENT_DAYCARE_MAN_IN_DAYCARE + setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 jump UnknownScript_0x7801d UnknownScript_0x78014: - setevent EVENT_6E5 - clearevent EVENT_6E6 + setevent EVENT_DAYCARE_MAN_IN_DAYCARE + clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 jump UnknownScript_0x7801d UnknownScript_0x7801d: checkflag ENGINE_DAYCARE_MAN_HAS_MON iffalse UnknownScript_0x78029 - clearevent EVENT_6E7 + clearevent EVENT_DAYCARE_MON_1 jump UnknownScript_0x7802f UnknownScript_0x78029: - setevent EVENT_6E7 + setevent EVENT_DAYCARE_MON_1 jump UnknownScript_0x7802f UnknownScript_0x7802f: checkflag ENGINE_DAYCARE_LADY_HAS_MON iffalse UnknownScript_0x78039 - clearevent EVENT_6E8 + clearevent EVENT_DAYCARE_MON_2 return UnknownScript_0x78039: - setevent EVENT_6E8 + setevent EVENT_DAYCARE_MON_2 return GrampsScript_0x7803d: @@ -604,13 +604,11 @@ ItemFragment_0x7832b: db NUGGET, 1 MapRoute34SignpostItem3: - dw $00a7 - db RARE_CANDY + dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY MapRoute34SignpostItem4: - dw $00a8 - db SUPER_POTION + dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION MovementData_0x78333: @@ -888,9 +886,9 @@ Route34_MapEventHeader: db 5 warp_def $25, $d, 1, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE warp_def $25, $e, 2, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE - warp_def $e, $b, 1, GROUP_DAY_CARE, MAP_DAY_CARE - warp_def $f, $b, 2, GROUP_DAY_CARE, MAP_DAY_CARE - warp_def $f, $d, 3, GROUP_DAY_CARE, MAP_DAY_CARE + warp_def $e, $b, 1, GROUP_DAYCARE, MAP_DAYCARE + warp_def $f, $b, 2, GROUP_DAYCARE, MAP_DAYCARE + warp_def $f, $d, 3, GROUP_DAYCARE, MAP_DAYCARE ; xy triggers db 0 @@ -900,8 +898,8 @@ Route34_MapEventHeader: signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script signpost 13, 10, SIGNPOST_READ, MapRoute34Signpost2Script - signpost 32, 8, SIGNPOST_ITEMIFSET, MapRoute34SignpostItem3 - signpost 19, 17, SIGNPOST_ITEMIFSET, MapRoute34SignpostItem4 + signpost 32, 8, SIGNPOST_ITEM, MapRoute34SignpostItem3 + signpost 19, 17, SIGNPOST_ITEM, MapRoute34SignpostItem4 ; people-events db 13 @@ -911,10 +909,10 @@ Route34_MapEventHeader: person_event SPRITE_LASS, 30, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerGina1, -1 person_event SPRITE_OFFICER, 15, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7824c, -1 person_event SPRITE_POKEFAN_M, 32, 22, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmBrandon, -1 - person_event SPRITE_GRAMPS, 20, 19, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x7803d, EVENT_6E6 - person_event SPRITE_DAYCARE_MON_1, 22, 18, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon1Script_0x78065, EVENT_6E7 - person_event SPRITE_DAYCARE_MON_2, 23, 21, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon2Script_0x7806b, EVENT_6E8 + person_event SPRITE_GRAMPS, 20, 19, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x7803d, EVENT_DAYCARE_MAN_ON_ROUTE_34 + person_event SPRITE_DAYCARE_MON_1, 22, 18, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon1Script_0x78065, EVENT_DAYCARE_MON_1 + person_event SPRITE_DAYCARE_MON_2, 23, 21, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon2Script_0x7806b, EVENT_DAYCARE_MON_2 person_event SPRITE_COOLTRAINER_F, 52, 15, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainerfIrene, -1 person_event SPRITE_COOLTRAINER_F, 52, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfJenn, -1 person_event SPRITE_COOLTRAINER_F, 55, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfKate, -1 - person_event SPRITE_POKE_BALL, 34, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7832b, EVENT_7BC + person_event SPRITE_POKE_BALL, 34, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index e1d9ba609..b7d9548d5 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, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_6EA + person_event SPRITE_TEACHER, 7, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER person_event SPRITE_BUTTERFREE, 8, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ButterfreeScript_0x62d8a, -1 - person_event SPRITE_LASS, 8, 7, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x62d94, EVENT_6EB - person_event SPRITE_TEACHER, 11, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_6EC + person_event SPRITE_LASS, 8, 7, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + person_event SPRITE_TEACHER, 11, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index ae2bd1a9f..06cebe3ee 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -607,4 +607,4 @@ Route35_MapEventHeader: person_event SPRITE_SUPER_NERD, 14, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerJugglerIrwin, -1 person_event SPRITE_OFFICER, 10, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x19ca49, -1 person_event SPRITE_FRUIT_TREE, 29, 6, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 20, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19ca7c, EVENT_6B2 + person_event SPRITE_POKE_BALL, 20, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index e28e042b9..ca966c324 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -458,6 +458,6 @@ Route35NationalParkgate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a204, EVENT_745 - person_event SPRITE_YOUNGSTER, 9, 10, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6a2d8, EVENT_734 - person_event SPRITE_OFFICER, 7, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a2ca, EVENT_746 + person_event SPRITE_OFFICER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + person_event SPRITE_YOUNGSTER, 9, 10, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + person_event SPRITE_OFFICER, 7, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index e5b25dc4a..62de1e170 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -102,7 +102,7 @@ LassScript_0x19408c: writetext UnknownText_0x1942f1 closetext loadmovesprites - clearevent EVENT_768 + clearevent EVENT_FLORIA_AT_FLOWER_SHOP checkcode VAR_FACING if_equal $1, UnknownScript_0x1940ac applymovement $9, MovementData_0x19424e @@ -713,10 +713,10 @@ Route36_MapEventHeader: db 9 person_event SPRITE_YOUNGSTER, 17, 24, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicMark, -1 person_event SPRITE_YOUNGSTER, 18, 35, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSchoolboyAlan1, -1 - person_event SPRITE_WEIRD_TREE, 13, 39, UP << 2 | $13, $0, -1, -1, $0, 0, WeirdTreeScript_0x19403c, EVENT_6F8 + person_event SPRITE_WEIRD_TREE, 13, 39, UP << 2 | $13, $0, -1, -1, $0, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO person_event SPRITE_LASS, 12, 55, UP << 2 | $1, $2, -1, -1, $0, 0, LassScript_0x1940e0, -1 person_event SPRITE_FISHER, 13, 48, LEFT << 2 | $0, $0, -1, -1, $0, 0, FisherScript_0x1940b9, -1 person_event SPRITE_FRUIT_TREE, 8, 25, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x194247, -1 - person_event SPRITE_YOUNGSTER, 10, 50, DOWN << 2 | $2, $11, -1, -1, $0, 0, ArthurScript, EVENT_75A + person_event SPRITE_YOUNGSTER, 10, 50, DOWN << 2 | $2, $11, -1, -1, $0, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY person_event SPRITE_LASS, 16, 37, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO person_event SPRITE_SUICUNE, 10, 25, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index d938228c3..c9f751aa8 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -862,7 +862,7 @@ Route36NationalParkgate_MapEventHeader: ; people-events db 12 - person_event SPRITE_OFFICER, 7, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_747 + person_event SPRITE_OFFICER, 7, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B person_event SPRITE_YOUNGSTER, 9, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B person_event SPRITE_ROCKER, 10, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B @@ -873,4 +873,4 @@ Route36NationalParkgate_MapEventHeader: person_event SPRITE_YOUNGSTER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B person_event SPRITE_YOUNGSTER, 11, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B person_event SPRITE_YOUNGSTER, 10, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B - person_event SPRITE_OFFICER, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6acf4, EVENT_748 + person_event SPRITE_OFFICER, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route37.asm b/maps/Route37.asm index 7ef7d624f..f82c23ccd 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -156,8 +156,7 @@ FruitTreeScript_0x1a8e0d: fruittree $13 MapRoute37SignpostItem1: - dw $00a9 - db ETHER + dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER TwinsAnnandanne1SeenText: @@ -294,7 +293,7 @@ Route37_MapEventHeader: ; signposts db 2 signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script - signpost 2, 4, SIGNPOST_ITEMIFSET, MapRoute37SignpostItem1 + signpost 2, 4, SIGNPOST_ITEM, MapRoute37SignpostItem1 ; people-events db 7 @@ -302,6 +301,6 @@ Route37_MapEventHeader: person_event SPRITE_WEIRD_TREE, 16, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne2, -1 person_event SPRITE_YOUNGSTER, 10, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicGreg, -1 person_event SPRITE_FRUIT_TREE, 9, 17, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e09, -1 - person_event SPRITE_BUG_CATCHER, 12, 20, DOWN << 2 | $2, $11, -1, -1, $0, 0, SunnyScript, EVENT_75B + person_event SPRITE_BUG_CATCHER, 12, 20, DOWN << 2 | $2, $11, -1, -1, $0, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY person_event SPRITE_FRUIT_TREE, 9, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0b, -1 person_event SPRITE_FRUIT_TREE, 11, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index e9272be38..34f56bb3e 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -232,8 +232,7 @@ FruitTreeScript_0x1a5bf4: fruittree $f MapRoute39SignpostItem3: - dw $00aa - db NUGGET + dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET UnknownText_0x1a5bf9: @@ -414,7 +413,7 @@ Route39_MapEventHeader: signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script - signpost 13, 5, SIGNPOST_ITEMIFSET, MapRoute39SignpostItem3 + signpost 13, 5, SIGNPOST_ITEM, MapRoute39SignpostItem3 ; people-events db 10 diff --git a/maps/Route4.asm b/maps/Route4.asm index 8baa6a068..66265bba5 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -93,8 +93,7 @@ ItemFragment_0x1ae20f: db HP_UP, 1 MapRoute4SignpostItem1: - dw $00f1 - db ULTRA_BALL + dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL Bird_keeperHankSeenText: @@ -178,11 +177,11 @@ Route4_MapEventHeader: ; signposts db 2 signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script - signpost 3, 10, SIGNPOST_ITEMIFSET, MapRoute4SignpostItem1 + signpost 3, 10, SIGNPOST_ITEM, MapRoute4SignpostItem1 ; people-events db 4 person_event SPRITE_YOUNGSTER, 13, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperHank, -1 person_event SPRITE_LASS, 12, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerHope, -1 person_event SPRITE_LASS, 10, 25, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerSharon, -1 - person_event SPRITE_POKE_BALL, 7, 30, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ae20f, EVENT_787 + person_event SPRITE_POKE_BALL, 7, 30, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index 5c00917be..b326ca0ef 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -10,7 +10,7 @@ Route40_MapScriptHeader: dbw 2, MonicaCallback MonicaCallback: - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears disappear $a @@ -188,8 +188,7 @@ Route40Rock: jumpstd smashrock MapRoute40SignpostItem1: - dw $00ab - db HYPER_POTION + dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a621c: step_right @@ -405,7 +404,7 @@ Route40_MapEventHeader: ; signposts db 2 signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script - signpost 8, 7, SIGNPOST_ITEMIFSET, MapRoute40SignpostItem1 + signpost 8, 7, SIGNPOST_ITEM, MapRoute40SignpostItem1 ; people-events db 12 @@ -417,7 +416,7 @@ Route40_MapEventHeader: person_event SPRITE_ROCK, 13, 10, LEFT << 2 | $10, $0, -1, -1, $0, 0, Route40Rock, -1 person_event SPRITE_ROCK, 12, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, Route40Rock, -1 person_event SPRITE_LASS, 17, 15, UP << 2 | $2, $0, -1, -1, $0, 0, LassScript_0x1a61c4, -1 - person_event SPRITE_BUENA, 14, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, MonicaScript, EVENT_75E + person_event SPRITE_BUENA, 14, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY person_event SPRITE_POKEFAN_M, 10, 11, LEFT << 2 | $1, $0, -1, -1, $0, 0, PokefanMScript_0x1a61c7, -1 person_event SPRITE_LASS, 8, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a61d3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, StandingYoungsterScript_0x1a61d6, EVENT_7CF + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index ddc61b758..ca64f94a3 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -10,7 +10,7 @@ Route40BattleTowerGate_MapScriptHeader: dbw 2, UnknownScript_0x9f665 UnknownScript_0x9f665: - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return RockerScript_0x9f669: @@ -88,5 +88,5 @@ Route40BattleTowerGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_ROCKER, 7, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, RockerScript_0x9f669, EVENT_7CF + person_event SPRITE_ROCKER, 7, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR person_event SPRITE_TWIN, 9, 11, UP << 2 | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, TwinScript_0x9f66c, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index c0b2ea5f3..aff5462ef 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -280,8 +280,7 @@ Route41Rock: jumpstd smashrock MapRoute41SignpostItem0: - dw $00ac - db MAX_ETHER + dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" @@ -506,7 +505,7 @@ Route41_MapEventHeader: ; signposts db 1 - signpost 35, 9, SIGNPOST_ITEMIFSET, MapRoute41SignpostItem0 + signpost 35, 9, SIGNPOST_ITEM, MapRoute41SignpostItem0 ; people-events db 10 diff --git a/maps/Route42.asm b/maps/Route42.asm index 054f026b1..c241a5a1e 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -251,8 +251,7 @@ FruitTreeScript_0x1a9351: fruittree $17 MapRoute42SignpostItem4: - dw $00ad - db MAX_POTION + dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x1a9356: @@ -381,7 +380,7 @@ Route42_MapEventHeader: signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script signpost 9, 45, SIGNPOST_READ, MapRoute42Signpost2Script signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script - signpost 11, 16, SIGNPOST_ITEMIFSET, MapRoute42SignpostItem4 + signpost 11, 16, SIGNPOST_ITEM, MapRoute42SignpostItem4 ; people-events db 9 @@ -391,6 +390,6 @@ Route42_MapEventHeader: person_event SPRITE_FRUIT_TREE, 20, 31, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a934d, -1 person_event SPRITE_FRUIT_TREE, 20, 32, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a934f, -1 person_event SPRITE_FRUIT_TREE, 20, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9351, -1 - person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a9349, EVENT_6B3 - person_event SPRITE_POKE_BALL, 12, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a934b, EVENT_6B4 + person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL + person_event SPRITE_POKE_BALL, 12, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION person_event SPRITE_SUICUNE, 20, 30, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route43.asm b/maps/Route43.asm index 3b69877e7..d2d30fe3d 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -619,4 +619,4 @@ Route43_MapEventHeader: person_event SPRITE_LASS, 29, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTiffany3, -1 person_event SPRITE_YOUNGSTER, 44, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperSpencer, -1 person_event SPRITE_FRUIT_TREE, 30, 5, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19d266, -1 - person_event SPRITE_POKE_BALL, 36, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19d268, EVENT_6B5 + person_event SPRITE_POKE_BALL, 36, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 4281405b1..e338b7861 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, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ac85, EVENT_735 - person_event SPRITE_ROCKET, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_6DC - person_event SPRITE_ROCKET, 8, 11, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_6DC + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ac85, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_ROCKET, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS + person_event SPRITE_ROCKET, 8, 11, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route44.asm b/maps/Route44.asm index b8a78ffa4..74e491192 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -417,8 +417,7 @@ ItemFragment_0x19da46: db MAX_REPEL, 1 MapRoute44SignpostItem2: - dw $00ae - db ELIXER + dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER FisherWilton1SeenText: @@ -622,7 +621,7 @@ Route44_MapEventHeader: db 3 signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script - signpost 9, 32, SIGNPOST_ITEMIFSET, MapRoute44SignpostItem2 + signpost 9, 32, SIGNPOST_ITEM, MapRoute44SignpostItem2 ; people-events db 11 @@ -634,6 +633,6 @@ Route44_MapEventHeader: person_event SPRITE_COOLTRAINER_M, 19, 45, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainermAllen, -1 person_event SPRITE_COOLTRAINER_F, 18, 35, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainerfCybil, -1 person_event SPRITE_FRUIT_TREE, 9, 13, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19da40, -1 - person_event SPRITE_POKE_BALL, 12, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da42, EVENT_6B6 - person_event SPRITE_POKE_BALL, 8, 49, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da44, EVENT_6B7 - person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da46, EVENT_7BD + person_event SPRITE_POKE_BALL, 12, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE + person_event SPRITE_POKE_BALL, 8, 49, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL + person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL diff --git a/maps/Route45.asm b/maps/Route45.asm index af2489383..7057ccbf9 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -409,8 +409,7 @@ ItemFragment_0x19e29c: db MAX_POTION, 1 MapRoute45SignpostItem1: - dw $00af - db PP_UP + dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP HikerErikSeenText: @@ -644,7 +643,7 @@ Route45_MapEventHeader: ; signposts db 2 signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script - signpost 80, 13, SIGNPOST_ITEMIFSET, MapRoute45SignpostItem1 + signpost 80, 13, SIGNPOST_ITEM, MapRoute45SignpostItem1 ; people-events db 13 @@ -656,8 +655,8 @@ Route45_MapEventHeader: person_event SPRITE_COOLTRAINER_M, 22, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermRyan, -1 person_event SPRITE_COOLTRAINER_F, 40, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfKelly, -1 person_event SPRITE_FRUIT_TREE, 86, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19e294, -1 - person_event SPRITE_POKE_BALL, 55, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e296, EVENT_6B8 - person_event SPRITE_POKE_BALL, 70, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e298, EVENT_6B9 - person_event SPRITE_POKE_BALL, 24, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29a, EVENT_6BA - person_event SPRITE_POKE_BALL, 37, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29c, EVENT_6BB + person_event SPRITE_POKE_BALL, 55, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET + person_event SPRITE_POKE_BALL, 70, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE + person_event SPRITE_POKE_BALL, 24, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER + person_event SPRITE_POKE_BALL, 37, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION person_event SPRITE_YOUNGSTER, 74, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 0b7c8d016..105bfbd96 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -314,4 +314,4 @@ Route46_MapEventHeader: person_event SPRITE_LASS, 17, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerErin1, -1 person_event SPRITE_FRUIT_TREE, 9, 11, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a978f, -1 person_event SPRITE_FRUIT_TREE, 10, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9791, -1 - person_event SPRITE_POKE_BALL, 19, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a978d, EVENT_6BC + person_event SPRITE_POKE_BALL, 19, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index 74353b71b..bddc02d2e 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, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1adb19, EVENT_771 + person_event SPRITE_POKEFAN_M, 20, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route6.asm b/maps/Route6.asm index 86be6b7d9..e3522e22a 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, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_771 + person_event SPRITE_POKEFAN_M, 8, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH person_event SPRITE_POKEFAN_M, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmRex, -1 person_event SPRITE_POKEFAN_M, 16, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index d4c7dff56..032f33cc7 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -171,8 +171,7 @@ MapRoute9Signpost0Script: jumptext UnknownText_0x1ab2a2 MapRoute9SignpostItem1: - dw $00f2 - db ETHER + dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER CamperDeanSeenText: @@ -309,7 +308,7 @@ Route9_MapEventHeader: ; signposts db 2 signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script - signpost 15, 41, SIGNPOST_ITEMIFSET, MapRoute9SignpostItem1 + signpost 15, 41, SIGNPOST_ITEM, MapRoute9SignpostItem1 ; people-events db 6 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index e8b8113c8..06f0f40f4 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -61,7 +61,7 @@ MapRuinsofAlphAerodactylChamberSignpost2Script: end UnknownScript_0x58df7: - setevent EVENT_705 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_2A3 setflag ENGINE_UNLOCKED_UNOWNS_3 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index fcd484b2c..6f6d5a3a0 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -62,7 +62,7 @@ MapRuinsofAlphHoOhChamberSignpost2Script: end UnknownScript_0x585ba: - setevent EVENT_705 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_2A0 setflag ENGINE_UNLOCKED_UNOWNS_4 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 0b79dc97b..5d33b72d7 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 EVENT_78E + clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end FisherScript_0x58f7d: @@ -125,6 +125,6 @@ RuinsofAlphInnerChamber_MapEventHeader: ; people-events db 3 - person_event SPRITE_FISHER, 11, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_705 - person_event SPRITE_TEACHER, 17, 18, DOWN << 2 | $2, $11, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_705 - person_event SPRITE_GRAMPS, 23, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x58f83, EVENT_705 + person_event SPRITE_FISHER, 11, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_TEACHER, 17, 18, DOWN << 2 | $2, $11, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_GRAMPS, 23, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 013bd4a43..c7c478862 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -66,10 +66,10 @@ MapRuinsofAlphKabutoChamberSignpost2Script: end UnknownScript_0x58778: - setevent EVENT_705 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_2A1 setflag ENGINE_UNLOCKED_UNOWNS_1 - setevent EVENT_74E + setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, $0, 15 @@ -284,5 +284,5 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 9, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x58769, EVENT_74E + person_event SPRITE_RECEPTIONIST, 9, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST person_event SPRITE_SCIENTIST, 5, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 86ba93086..b6be9055d 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -62,7 +62,7 @@ MapRuinsofAlphOmanyteChamberSignpost2Script: end UnknownScript_0x58c36: - setevent EVENT_705 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_2A2 setflag ENGINE_UNLOCKED_UNOWNS_2 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index eabecdf7e..7c8bfc4f0 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -344,7 +344,7 @@ RuinsofAlphOutside_MapEventHeader: ; people-events db 5 person_event SPRITE_YOUNGSTER, 24, 8, UP << 2 | $2, $0, -1, -1, $2, 1, TrainerPsychicNathan, -1 - person_event SPRITE_SCIENTIST, 19, 15, UP << 2 | $3, $0, -1, -1, $0, 0, ScientistScript_0x58043, EVENT_703 - person_event SPRITE_FISHER, 21, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58061, EVENT_78E - person_event SPRITE_YOUNGSTER, 15, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x58076, EVENT_78F - person_event SPRITE_YOUNGSTER, 12, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5807e, EVENT_78F + person_event SPRITE_SCIENTIST, 19, 15, UP << 2 | $3, $0, -1, -1, $0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + person_event SPRITE_FISHER, 21, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + person_event SPRITE_YOUNGSTER, 15, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + person_event SPRITE_YOUNGSTER, 12, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index c2f6e5744..8bdc688fb 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -105,7 +105,7 @@ UnknownScript_0x5920b: writetext UnknownText_0x594cb closetext loadmovesprites - clearevent EVENT_78F + clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS end ScientistScript_0x59214: @@ -134,7 +134,7 @@ UnknownScript_0x5922e: MapRuinsofAlphResearchCenterSignpost1Script: loadfont - checkevent EVENT_704 + checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59247 @@ -152,7 +152,7 @@ UnknownScript_0x59247: MapRuinsofAlphResearchCenterSignpost2Script: loadfont - checkevent EVENT_704 + checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59260 @@ -414,4 +414,4 @@ RuinsofAlphResearchCenter_MapEventHeader: db 3 person_event SPRITE_SCIENTIST, 9, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591e5, -1 person_event SPRITE_SCIENTIST, 6, 9, DOWN << 2 | $2, $12, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x59214, -1 - person_event SPRITE_SCIENTIST, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591d1, EVENT_704 + person_event SPRITE_SCIENTIST, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index cf02c89d9..c4638612c 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -233,5 +233,5 @@ SaffronTrainStation_MapEventHeader: db 4 person_event SPRITE_OFFICER, 13, 13, UP << 2 | $2, $0, -1, -1, $0, 0, OfficerScript_0x18a81e, -1 person_event SPRITE_GYM_GUY, 18, 14, DOWN << 2 | $2, $11, -1, -1, $0, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 15, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x18a889, EVENT_772 - person_event SPRITE_LASS, 14, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x18a88c, EVENT_772 + person_event SPRITE_TEACHER, 15, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_LASS, 14, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 69316d34f..aa061a712 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -172,4 +172,4 @@ SeafoamGym_MapEventHeader: ; people-events db 2 person_event SPRITE_BLAINE, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlaineScript_0x1ab4fb, -1 - person_event SPRITE_GYM_GUY, 9, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SeafoamGymGuyScript, EVENT_777 + person_event SPRITE_GYM_GUY, 9, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 827553030..02deaf08d 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c65e, EVENT_69C - person_event SPRITE_POKE_BALL, 15, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c660, EVENT_69D + person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + person_event SPRITE_POKE_BALL, 15, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index ab2b3f4be..9120d097b 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -19,8 +19,7 @@ MtSilverSign: jumptext MtSilverSignText MapSilverCaveOutsideSignpostItem2: - dw $00b8 - db FULL_RESTORE + dwb EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE MtSilverSignText: text "MT.SILVER" @@ -42,7 +41,7 @@ SilverCaveOutside_MapEventHeader: db 3 signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign signpost 13, 17, SIGNPOST_READ, MtSilverSign - signpost 25, 9, SIGNPOST_ITEMIFSET, MapSilverCaveOutsideSignpostItem2 + signpost 25, 9, SIGNPOST_ITEM, MapSilverCaveOutsideSignpostItem2 ; people-events db 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index a47c3ecff..b63ae780e 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -18,13 +18,11 @@ ItemFragment_0x18c55a: db ULTRA_BALL, 1 MapSilverCaveRoom1SignpostItem0: - dw $009a - db DIRE_HIT + dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT MapSilverCaveRoom1SignpostItem1: - dw $009b - db ULTRA_BALL + dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL SilverCaveRoom1_MapEventHeader: @@ -41,12 +39,12 @@ SilverCaveRoom1_MapEventHeader: ; signposts db 2 - signpost 23, 16, SIGNPOST_ITEMIFSET, MapSilverCaveRoom1SignpostItem0 - signpost 12, 17, SIGNPOST_ITEMIFSET, MapSilverCaveRoom1SignpostItem1 + signpost 23, 16, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem0 + signpost 12, 17, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem1 ; people-events db 4 - person_event SPRITE_POKE_BALL, 13, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_699 - person_event SPRITE_POKE_BALL, 33, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_69A - person_event SPRITE_POKE_BALL, 34, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_69B - person_event SPRITE_POKE_BALL, 22, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_7C1 + person_event SPRITE_POKE_BALL, 13, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + person_event SPRITE_POKE_BALL, 33, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN + person_event SPRITE_POKE_BALL, 34, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 22, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 4d7280ebb..47e4caf0d 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -15,8 +15,7 @@ ItemFragment_0x18c5b6: db PP_UP, 1 MapSilverCaveRoom2SignpostItem0: - dw $009c - db MAX_POTION + dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION SilverCaveRoom2_MapEventHeader: @@ -35,10 +34,10 @@ SilverCaveRoom2_MapEventHeader: ; signposts db 1 - signpost 31, 14, SIGNPOST_ITEMIFSET, MapSilverCaveRoom2SignpostItem0 + signpost 31, 14, SIGNPOST_ITEM, MapSilverCaveRoom2SignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 14, 28, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b2, EVENT_7C2 - person_event SPRITE_POKE_BALL, 28, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b4, EVENT_7C3 - person_event SPRITE_POKE_BALL, 24, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b6, EVENT_7C4 + person_event SPRITE_POKE_BALL, 14, 28, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + person_event SPRITE_POKE_BALL, 28, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + person_event SPRITE_POKE_BALL, 24, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index b8965e462..f7889562f 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -79,15 +79,15 @@ GruntM1Script: setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 - clearevent EVENT_6F3 - clearevent EVENT_6E9 + clearevent EVENT_ILEX_FOREST_APPRENTICE + clearevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_6F5 setevent EVENT_6F6 - setevent EVENT_6FB - setevent EVENT_740 - clearevent EVENT_6F9 - clearevent EVENT_6FD - clearevent EVENT_73E + setevent EVENT_SLOWPOKE_WELL_SLOWPOKES + setevent EVENT_SLOWPOKE_WELL_KURT + clearevent EVENT_AZALEA_TOWN_SLOWPOKES + clearevent EVENT_KURTS_HOUSE_SLOWPOKE + clearevent EVENT_KURTS_HOUSE_KURT_1 special Function8c084 special HealParty pause 15 @@ -390,12 +390,12 @@ SlowpokeWellB1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_ROCKET, 11, 19, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM29, EVENT_6FC - person_event SPRITE_ROCKET, 6, 9, UP << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM1, EVENT_6FC - person_event SPRITE_ROCKET, 10, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM2, EVENT_6FC - person_event SPRITE_ROCKET_GIRL, 8, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerGruntF1, EVENT_6FC - person_event SPRITE_SLOWPOKE, 8, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a681, EVENT_6FB - person_event SPRITE_SLOWPOKE, 6, 10, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a695, EVENT_6FB - person_event SPRITE_KURT, 18, 20, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x5a5d5, EVENT_740 + person_event SPRITE_ROCKET, 11, 19, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET, 6, 9, UP << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET, 10, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET_GIRL, 8, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_SLOWPOKE, 8, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES + person_event SPRITE_SLOWPOKE, 6, 10, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES + person_event SPRITE_KURT, 18, 20, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT person_event SPRITE_BOULDER, 6, 7, LEFT << 2 | $11, $0, -1, -1, $0, 0, SlowpokeWellB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 7, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a6a3, EVENT_662 + person_event SPRITE_POKE_BALL, 7, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 811d5b0f6..fd8a9d4f8 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -74,4 +74,4 @@ SlowpokeWellB2F_MapEventHeader: ; people-events db 2 person_event SPRITE_GYM_GUY, 8, 9, DOWN << 2 | $2, $21, -1, -1, $0, 1, GymGuyScript_0x5ad0b, -1 - person_event SPRITE_POKE_BALL, 9, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5ad28, EVENT_663 + person_event SPRITE_POKE_BALL, 9, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 2e5a5bfa8..30c0a5ec2 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -137,4 +137,4 @@ SproutTower1F_MapEventHeader: person_event SPRITE_GRANNY, 16, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrannyScript_0x184504, -1 person_event SPRITE_TEACHER, 13, 13, UP << 2 | $3, $0, -1, -1, $0, 0, TeacherScript_0x184507, -1 person_event SPRITE_SAGE, 9, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageChow, -1 - person_event SPRITE_POKE_BALL, 11, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18451e, EVENT_647 + person_event SPRITE_POKE_BALL, 11, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index c138cc272..1d74f3b1a 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -133,4 +133,4 @@ SproutTower2F_MapEventHeader: db 3 person_event SPRITE_SAGE, 7, 16, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageNico, -1 person_event SPRITE_SAGE, 18, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSageEdmond, -1 - person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1847a7, EVENT_648 + person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 5f6aaccb4..dbbde2c39 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -397,6 +397,6 @@ SproutTower3F_MapEventHeader: person_event SPRITE_SAGE, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerSageTroy, -1 person_event SPRITE_SAGE, 6, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageLiScript, -1 person_event SPRITE_SAGE, 15, 15, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSageNeal, -1 - person_event SPRITE_POKE_BALL, 18, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a19, EVENT_649 - person_event SPRITE_POKE_BALL, 5, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a1b, EVENT_64A + person_event SPRITE_POKE_BALL, 18, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION + person_event SPRITE_POKE_BALL, 5, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE person_event SPRITE_SILVER, 8, 14, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index ac32a8b96..1ee9fa25f 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -23,7 +23,7 @@ SecurityCamera1a: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -48,7 +48,7 @@ SecurityCamera1b: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -73,7 +73,7 @@ SecurityCamera2a: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -99,7 +99,7 @@ SecurityCamera2b: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -125,7 +125,7 @@ SecurityCamera3a: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -151,7 +151,7 @@ SecurityCamera3b: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -177,7 +177,7 @@ SecurityCamera4: checkevent EVENT_SECURITY_CAMERA_4 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -203,7 +203,7 @@ SecurityCamera5: checkevent EVENT_SECURITY_CAMERA_5 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -569,8 +569,7 @@ ItemFragment_0x6cac8: db GUARD_SPEC, 1 MapTeamRocketBaseB1FSignpostItem8: - dw $0086 - db REVIVE + dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE SecurityCameraMovement1: @@ -815,13 +814,13 @@ TeamRocketBaseB1F_MapEventHeader: signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, SIGNPOST_ITEMIFSET, MapTeamRocketBaseB1FSignpostItem8 + signpost 11, 3, SIGNPOST_ITEM, MapTeamRocketBaseB1FSignpostItem8 ; people-events db 6 - person_event SPRITE_ROCKET, 4, 4, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D9 - person_event SPRITE_ROCKET, 8, 6, LEFT << 2 | $1, $0, -1, -1, $2, 3, TrainerGruntM16, EVENT_6DA - person_event SPRITE_SCIENTIST, 16, 22, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistJed, EVENT_6DA - person_event SPRITE_POKE_BALL, 10, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac4, EVENT_669 - person_event SPRITE_POKE_BALL, 19, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac6, EVENT_66A - person_event SPRITE_POKE_BALL, 16, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac8, EVENT_66B + person_event SPRITE_ROCKET, 4, 4, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + person_event SPRITE_ROCKET, 8, 6, LEFT << 2 | $1, $0, -1, -1, $2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 16, 22, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_POKE_BALL, 10, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 19, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + person_event SPRITE_POKE_BALL, 16, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 97a8dba8f..8da4ee230 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -89,9 +89,9 @@ UnknownScript_0x6cfac: loadtrainer EXECUTIVEF, 2 startbattle disappear $5 - setevent EVENT_6DD - setevent EVENT_6DE - setevent EVENT_6D6 + setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE returnafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 loadfont @@ -108,7 +108,7 @@ UnknownScript_0x6cfac: pause 15 special Function8c0ab dotrigger $2 - clearevent EVENT_6D6 + clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface $4, DOWN loadfont writetext UnknownText_0x6d5d8 @@ -265,11 +265,11 @@ VoltorbScript_0x6d101: iftrue UnknownScript_0x6d182 disappear $6 disappear $9 - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -283,11 +283,11 @@ VoltorbScript_0x6d12c: iftrue UnknownScript_0x6d182 disappear $7 disappear $a - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -301,11 +301,11 @@ VoltorbScript_0x6d157: iftrue UnknownScript_0x6d182 disappear $8 disappear $b - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -339,10 +339,10 @@ UnknownScript_0x6d184: disappear $4 setevent EVENT_CLEARED_ROCKET_HIDEOUT clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 - setevent EVENT_6DC - setevent EVENT_757 + setevent EVENT_ROUTE_43_GATE_ROCKETS + setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM dotrigger $3 - clearevent EVENT_735 + clearevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 setevent EVENT_SECURITY_CAMERA_2 @@ -395,8 +395,7 @@ ItemFragment_0x6d20d: db TM_THIEF, 1 MapTeamRocketBaseB2FSignpostItem22: - dw $0087 - db FULL_HEAL + dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x6d212: @@ -997,21 +996,21 @@ TeamRocketBaseB2F_MapEventHeader: signpost 6, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 7, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 26, SIGNPOST_ITEMIFSET, MapTeamRocketBaseB2FSignpostItem22 + signpost 7, 26, SIGNPOST_ITEM, MapTeamRocketBaseB2FSignpostItem22 ; people-events db 14 - person_event SPRITE_ROCKET, 20, 24, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DE - person_event SPRITE_ROCKET_GIRL, 20, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_6DD - person_event SPRITE_LANCE, 17, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D6 - person_event SPRITE_DRAGON, 17, 13, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DF - person_event SPRITE_VOLTORB, 9, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d101, EVENT_6E0 - person_event SPRITE_VOLTORB, 11, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d12c, EVENT_6E1 - person_event SPRITE_VOLTORB, 13, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d157, EVENT_6E2 - person_event SPRITE_VOLTORB, 9, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E0 - person_event SPRITE_VOLTORB, 11, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E1 - person_event SPRITE_VOLTORB, 13, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E2 - person_event SPRITE_ROCKET, 17, 29, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM17, EVENT_6DA - person_event SPRITE_ROCKET, 5, 8, LEFT << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM18, EVENT_6DA - person_event SPRITE_ROCKET, 18, 25, LEFT << 2 | $0, $0, -1, -1, $2, 4, TrainerGruntM19, EVENT_6DA - person_event SPRITE_POKE_BALL, 14, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6d20d, EVENT_66C + person_event SPRITE_ROCKET, 20, 24, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + person_event SPRITE_ROCKET_GIRL, 20, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + person_event SPRITE_LANCE, 17, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE + person_event SPRITE_DRAGON, 17, 13, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + person_event SPRITE_VOLTORB, 9, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d101, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + person_event SPRITE_VOLTORB, 11, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d12c, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + person_event SPRITE_VOLTORB, 13, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d157, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + person_event SPRITE_VOLTORB, 9, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + person_event SPRITE_VOLTORB, 11, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + person_event SPRITE_VOLTORB, 13, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + person_event SPRITE_ROCKET, 17, 29, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 5, 8, LEFT << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 25, LEFT << 2 | $0, $0, -1, -1, $2, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_POKE_BALL, 14, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6d20d, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 2c431a702..b0acfa21c 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, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x6dffc, EVENT_6D7 - person_event SPRITE_ROCKET, 7, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DB - person_event SPRITE_MOLTRES, 6, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MoltresScript_0x6e091, EVENT_6DA - person_event SPRITE_ROCKET_GIRL, 11, 25, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerGruntF5, EVENT_6DA - person_event SPRITE_ROCKET, 18, 9, LEFT << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM28, EVENT_6DA - person_event SPRITE_SCIENTIST, 15, 27, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerScientistRoss, EVENT_6DA - person_event SPRITE_SCIENTIST, 19, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistMitch, EVENT_6DA - person_event SPRITE_ROCKET, 18, 28, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x6e048, EVENT_6DA - person_event SPRITE_SILVER, 9, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C0 - person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e120, EVENT_66D - person_event SPRITE_POKE_BALL, 16, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e122, EVENT_66E - person_event SPRITE_POKE_BALL, 13, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e124, EVENT_66F - person_event SPRITE_POKE_BALL, 6, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e126, EVENT_670 - person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e128, EVENT_654 + person_event SPRITE_LANCE, 18, 29, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS + person_event SPRITE_ROCKET, 7, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + person_event SPRITE_MOLTRES, 6, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MoltresScript_0x6e091, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET_GIRL, 11, 25, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerGruntF5, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 9, LEFT << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM28, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 15, 27, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 19, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 28, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SILVER, 9, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE + person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + person_event SPRITE_POKE_BALL, 16, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e122, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + person_event SPRITE_POKE_BALL, 13, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e124, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + person_event SPRITE_POKE_BALL, 6, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e126, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e128, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index a0ffa54a7..262fae8c3 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -29,8 +29,8 @@ UnknownScript_0x18502f: iffalse UnknownScript_0x185050 special SpecialBeastsCheck iffalse UnknownScript_0x185050 - clearevent EVENT_7C5 - setevent EVENT_7B6 + clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 UnknownScript_0x185047: checkevent EVENT_FOUGHT_HO_OH iffalse UnknownScript_0x18504f @@ -66,8 +66,8 @@ UnknownScript_0x185077: disappear $2 disappear $3 disappear $4 - clearevent EVENT_7B6 - setevent EVENT_7C5 + clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return UnknownScript_0x185084: @@ -534,13 +534,13 @@ TinTower1F_MapEventHeader: ; people-events db 10 - person_event SPRITE_SUICUNE, 13, 13, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_7B2 - person_event SPRITE_RAIKOU, 13, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_7B4 - person_event SPRITE_ENTEI, 13, 16, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_7B3 - person_event SPRITE_SUPER_NERD, 7, 12, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x1851c8, EVENT_7B5 - person_event SPRITE_SAGE, 13, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185173, EVENT_7B6 - person_event SPRITE_SAGE, 15, 15, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185176, EVENT_7B6 - person_event SPRITE_SAGE, 10, 18, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185179, EVENT_7B6 - person_event SPRITE_SAGE, 6, 8, UP << 2 | $0, $10, -1, -1, $0, 0, SageScript_0x18517c, EVENT_7C5 - person_event SPRITE_SAGE, 5, 13, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x185188, EVENT_7C5 - person_event SPRITE_SAGE, 6, 18, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x1851bc, EVENT_7C5 + person_event SPRITE_SUICUNE, 13, 13, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE + person_event SPRITE_RAIKOU, 13, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU + person_event SPRITE_ENTEI, 13, 16, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI + person_event SPRITE_SUPER_NERD, 7, 12, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x1851c8, EVENT_TIN_TOWER_1F_EUSINE + person_event SPRITE_SAGE, 13, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 15, 15, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 10, 18, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 6, 8, UP << 2 | $0, $10, -1, -1, $0, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 5, 13, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 6, 18, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 02b0765ba..a9ad927e5 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a37, EVENT_64B + person_event SPRITE_POKE_BALL, 18, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index e5109007f..3225347fc 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -15,8 +15,7 @@ ItemFragment_0x185a5c: db ESCAPE_ROPE, 1 MapTinTower4FSignpostItem0: - dw $007d - db MAX_POTION + dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION TinTower4F_MapEventHeader: @@ -35,10 +34,10 @@ TinTower4F_MapEventHeader: ; signposts db 1 - signpost 6, 11, SIGNPOST_ITEMIFSET, MapTinTower4FSignpostItem0 + signpost 6, 11, SIGNPOST_ITEM, MapTinTower4FSignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a58, EVENT_64C - person_event SPRITE_POKE_BALL, 18, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5a, EVENT_64D - person_event SPRITE_POKE_BALL, 16, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5c, EVENT_64E + person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL + person_event SPRITE_POKE_BALL, 18, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP + person_event SPRITE_POKE_BALL, 16, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 7478ac69f..4611567c4 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -9,13 +9,11 @@ ItemFragment_0x185aa9: db RARE_CANDY, 1 MapTinTower5FSignpostItem0: - dw $007e - db FULL_RESTORE + dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE MapTinTower5FSignpostItem1: - dw $007f - db CARBOS + dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS TinTower5F_MapEventHeader: @@ -34,9 +32,9 @@ TinTower5F_MapEventHeader: ; signposts db 2 - signpost 14, 16, SIGNPOST_ITEMIFSET, MapTinTower5FSignpostItem0 - signpost 15, 3, SIGNPOST_ITEMIFSET, MapTinTower5FSignpostItem1 + signpost 14, 16, SIGNPOST_ITEM, MapTinTower5FSignpostItem0 + signpost 15, 3, SIGNPOST_ITEM, MapTinTower5FSignpostItem1 ; people-events db 1 - person_event SPRITE_POKE_BALL, 13, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185aa9, EVENT_64F + person_event SPRITE_POKE_BALL, 13, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 2e9c3ab09..11a532b55 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ae4, EVENT_7C6 + person_event SPRITE_POKE_BALL, 12, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index e84c42e6d..5d8d3969d 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b05, EVENT_650 + person_event SPRITE_POKE_BALL, 5, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 647de8435..78944021c 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b35, EVENT_651 - person_event SPRITE_POKE_BALL, 10, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b37, EVENT_652 - person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b39, EVENT_653 + person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET + person_event SPRITE_POKE_BALL, 10, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER + person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 17c73e459..9ac6e5b08 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b88, EVENT_7C7 + person_event SPRITE_POKE_BALL, 5, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index d2d2772e1..54c0dcc47 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, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, HoOhScript_0x77244, EVENT_73C + person_event SPRITE_HO_OH, 9, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, HoOhScript_0x77244, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index e06881187..78f29fc42 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18db02, EVENT_6A9 + person_event SPRITE_POKE_BALL, 10, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/Underground.asm b/maps/Underground.asm index 6e4c455e9..620a5cf1f 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -6,13 +6,11 @@ Underground_MapScriptHeader: db 0 MapUndergroundSignpostItem0: - dw $00e5 - db FULL_RESTORE + dwb EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE, FULL_RESTORE MapUndergroundSignpostItem1: - dw $00e6 - db X_SPECIAL + dwb EVENT_UNDERGROUND_HIDDEN_X_SPECIAL, X_SPECIAL Underground_MapEventHeader: @@ -29,8 +27,8 @@ Underground_MapEventHeader: ; signposts db 2 - signpost 9, 3, SIGNPOST_ITEMIFSET, MapUndergroundSignpostItem0 - signpost 19, 1, SIGNPOST_ITEMIFSET, MapUndergroundSignpostItem1 + signpost 9, 3, SIGNPOST_ITEM, MapUndergroundSignpostItem0 + signpost 19, 1, SIGNPOST_ITEM, MapUndergroundSignpostItem1 ; people-events db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 1962e4364..fc8b7befa 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -116,9 +116,9 @@ UnknownScript_0x7caaa: end UnknownScript_0x7cad4: - checkevent EVENT_6C5 + checkevent EVENT_RIVAL_BURNED_TOWER iftrue UnknownScript_0x7cae1 - setevent EVENT_6C5 + setevent EVENT_RIVAL_BURNED_TOWER 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 EVENT_6C1 + setevent EVENT_RIVAL_UNDERGROUND_PATH checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x7cb09 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -686,13 +686,11 @@ ItemFragment_0x7ce7f: db FULL_HEAL, 1 MapUndergroundPathSwitchRoomEntrancesSignpostItem4: - dw $008e - db MAX_POTION + dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION MapUndergroundPathSwitchRoomEntrancesSignpostItem5: - dw $008f - db REVIVE + dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE MovementData_0x7ce87: @@ -1016,19 +1014,19 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: signpost 1, 10, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost1Script signpost 1, 2, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost2Script signpost 11, 20, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost3Script - signpost 9, 8, SIGNPOST_ITEMIFSET, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 - signpost 8, 1, SIGNPOST_ITEMIFSET, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 + signpost 9, 8, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 + signpost 8, 1, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 ; people-events db 11 - person_event SPRITE_PHARMACIST, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarDuncan, EVENT_6CE - person_event SPRITE_PHARMACIST, 12, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarEddie, EVENT_6CE - person_event SPRITE_ROCKET, 6, 21, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM13, EVENT_6CE - person_event SPRITE_ROCKET, 6, 15, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM11, EVENT_6CE - person_event SPRITE_ROCKET, 6, 7, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM25, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF3, EVENT_6CE + person_event SPRITE_PHARMACIST, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_PHARMACIST, 12, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 21, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 15, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 7, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_TEACHER, 31, 7, UP << 2 | $2, $0, -1, -1, $0, 0, TeacherScript_0x7ca7d, -1 person_event SPRITE_SUPER_NERD, 31, 23, UP << 2 | $2, $0, -1, -1, $0, 0, SuperNerdScript_0x7ca7a, -1 - person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7d, EVENT_673 - person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7f, EVENT_674 - person_event SPRITE_SILVER, 7, 27, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C1 + person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7d, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7f, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL + person_event SPRITE_SILVER, 7, 27, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 051f14d9b..5a6b56941 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -270,10 +270,10 @@ UndergroundWarehouse_MapEventHeader: ; people-events db 7 - person_event SPRITE_ROCKET, 12, 13, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM24, EVENT_6CE - person_event SPRITE_ROCKET, 19, 12, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM14, EVENT_6CE - person_event SPRITE_ROCKET, 7, 18, LEFT << 2 | $1, $0, -1, -1, $2, 4, TrainerGruntM15, EVENT_6CE - person_event SPRITE_GENTLEMAN, 12, 16, DOWN << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x7d9bf, EVENT_6CE - person_event SPRITE_POKE_BALL, 19, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e4, EVENT_679 - person_event SPRITE_POKE_BALL, 13, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e6, EVENT_67A - person_event SPRITE_POKE_BALL, 5, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e8, EVENT_655 + person_event SPRITE_ROCKET, 12, 13, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 19, 12, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 7, 18, LEFT << 2 | $1, $0, -1, -1, $2, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_GENTLEMAN, 12, 16, DOWN << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_POKE_BALL, 19, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER + person_event SPRITE_POKE_BALL, 13, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + person_event SPRITE_POKE_BALL, 5, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 518e5511e..68445bb22 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -292,7 +292,7 @@ UnionCave1F_MapEventHeader: person_event SPRITE_POKEFAN_M, 12, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerRussell, -1 person_event SPRITE_FISHER, 31, 19, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerFirebreatherRay, -1 person_event SPRITE_FISHER, 23, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerFirebreatherBill, -1 - person_event SPRITE_POKE_BALL, 25, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c00, EVENT_65A - person_event SPRITE_POKE_BALL, 6, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c02, EVENT_65B - person_event SPRITE_POKE_BALL, 21, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c04, EVENT_65C - person_event SPRITE_POKE_BALL, 37, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c06, EVENT_65D + person_event SPRITE_POKE_BALL, 25, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL + person_event SPRITE_POKE_BALL, 6, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK + person_event SPRITE_POKE_BALL, 21, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION + person_event SPRITE_POKE_BALL, 37, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index b19b3570e..8ff1dce72 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -231,6 +231,6 @@ UnionCaveB1F_MapEventHeader: person_event SPRITE_POKEFAN_M, 11, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerLeonard, -1 person_event SPRITE_SUPER_NERD, 36, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacAndrew, -1 person_event SPRITE_SUPER_NERD, 34, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacCalvin, -1 - person_event SPRITE_POKE_BALL, 20, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a016, EVENT_65E + person_event SPRITE_POKE_BALL, 20, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT person_event SPRITE_BOULDER, 14, 11, LEFT << 2 | $11, $0, -1, -1, $0, 0, UnionCaveB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 27, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a018, EVENT_65F + person_event SPRITE_POKE_BALL, 27, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 7a967bf44..863629925 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -203,6 +203,6 @@ UnionCaveB2F_MapEventHeader: person_event SPRITE_ROCKER, 23, 19, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermNick, -1 person_event SPRITE_COOLTRAINER_F, 17, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfGwen, -1 person_event SPRITE_COOLTRAINER_F, 34, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfEmma, -1 - person_event SPRITE_POKE_BALL, 6, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36a, EVENT_660 - person_event SPRITE_POKE_BALL, 23, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36c, EVENT_661 - person_event SPRITE_SURF, 35, 15, UP << 2 | $20, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SurfScript_0x5a31f, EVENT_760 + person_event SPRITE_POKE_BALL, 6, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER + person_event SPRITE_POKE_BALL, 23, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION + person_event SPRITE_SURF, 35, 15, UP << 2 | $20, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 5764f0a2e..9805c5fb9 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -117,8 +117,7 @@ VermilionCityMartSign: jumpstd martsign MapVermilionCitySignpostItem7: - dw $00fc - db FULL_HEAL + dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x1aaa15: text "VERMILION PORT is" @@ -291,7 +290,7 @@ VermilionCity_MapEventHeader: signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign - signpost 19, 12, SIGNPOST_ITEMIFSET, MapVermilionCitySignpostItem7 + signpost 19, 12, SIGNPOST_ITEM, MapVermilionCitySignpostItem7 ; people-events db 6 @@ -299,5 +298,5 @@ VermilionCity_MapEventHeader: person_event SPRITE_GRAMPS, 10, 27, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x1aa986, -1 person_event SPRITE_MACHOP, 11, 30, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, VermilionMachop, -1 person_event SPRITE_SUPER_NERD, 20, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x1aa99b, -1 - person_event SPRITE_BIG_SNORLAX, 12, 38, UP << 2 | $11, $0, -1, -1, $0, 0, VermilionSnorlax, EVENT_770 + person_event SPRITE_BIG_SNORLAX, 12, 38, UP << 2 | $11, $0, -1, -1, $0, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX person_event SPRITE_POKEFAN_M, 16, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8b031fc91..94d273189 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -27,10 +27,10 @@ UnknownScript_0x74da6: applymovement $0, MovementData_0x74ef3 appear $2 dotrigger $0 - setevent EVENT_731 - setevent EVENT_730 - setevent EVENT_739 - clearevent EVENT_733 + setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M setevent EVENT_030 setevent EVENT_000 blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY @@ -53,8 +53,8 @@ SailorScript_0x74dc4: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - setevent EVENT_73A - clearevent EVENT_73B + setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_POKEMANIAC_ETHAN clearevent EVENT_BEAT_BURGLAR_COREY clearevent EVENT_BEAT_BUG_CATCHER_KEN @@ -194,8 +194,7 @@ SuperNerdScript_0x74ee6: end MapVermilionPortSignpostItem0: - dw $00eb - db IRON + dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON MovementData_0x74ef1: @@ -314,10 +313,10 @@ VermilionPort_MapEventHeader: ; signposts db 1 - signpost 13, 16, SIGNPOST_ITEMIFSET, MapVermilionPortSignpostItem0 + signpost 13, 16, SIGNPOST_ITEM, MapVermilionPortSignpostItem0 ; people-events db 3 - person_event SPRITE_SAILOR, 21, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x74dc4, EVENT_72B + person_event SPRITE_SAILOR, 21, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY person_event SPRITE_SAILOR, 15, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x74e97, -1 person_event SPRITE_SUPER_NERD, 15, 15, UP << 2 | $1, $2, -1, -1, $0, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index de102f60b..cfc00a877 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -51,7 +51,7 @@ UnknownScript_0x744d4: writetext UnknownText_0x7455f closetext loadmovesprites - setevent EVENT_6C2 + setevent EVENT_RIVAL_VICTORY_ROAD checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -106,13 +106,11 @@ ItemFragment_0x74531: db HP_UP, 1 MapVictoryRoadSignpostItem0: - dw $009e - db MAX_POTION + dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION MapVictoryRoadSignpostItem1: - dw $009f - db FULL_HEAL + dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x74539: @@ -260,14 +258,14 @@ VictoryRoad_MapEventHeader: ; signposts db 2 - signpost 29, 3, SIGNPOST_ITEMIFSET, MapVictoryRoadSignpostItem0 - signpost 65, 3, SIGNPOST_ITEMIFSET, MapVictoryRoadSignpostItem1 + signpost 29, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem0 + signpost 65, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem1 ; people-events db 6 - person_event SPRITE_SILVER, 17, 22, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C2 - person_event SPRITE_POKE_BALL, 32, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74529, EVENT_6A3 - person_event SPRITE_POKE_BALL, 52, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452b, EVENT_6A4 - person_event SPRITE_POKE_BALL, 33, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452d, EVENT_6A5 - person_event SPRITE_POKE_BALL, 52, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452f, EVENT_6A6 - person_event SPRITE_POKE_BALL, 42, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74531, EVENT_6A7 + person_event SPRITE_SILVER, 17, 22, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD + person_event SPRITE_POKE_BALL, 32, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE + person_event SPRITE_POKE_BALL, 52, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE + person_event SPRITE_POKE_BALL, 33, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE + person_event SPRITE_POKE_BALL, 52, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL + person_event SPRITE_POKE_BALL, 42, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 38c13a4df..e2285be1f 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 EVENT_6CB + clearevent EVENT_EARLS_ACADEMY_EARL waitbutton end @@ -90,8 +90,7 @@ FruitTreeScript_0x1a8425: fruittree $9 MapVioletCitySignpostItem6: - dw $00b0 - db HYPER_POTION + dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a842a: big_step_down @@ -298,15 +297,15 @@ VioletCity_MapEventHeader: signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign signpost 17, 10, SIGNPOST_READ, VioletCityMartSign - signpost 14, 37, SIGNPOST_ITEMIFSET, MapVioletCitySignpostItem6 + signpost 14, 37, SIGNPOST_ITEM, MapVioletCitySignpostItem6 ; people-events db 8 - person_event SPRITE_FISHER, 20, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a83bb, EVENT_6CA + person_event SPRITE_FISHER, 20, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a83bb, EVENT_VIOLET_CITY_EARL person_event SPRITE_LASS, 32, 32, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a8403, -1 person_event SPRITE_SUPER_NERD, 18, 28, DOWN << 2 | $2, $21, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a8406, -1 person_event SPRITE_GRAMPS, 24, 21, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x1a8409, -1 person_event SPRITE_YOUNGSTER, 22, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a840c, -1 person_event SPRITE_FRUIT_TREE, 33, 18, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8425, -1 - person_event SPRITE_POKE_BALL, 5, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8421, EVENT_643 - person_event SPRITE_POKE_BALL, 9, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8423, EVENT_644 + person_event SPRITE_POKE_BALL, 5, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP + person_event SPRITE_POKE_BALL, 9, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 6a2b0d744..7af74d807 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, UP << 2 | $2, $0, -1, -1, $0, 0, BlueScript_0x9aa26, EVENT_776 - person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ViridianGymGuyScript, EVENT_776 + person_event SPRITE_BLUE, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE + person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 4ee49c1a7..3fcc7eb36 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -7,13 +7,13 @@ WarehouseEntrance_MapScriptHeader: ; callbacks - dbw 5, UnknownScript_0x7c043 + dbw 5, .ResetSwitches - dbw 1, UnknownScript_0x7c076 + dbw 1, .CheckBasementKey - dbw 2, UnknownScript_0x7c082 + dbw 2, .CheckDayOfWeek -UnknownScript_0x7c043: +.ResetSwitches: clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 @@ -33,69 +33,71 @@ UnknownScript_0x7c043: copyvartobyte UndergroundSwitchPositions return -UnknownScript_0x7c076: +.CheckBasementKey: checkevent EVENT_USED_BASEMENT_KEY - iffalse UnknownScript_0x7c07d + iffalse .LockBasementDoor return -UnknownScript_0x7c07d: +.LockBasementDoor: changeblock $12, $6, $3d return -UnknownScript_0x7c082: +.CheckDayOfWeek: checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x7c0a5 - if_equal TUESDAY, UnknownScript_0x7c0b5 - if_equal WEDNESDAY, UnknownScript_0x7c0be - if_equal THURSDAY, UnknownScript_0x7c0c7 - if_equal FRIDAY, UnknownScript_0x7c0d0 - if_equal SATURDAY, UnknownScript_0x7c0d9 + if_equal MONDAY, .Monday + if_equal TUESDAY, .Tuesday + if_equal WEDNESDAY, .Wednesday + if_equal THURSDAY, .Thursday + if_equal FRIDAY, .Friday + if_equal SATURDAY, .Saturday + +.Sunday: disappear $7 disappear $8 appear $9 appear $a return -UnknownScript_0x7c0a5: +.Monday: disappear $7 checkmorn - iffalse UnknownScript_0x7c0ae + iffalse .NotMondayMorning appear $7 -UnknownScript_0x7c0ae: +.NotMondayMorning: disappear $8 disappear $9 disappear $a return -UnknownScript_0x7c0b5: +.Tuesday: disappear $7 appear $8 disappear $9 disappear $a return -UnknownScript_0x7c0be: +.Wednesday: disappear $7 disappear $8 appear $9 disappear $a return -UnknownScript_0x7c0c7: +.Thursday: disappear $7 appear $8 disappear $9 disappear $a return -UnknownScript_0x7c0d0: +.Friday: disappear $7 disappear $8 appear $9 disappear $a return -UnknownScript_0x7c0d9: +.Saturday: disappear $7 appear $8 disappear $9 @@ -213,11 +215,11 @@ PokemaniacDonaldScript: GrannyScript_0x7c132: loadfont checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x7c140 - if_equal SATURDAY, UnknownScript_0x7c140 - jump UnknownScript_0x7c300 + if_equal SUNDAY, .Open + if_equal SATURDAY, .Open + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c140: +.Open: pokemart $1, $0021 loadmovesprites end @@ -225,64 +227,64 @@ UnknownScript_0x7c140: GrampsScript_0x7c146: loadfont checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED - iftrue UnknownScript_0x7c300 + iftrue WarehouseEntranceScript_ShopClosed checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x7c156 - jump UnknownScript_0x7c300 + if_equal MONDAY, .CheckMorn + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c156: +.CheckMorn: checkmorn - iffalse UnknownScript_0x7c300 + iffalse WarehouseEntranceScript_ShopClosed pokemart $2, $0000 loadmovesprites end -SuperNerdScript_0x7c161: +OlderHaircutBrotherScript: loadfont checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0x7c173 - if_equal THURSDAY, UnknownScript_0x7c173 - if_equal SATURDAY, UnknownScript_0x7c173 - jump UnknownScript_0x7c300 + if_equal TUESDAY, .DoHaircut + if_equal THURSDAY, .DoHaircut + if_equal SATURDAY, .DoHaircut + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c173: +.DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - iftrue UnknownScript_0x7c208 + iftrue .AlreadyGotHaircut special Function24ae8 writetext UnknownText_0x7c5f9 yesorno - iffalse UnknownScript_0x7c1fc + iffalse .Refused checkmoney $0, 500 - if_equal $2, UnknownScript_0x7c202 + if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c69a keeptextopen special Function7413 - if_equal $0, UnknownScript_0x7c1fc - if_equal $1, UnknownScript_0x7c1fc + if_equal $0, .Refused + if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - if_equal $2, UnknownScript_0x7c1a9 - if_equal $3, UnknownScript_0x7c1b5 - jump UnknownScript_0x7c1c1 + if_equal $2, .two + if_equal $3, .three + jump .else -UnknownScript_0x7c1a9: +.two: setevent EVENT_000 clearevent EVENT_001 clearevent EVENT_002 - jump UnknownScript_0x7c1cd + jump .then -UnknownScript_0x7c1b5: +.three: clearevent EVENT_000 setevent EVENT_001 clearevent EVENT_002 - jump UnknownScript_0x7c1cd + jump .then -UnknownScript_0x7c1c1: +.else: clearevent EVENT_000 clearevent EVENT_001 setevent EVENT_002 - jump UnknownScript_0x7c1cd + jump .then -UnknownScript_0x7c1cd: +.then: takemoney $0, 500 special Function24ae8 writetext UnknownText_0x7c6b8 @@ -302,70 +304,70 @@ UnknownScript_0x7c1cd: iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd -UnknownScript_0x7c1fc: +.Refused: writetext UnknownText_0x7c6ea closetext loadmovesprites end -UnknownScript_0x7c202: +.NotEnoughMoney: writetext UnknownText_0x7c709 closetext loadmovesprites end -UnknownScript_0x7c208: +.AlreadyGotHaircut: writetext UnknownText_0x7c72b closetext loadmovesprites end -SuperNerdScript_0x7c20e: +YoungerHaircutBrotherScript: loadfont checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x7c220 - if_equal WEDNESDAY, UnknownScript_0x7c220 - if_equal FRIDAY, UnknownScript_0x7c220 - jump UnknownScript_0x7c300 + if_equal SUNDAY, .DoHaircut + if_equal WEDNESDAY, .DoHaircut + if_equal FRIDAY, .DoHaircut + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c220: +.DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - iftrue UnknownScript_0x7c2b5 + iftrue .AlreadyGotHaircut special Function24ae8 writetext UnknownText_0x7c75c yesorno - iffalse UnknownScript_0x7c2a9 + iffalse .Refused checkmoney $0, 300 - if_equal $2, UnknownScript_0x7c2af + if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c7f1 keeptextopen special Function7418 - if_equal $0, UnknownScript_0x7c2a9 - if_equal $1, UnknownScript_0x7c2a9 + if_equal $0, .Refused + if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - if_equal $2, UnknownScript_0x7c256 - if_equal $3, UnknownScript_0x7c262 - jump UnknownScript_0x7c26e + if_equal $2, .two + if_equal $3, .three + jump .else -UnknownScript_0x7c256: +.two: setevent EVENT_000 clearevent EVENT_001 clearevent EVENT_002 - jump UnknownScript_0x7c27a + jump .then -UnknownScript_0x7c262: +.three: clearevent EVENT_000 setevent EVENT_001 clearevent EVENT_002 - jump UnknownScript_0x7c27a + jump .then -UnknownScript_0x7c26e: +.else: clearevent EVENT_000 clearevent EVENT_001 setevent EVENT_002 - jump UnknownScript_0x7c27a + jump .then -UnknownScript_0x7c27a: +.then: takemoney $0, 300 special Function24ae8 writetext UnknownText_0x7c80e @@ -385,19 +387,19 @@ UnknownScript_0x7c27a: iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd -UnknownScript_0x7c2a9: +.Refused: writetext UnknownText_0x7c842 closetext loadmovesprites end -UnknownScript_0x7c2af: +.NotEnoughMoney: writetext UnknownText_0x7c85b closetext loadmovesprites end -UnknownScript_0x7c2b5: +.AlreadyGotHaircut: writetext UnknownText_0x7c87b closetext loadmovesprites @@ -424,18 +426,18 @@ UnknownScript_0x7c2cd: loadmovesprites end -MapWarehouseEntranceSignpost0Script:: +BasementDoorScript:: loadfont checkevent EVENT_USED_BASEMENT_KEY - iftrue UnknownScript_0x7c2fa + iftrue .Open checkitem BASEMENT_KEY - iftrue UnknownScript_0x7c2e8 + iftrue .Unlock writetext UnknownText_0x7c5b0 closetext loadmovesprites end -UnknownScript_0x7c2e8: +.Unlock: playsound SFX_TRANSACTION writetext UnknownText_0x7c5d6 closetext @@ -446,13 +448,13 @@ UnknownScript_0x7c2e8: setevent EVENT_USED_BASEMENT_KEY end -UnknownScript_0x7c2fa: +.Open: writetext UnknownText_0x7c5c3 closetext loadmovesprites end -UnknownScript_0x7c300: +WarehouseEntranceScript_ShopClosed: writetext UnknownText_0x7c904 closetext loadmovesprites @@ -465,18 +467,15 @@ MapWarehouseEntranceSignpost1Script: jumptext UnknownText_0x7c91a MapWarehouseEntranceSignpostItem2: - dw $008b - db PARLYZ_HEAL + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL MapWarehouseEntranceSignpostItem3: - dw $008c - db SUPER_POTION + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION MapWarehouseEntranceSignpostItem4: - dw $008d - db ANTIDOTE + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE SupernerdEricSeenText: @@ -726,11 +725,11 @@ WarehouseEntrance_MapEventHeader: ; signposts db 5 - signpost 6, 18, SIGNPOST_READ, MapWarehouseEntranceSignpost0Script + signpost 6, 18, SIGNPOST_READ, BasementDoorScript signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script - signpost 13, 6, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem2 - signpost 18, 4, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem3 - signpost 8, 17, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem4 + signpost 13, 6, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem2 + signpost 18, 4, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem3 + signpost 8, 17, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem4 ; people-events db 9 @@ -738,8 +737,8 @@ WarehouseEntrance_MapEventHeader: person_event SPRITE_SUPER_NERD, 13, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdTeru, -1 person_event SPRITE_SUPER_NERD, 31, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacIssac, -1 person_event SPRITE_SUPER_NERD, 10, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacDonald, -1 - person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7c306, EVENT_672 - person_event SPRITE_GRAMPS, 15, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x7c146, EVENT_753 - person_event SPRITE_SUPER_NERD, 18, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x7c161, EVENT_754 - person_event SPRITE_SUPER_NERD, 19, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x7c20e, EVENT_755 - person_event SPRITE_GRANNY, 25, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x7c132, EVENT_752 + person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE + person_event SPRITE_GRAMPS, 15, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS + person_event SPRITE_SUPER_NERD, 18, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER + person_event SPRITE_SUPER_NERD, 19, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER + person_event SPRITE_GRANNY, 25, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 5962de827..c58d3a513 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -24,18 +24,15 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder MapWhirlIslandB1FSignpostItem0: - dw $0097 - db RARE_CANDY + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY MapWhirlIslandB1FSignpostItem1: - dw $0098 - db ULTRA_BALL + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL MapWhirlIslandB1FSignpostItem2: - dw $0099 - db FULL_RESTORE + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE WhirlIslandB1F_MapEventHeader: @@ -59,15 +56,15 @@ WhirlIslandB1F_MapEventHeader: ; signposts db 3 - signpost 4, 30, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem0 - signpost 18, 36, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem1 - signpost 23, 2, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem2 + signpost 4, 30, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem0 + signpost 18, 36, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem1 + signpost 23, 2, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem2 ; people-events db 6 - person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c410, EVENT_691 - person_event SPRITE_POKE_BALL, 22, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c412, EVENT_692 - person_event SPRITE_POKE_BALL, 27, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c414, EVENT_693 - person_event SPRITE_POKE_BALL, 12, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c416, EVENT_694 - person_event SPRITE_POKE_BALL, 30, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c418, EVENT_695 + person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 22, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS + person_event SPRITE_POKE_BALL, 27, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 12, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET + person_event SPRITE_POKE_BALL, 30, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE person_event SPRITE_BOULDER, 30, 27, LEFT << 2 | $11, $0, -1, -1, $0, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index dcb4dde53..98f5ec703 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4b8, EVENT_696 - person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4ba, EVENT_697 - person_event SPRITE_POKE_BALL, 16, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4bc, EVENT_698 + person_event SPRITE_POKE_BALL, 15, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + person_event SPRITE_POKE_BALL, 16, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 139f89a1e..37bdbd0cb 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, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LugiaScript_0x18c518, EVENT_73D + person_event SPRITE_LUGIA, 9, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LugiaScript_0x18c518, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 657aebe43..317d45b48 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c396, EVENT_68F + person_event SPRITE_POKE_BALL, 15, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 60e5ce412..759a60693 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, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c3bc, EVENT_690 + person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index b85e8e18f..84316f758 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 EVENT_7AB - setevent EVENT_7AC + clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return UnknownScript_0x9858c: - setevent EVENT_7AB - clearevent EVENT_7AC + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return UnknownScript_0x98593: - setevent EVENT_7AB - setevent EVENT_7AC + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return SageScript_0x9859a: @@ -408,9 +408,9 @@ WiseTriosRoom_MapEventHeader: ; people-events db 6 - person_event SPRITE_SAGE, 6, 10, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x9859a, EVENT_7AB - person_event SPRITE_SAGE, 11, 10, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x9859d, EVENT_7AB - person_event SPRITE_SAGE, 9, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, SageScript_0x985a0, EVENT_7AB - person_event SPRITE_SAGE, 6, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerSageGaku, EVENT_7AC - person_event SPRITE_SAGE, 10, 8, UP << 2 | $3, $0, -1, -1, $2, 2, TrainerSageMasa, EVENT_7AC - person_event SPRITE_SAGE, 8, 10, LEFT << 2 | $0, $0, -1, -1, $2, 2, TrainerSageKoji, EVENT_7AC + person_event SPRITE_SAGE, 6, 10, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 11, 10, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 9, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 6, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + person_event SPRITE_SAGE, 10, 8, UP << 2 | $3, $0, -1, -1, $2, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + person_event SPRITE_SAGE, 8, 10, LEFT << 2 | $0, $0, -1, -1, $2, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 26a3f02ca..1ba749409 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -456,7 +456,7 @@ map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, NONE map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, NONE map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, NONE - map_header_2 DayCare, DAY_CARE, $0, NONE + map_header_2 DayCare, DAYCARE, $0, NONE map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, NONE map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, NONE map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, NONE |