Port miscellaneous recent updates from pokecrystal

2 files changed, 55 insertions, 55 deletions

diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index 2e23a342..a09427df 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -23,7 +23,7 @@
 	const ENGINE_ROCKET_SIGNAL_ON_CH20
 	const ENGINE_CREDITS_SKIP
 ; wStatusFlags2
-	const ENGINE_BUG_CONTEST_TIMER ; 10
+	const ENGINE_BUG_CONTEST_TIMER
 	const ENGINE_SAFARI_ZONE
 	const ENGINE_ROCKETS_IN_RADIO_TOWER
 	const ENGINE_BIKE_SHOP_CALL_ENABLED
@@ -41,7 +41,7 @@
 	const ENGINE_FOGBADGE
 	const ENGINE_MINERALBADGE
 	const ENGINE_STORMBADGE
-	const ENGINE_GLACIERBADGE ; 20
+	const ENGINE_GLACIERBADGE
 	const ENGINE_RISINGBADGE
 ; wKantoBadges
 	const ENGINE_BOULDERBADGE
@@ -59,7 +59,7 @@
 	const ENGINE_UNLOCKED_UNOWNS_X_TO_Z
 	const ENGINE_UNLOCKED_UNOWNS_UNUSED_4
 	const ENGINE_UNLOCKED_UNOWNS_UNUSED_5
-	const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 ; 30
+	const ENGINE_UNLOCKED_UNOWNS_UNUSED_6
 	const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
 ; wVisitedSpawns
 	const ENGINE_FLYPOINT_PLAYERS_HOUSE
@@ -76,7 +76,7 @@
 	const ENGINE_FLYPOINT_FUCHSIA
 	const ENGINE_FLYPOINT_CINNABAR
 	const ENGINE_FLYPOINT_INDIGO_PLATEAU
-	const ENGINE_FLYPOINT_NEW_BARK ; 40
+	const ENGINE_FLYPOINT_NEW_BARK
 	const ENGINE_FLYPOINT_CHERRYGROVE
 	const ENGINE_FLYPOINT_VIOLET
 	const ENGINE_FLYPOINT_AZALEA
@@ -95,7 +95,7 @@
 	const ENGINE_4E
 ; wDailyFlags1
 	const ENGINE_KURT_MAKING_BALLS
-	const ENGINE_DAILY_BUG_CONTEST ; 50
+	const ENGINE_DAILY_BUG_CONTEST
 	const ENGINE_SWARM
 	const ENGINE_TIME_CAPSULE
 	const ENGINE_ALL_FRUIT_TREES
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index ab6652e8..2b75974e 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -19,7 +19,7 @@
 	const EVENT_GOT_TM16_ICY_WIND
 	const EVENT_GOT_TM24_DRAGONBREATH
 ; HMs (EVENT_GOT_HM07_WATERFALL is with the Johto itemballs)
-	const EVENT_GOT_HM01_CUT ; 010
+	const EVENT_GOT_HM01_CUT
 	const EVENT_GOT_HM02_FLY
 	const EVENT_GOT_HM03_SURF
 	const EVENT_GOT_HM04_STRENGTH
@@ -37,7 +37,7 @@
 	const EVENT_GOT_CHIKORITA_FROM_ELM
 	const EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
 	const EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	const EVENT_JASMINE_RETURNED_TO_GYM ; 020
+	const EVENT_JASMINE_RETURNED_TO_GYM
 	const EVENT_CLEARED_RADIO_TOWER
 	const EVENT_CLEARED_ROCKET_HIDEOUT
 	const EVENT_GOT_SECRETPOTION_FROM_PHARMACY
@@ -53,7 +53,7 @@
 	const EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
 	const EVENT_MADE_UNOWN_APPEAR_IN_RUINS
 	const EVENT_FAST_SHIP_DESTINATION_OLIVINE
-	const EVENT_FAST_SHIP_FIRST_TIME ; 030
+	const EVENT_FAST_SHIP_FIRST_TIME
 	const EVENT_FAST_SHIP_HAS_ARRIVED
 	const EVENT_FAST_SHIP_FOUND_GIRL
 	const EVENT_FAST_SHIP_LAZY_SAILOR
