More label updates, moved predefs to new file

Also named most of the engine and event flag constants.

1 files changed, 64 insertions, 50 deletions

diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index 3fe7c5eff..775991a87 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -1,14 +1,16 @@
 
 	const_def
 
-	const EVENT_000
-	const EVENT_001
-	const EVENT_002
-	const EVENT_003
-	const EVENT_004
-	const EVENT_005
-	const EVENT_006
-	const EVENT_007
+; These first eight flags are reset upon reloading the map.
+	const EVENT_GAVE_KURT_APRICORNS ; 000
+	const EVENT_RECEIVED_BALLS_FROM_KURT
+	const EVENT_DRAGON_SHRINE_QUESTION_2
+	const EVENT_DRAGON_SHRINE_QUESTION_3
+	const EVENT_DRAGON_SHRINE_QUESTION_4
+	const EVENT_DRAGON_SHRINE_QUESTION_5
+	const EVENT_JUST_RECEIVED_DRATINI
+	const EVENT_IN_YOUR_ROOM
+; Johto story events
 	const EVENT_GOT_TM31_MUD_SLAP
 	const EVENT_GOT_TM49_FURY_CUTTER
 	const EVENT_GOT_TM01_DYNAMICPUNCH
@@ -49,23 +51,23 @@
 	const EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
 	const EVENT_MADE_UNOWN_APPEAR_IN_RUINS
 	const EVENT_FAST_SHIP_DESTINATION_OLIVINE
-	const EVENT_030
-	const EVENT_031
-	const EVENT_032
-	const EVENT_033
-	const EVENT_034
-	const EVENT_035
+	const EVENT_FAST_SHIP_FIRST_TIME
+	const EVENT_FAST_SHIP_HAS_ARRIVED
+	const EVENT_FAST_SHIP_FOUND_GIRL
+	const EVENT_FAST_SHIP_LAZY_SAILOR
+	const EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
+	const EVENT_KURT_GAVE_YOU_LURE_BALL
 	const EVENT_INITIALIZED_EVENTS
 	const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
-	const EVENT_038
-	const EVENT_039
-	const EVENT_03A
+	const EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
+	const EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
+	const EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
 	const EVENT_03B
 	const EVENT_03C
 	const EVENT_HEALED_MOOMOO
 	const EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
 	const EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
-	const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+	const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST ; 040
 	const EVENT_DUDE_TALKED_TO_YOU
 	const EVENT_LEARNED_TO_CATCH_POKEMON
 	const EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
@@ -75,13 +77,13 @@
 	const EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
 	const EVENT_GOT_PINK_BOW_FROM_MARY
 	const EVENT_USED_BASEMENT_KEY
-	const EVENT_04A
+	const EVENT_RECEIVED_CARD_KEY
 	const EVENT_GOT_TM08_ROCK_SMASH
-	const EVENT_04C
+	const EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	const EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
 	const EVENT_GOT_TM05_ROAR
 	const EVENT_GOT_EEVEE
-	const EVENT_GOT_KENYA
+	const EVENT_GOT_KENYA ; 050
 	const EVENT_GAVE_KENYA
 	const EVENT_GOT_HP_UP_FROM_RANDY
 	const EVENT_GOT_TM50_NIGHTMARE
@@ -97,7 +99,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
+	const EVENT_DECIDED_TO_HELP_LANCE ; 060
 	const EVENT_GOT_TYROGUE_FROM_KIYO
 	const EVENT_MET_FRIEDA_OF_FRIDAY
 	const EVENT_GOT_POISON_BARB_FROM_FRIEDA
@@ -112,25 +114,25 @@
 	const EVENT_MET_SANTOS_OF_SATURDAY
 	const EVENT_GOT_SPELL_TAG_FROM_SANTOS
 	const EVENT_MET_MONICA_OF_MONDAY
-	const EVENT_GOT_SHARP_BEAK_FROM_MONICA
+	const EVENT_GOT_SHARP_BEAK_FROM_MONICA ; 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
 	const EVENT_GOT_TM47_STEEL_WING
 	const EVENT_GOT_TM37_SANDSTORM
-	const EVENT_076
+	const EVENT_FIRST_TIME_BANKING_WITH_MOM
 	const EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
 	const EVENT_GOT_CLEAR_BELL
 	const EVENT_GOT_SILVER_WING
 	const EVENT_GOT_TM12_SWEET_SCENT
 	const EVENT_RELEASED_THE_BEASTS
 	const EVENT_GOT_MASTER_BALL_FROM_ELM
+; Johto Signpost Items
 	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_BURNED_TOWER_1F_HIDDEN_ETHER ; 080
 	const EVENT_081
 	const EVENT_082
 	const EVENT_083
@@ -187,8 +189,9 @@
 	const EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY
 	const EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION
 	const EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE
+; Crystal-exclusive events in Johto
 	const EVENT_MET_FLORIA
-	const EVENT_0BA
+	const EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
 	const EVENT_BUGGING_KURT_TOO_MUCH
 	const EVENT_TALKED_TO_RUINS_COWARD
 	const EVENT_GOT_DRATINI
@@ -202,6 +205,7 @@
 	const EVENT_0C5
 	const EVENT_0C6
 	const EVENT_0C7
+; Kanto story events
 	const EVENT_GOT_NUGGET_FROM_GUY
 	const EVENT_RETURNED_MACHINE_PART
 	const EVENT_MET_MANAGER_AT_POWER_PLANT
