3 files changed, 156 insertions, 138 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index 072a90b8..c5ca0b39 100755
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -1,12 +1,12 @@
 const_value = 0
 
-	const EVENT_STOPPED_FROM_LEAVING_PALLET
+	const EVENT_FOLLOWED_OAK_INTO_LAB
 	const EVENT_001
 	const EVENT_002
 	const EVENT_003
 	const EVENT_004
 	const EVENT_005
-	const EVENT_006
+	const EVENT_PALLET_AFTER_GETTING_POKEBALLS
 	const EVENT_007
 	const EVENT_008
 	const EVENT_009
@@ -24,24 +24,24 @@ const_value = 0
 	const EVENT_015
 	const EVENT_016
 	const EVENT_017
-	const EVENT_018
-	const EVENT_019
-	const EVENT_01A
+	const EVENT_GOT_TOWN_MAP
+	const EVENT_ENTERED_BLUES_HOUSE
+	const EVENT_DAISY_WALKING
 	const EVENT_01B
 	const EVENT_01C
 	const EVENT_01D
 	const EVENT_01E
 	const EVENT_01F
-	const EVENT_FOLLOWED_OAK_INSIDE_LAB
+	const EVENT_FOLLOWED_OAK_INTO_LAB_2
 	const EVENT_OAK_ASKED_TO_CHOOSE_MON
 	const EVENT_GOT_STARTER
 	const EVENT_BATTLED_RIVAL_IN_OAKS_LAB
 	const EVENT_GOT_POKEBALLS_FROM_OAK
 	const EVENT_GOT_POKEDEX
-	const EVENT_026
-	const EVENT_027
-	const EVENT_028
-	const EVENT_029
+	const EVENT_PALLET_AFTER_GETTING_POKEBALLS_2
+	const EVENT_OAK_APPEARED_IN_PALLET
+	const EVENT_VIRIDIAN_GYM_OPEN
+	const EVENT_GOT_TM42
 	const EVENT_02A
 	const EVENT_02B
 	const EVENT_02C
@@ -56,8 +56,8 @@ const_value = 0
 	const EVENT_035
 	const EVENT_036
 	const EVENT_037
-	const EVENT_038
-	const EVENT_039
+	const EVENT_OAK_GOT_PARCEL
+	const EVENT_GOT_OAKS_PARCEL
 	const EVENT_03A
 	const EVENT_03B
 	const EVENT_03C
@@ -104,8 +104,8 @@ const_value = 0
 	const EVENT_065
 	const EVENT_066
 	const EVENT_067
-	const EVENT_068
-	const EVENT_069
+	const EVENT_BOUGHT_MUSEUM_TICKET
+	const EVENT_GOT_OLD_AMBER
 	const EVENT_06A
 	const EVENT_06B
 	const EVENT_06C
@@ -152,7 +152,7 @@ const_value = 0
 	const EVENT_095
 	const EVENT_096
 	const EVENT_097
-	const EVENT_098
+	const EVENT_BEAT_CERULEAN_RIVAL
 	const EVENT_099
 	const EVENT_09A
 	const EVENT_09B
@@ -167,7 +167,7 @@ const_value = 0
 	const EVENT_0A4
 	const EVENT_0A5
 	const EVENT_0A6
-	const EVENT_0A7
+	const EVENT_BEAT_CERULEAN_ROCKET_THIEF
 	const EVENT_0A8
 	const EVENT_0A9
 	const EVENT_0AA
@@ -192,7 +192,7 @@ const_value = 0
 	const EVENT_0BD
 	const EVENT_GOT_TM11
 	const EVENT_BEAT_MISTY
-	const EVENT_0C0
+	const EVENT_GOT_BICYCLE
 	const EVENT_0C1
 	const EVENT_0C2
 	const EVENT_0C3
@@ -238,8 +238,8 @@ const_value = 0
 	const EVENT_0EB
 	const EVENT_0EC
 	const EVENT_0ED