@@ -69,7 +69,7 @@
 	const EVENT_HEALED_MOOMOO
 	const EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
 	const EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
-	const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST ; 040
+	const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	const EVENT_DUDE_TALKED_TO_YOU
 	const EVENT_LEARNED_TO_CATCH_POKEMON
 	const EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
@@ -85,7 +85,7 @@
 	const EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
 	const EVENT_GOT_TM05_ROAR
 	const EVENT_GOT_EEVEE
-	const EVENT_GOT_KENYA ; 050
+	const EVENT_GOT_KENYA
 	const EVENT_GAVE_KENYA
 	const EVENT_GOT_HP_UP_FROM_RANDY
 	const EVENT_GOT_TM50_NIGHTMARE
@@ -101,7 +101,7 @@
 	const EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
 	const EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
 	const EVENT_GOT_TM02_HEADBUTT
-	const EVENT_DECIDED_TO_HELP_LANCE ; 060
+	const EVENT_DECIDED_TO_HELP_LANCE
 	const EVENT_GOT_TYROGUE_FROM_KIYO
 	const EVENT_MET_FRIEDA_OF_FRIDAY
 	const EVENT_GOT_POISON_BARB_FROM_FRIEDA
@@ -117,7 +117,7 @@
 	const EVENT_GOT_SPELL_TAG_FROM_SANTOS
 	const EVENT_MET_MONICA_OF_MONDAY
 	const EVENT_GOT_SHARP_BEAK_FROM_MONICA
-	const EVENT_GOT_SOFT_SAND_FROM_KATE ; 070
+	const EVENT_GOT_SOFT_SAND_FROM_KATE
 	const EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
 	const EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
 	const EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
@@ -134,7 +134,7 @@
 	const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
 	const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
 	const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
-	const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER ; 080
+	const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER
 	const EVENT_BURNED_TOWER_B1F_HIDDEN_ULTRA_BALL
 	const EVENT_BURNED_TOWER_B1F_HIDDEN_BURN_HEAL
 	const EVENT_BURNED_TOWER_B1F_HIDDEN_NUGGET
@@ -150,7 +150,7 @@
 	const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE
 	const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
 	const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
-	const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION ; 090
+	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
@@ -166,7 +166,7 @@
 	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 ; 0a0
+	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
@@ -182,7 +182,7 @@
 	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 ; 0b0
+	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
@@ -199,7 +199,7 @@
 	const EVENT_0BD
 	const EVENT_0BE
 	const EVENT_0BF
-	const EVENT_0C0 ; 0c0
+	const EVENT_0C0
 	const EVENT_0C1
 	const EVENT_0C2
 	const EVENT_0C3
@@ -216,7 +216,7 @@
 	const EVENT_RESTORED_POWER_TO_KANTO
 	const EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
 	const EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
-	const EVENT_RETURNED_LOST_ITEM_TO_COPYCAT ; 0d0
+	const EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
 	const EVENT_GOT_PASS_FROM_COPYCAT
 	const EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
 	const EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL
@@ -232,7 +232,7 @@
 	const EVENT_GOT_TM06_TOXIC
 	const EVENT_GOT_UP_GRADE
 	const EVENT_GOT_TM07_ZAP_CANNON
-	const EVENT_GOT_TM42_DREAM_EATER ; 0e0
+	const EVENT_GOT_TM42_DREAM_EATER
 	const EVENT_TALKED_TO_OAK_IN_KANTO
 	const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
 	const EVENT_GOT_TM29_PSYCHIC
@@ -249,7 +249,7 @@
 	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 ; 0f0
+	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
@@ -265,7 +265,7 @@
 	const EVENT_CELADON_CITY_HIDDEN_PP_UP
 	const EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY
 	const EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL
-	const EVENT_GINA_GAVE_LEAF_STONE ; 100
+	const EVENT_GINA_GAVE_LEAF_STONE
 	const EVENT_ALAN_GAVE_FIRE_STONE
 	const EVENT_DANA_GAVE_THUNDERSTONE
 	const EVENT_TULLY_GAVE_WATER_STONE
@@ -620,7 +620,7 @@
 	const EVENT_GAVE_KURT_PNK_APRICORN
 ; Phone events
 	const EVENT_JACK_ASKED_FOR_PHONE_NUMBER
