More label updates, moved predefs to new file

Also named most of the engine and event flag constants.

1 files changed, 36 insertions, 36 deletions

diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index 2ff70a57d..4dfe7732a 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -16,13 +16,13 @@
 	const ENGINE_POKERUS
 	const ENGINE_ROCKET_SIGNAL_ON_CH20
 	const ENGINE_CREDITS_SKIP
-	const ENGINE_BUG_CONTEST_ON
+	const ENGINE_BUG_CONTEST_ON ; 10
 	const ENGINE_BUG_CONTEST_TIMER
 	const ENGINE_12
 	const ENGINE_ROCKETS_IN_RADIO_TOWER
 	const ENGINE_BIKE_SHOP_CALL_ENABLED
 	const ENGINE_GIVE_POKERUS
-	const ENGINE_16
+	const ENGINE_FLORIA
 	const ENGINE_ROCKETS_IN_MAHOGANY
 	const ENGINE_STRENGTH_ACTIVE
 	const ENGINE_ALWAYS_ON_BIKE
@@ -32,7 +32,7 @@
 	const ENGINE_PLAINBADGE
 	const ENGINE_FOGBADGE
 	const ENGINE_MINERALBADGE
-	const ENGINE_STORMBADGE
+	const ENGINE_STORMBADGE ; 20
 	const ENGINE_GLACIERBADGE
 	const ENGINE_RISINGBADGE
 	const ENGINE_BOULDERBADGE
@@ -48,7 +48,7 @@
 	const ENGINE_UNLOCKED_UNOWNS_3
 	const ENGINE_UNLOCKED_UNOWNS_4
 	const ENGINE_UNLOCKED_UNOWNS_5
-	const ENGINE_UNLOCKED_UNOWNS_6
+	const ENGINE_UNLOCKED_UNOWNS_6 ; 30
 	const ENGINE_UNLOCKED_UNOWNS_7
 	const ENGINE_UNLOCKED_UNOWNS_8
 	const ENGINE_FLYPOINT_KRISS_HOUSE
@@ -64,7 +64,7 @@
 	const ENGINE_FLYPOINT_CELADON
 	const ENGINE_FLYPOINT_FUCHSIA
 	const ENGINE_FLYPOINT_CINNABAR
-	const ENGINE_FLYPOINT_INDIGO_PLATEAU
+	const ENGINE_FLYPOINT_INDIGO_PLATEAU ; 40
 	const ENGINE_FLYPOINT_NEW_BARK
 	const ENGINE_FLYPOINT_CHERRYGROVE
 	const ENGINE_FLYPOINT_VIOLET
@@ -80,7 +80,7 @@
 	const ENGINE_FLYPOINT_UNUSED
 	const ENGINE_LUCKY_NUMBER_SHOW
 	const ENGINE_4F
-	const ENGINE_KURT_MAKING_BALLS
+	const ENGINE_KURT_MAKING_BALLS ; 50
 	const ENGINE_DAILY_BUG_CONTEST
 	const ENGINE_SPECIAL_WILDDATA
 	const ENGINE_TIME_CAPSULE
@@ -95,8 +95,8 @@
 	const ENGINE_TEA_IN_BLUES_HOUSE
 	const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 	const ENGINE_DAILY_MOVE_TUTOR
-	const ENGINE_5F
-	const ENGINE_60
+	const ENGINE_BUENAS_PASSWORD
+	const ENGINE_BUENAS_PASSWORD_2 ; 60
 	const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
 	const ENGINE_62
 	const ENGINE_PLAYER_IS_FEMALE
@@ -112,7 +112,7 @@
 	const ENGINE_RALPH
 	const ENGINE_LIZ
 	const ENGINE_ANTHONY
-	const ENGINE_TODD
+	const ENGINE_TODD ; 70
 	const ENGINE_GINA
 	const ENGINE_ARNIE
 	const ENGINE_ALAN
@@ -128,37 +128,37 @@
 	const ENGINE_BEVERLY_HAS_NUGGET
 	const ENGINE_JOSE_HAS_STAR_PIECE
 	const ENGINE_WADE_HAS_ITEM
-	const ENGINE_GINA_HAS_LEAF_STONE
+	const ENGINE_GINA_HAS_LEAF_STONE ; 80
 	const ENGINE_ALAN_HAS_FIRE_STONE
-	const ENGINE_LIZ_HAS_THUNDERSTONE
+	const ENGINE_DANA_HAS_THUNDERSTONE
 	const ENGINE_DEREK_HAS_NUGGET
 	const ENGINE_TULLY_HAS_WATER_STONE
 	const ENGINE_TIFFANY_HAS_PINK_BOW
 	const ENGINE_WILTON_HAS_ITEM
-	const ENGINE_87
-	const ENGINE_88
-	const ENGINE_89
-	const ENGINE_8A
-	const ENGINE_8B
-	const ENGINE_8C
-	const ENGINE_8D
-	const ENGINE_8E
-	const ENGINE_8F
-	const ENGINE_90
-	const ENGINE_91
-	const ENGINE_92
-	const ENGINE_93
-	const ENGINE_94
-	const ENGINE_95
-	const ENGINE_96
-	const ENGINE_97
-	const ENGINE_98
-	const ENGINE_99
-	const ENGINE_9A
-	const ENGINE_9B
-	const ENGINE_9C
-	const ENGINE_9D
-	const ENGINE_9E
+	const ENGINE_JACK_MONDAY_MORNING
+	const ENGINE_HUEY_WEDNESDAY_NIGHT
+	const ENGINE_GAVEN_THURSDAY_MORNING
+	const ENGINE_BETH_FRIDAY_AFTERNOON
+	const ENGINE_JOSE_SATURDAY_NIGHT
+	const ENGINE_REENA_SUNDAY_MORNING
+	const ENGINE_JOEY_MONDAY_AFTERNOON
+	const ENGINE_WADE_TUESDAY_NIGHT
+	const ENGINE_RALPH_WEDNESDAY_MORNING
+	const ENGINE_LIZ_THURSDAY_AFTERNOON ; 90
+	const ENGINE_ANTHONY_FRIDAY_NIGHT
+	const ENGINE_TODD_SATURDAY_MORNING
+	const ENGINE_GINA_SUNDAY_AFTERNOON
+	const ENGINE_ARNIE_TUESDAY_MORNING
+	const ENGINE_ALAN_WEDNESDAY_AFTERNOON
+	const ENGINE_DANA_THURSDAY_NIGHT
+	const ENGINE_CHAD_FRIDAY_MORNING
+	const ENGINE_TULLY_SUNDAY_NIGHT
+	const ENGINE_BRENT_MONDAY_MORNING
+	const ENGINE_TIFFANY_TUESDAY_AFTERNOON
+	const ENGINE_VANCE_WEDNESDAY_NIGHT
+	const ENGINE_WILTON_THRUSDAY_MORNING
+	const ENGINE_PARRY_FRIDAY_AFTERNOON
+	const ENGINE_ERIN_SATURDAY_NIGHT
 	const ENGINE_KRIS_IN_CABLE_CLUB
-	const ENGINE_DUNSPARCE_SWARM
+	const ENGINE_DUNSPARCE_SWARM ; a0
 	const ENGINE_YANMA_SWARM