-	const EVENT_0EE
-	const EVENT_0EF
+	const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
+	const EVENT_BEAT_POKEMON_TOWER_RIVAL
 	const EVENT_0F0
 	const EVENT_BEAT_POKEMONTOWER_3_TRAINER_0
 	const EVENT_BEAT_POKEMONTOWER_3_TRAINER_1
@@ -263,7 +263,7 @@ const_value = 0
 	const EVENT_BEAT_POKEMONTOWER_5_TRAINER_2
 	const EVENT_BEAT_POKEMONTOWER_5_TRAINER_3
 	const EVENT_106
-	const EVENT_107
+	const EVENT_IN_PURIFIED_ZONE
 	const EVENT_108
 	const EVENT_BEAT_POKEMONTOWER_6_TRAINER_0
 	const EVENT_BEAT_POKEMONTOWER_6_TRAINER_1
@@ -271,7 +271,7 @@ const_value = 0
 	const EVENT_10C
 	const EVENT_10D
 	const EVENT_10E
-	const EVENT_10F
+	const EVENT_BEAT_GHOST_MAROWAK
 	const EVENT_110
 	const EVENT_BEAT_POKEMONTOWER_7_TRAINER_0
 	const EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
@@ -279,7 +279,7 @@ const_value = 0
 	const EVENT_114
 	const EVENT_115
 	const EVENT_116
-	const EVENT_117
+	const EVENT_RESCUED_MR_FUJI_2
 	const EVENT_118
 	const EVENT_119
 	const EVENT_11A
@@ -296,7 +296,7 @@ const_value = 0
 	const EVENT_125
 	const EVENT_126
 	const EVENT_127
-	const EVENT_128
+	const EVENT_GOT_POKE_FLUTE
 	const EVENT_129
 	const EVENT_12A
 	const EVENT_12B
@@ -342,8 +342,8 @@ const_value = 0
 	const EVENT_153
 	const EVENT_154
 	const EVENT_155
-	const EVENT_156
-	const EVENT_157
+	const EVENT_SEEL_FAN_BOAST
+	const EVENT_PIKACHU_FAN_BOAST
 	const EVENT_158
 	const EVENT_159
 	const EVENT_15A
@@ -384,7 +384,7 @@ const_value = 0
 	const EVENT_17D
 	const EVENT_17E
 	const EVENT_17F
-	const EVENT_180
+	const EVENT_GOT_TM41
 	const EVENT_181
 	const EVENT_182
 	const EVENT_183
@@ -396,10 +396,10 @@ const_value = 0
 	const EVENT_189
 	const EVENT_18A
 	const EVENT_18B
-	const EVENT_18C
-	const EVENT_18D
-	const EVENT_18E
-	const EVENT_18F
+	const EVENT_GOT_TM13
+	const EVENT_GOT_TM48
+	const EVENT_GOT_TM49
+	const EVENT_GOT_TM18
 	const EVENT_190
 	const EVENT_191
 	const EVENT_192
@@ -441,10 +441,10 @@ const_value = 0
 	const EVENT_1B6
 	const EVENT_1B7
 	const EVENT_1B8
-	const EVENT_1B9
-	const EVENT_1BA
-	const EVENT_1BB
-	const EVENT_1BC
+	const EVENT_FOUND_ROCKET_HIDEOUT
+	const EVENT_GOT_10_COINS
+	const EVENT_GOT_20_COINS
+	const EVENT_GOT_20_COINS_2
 	const EVENT_1BD
 	const EVENT_1BE
 	const EVENT_1BF
@@ -480,7 +480,7 @@ const_value = 0
 	const EVENT_1DD
 	const EVENT_1DE
 	const EVENT_1DF
-	const EVENT_1E0
+	const EVENT_GOT_COIN_CASE
 	const EVENT_1E1
 	const EVENT_1E2
 	const EVENT_1E3
