A few more flags

8 files changed, 22 insertions, 17 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index f96d0ba5d..d0b0efb81 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1242,7 +1242,7 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag FLAG_HIDE_RIVAL_ROUTE119
 	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
 	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
-	setflag 973
+	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
 	setflag FLAG_HIDE_LANETTE
 	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
 	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
@@ -2365,7 +2365,7 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
 	playpokecry SPECIES_ELECTRODE, 2
 	delay 40
 	waitpokecry
-	setflag 977
+	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
 	setflag 2145
 	dowildbattle
 	clearflag 2145
@@ -2381,7 +2381,7 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
 	playpokecry SPECIES_ELECTRODE, 2
 	delay 40
 	waitpokecry
-	setflag 978
+	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
 	setflag 2145
 	dowildbattle
 	clearflag 2145
diff --git a/data/event_scripts.s b/data/event_scripts.s
index a84a2dd12..f703eb327 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1236,7 +1236,7 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag FLAG_HIDE_RIVAL_ROUTE119
 	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
 	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
-	setflag 973
+	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
 	setflag FLAG_HIDE_LANETTE
 	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
 	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
@@ -2359,7 +2359,7 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
 	playpokecry SPECIES_ELECTRODE, 2
 	delay 40
 	waitpokecry
-	setflag 977
+	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
 	setflag 2145
 	dowildbattle
 	clearflag 2145
@@ -2375,7 +2375,7 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
 	playpokecry SPECIES_ELECTRODE, 2
 	delay 40
 	waitpokecry
-	setflag 978
+	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
 	setflag 2145
 	dowildbattle
 	clearflag 2145
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc
index c3bc7c96b..f3f9e8288 100644
--- a/data/maps/events/AquaHideout_B1F.inc
+++ b/data/maps/events/AquaHideout_B1F.inc
@@ -4,9 +4,9 @@ AquaHideout_B1F_MapObjects:: @ 838CD80
 	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, 1071, 0, 0
 	object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
 	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, 1124, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, 977, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
 	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, 1132, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, 978, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
 
 AquaHideout_B1F_MapWarps:: @ 838CE40
 	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc
index db457bb45..597c40b39 100644
--- a/data/maps/events/MagmaHideout_B1F.inc
+++ b/data/maps/events/MagmaHideout_B1F.inc
@@ -4,9 +4,9 @@ MagmaHideout_B1F_MapObjects:: @ 838EA28
 	object_event 3, 242, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, 1125, 0, 0
 	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, 1126, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, 977, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
 	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, 1134, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, 978, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
 
 MagmaHideout_B1F_MapWarps:: @ 838EAE8
 	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc
index 826e6a089..978842032 100644
--- a/data/maps/events/NewMauville_Inside.inc
+++ b/data/maps/events/NewMauville_Inside.inc
@@ -4,9 +4,9 @@ NewMauville_Inside_MapObjects:: @ 838DF08
 	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, 1110, 0, 0
 	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, 1122, 0, 0
 	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, 1123, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, 974, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, 975, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, 976, 0, 0
+	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0
+	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0
+	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0
 
 NewMauville_Inside_MapWarps:: @ 838DFC8
 	warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc
index 62b8f4d59..1b55cde28 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/scripts/maps/NewMauville_Inside.inc
@@ -169,7 +169,7 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900
 	playpokecry SPECIES_VOLTORB, 2
 	delay 40
 	waitpokecry
-	setflag 974
+	setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE
 	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag SYS_CTRL_OBJ_DELETE
@@ -184,7 +184,7 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E
 	playpokecry SPECIES_VOLTORB, 2
 	delay 40
 	waitpokecry
-	setflag 975
+	setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE
 	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag SYS_CTRL_OBJ_DELETE
@@ -199,7 +199,7 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C
 	playpokecry SPECIES_VOLTORB, 2
 	delay 40
 	waitpokecry
-	setflag 976
+	setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE
 	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag SYS_CTRL_OBJ_DELETE
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index fa19ee504..b66d4245d 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -195,7 +195,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
 	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
 	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
-	clearflag 973
+	clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS
 	setvar 0x405e, 1
 	clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
 	clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 7bb834297..a667dcf96 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -489,6 +489,11 @@
 #define FLAG_HIDE_RIVAL_LILYCOVE_MART       0x3CB
 #define FLAG_HIDE_STEVEN_ROUTE120           0x3CC
 #define FLAG_HIDE_STEVEN_SOOTOPOLIS         0x3CD
+#define FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE    0x3CE
+#define FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE    0x3CF
+#define FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE    0x3D0
+#define FLAG_HIDE_ELECTRODE_1_HIDEOUT       0x3D1
+#define FLAG_HIDE_ELECTRODE_2_HIDEOUT       0x3D2
 
 #define TRAINER_FLAG_START 0x500