Updated signpost items and person_event flags

4 files changed, 466 insertions, 414 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
+