@@ -568,8 +568,8 @@ const_value = 0
 	const EVENT_235
 	const EVENT_236
 	const EVENT_237
-	const EVENT_238
-	const EVENT_239
+	const EVENT_GOT_HM04
+	const EVENT_GAVE_GOLD_TEETH
 	const EVENT_23A
 	const EVENT_23B
 	const EVENT_23C
@@ -632,7 +632,7 @@ const_value = 0
 	const EVENT_275
 	const EVENT_276
 	const EVENT_277
-	const EVENT_278
+	const EVENT_MANSION_SWITCH_ON
 	const EVENT_279
 	const EVENT_27A
 	const EVENT_27B
@@ -727,7 +727,7 @@ const_value = 0
 	const EVENT_2D4
 	const EVENT_2D5
 	const EVENT_2D6
-	const EVENT_2D7
+	const EVENT_GOT_TM35
 	const EVENT_2D8
 	const EVENT_2D9
 	const EVENT_2DA
@@ -736,9 +736,9 @@ const_value = 0
 	const EVENT_2DD
 	const EVENT_2DE
 	const EVENT_2DF
-	const EVENT_2E0
-	const EVENT_2E1
-	const EVENT_2E2
+	const EVENT_GAVE_FOSSIL_TO_LAB
+	const EVENT_LAB_STILL_REVIVING_FOSSIL
+	const EVENT_LAB_HANDING_OVER_FOSSIL_MON
 	const EVENT_2E3
 	const EVENT_2E4
 	const EVENT_2E5
@@ -832,7 +832,7 @@ const_value = 0
 	const EVENT_33D
 	const EVENT_33E
 	const EVENT_33F
-	const EVENT_340
+	const EVENT_GOT_TM31
 	const EVENT_341
 	const EVENT_342
 	const EVENT_343
@@ -848,14 +848,14 @@ const_value = 0
 	const EVENT_34D
 	const EVENT_34E
 	const EVENT_34F
-	const EVENT_350
-	const EVENT_351
+	const EVENT_DEFEATED_FIGHTING_DOJO
+	const EVENT_BEAT_KARATE_MASTER
 	const EVENT_BEAT_FIGHTING_DOJO_TRAINER_0
 	const EVENT_BEAT_FIGHTING_DOJO_TRAINER_1
 	const EVENT_BEAT_FIGHTING_DOJO_TRAINER_2
 	const EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
-	const EVENT_356
-	const EVENT_357
+	const EVENT_GOT_HITMONLEE
+	const EVENT_GOT_HITMONCHAN
 	const EVENT_358
 	const EVENT_359
 	const EVENT_35A
@@ -919,7 +919,7 @@ const_value = 0
 	const EVENT_394
 	const EVENT_395
 	const EVENT_396
-	const EVENT_397
+	const EVENT_SILPH_CO_RECEPTIONIST_AT_DESK
 	const EVENT_398
 	const EVENT_399
 	const EVENT_39A
@@ -944,7 +944,7 @@ const_value = 0
 	const EVENT_3AD
 	const EVENT_3AE
 	const EVENT_3AF
-	const EVENT_3B0
+	const EVENT_GOT_TM29
 	const EVENT_3B1
 	const EVENT_3B2
 	const EVENT_3B3
@@ -960,7 +960,7 @@ const_value = 0
 	const EVENT_3BD
 	const EVENT_3BE
 	const EVENT_3BF
-	const EVENT_3C0
+	const EVENT_GOT_POTION_SAMPLE
 	const EVENT_3C1
 	const EVENT_3C2
 	const EVENT_3C3
@@ -984,7 +984,7 @@ const_value = 0
 	const EVENT_3D5
 	const EVENT_3D6
 	const EVENT_3D7
-	const EVENT_3D8
+	const EVENT_GOT_HM05
 	const EVENT_3D9
 	const EVENT_3DA
 	const EVENT_3DB
