diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-09 14:43:21 -0800 | 
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-09 14:43:21 -0800 | 
| commit | 65207e03662c639970ef19b372c21b8e28b6f097 (patch) | |
| tree | 1bc82a7d52642f5a925bfa886c443cac3fd5abf1 /data/scripts/maps | |
| parent | 8dd25bcad09064f0b3314a71a62ad22f91b42bb3 (diff) | |
Label all flags up to 901
Diffstat (limited to 'data/scripts/maps')
36 files changed, 103 insertions, 103 deletions
| diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index c0437d804..a587fcc92 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -65,7 +65,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD  	waitmovement 0  	msgbox AquaHideout_B2F_Text_1971AE, 4  	setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE -	setflag 852 +	setflag FLAG_HIDE_GRUNTS_LILYCOVE  	release  	end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c0a88a880..d0d19e4b9 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -68,13 +68,13 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7  	specialvar RESULT, sub_810E300  	compare RESULT, 1  	call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 -	setflag 816 -	setflag 855 -	setflag 856 -	clearflag 815 +	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS +	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 +	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 +	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM  	setvar 0x409b, 1  	setflag FLAG_LEGENDARY_BATTLE_COMPLETED -	clearflag 854 +	clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS  	clearflag SYS_WEATHER_CTRL  	setvar 0x40b9, 2  	clearflag 916 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index b8da349f3..3d3240e81 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -135,10 +135,10 @@ DewfordTown_EventScript_14E151:: @ 814E151  	applymovement 255, DewfordTown_Movement_14E405  	waitmovement 0  	showobject 255, 0, 19 -	clearflag 739 -	clearflag 881 -	clearflag 742 -	setflag 743 +	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE +	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE +	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 +	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD  	hideobject 4, 0, 11  	setvar 0x408e, 2  	resetobjectpriority 255, 0, 11 @@ -171,10 +171,10 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8  	setobjectpriority 2, 0, 24, 0  	applymovement 2, DewfordTown_Movement_14E410  	waitmovement 0 -	clearflag 741 +	clearflag FLAG_HIDE_MR_BRINEY_ROUTE109  	addobject 1 -	clearflag 744 -	setflag 743 +	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 +	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD  	hideobject 4, 0, 11  	checkflag FLAG_DELIVERED_DEVON_GOODS  	call_if 0, DewfordTown_EventScript_14E281 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index b13c930cf..ae3cbd4ad 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -136,7 +136,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0  	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF  	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0  	waitmovement 0 -	setflag 781 +	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE  	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16  	waitstate  	releaseall diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index f6c62fbcb..70f3cbc3b 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -5,7 +5,7 @@ FallarborTown_MapScripts:: @ 814E7E0  FallarborTown_MapScript1_14E7E6:: @ 814E7E6  	setflag FLAG_VISITED_FALLARBOR_TOWN  	setvar 0x4086, 0 -	setflag 800 +	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR  	clearflag FLAG_CONTEST_SKETCH_CREATED  	end diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 5b1f1c948..1e50c2fd6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -48,7 +48,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59  FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69  	playse 18  	removeobject 4 -	clearflag 870 +	clearflag FLAG_HIDE_LANETTE  	release  	end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 036523bf1..6cf2d630b 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -26,10 +26,10 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29  InsideOfTruck_EventScript_15FC45:: @ 815FC45  	sethealplace 1  	setvar 0x4092, 1 -	setflag 759 -	setflag 762 -	setflag 784 -	setflag 760 +	setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS +	setflag FLAG_HIDE_MOVING_TRUCK_MAY +	setflag FLAG_HIDE_BRENDAN_MOM +	setflag FLAG_HIDE_BRENDAN_UPSTAIRS  	setvar 0x408c, 1  	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10  	releaseall @@ -38,9 +38,9 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45  InsideOfTruck_EventScript_15FC68:: @ 815FC68  	sethealplace 2  	setvar 0x4092, 2 -	setflag 758 -	setflag 761 -	setflag 785 +	setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS +	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN +	setflag FLAG_HIDE_MAY_MOM  	setflag FLAG_HIDE_MAY_UPSTAIRS  	setvar 0x4082, 1  	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 4948c17b3..29b5ef2b9 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -19,7 +19,7 @@ LavaridgeTown_EventScript_14E4D0:: @ 814E4D0  	return  LavaridgeTown_EventScript_14E4DF:: @ 814E4DF -	clearflag 877 +	clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE  	return  LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 40c1b6ea9..f6c34484e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -88,7 +88,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766  	call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB  	setvar 0x8008, 4  	call LavaridgeTown_Gym_1F_EventScript_1A01C0 -	setflag 806 +	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE  	setvar 0x4053, 1  	goto LavaridgeTown_Gym_1F_EventScript_1537A7  	end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b8c6b26f5..29a8497ed 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -6,7 +6,7 @@ LilycoveCity_MapScripts:: @ 814CA15  LilycoveCity_MapScript1_14CA20:: @ 814CA20  	setflag FLAG_VISITED_LILYCOVE_CITY  	setvar 0x4086, 0 -	setflag 802 +	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE  	checkflag SYS_WEATHER_CTRL  	call_if 1, LilycoveCity_EventScript_1A02C1  	call LilycoveCity_EventScript_1A0196 @@ -356,7 +356,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6  	compare RESULT, 1  	call_if 1, LilycoveCity_EventScript_14CEF7  	clearflag FLAG_HIDE_MAY_UPSTAIRS -	clearflag 849 +	clearflag FLAG_HIDE_MAY_PICHU_DOLL  	goto LilycoveCity_EventScript_14CF6B  	end @@ -392,7 +392,7 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12  	call_if 1, LilycoveCity_EventScript_14CF47  	compare RESULT, 1  	call_if 1, LilycoveCity_EventScript_14CF50 -	clearflag 760 +	clearflag FLAG_HIDE_BRENDAN_UPSTAIRS  	goto LilycoveCity_EventScript_14CF6B  	end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index f0e515f13..7546fe41b 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -13,7 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877  	.2byte 0  LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 -	checkflag 775 +	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR  	goto_if_eq LilycoveCity_ContestLobby_EventScript_158898  	setvar 0x4099, 0  	end @@ -97,23 +97,23 @@ LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994  	return  LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6 -	clearflag 776 +	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY  	return  LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA -	clearflag 777 +	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL  	return  LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE -	clearflag 778 +	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN  	return  LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2 -	clearflag 779 +	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER  	return  LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 -	clearflag 780 +	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS  	return  LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA @@ -188,7 +188,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52  	step_end  LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B -	checkflag 775 +	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR  	goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A  	setvar 0x4099, 0  	end @@ -583,7 +583,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0  	end  LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 -	setflag 775 +	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR  	copyvar 0x4094, 0x1  	additem ITEM_CONTEST_PASS, 1  	setvar 0x800b, 8 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 54e2bd042..117aa5579 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -52,7 +52,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A  	return  LittlerootTown_EventScript_14D5A6:: @ 814D5A6 -	clearflag 752 +	clearflag FLAG_HIDE_MOM_LITTLEROOT  	setobjectmovementtype 4, 8  	checkplayergender  	compare RESULT, 0 @@ -80,7 +80,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF  	setvar 0x8004, 5  	setvar 0x8005, 8  	call LittlerootTown_EventScript_14D62B -	setflag 761 +	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN  	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8  	waitstate  	releaseall @@ -91,7 +91,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D  	setvar 0x8004, 14  	setvar 0x8005, 8  	call LittlerootTown_EventScript_14D62B -	setflag 762 +	setflag FLAG_HIDE_MOVING_TRUCK_MAY  	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8  	waitstate  	releaseall @@ -122,12 +122,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B  	applymovement 4, LittlerootTown_Movement_14D6B5  	applymovement 255, LittlerootTown_Movement_14D6BD  	waitmovement 0 -	setflag 752 +	setflag FLAG_HIDE_MOM_LITTLEROOT  	setvar 0x4092, 3  	hideobject 255, 0, 0  	closedoor 0x8004, 0x8005  	waitdooranim -	clearflag 868 +	clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT  	clearflag 0x4000  	return diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 8e7a0854d..868e4f06e 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90  LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A  	lock  	faceplayer -	checkflag 896 +	checkflag FLAG_UNKNOWN_BIRCH_380  	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F  	compare 0x4084, 5  	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 0bc64765a..451219edb 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -156,8 +156,8 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9  MauvilleCity_EventScript_14C22B:: @ 814C22B  	removeobject 6  	removeobject 7 -	clearflag 806 -	clearflag 809 +	clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE +	clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE  	setflag FLAG_DEFEATED_WALLY_MAUVILLE  	releaseall  	end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 06774d400..7ce6e3704 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -77,7 +77,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C  	removeobject 7  	removeobject 8  	removeobject 9 -	setflag 819 +	setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR  	setvar 0x40bf, 1  	releaseall  	end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 9c32e989c..231865942 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -63,7 +63,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594  	msgbox MossdeepCity_Gym_Text_18D128, 4  	setflag 1229  	setflag BADGE07_GET -	clearflag 869 +	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD  	clearflag 915  	setvar 0x8008, 7  	call MossdeepCity_Gym_EventScript_1A01C0 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e9456ae13..fd90210ca 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -71,8 +71,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1  MtPyre_Summit_EventScript_15D57A:: @ 815D57A  	setflag FLAG_MT_PYRE_ORB_STOLEN  	setvar 0x4058, 1 -	clearflag 840 -	clearflag 835 +	clearflag FLAG_HIDE_STERN_SLATEPORT +	clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT  	setvar 0x40a0, 1  	setvar 0x40b9, 1  	return diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 47601a964..61476b085 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -209,8 +209,8 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669  	setvar 0x4085, 1  	setvar 0x4057, 2  	clearflag FLAG_HIDE_WALLY_PETALBURG -	clearflag 866 -	setflag 889 +	clearflag FLAG_HIDE_WALLY_PETALBURG_GYM +	setflag FLAG_HIDE_RIVAL_BIRCH_LAB  	special InitBirchState  	warp MAP_PETALBURG_CITY, 255, 15, 8  	waitstate diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 9af5c1bdc..23ed60f9a 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -119,7 +119,7 @@ Route103_EventScript_14ED46:: @ 814ED46  	removeobject 2  	setvar 0x4062, 1  	setvar 0x4084, 4 -	clearflag 889 +	clearflag FLAG_HIDE_RIVAL_BIRCH_LAB  	setflag FLAG_DEFEATED_RIVAL_ROUTE103  	setvar 0x40c7, 1  	clearflag 979 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 20044f020..ac8a48353 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -145,13 +145,13 @@ Route104_EventScript_14EFD5:: @ 814EFD5  	setobjectxyperm 2, 12, 8  	addobject 2  	setobjectpriority 2, 0, 11, 0 -	clearflag 740 +	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN  	applymovement 2, Route104_Movement_14F16F  	waitmovement 0  	addobject 4 -	clearflag 743 +	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD  	call Route104_EventScript_1A02EF -	setflag 742 +	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104  	hideobject 7, 0, 19  	copyvar 0x4096, 0x8008  	resetobjectpriority 255, 0, 19 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index aabc03439..3d775ccfe 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -11,7 +11,7 @@ Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8  	end  Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 -	setflag 814 +	setflag FLAG_HIDE_RIVAL_RUSTBORO  	return  Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 @@ -80,9 +80,9 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB  	msgbox Route104_MrBrineysHouse_Text_191BFD, 4  	call Route104_MrBrineysHouse_EventScript_1A010C  	setvar 0x408e, 1 -	clearflag 738 -	setflag 739 -	setflag 881 +	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 +	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE +	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE  	warp MAP_ROUTE104, 255, 13, 51  	waitstate  	releaseall diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index f4838a211..1277168e0 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -43,14 +43,14 @@ Route109_EventScript_14F548:: @ 814F548  	applymovement 255, Route109_Movement_14F670  	waitmovement 0  	addobject 4 -	clearflag 743 +	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD  	setobjectxyperm 2, 12, 8  	addobject 2  	setobjectpriority 2, 0, 11, 0  	applymovement 2, Route109_Movement_14F67D  	waitmovement 0 -	clearflag 740 -	setflag 744 +	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN +	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109  	hideobject 1, 0, 24  	msgbox Route109_Text_16B4B5, 4  	closemessage diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 343d666b2..7d9c8aaaa 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -40,10 +40,10 @@ Route111_EventScript_15000C:: @ 815000C  	return  Route111_EventScript_15000D:: @ 815000D -	clearflag 768 -	setflag 769 -	setflag 770 -	setflag 771 +	clearflag FLAG_HIDE_VICTOR_WINSTRATE +	setflag FLAG_HIDE_VICTORIA_WINSTRATE +	setflag FLAG_HIDE_VIVI_WINSTRATE +	setflag FLAG_HIDE_VICKI_WINSTRATE  	cleartrainerflag OPPONENT_VICTOR  	cleartrainerflag OPPONENT_VICTORIA  	cleartrainerflag OPPONENT_VIVI diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index ec47cbd79..5454fa946 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -33,8 +33,8 @@ Route119_MapScript1_15119B:: @ 815119B  	end  Route119_EventScript_1511B9:: @ 81511B9 -	setflag 893 -	clearflag 892 +	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F +	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F  	setvar 0x40b3, 2  	return diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 09bab727a..4ee12fe93 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -39,10 +39,10 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45  	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4  	closemessage  	setvar 0x40b3, 1 -	clearflag 893 +	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F  	fadedefaultbgm  	fadescreen 1 -	setflag 890 +	setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE  	removeobject 1  	removeobject 2  	removeobject 3 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 358a946a6..ffe133906 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -183,11 +183,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4  	setvar 0x405a, 2  	setvar 0x409a, 2  	setvar 0x406f, 1 -	clearflag 891 -	clearflag 880 -	clearflag 878 -	setflag 739 -	setflag 881 +	clearflag FLAG_HIDE_BRINEY_ROUTE116 +	clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL +	clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL +	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE +	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE  	releaseall  	end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0cd4a36a8..eca55c118 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -57,13 +57,13 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752  	setflag SYS_POKENAV_GET  	setflag FLAG_RECEIVED_POKENAV  	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 -	setflag 894 -	clearflag 807 +	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 +	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL  	clearflag 983 -	clearflag 739 -	clearflag 881 +	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE +	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE  	setvar 0x4096, 1 -	clearflag 814 +	clearflag FLAG_HIDE_RIVAL_RUSTBORO  	setvar 0x408f, 1  	releaseall  	end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 002071f2d..04364b661 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -345,7 +345,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA  	setflag FLAG_RECOVERED_DEVON_GOODS  	setvar 0x405a, 4  	setvar 0x4090, 1 -	setflag 891 +	setflag FLAG_HIDE_BRINEY_ROUTE116  	release  	end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index d38459c1c..9131dcdb3 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -192,23 +192,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA  	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4  	.endif  	setvar 0x407b, 1 -	clearflag 855 -	clearflag 856 -	clearflag 816 +	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  	setvar 0x405e, 1  	clearflag 944  	clearflag 945  	setflag SYS_WEATHER_CTRL -	setflag 854 +	setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS  	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN  	setflag 967  	setvar 0x40c6, 1  	setvar 0x40a2, 1 -	setflag 828 -	setflag 829 -	setflag 831 -	setflag 859 +	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN +	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN +	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN +	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN  	setflag 946  	warp MAP_ROUTE128, 255, 38, 22  	waitstate diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index f22055bc4..b278fcfc2 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -19,7 +19,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316  	playpokecry SPECIES_RAYQUAZA, 2  	delay 40  	waitpokecry -	setflag 773 +	setflag FLAG_HIDE_RAYQUAZA  	setflag SYS_CTRL_OBJ_DELETE  	special ScrSpecial_StartRayquazaBattle  	waitstate diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index b94a0ffd3..567dd779b 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -19,7 +19,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C  SlateportCity_EventScript_14BA5C:: @ 814BA5C  	setflag FLAG_VISITED_SLATEPORT_CITY  	setvar 0x4086, 0 -	setflag 803 +	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT  	return  SlateportCity_EventScript_14BA68:: @ 814BA68 @@ -533,10 +533,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC  	applymovement 255, SlateportCity_Movement_14C008  	waitmovement 0  	removeobject 11 -	clearflag 841 -	clearflag 848 -	clearflag 845 -	clearflag 846 +	clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR +	clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR +	clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR +	clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR  	setvar 0x4058, 2  	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14  	waitstate diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index daa6b1e7c..2e042b1e5 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -12,7 +12,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63  	end  SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 -	clearflag 860 +	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR  	return  SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 @@ -73,8 +73,8 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5  	call_if 1, SlateportCity_Harbor_EventScript_156086  	msgbox SlateportCity_Harbor_Text_17FE60, 4  	closemessage -	setflag 821 -	setflag 822 +	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT +	setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT  	moveobjectoffscreen 4  	setobjectmovementtype 4, 10  	releaseall diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index a8411e067..db65a51db 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -74,7 +74,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6  	removeobject 4  	fadescreen 0  	delay 30 -	setflag 883 +	setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM  	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843  	waitmovement 0  	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 @@ -86,7 +86,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6  	waitmovement 0  	playse 9  	removeobject 1 -	setflag 900 +	setflag FLAG_HIDE_EVIL_TEAM_ROUTE110  	setflag FLAG_DELIVERED_DEVON_GOODS  	clearflag 947  	setflag 949 diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 7b2ae0d67..73d63fe06 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -19,7 +19,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336  	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D  	waitmovement 0  	setflag FLAG_DOCK_REJECTED_DEVON_GOODS -	setflag 882 +	setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT  	releaseall  	end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index babbd8cce..b9e9b85a5 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -5,7 +5,7 @@ VerdanturfTown_MapScripts:: @ 814E854  VerdanturfTown_MapScript1_14E85A:: @ 814E85A  	setflag FLAG_VISITED_VERDANTURF_TOWN  	setvar 0x4086, 0 -	setflag 801 +	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF  	end  VerdanturfTown_EventScript_14E866:: @ 814E866 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index e92cdcc82..7e48d3d90 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -8,7 +8,7 @@ VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89  	end  VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 -	setflag 858 +	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD  	return  VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 @@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3  	msgbox VictoryRoad_1F_Text_19782B, 4  	trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943  	msgbox VictoryRoad_1F_Text_197967, 4 -	clearflag 858 +	clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD  	moveobjectoffscreen 4  	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD  	setvar 0x40c3, 1 | 