-	const EVENT_JACK_READY_FOR_REMATCH ; 260
+	const EVENT_JACK_READY_FOR_REMATCH
 	const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
 	const EVENT_BEVERLY_READY_FOR_REMATCH
 	const EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
@@ -636,7 +636,7 @@
 	const EVENT_BETH_ASKED_FOR_PHONE_NUMBER
 	const EVENT_BETH_READY_FOR_REMATCH
 	const EVENT_JOSE_ASKED_FOR_PHONE_NUMBER
-	const EVENT_JOSE_READY_FOR_REMATCH ; 270
+	const EVENT_JOSE_READY_FOR_REMATCH
 	const EVENT_REENA_ASKED_FOR_PHONE_NUMBER
 	const EVENT_REENA_READY_FOR_REMATCH
 	const EVENT_JOEY_ASKED_FOR_PHONE_NUMBER
@@ -652,7 +652,7 @@
 	const EVENT_TODD_ASKED_FOR_PHONE_NUMBER
 	const EVENT_TODD_READY_FOR_REMATCH
 	const EVENT_GINA_ASKED_FOR_PHONE_NUMBER
-	const EVENT_GINA_READY_FOR_REMATCH ; 280
+	const EVENT_GINA_READY_FOR_REMATCH
 	const EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
 	const EVENT_IRWIN_READY_FOR_REMATCH
 	const EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
@@ -668,7 +668,7 @@
 	const EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
 	const EVENT_DEREK_READY_FOR_REMATCH
 	const EVENT_CHRIS_ASKED_FOR_PHONE_NUMBER
-	const EVENT_CHRIS_READY_FOR_REMATCH ; 290
+	const EVENT_CHRIS_READY_FOR_REMATCH
 	const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
 	const EVENT_BRENT_READY_FOR_REMATCH
 	const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
@@ -685,7 +685,7 @@
 	const EVENT_ERIN_READY_FOR_REMATCH
 	const EVENT_29F ; unused
 ; Ruins of Alph puzzles
-	const EVENT_SOLVED_HO_OH_PUZZLE ; 2a0
+	const EVENT_SOLVED_HO_OH_PUZZLE
 	const EVENT_SOLVED_KABUTO_PUZZLE
 	const EVENT_SOLVED_OMANYTE_PUZZLE
 	const EVENT_SOLVED_AERODACTYL_PUZZLE
@@ -702,7 +702,7 @@
 	const EVENT_DECO_PLANT_2
 	const EVENT_DECO_PLANT_3
 	const EVENT_DECO_POSTER_1
-	const EVENT_DECO_POSTER_2 ; 2b0
+	const EVENT_DECO_POSTER_2
 	const EVENT_DECO_POSTER_3
 	const EVENT_DECO_POSTER_4
 	const EVENT_DECO_FAMICOM
@@ -718,7 +718,7 @@
 	const EVENT_DECO_SQUIRTLE_DOLL
 	const EVENT_DECO_POLIWAG_DOLL
 	const EVENT_DECO_DIGLETT_DOLL
-	const EVENT_DECO_STARMIE_DOLL ; 2c0
+	const EVENT_DECO_STARMIE_DOLL
 	const EVENT_DECO_MAGIKARP_DOLL
 	const EVENT_DECO_ODDISH_DOLL
 	const EVENT_DECO_GENGAR_DOLL
@@ -734,7 +734,7 @@
 	const EVENT_DECO_GOLD_TROPHY
 	const EVENT_DECO_SILVER_TROPHY
 	const EVENT_DECO_BIG_SNORLAX_DOLL
-	const EVENT_DECO_BIG_ONIX_DOLL ; 2d0
+	const EVENT_DECO_BIG_ONIX_DOLL
 	const EVENT_DECO_BIG_LAPRAS_DOLL
 ; More Johto story events
 	const EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
@@ -751,7 +751,7 @@
 	const EVENT_SWITCH_10
 	const EVENT_SWITCH_11
 	const EVENT_SWITCH_12
-	const EVENT_SWITCH_13 ; 2e0
+	const EVENT_SWITCH_13
 	const EVENT_SWITCH_14
 	const EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
 	const EVENT_TURNED_OFF_SECURITY_CAMERAS