@@ -1151,8 +1151,8 @@ const_value = 0
 	const EVENT_47C
 	const EVENT_47D
 	const EVENT_47E
-	const EVENT_47F
-	const EVENT_480
+	const EVENT_GOT_ITEMFINDER
+	const EVENT_GOT_TM39
 	const EVENT_481
 	const EVENT_BEAT_ROUTE_12_TRAINER_0
 	const EVENT_BEAT_ROUTE_12_TRAINER_1
@@ -1200,7 +1200,7 @@ const_value = 0
 	const EVENT_4AD
 	const EVENT_4AE
 	const EVENT_4AF
-	const EVENT_4B0
+	const EVENT_GOT_EXP_ALL
 	const EVENT_BEAT_ROUTE_15_TRAINER_0
 	const EVENT_BEAT_ROUTE_15_TRAINER_1
 	const EVENT_BEAT_ROUTE_15_TRAINER_2
@@ -1230,8 +1230,8 @@ const_value = 0
 	const EVENT_4CB
 	const EVENT_4CC
 	const EVENT_4CD
-	const EVENT_4CE
-	const EVENT_4CF
+	const EVENT_GOT_HM02
+	const EVENT_RESCUED_MR_FUJI
 	const EVENT_4D0
 	const EVENT_BEAT_ROUTE_17_TRAINER_0
 	const EVENT_BEAT_ROUTE_17_TRAINER_1
@@ -1280,7 +1280,7 @@ const_value = 0
 	const EVENT_4FD
 	const EVENT_4FE
 	const EVENT_4FF
-	const EVENT_500
+	const EVENT_IN_SEAFOAM_ISLANDS
 	const EVENT_BEAT_ROUTE_20_TRAINER_0
 	const EVENT_BEAT_ROUTE_20_TRAINER_2
 	const EVENT_BEAT_ROUTE_20_TRAINER_3
@@ -1294,8 +1294,8 @@ const_value = 0
 	const EVENT_50B
 	const EVENT_50C
 	const EVENT_50D
-	const EVENT_50E
-	const EVENT_50F
+	const EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
+	const EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE
 	const EVENT_510
 	const EVENT_BEAT_ROUTE_21_TRAINER_0
 	const EVENT_BEAT_ROUTE_21_TRAINER_1
@@ -1312,14 +1312,14 @@ const_value = 0
 	const EVENT_51D
 	const EVENT_51E
 	const EVENT_51F
-	const EVENT_520
-	const EVENT_521
+	const EVENT_1ST_ROUTE22_RIVAL_BATTLE
+	const EVENT_2ND_ROUTE22_RIVAL_BATTLE
 	const EVENT_522
 	const EVENT_523
 	const EVENT_524
-	const EVENT_525
-	const EVENT_526
-	const EVENT_527
+	const EVENT_BEAT_ROUTE22_RIVAL_1ST_FIGHT
+	const EVENT_BEAT_ROUTE22_RIVAL_2ND_FIGHT
+	const EVENT_ROUTE22_RIVAL_WANTS_FIGHT
 	const EVENT_528
 	const EVENT_529
 	const EVENT_52A
@@ -1328,24 +1328,24 @@ const_value = 0
 	const EVENT_52D
 	const EVENT_52E
 	const EVENT_52F
-	const EVENT_530
-	const EVENT_531
-	const EVENT_532
-	const EVENT_533
-	const EVENT_534
-	const EVENT_535
-	const EVENT_536
+	const EVENT_PASSED_CASCADEBADGE_CHECK
+	const EVENT_PASSED_THUNDERBADGE_CHECK
+	const EVENT_PASSED_RAINBOWBADGE_CHECK
+	const EVENT_PASSED_SOULBADGE_CHECK
+	const EVENT_PASSED_MARSHBADGE_CHECK
+	const EVENT_PASSED_VOLCANOBADGE_CHECK
+	const EVENT_PASSED_EARTHBADGE_CHECK
 	const EVENT_537
