summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data-de/event_scripts.s24
-rw-r--r--data/event_scripts.s24
-rw-r--r--data/maps/events/OldaleTown.inc2
-rw-r--r--data/maps/events/Route101.inc2
-rw-r--r--data/maps/events/Route119.inc4
-rw-r--r--data/maps/events/Route120.inc12
-rw-r--r--data/maps/events/RusturfTunnel.inc2
-rw-r--r--data/maps/events/SlateportCity_OceanicMuseum_2F.inc6
-rw-r--r--data/maps/events/Underwater_SeafloorCavern.inc8
-rw-r--r--data/maps/events/VerdanturfTown_WandasHouse.inc2
-rw-r--r--data/scripts/maps/LittlerootTown.inc2
-rw-r--r--data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc2
-rw-r--r--data/scripts/maps/OldaleTown.inc2
-rw-r--r--data/scripts/maps/Route103.inc2
-rw-r--r--data/scripts/maps/RustboroCity_DevonCorp_3F.inc2
-rw-r--r--data/scripts/maps/Underwater_SeafloorCavern.inc2
-rw-r--r--include/constants/flags.h13
17 files changed, 62 insertions, 49 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index d0b0efb81..e1d90c37b 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1216,7 +1216,7 @@ gUnknown_0819FA81:: @ 819FA81
setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
- setflag 984
+ setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
setflag FLAG_HIDE_WALLY_PETALBURG_GYM
@@ -1251,7 +1251,7 @@ gUnknown_0819FA81:: @ 819FA81
setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
- setflag 983
+ setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
@@ -1290,9 +1290,9 @@ gUnknown_0819FA81:: @ 819FA81
setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
setflag 1133
setflag FLAG_HIDE_STEVENS_LETTER
- setflag 979
+ setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
- setflag 991
+ setflag FLAG_HIDE_BOY_ROUTE101
call Event_ResetBerryTrees
end
@@ -2273,7 +2273,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442
removeobject 1
removeobject 10
clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
- clearflag 984
+ clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
setvar 0x409a, 6
setflag FLAG_RUSTURF_TUNNEL_OPENED
return
@@ -2486,31 +2486,31 @@ Route119_EventScript_1A05C3:: @ 81A05C3
end
Route119_EventScript_1A0646:: @ 81A0646
- setflag 982
+ setflag FLAG_HIDE_KECLEON_ROUTE120_3
return
Route119_EventScript_1A064A:: @ 81A064A
- setflag 985
+ setflag FLAG_HIDE_KECLEON_ROUTE120_4
return
Route119_EventScript_1A064E:: @ 81A064E
- setflag 986
+ setflag FLAG_HIDE_KECLEON_ROUTE120_5
return
Route119_EventScript_1A0652:: @ 81A0652
- setflag 987
+ setflag FLAG_HIDE_KECLEON_ROUTE120_6
return
Route119_EventScript_1A0656:: @ 81A0656
- setflag 988
+ setflag FLAG_HIDE_KECLEON_ROUTE120_7
return
Route119_EventScript_1A065A:: @ 81A065A
- setflag 989
+ setflag FLAG_HIDE_KECLEON_ROUTE119_1
return
Route119_EventScript_1A065E:: @ 81A065E
- setflag 990
+ setflag FLAG_HIDE_KECLEON_ROUTE119_2
return
FortreeCity_Movement_1A0662:: @ 81A0662
diff --git a/data/event_scripts.s b/data/event_scripts.s
index f703eb327..ca7b99d21 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1210,7 +1210,7 @@ gUnknown_0819FA81:: @ 819FA81
setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
- setflag 984
+ setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
setflag FLAG_HIDE_WALLY_PETALBURG_GYM
@@ -1245,7 +1245,7 @@ gUnknown_0819FA81:: @ 819FA81
setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
- setflag 983
+ setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
@@ -1284,9 +1284,9 @@ gUnknown_0819FA81:: @ 819FA81
setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
setflag 1133
setflag FLAG_HIDE_STEVENS_LETTER
- setflag 979
+ setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
- setflag 991
+ setflag FLAG_HIDE_BOY_ROUTE101
call Event_ResetBerryTrees
end
@@ -2267,7 +2267,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442
removeobject 1
removeobject 10
clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
- clearflag 984
+ clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
setvar 0x409a, 6
setflag FLAG_RUSTURF_TUNNEL_OPENED
return
@@ -2480,31 +2480,31 @@ Route119_EventScript_1A05C3:: @ 81A05C3
end
Route119_EventScript_1A0646:: @ 81A0646
- setflag 982
+ setflag FLAG_HIDE_KECLEON_ROUTE120_3
return
Route119_EventScript_1A064A:: @ 81A064A
- setflag 985
+ setflag FLAG_HIDE_KECLEON_ROUTE120_4
return
Route119_EventScript_1A064E:: @ 81A064E
- setflag 986
+ setflag FLAG_HIDE_KECLEON_ROUTE120_5
return
Route119_EventScript_1A0652:: @ 81A0652
- setflag 987
+ setflag FLAG_HIDE_KECLEON_ROUTE120_6
return
Route119_EventScript_1A0656:: @ 81A0656
- setflag 988
+ setflag FLAG_HIDE_KECLEON_ROUTE120_7
return
Route119_EventScript_1A065A:: @ 81A065A
- setflag 989
+ setflag FLAG_HIDE_KECLEON_ROUTE119_1
return
Route119_EventScript_1A065E:: @ 81A065E
- setflag 990
+ setflag FLAG_HIDE_KECLEON_ROUTE119_2
return
FortreeCity_Movement_1A0662:: @ 81A0662
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc
index 3b5fc9150..828ffc986 100644
--- a/data/maps/events/OldaleTown.inc
+++ b/data/maps/events/OldaleTown.inc
@@ -2,7 +2,7 @@ OldaleTown_MapObjects:: @ 8380A78
object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0
object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0
object_event 3, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0
- object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, 979, 0, 0
+ object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0
OldaleTown_MapWarps:: @ 8380AD8
warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
index ae2370546..a527ada51 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/events/Route101.inc
@@ -4,7 +4,7 @@ Route101_MapObjects:: @ 83810BC
object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0
object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0
object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0
- object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0
+ object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0
Route101_MapCoordEvents:: @ 838114C
coord_event 10, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
index 49c4928aa..a5c62e632 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/events/Route119.inc
@@ -33,8 +33,8 @@ Route119_MapObjects:: @ 8383914
object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0
object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0
object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0
- object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, 989, 0, 0
- object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, 990, 0, 0
+ object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0
+ object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2, 0, 0
object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0
Route119_MapWarps:: @ 8383C8C
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
index e5dc045dc..f85276971 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/events/Route120.inc
@@ -34,12 +34,12 @@ Route120_MapObjects:: @ 8383F30
object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0
object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0
- object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0
- object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, 982, 0, 0
- object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, 985, 0, 0
- object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, 986, 0, 0
- object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, 988, 0, 0
- object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, 987, 0, 0
+ object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2, 0, 0
+ object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3, 0, 0
+ object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4, 0, 0
+ object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5, 0, 0
+ object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7, 0, 0
+ object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0
Route120_MapWarps:: @ 8384308
warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
index 049b66beb..3d3cfc1af 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/events/RusturfTunnel.inc
@@ -8,7 +8,7 @@ RusturfTunnel_MapObjects:: @ 838BD2C
object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0
object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0
object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0
- object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0
+ object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0
RusturfTunnel_MapWarps:: @ 838BE1C
warp_def 4, 10, 3, 0, MAP_ROUTE116
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
index 0194c4004..911d8e7e2 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
@@ -3,9 +3,9 @@ SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70
object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0
object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0
object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0
- object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, 961, 0, 0
- object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, 961, 0, 0
- object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0
+ object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+ object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18
warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc
index 1dff571c3..fa8c12c65 100644
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ b/data/maps/events/Underwater_SeafloorCavern.inc
@@ -1,8 +1,8 @@
Underwater_SeafloorCavern_MapObjects:: @ 838D018
- object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0
- object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0
- object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0
- object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0
+ object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+ object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+ object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+ object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
Underwater_SeafloorCavern_MapWarps:: @ 838D078
warp_def 6, 7, 0, 0, MAP_UNDERWATER4
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc
index 3753a78aa..26c178a87 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/events/VerdanturfTown_WandasHouse.inc
@@ -3,7 +3,7 @@ VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC
object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0
object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0
object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0
- object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0
VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64
warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index 117aa5579..07f6581c2 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -27,7 +27,7 @@ LittlerootTown_EventScript_14D563:: @ 814D563
LittlerootTown_EventScript_14D567:: @ 814D567
setvar 0x40c7, 2
- setflag 979
+ setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
return
LittlerootTown_EventScript_14D570:: @ 814D570
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index 868e4f06e..871025f55 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
@@ -52,7 +52,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA
LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19
msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4
- clearflag 991
+ clearflag FLAG_HIDE_BOY_ROUTE101
setvar 0x4084, 3
releaseall
end
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index 92120e362..64928f840 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -279,7 +279,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6
waitmovement 0
removeobject 4
setvar 0x40c7, 2
- setflag 979
+ setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
releaseall
end
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index 23ed60f9a..ee9decedc 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -122,7 +122,7 @@ Route103_EventScript_14ED46:: @ 814ED46
clearflag FLAG_HIDE_RIVAL_BIRCH_LAB
setflag FLAG_DEFEATED_RIVAL_ROUTE103
setvar 0x40c7, 1
- clearflag 979
+ clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN
savebgm 0
fadedefaultbgm
releaseall
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index eca55c118..68039aac6 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -59,7 +59,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
- clearflag 983
+ clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
setvar 0x4096, 1
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc
index 9970d0490..e2b60f22e 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/scripts/maps/Underwater_SeafloorCavern.inc
@@ -11,7 +11,7 @@ Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE
end
Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB
- setflag 980
+ setflag FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION
end
Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF
diff --git a/include/constants/flags.h b/include/constants/flags.h
index a667dcf96..a92c713ad 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -494,6 +494,19 @@
#define FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE 0x3D0
#define FLAG_HIDE_ELECTRODE_1_HIDEOUT 0x3D1
#define FLAG_HIDE_ELECTRODE_2_HIDEOUT 0x3D2
+#define FLAG_HIDE_RIVAL_OLDALE_TOWN 0x3D3
+#define FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION 0x3D4
+#define FLAG_HIDE_KECLEON_ROUTE120_2 0x3D5
+#define FLAG_HIDE_KECLEON_ROUTE120_3 0x3D6
+#define FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL 0x3D7
+#define FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE 0x3D8
+#define FLAG_HIDE_KECLEON_ROUTE120_4 0x3D9
+#define FLAG_HIDE_KECLEON_ROUTE120_5 0x3DA
+#define FLAG_HIDE_KECLEON_ROUTE120_6 0x3DB
+#define FLAG_HIDE_KECLEON_ROUTE120_7 0x3DC
+#define FLAG_HIDE_KECLEON_ROUTE119_1 0x3DD
+#define FLAG_HIDE_KECLEON_ROUTE119_2 0x3DE
+#define FLAG_HIDE_BOY_ROUTE101 0x3DF
#define TRAINER_FLAG_START 0x500
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 05:42:51 +0000