@@ -767,7 +767,7 @@
 	const EVENT_EXPLODING_TRAP_5
 	const EVENT_EXPLODING_TRAP_6
 	const EVENT_EXPLODING_TRAP_7
-	const EVENT_EXPLODING_TRAP_8 ; 2f0
+	const EVENT_EXPLODING_TRAP_8
 	const EVENT_EXPLODING_TRAP_9
 	const EVENT_EXPLODING_TRAP_10
 	const EVENT_EXPLODING_TRAP_11
@@ -783,7 +783,7 @@
 	const EVENT_EXPLODING_TRAP_21
 	const EVENT_EXPLODING_TRAP_22
 	const EVENT_LEARNED_HAIL_GIOVANNI
-	const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER ; 300
+	const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
 	const EVENT_LEARNED_SLOWPOKETAIL
 	const EVENT_LEARNED_RATICATE_TAIL
 	const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
@@ -799,7 +799,7 @@
 	const EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
 	const EVENT_BRUNOS_ROOM_EXIT_OPEN
 	const EVENT_KARENS_ROOM_ENTRANCE_CLOSED
-	const EVENT_KARENS_ROOM_EXIT_OPEN ; 310
+	const EVENT_KARENS_ROOM_EXIT_OPEN
 	const EVENT_LANCES_ROOM_ENTRANCE_CLOSED
 	const EVENT_LANCES_ROOM_EXIT_OPEN
 	const EVENT_CONTEST_OFFICER_HAS_SUN_STONE
@@ -815,7 +815,7 @@
 	const EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
 	const EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
 	const EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
-	const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA ; 320
+	const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
@@ -1666,7 +1666,7 @@
 ; 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 itemballs
-	const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB ; 640
+	const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
 	const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
 	const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
 	const EVENT_VIOLET_CITY_PP_UP
@@ -1682,7 +1682,7 @@
 	const EVENT_TIN_TOWER_4F_SUPER_POTION
 	const EVENT_TIN_TOWER_4F_ESCAPE_ROPE
 	const EVENT_TIN_TOWER_5F_RARE_CANDY
-	const EVENT_TIN_TOWER_7F_MAX_REVIVE ; 650
+	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
@@ -1698,7 +1698,7 @@
 	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 ; 660
+	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
@@ -1714,7 +1714,7 @@
 	const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
 	const EVENT_TEAM_ROCKET_BASE_B3F_DIRE_HIT
 	const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
-	const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL ; 670
+	const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
 	const EVENT_ILEX_FOREST_REVIVE
 	const EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
 	const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
@@ -1730,7 +1730,7 @@
 	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 ; 680
+	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
@@ -1746,7 +1746,7 @@
 	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_GUARD_SPEC ; 690
+	const EVENT_WHIRL_ISLAND_SW_GUARD_SPEC
 	const EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
 	const EVENT_WHIRL_ISLAND_B1F_CARBOS
 	const EVENT_WHIRL_ISLAND_B1F_CALCIUM
@@ -1762,7 +1762,7 @@
 	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 ; 6a0
+	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
@@ -1778,7 +1778,7 @@
 	const EVENT_ROUTE_29_POTION
 	const EVENT_ROUTE_31_ANTIDOTE
 	const EVENT_ROUTE_31_POKE_BALL
-	const EVENT_ROUTE_32_GREAT_BALL ; 6b0
+	const EVENT_ROUTE_32_GREAT_BALL
 	const EVENT_ROUTE_32_POTION
 	const EVENT_ROUTE_35_TM_ROLLOUT
 	const EVENT_ROUTE_42_ULTRA_BALL
@@ -1795,7 +1795,7 @@
 	const EVENT_RIVAL_NEW_BARK_TOWN
 	const EVENT_RIVAL_CHERRYGROVE_CITY
 	const EVENT_RIVAL_AZALEA_TOWN
-	const EVENT_RIVAL_TEAM_ROCKET_BASE ; 6c0
+	const EVENT_RIVAL_TEAM_ROCKET_BASE
 	const EVENT_RIVAL_GOLDENROD_UNDERGROUND
 	const EVENT_RIVAL_VICTORY_ROAD
 	const EVENT_RIVAL_OLIVINE_CITY