-	const EVENT_538
+	const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1
 	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
 	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
 	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
 	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
 	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
 	const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6
-	const EVENT_53F
-	const EVENT_540
-	const EVENT_541
+	const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
+	const EVENT_GOT_NUGGET
+	const EVENT_BEAT_ROUTE24_ROCKET
 	const EVENT_BEAT_ROUTE_24_TRAINER_0
 	const EVENT_BEAT_ROUTE_24_TRAINER_2
 	const EVENT_BEAT_ROUTE_24_TRAINER_3
@@ -1353,14 +1353,14 @@ const_value = 0
 	const EVENT_BEAT_ROUTE_24_TRAINER_5
 	const EVENT_BEAT_ROUTE_24_TRAINER_6
 	const EVENT_548
-	const EVENT_549
+	const EVENT_NUGGET_REWARD_AVAILABLE
 	const EVENT_54A
 	const EVENT_54B
 	const EVENT_54C
 	const EVENT_54D
 	const EVENT_54E
 	const EVENT_54F
-	const EVENT_550
+	const EVENT_MET_BILL
 	const EVENT_BEAT_ROUTE_25_TRAINER_0
 	const EVENT_BEAT_ROUTE_25_TRAINER_2
 	const EVENT_BEAT_ROUTE_25_TRAINER_3
@@ -1371,11 +1371,11 @@ const_value = 0
 	const EVENT_BEAT_ROUTE_25_TRAINER_8
 	const EVENT_BEAT_ROUTE_25_TRAINER_9
 	const EVENT_55A
-	const EVENT_55B
-	const EVENT_55C
-	const EVENT_55D
-	const EVENT_55E
-	const EVENT_55F
+	const EVENT_USED_CELL_SEPARATOR_ON_BILL
+	const EVENT_GOT_SS_TICKET
+	const EVENT_MET_BILL_2
+	const EVENT_BILL_SAID_USE_CELL_SEPARATOR
+	const EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING
 	const EVENT_560
 	const EVENT_561
 	const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0
@@ -1401,13 +1401,13 @@ const_value = 0
 	const EVENT_BEAT_MT_MOON_1_TRAINER_6
 	const EVENT_BEAT_MT_MOON_1_TRAINER_7
 	const EVENT_578
-	const EVENT_579
+	const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	const EVENT_BEAT_MT_MOON_3_TRAINER_0
 	const EVENT_BEAT_MT_MOON_3_TRAINER_2
 	const EVENT_BEAT_MT_MOON_3_TRAINER_3
 	const EVENT_BEAT_MT_MOON_3_TRAINER_4
-	const EVENT_57E
-	const EVENT_57F
+	const EVENT_GOT_DOME_FOSSIL
+	const EVENT_GOT_HELIX_FOSSIL
 	const EVENT_580
 	const EVENT_581
 	const EVENT_582
@@ -1504,12 +1504,12 @@ const_value = 0
 	const EVENT_5DD
 	const EVENT_5DE
 	const EVENT_5DF
-	const EVENT_5E0
-	const EVENT_5E1
+	const EVENT_GOT_HM01
+	const EVENT_RUBBED_CAPTAINS_BACK
 	const EVENT_SS_ANNE_LEFT
-	const EVENT_5E3
-	const EVENT_5E4
-	const EVENT_5E5
+	const EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT
+	const EVENT_STARTED_WALKING_OUT_OF_DOCK
+	const EVENT_WALKED_OUT_OF_DOCK
 	const EVENT_5E6
 	const EVENT_5E7
 	const EVENT_5E8
@@ -1632,13 +1632,13 @@ const_value = 0
 	const EVENT_65D
 	const EVENT_65E
 	const EVENT_65F
-	const EVENT_660
+	const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1
 	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0
 	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
 	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
 	const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
 	const EVENT_665
-	const EVENT_666
+	const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
 	const EVENT_667
 	const EVENT_668
 	const EVENT_669