@@ -230,6 +234,7 @@
 	const EVENT_TALKED_TO_OAK_IN_KANTO
 	const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
 	const EVENT_GOT_TM29_PSYCHIC
+; Kanto Signpost Items
 	const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
 	const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE
 	const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL
@@ -258,11 +263,12 @@
 	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
-	const EVENT_103
-	const EVENT_104
+	const EVENT_GINA_GAVE_LEAF_STONE
+	const EVENT_ALAN_GAVE_FIRE_STONE
+	const EVENT_DANA_GAVE_THUNDERSTONE
+	const EVENT_TULLY_GAVE_WATER_STONE
+	const EVENT_TIFFANY_GAVE_PINK_BOW
+; ???
 	const EVENT_105
 	const EVENT_106
 	const EVENT_107
@@ -602,13 +608,15 @@
 	const EVENT_255
 	const EVENT_256
 	const EVENT_257
-	const EVENT_258
-	const EVENT_259
-	const EVENT_25A
-	const EVENT_25B
-	const EVENT_25C
-	const EVENT_25D
-	const EVENT_25E
+; Kurt events
+	const EVENT_GAVE_KURT_RED_APRICORN
+	const EVENT_GAVE_KURT_BLU_APRICORN
+	const EVENT_GAVE_KURT_YLW_APRICORN
+	const EVENT_GAVE_KURT_GRN_APRICORN
+	const EVENT_GAVE_KURT_WHT_APRICORN
+	const EVENT_GAVE_KURT_BLK_APRICORN
+	const EVENT_GAVE_KURT_PNK_APRICORN
+; Phone events
 	const EVENT_JACK_ASKED_FOR_PHONE_NUMBER
 	const EVENT_260
 	const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
@@ -620,7 +628,7 @@
 	const EVENT_GOT_CARBOS_FROM_VANCE
 	const EVENT_GOT_IRON_FROM_PARRY
 	const EVENT_GOT_CALCIUM_FROM_ERIN
-	const EVENT_26A
+	const EVENT_KENJI_ON_BREAK
 	const EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
 	const EVENT_26C
 	const EVENT_BETH_ASKED_FOR_PHONE_NUMBER
@@ -674,10 +682,12 @@
 	const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
 	const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	const EVENT_29F
-	const EVENT_2A0 ; 2a0
-	const EVENT_2A1
-	const EVENT_2A2
-	const EVENT_2A3
+; Ruins Of Alph puzzles
+	const EVENT_SOLVED_HO_OH_PUZZLE ; 2a0
+	const EVENT_SOLVED_KABUTO_PUZZLE
+	const EVENT_SOLVED_OMANYTE_PUZZLE
+	const EVENT_SOLVED_AERODACTYL_PUZZLE
+; Decorations
 	const EVENT_DECO_BED_1
 	const EVENT_DECO_BED_2
 	const EVENT_DECO_BED_3
@@ -724,7 +734,8 @@
 	const EVENT_DECO_BIG_SNORLAX_DOLL
 	const EVENT_DECO_BIG_ONIX_DOLL ; 2d0
 	const EVENT_DECO_BIG_LAPRAS_DOLL
-	const EVENT_2D2
+; More Johto events
+	const EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
 	const EVENT_SWITCH_1
 	const EVENT_SWITCH_2
 	const EVENT_SWITCH_3
@@ -807,6 +818,7 @@
 	const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
+; More Crystal-specific events
 	const EVENT_LISTENED_TO_INITIAL_RADIO
 	const EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	const EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
@@ -835,6 +847,7 @@
 	const EVENT_GOT_ODD_EGG
 	const EVENT_33F
 	const EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
+; ???
 	const EVENT_341
 	const EVENT_342
 	const EVENT_343
@@ -1533,6 +1546,7 @@
 	const EVENT_BEAT_SAGE_GAKU
 	const EVENT_BEAT_SAGE_MASA
 	const EVENT_BEAT_SAGE_KOJI
+; ???
 	const EVENT_5CC
 	const EVENT_5CD
 	const EVENT_5CE
@@ -1725,7 +1739,7 @@
 	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_GOT_HM07_WATERFALL
 	const EVENT_ICE_PATH_1F_PP_UP
 	const EVENT_ICE_PATH_B1F_IRON
 	const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
@@ -1835,9 +1849,9 @@
 	const EVENT_6F2
 	const EVENT_ILEX_FOREST_APPRENTICE
 	const EVENT_ILEX_FOREST_CHARCOAL_MASTER
-	const EVENT_6F5
-	const EVENT_6F6
-	const EVENT_6F7
+	const EVENT_CHARCOAL_KILN_FARFETCH_D
+	const EVENT_CHARCOAL_KILN_APPRENTICE
+	const EVENT_CHARCOAL_KILN_BOSS
 	const EVENT_ROUTE_36_SUDOWOODO
 	const EVENT_AZALEA_TOWN_SLOWPOKES
 	const EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
@@ -1943,7 +1957,7 @@
 	const EVENT_ROUTE_40_MONICA_OF_MONDAY
 	const EVENT_LANCES_ROOM_OAK_AND_MARY
 	const EVENT_UNION_CAVE_B2F_LAPRAS ; 760
-	const EVENT_761
+	const EVENT_TEAM_ROCKET_DISBANDED
 	const EVENT_RED_IN_MT_SILVER
 	const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
 	const EVENT_BURNED_TOWER_MORTY