@@ -1811,7 +1811,7 @@
 	const EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
 	const EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	const EVENT_GOLDENROD_CITY_CIVILIANS
-	const EVENT_RADIO_TOWER_CIVILIANS_AFTER ; 6d0
+	const EVENT_RADIO_TOWER_CIVILIANS_AFTER
 	const EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
 	const EVENT_OLIVINE_LIGHTHOUSE_JASMINE
 	const EVENT_OLIVINE_GYM_JASMINE
@@ -1827,7 +1827,7 @@
 	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 ; 6e0
+	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
@@ -1843,7 +1843,7 @@
 	const EVENT_ILEX_FOREST_FARFETCHD5
 	const EVENT_ILEX_FOREST_FARFETCHD6
 	const EVENT_ILEX_FOREST_FARFETCHD7
-	const EVENT_ILEX_FOREST_FARFETCHD8 ; 6f0
+	const EVENT_ILEX_FOREST_FARFETCHD8
 	const EVENT_ILEX_FOREST_FARFETCHD9
 	const EVENT_ILEX_FOREST_FARFETCHD10
 	const EVENT_ILEX_FOREST_APPRENTICE
@@ -1859,7 +1859,7 @@
 	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 ; 700
+	const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
 	const EVENT_ELMS_AIDE_IN_LAB
 	const EVENT_COP_IN_ELMS_LAB
 	const EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
@@ -1875,7 +1875,7 @@
 	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 ; 710
+	const EVENT_BOULDER_IN_ICE_PATH_4A
 	const EVENT_MYSTERY_GIFT_DELIVERY_GUY
 	const EVENT_MET_BILL
 	const EVENT_ECRUTEAK_POKE_CENTER_BILL
@@ -1891,7 +1891,7 @@
 	const EVENT_BUG_CATCHING_CONTESTANT_8A
 	const EVENT_BUG_CATCHING_CONTESTANT_9A
 	const EVENT_BUG_CATCHING_CONTESTANT_10A
-	const EVENT_BUG_CATCHING_CONTESTANT_1B ; 720
+	const EVENT_BUG_CATCHING_CONTESTANT_1B
 	const EVENT_BUG_CATCHING_CONTESTANT_2B
 	const EVENT_BUG_CATCHING_CONTESTANT_3B
 	const EVENT_BUG_CATCHING_CONTESTANT_4B
@@ -1907,7 +1907,7 @@
 	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 ; 730
+	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
@@ -1923,7 +1923,7 @@
 	const EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
 	const EVENT_KURTS_HOUSE_KURT_1
 	const EVENT_KURTS_HOUSE_KURT_2
-	const EVENT_SLOWPOKE_WELL_KURT ; 740
+	const EVENT_SLOWPOKE_WELL_KURT
 	const EVENT_PLAYERS_HOUSE_2F_CONSOLE
 	const EVENT_PLAYERS_HOUSE_2F_DOLL_1
 	const EVENT_PLAYERS_HOUSE_2F_DOLL_2
@@ -1939,7 +1939,7 @@
 	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 ; 750
+	const EVENT_FOUGHT_SNORLAX
 	const EVENT_LAKE_OF_RAGE_RED_GYARADOS
 	const EVENT_GOLDENROD_UNDERGROUND_GRANNY
 	const EVENT_GOLDENROD_UNDERGROUND_GRAMPS
@@ -1955,7 +1955,7 @@
 	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 ; 760
+	const EVENT_UNION_CAVE_B2F_LAPRAS
 	const EVENT_TEAM_ROCKET_DISBANDED
 	const EVENT_RED_IN_MT_SILVER
 	const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
@@ -1972,7 +1972,7 @@
 	const EVENT_CERULEAN_GYM_ROCKET
 	const EVENT_ROUTE_25_MISTY_BOYFRIEND
 	const EVENT_TRAINERS_IN_CERULEAN_GYM
-	const EVENT_VERMILION_CITY_SNORLAX ; 770
+	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
@@ -1989,7 +1989,7 @@
 	const EVENT_PICKED_UP_FOCUS_BAND
 	const EVENT_ROCK_TUNNEL_1F_ELIXER
 	const EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
-	const EVENT_ROCK_TUNNEL_B1F_IRON ; 780
+	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