@@ -1701,9 +1701,9 @@ const_value = 0
 	const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
 	const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
-	const EVENT_6A5
-	const EVENT_6A6
-	const EVENT_6A7
+	const EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
+	const EVENT_ROCKET_DROPPED_LIFT_KEY
+	const EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
 	const EVENT_6A8
 	const EVENT_6A9
 	const EVENT_6AA
@@ -1789,9 +1789,9 @@ const_value = 0
 	const EVENT_6FA
 	const EVENT_6FB
 	const EVENT_6FC
-	const EVENT_6FD
-	const EVENT_6FE
-	const EVENT_6FF
+	const EVENT_SILPH_CO_2_UNLOCKED_DOOR1
+	const EVENT_SILPH_CO_2_UNLOCKED_DOOR2
+	const EVENT_GOT_TM36
 	const EVENT_700
 	const EVENT_701
 	const EVENT_BEAT_SILPH_CO_3F_TRAINER_0
@@ -1800,8 +1800,8 @@ const_value = 0
 	const EVENT_705
 	const EVENT_706
 	const EVENT_707
-	const EVENT_708
-	const EVENT_709
+	const EVENT_SILPH_CO_3_UNLOCKED_DOOR1
+	const EVENT_SILPH_CO_3_UNLOCKED_DOOR2
 	const EVENT_70A
 	const EVENT_70B
 	const EVENT_70C
@@ -1816,8 +1816,8 @@ const_value = 0
 	const EVENT_715
 	const EVENT_716
 	const EVENT_717
-	const EVENT_718
-	const EVENT_719
+	const EVENT_SILPH_CO_4_UNLOCKED_DOOR1
+	const EVENT_SILPH_CO_4_UNLOCKED_DOOR2
 	const EVENT_71A
 	const EVENT_71B
 	const EVENT_71C
@@ -1832,9 +1832,9 @@ const_value = 0
 	const EVENT_BEAT_SILPH_CO_5F_TRAINER_4
 	const EVENT_726
 	const EVENT_727
-	const EVENT_728
-	const EVENT_729
-	const EVENT_72A
+	const EVENT_SILPH_CO_5_UNLOCKED_DOOR1
+	const EVENT_SILPH_CO_5_UNLOCKED_DOOR2
+	const EVENT_SILPH_CO_5_UNLOCKED_DOOR3
 	const EVENT_72B
 	const EVENT_72C
 	const EVENT_72D
@@ -1855,8 +1855,8 @@ const_value = 0
 	const EVENT_73C
 	const EVENT_73D
 	const EVENT_73E
-	const EVENT_73F
-	const EVENT_740
+	const EVENT_SILPH_CO_6_UNLOCKED_DOOR
+	const EVENT_BEAT_SILPH_CO_RIVAL
 	const EVENT_741
 	const EVENT_742
 	const EVENT_743
@@ -1868,9 +1868,9 @@ const_value = 0
 	const EVENT_749
 	const EVENT_74A
 	const EVENT_74B
-	const EVENT_74C
-	const EVENT_74D
-	const EVENT_74E
+	const EVENT_SILPH_CO_7_UNLOCKED_DOOR1
+	const EVENT_SILPH_CO_7_UNLOCKED_DOOR2
+	const EVENT_SILPH_CO_7_UNLOCKED_DOOR3
 	const EVENT_74F
 	const EVENT_750
 	const EVENT_751
@@ -1880,7 +1880,7 @@ const_value = 0
 	const EVENT_755
 	const EVENT_756
 	const EVENT_757
-	const EVENT_758
+	const EVENT_SILPH_CO_8_UNLOCKED_DOOR
 	const EVENT_759
 	const EVENT_75A
 	const EVENT_75B
@@ -1896,10 +1896,10 @@ const_value = 0
 	const EVENT_765
 	const EVENT_766
 	const EVENT_767
-	const EVENT_768
-	const EVENT_769
-	const EVENT_76A
-	const EVENT_76B
+	const EVENT_SILPH_CO_9_UNLOCKED_DOOR1
+	const EVENT_SILPH_CO_9_UNLOCKED_DOOR2
+	const EVENT_SILPH_CO_9_UNLOCKED_DOOR3
+	const EVENT_SILPH_CO_9_UNLOCKED_DOOR4
 	const EVENT_76C
 	const EVENT_76D
 	const EVENT_76E
@@ -1912,7 +1912,7 @@ const_value = 0
 	const EVENT_775
 	const EVENT_776
 	const EVENT_777
-	const EVENT_778
+	const EVENT_SILPH_CO_10_UNLOCKED_DOOR
 	const EVENT_779
 	const EVENT_77A
 	const EVENT_77B
@@ -1928,14 +1928,14 @@ const_value = 0
 	const EVENT_BEAT_SILPH_CO_11F_TRAINER_1
 	const EVENT_786
 	const EVENT_787
-	const EVENT_788
+	const EVENT_SILPH_CO_11_UNLOCKED_DOOR
 	const EVENT_789
 	const EVENT_78A
 	const EVENT_78B
 	const EVENT_78C
-	const EVENT_78D
+	const EVENT_GOT_MASTER_BALL
 	const EVENT_78E
-	const EVENT_78F
+	const EVENT_BEAT_SILPH_CO_GIOVANNI
 	const EVENT_790
 	const EVENT_791
 	const EVENT_792
@@ -2176,7 +2176,7 @@ const_value = 0
 	const EVENT_87D
 	const EVENT_87E
 	const EVENT_87F
-	const EVENT_880
+	const EVENT_GOT_HM03
 	const EVENT_881
 	const EVENT_882
 	const EVENT_883
@@ -2272,13 +2272,13 @@ const_value = 0
 	const EVENT_8DD
 	const EVENT_8DE
 	const EVENT_8DF
-	const EVENT_8E0
+	const EVENT_ELITE4_EVENTS_START
 	const EVENT_BEAT_LORELEIS_ROOM_TRAINER_0
 	const EVENT_8E2
 	const EVENT_8E3
 	const EVENT_8E4
 	const EVENT_8E5
-	const EVENT_8E6
+	const EVENT_AUTOWALKED_INTO_LORELEIS_ROOM
 	const EVENT_8E7
 	const EVENT_8E8
 	const EVENT_BEAT_BRUNOS_ROOM_TRAINER_0
@@ -2286,7 +2286,7 @@ const_value = 0
 	const EVENT_8EB
 	const EVENT_8EC
 	const EVENT_8ED
-	const EVENT_8EE
+	const EVENT_AUTOWALKED_INTO_BRUNOS_ROOM
 	const EVENT_8EF
 	const EVENT_8F0
 	const EVENT_BEAT_AGATHAS_ROOM_TRAINER_0
@@ -2294,7 +2294,7 @@ const_value = 0
 	const EVENT_8F3
 	const EVENT_8F4
 	const EVENT_8F5
-	const EVENT_8F6
+	const EVENT_AUTOWALKED_INTO_AGATHAS_ROOM
 	const EVENT_8F7
 	const EVENT_8F8
 	const EVENT_BEAT_LANCES_ROOM_TRAINER_0
@@ -2302,10 +2302,10 @@ const_value = 0
 	const EVENT_8FB
 	const EVENT_8FC
 	const EVENT_8FD
-	const EVENT_8FE
-	const EVENT_8FF
+	const EVENT_BEAT_LANCE
+	const EVENT_LANCES_ROOM_LOCK_DOOR
 	const EVENT_900
-	const EVENT_901
+	const EVENT_BEAT_CHAMPION_RIVAL
 	const EVENT_902
 	const EVENT_903
 	const EVENT_904
@@ -2327,7 +2327,7 @@ const_value = 0
 	const EVENT_914
 	const EVENT_915
 	const EVENT_916
-	const EVENT_917
+	const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
 	const EVENT_918
 	const EVENT_919
 	const EVENT_91A
@@ -2496,24 +2496,24 @@ const_value = 0
 	const EVENT_9BD
 	const EVENT_9BE
 	const EVENT_9BF
-	const EVENT_9C0
-	const EVENT_9C1
+	const EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
+	const EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE
 	const EVENT_9C2
 	const EVENT_9C3
 	const EVENT_9C4
 	const EVENT_9C5
 	const EVENT_9C6
 	const EVENT_9C7
-	const EVENT_9C8
-	const EVENT_9C9
+	const EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
+	const EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	const EVENT_9CA
 	const EVENT_9CB
 	const EVENT_9CC
 	const EVENT_9CD
 	const EVENT_9CE
 	const EVENT_9CF
-	const EVENT_9D0
-	const EVENT_9D1
+	const EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
+	const EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	const EVENT_9D2
 	const EVENT_9D3
 	const EVENT_9D4
diff --git a/constants/event_macros.asm b/constants/event_macros.asm
index 8daaea28..cc7c03f5 100755
--- a/constants/event_macros.asm
+++ b/constants/event_macros.asm
@@ -19,7 +19,19 @@ event_byte = ((\1) / 8)
 
 ;\1 = event index
 CheckEventReuseA: MACRO
-IF event_byte != ((\1) / 8)
+	IF event_byte != ((\1) / 8)
+event_byte = ((\1) / 8)
+		ld a, [wEventFlags + event_byte]
+	ENDC
+
+	bit (\1) % 8, a
+	ENDM
+
+;\1 = event index
+;\2 = event index of the last event used before the branch
+CheckEventAfterBranchReuseA: MACRO
+event_byte = ((\2) / 8)
+	IF event_byte != ((\1) / 8)
 event_byte = ((\1) / 8)
 		ld a, [wEventFlags + event_byte]
 	ENDC
@@ -355,11 +367,17 @@ event_fill_count = event_fill_count + 1
 	ENDM
 
 ; returns whether both events are set in Z flag
+; This is counter-intuitive because the other event checks set the Z flag when
+; the event is not set, but this sets the Z flag when the event is set.
 ;\1 = event index 1
 ;\2 = event index 2
+;\3 = try to reuse a (optional)
 CheckBothEventsSet: MACRO
 	IF ((\1) / 8) == ((\2) / 8)
-		ld a, [wEventFlags + ((\1) / 8)]
+		IF (_NARG < 3) || (((\1) / 8) != event_byte)
+event_byte = ((\1) / 8)
+			ld a, [wEventFlags + ((\1) / 8)]
+		ENDC
 		and (1 << ((\1) % 8)) | (1 << ((\2) % 8))
 		cp (1 << ((\1) % 8)) | (1 << ((\2) % 8))
 	ELSE
@@ -422,4 +440,4 @@ AdjustEventBit: MACRO
 	IF ((\1) % 8) != (\2)
 		add ((\1) % 8) - (\2)
 	ENDC
-	ENDM
-\ No newline at end of file
+	ENDM
diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm
index 1c5beb77..2afe9914 100755
--- a/constants/hide_show_constants.asm
+++ b/constants/hide_show_constants.asm
@@ -82,7 +82,7 @@ const_value = 0
 	const HS_MANSION_1_ITEM_2             ; 49 X
 	const HS_FIGHTING_DOJO_GIFT_1         ; 4A
 	const HS_FIGHTING_DOJO_GIFT_2         ; 4B
-	const HS_SILPH_CO_1F_1                ; 4C
+	const HS_SILPH_CO_1F_RECEPTIONIST                ; 4C
 	const HS_VOLTORB_1                    ; 4D X
 	const HS_VOLTORB_2                    ; 4E X
 	const HS_VOLTORB_3                    ; 4F X