summaryrefslogtreecommitdiff
path: root/data-de
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-10 15:41:21 -0800
committerMarcus Huderle <huderlem@gmail.com>2017-12-10 15:41:21 -0800
commit58bf5392b36bc3a5c3559f218aff9f751dd90a64 (patch)
treea2774449c18493fd7ad5050fa18d785a3127d582 /data-de
parent65207e03662c639970ef19b372c21b8e28b6f097 (diff)
Label flags up to 973
Diffstat (limited to 'data-de')
-rw-r--r--data-de/event_scripts.s70
1 files changed, 35 insertions, 35 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 3e5295e29..f96d0ba5d 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1180,7 +1180,7 @@ gUnknown_0819FA81:: @ 819FA81
setflag FLAG_HIDE_MR_BRINEY_ROUTE109
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
- setflag 906
+ setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
setflag FLAG_UNKNOWN_2E1
setflag FLAG_UNKNOWN_2EB
setflag FLAG_UNKNOWN_2EC
@@ -1203,12 +1203,12 @@ gUnknown_0819FA81:: @ 819FA81
setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
setflag FLAG_HIDE_FANCLUB_LADY
setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
- setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120
+ setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
- setflag 902
- setflag 903
- setflag 904
+ setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
+ setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
+ setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
@@ -1255,39 +1255,39 @@ gUnknown_0819FA81:: @ 819FA81
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
- setflag 961
+ setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
- setflag 941
+ setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
setflag FLAG_HIDE_MOM_LITTLEROOT
setflag FLAG_HIDE_MOM_UPSTAIRS
setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
setflag FLAG_UNKNOWN_BIRCH_380
setflag FLAG_HIDE_BIRCH_ROUTE101
setflag FLAG_HIDE_BIRCH_ROUTE103
- setflag 909
- setflag 910
- setflag 911
- setflag 915
- setflag 912
- setflag 920
- setflag 921
- setflag 922
- setflag 923
- setflag 925
- setflag 929
- setflag 930
- setflag 934
- setflag 939
- setflag 940
- setflag 928
+ setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
+ setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
+ setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+ setflag FLAG_UNKNOWN_393
+ setflag FLAG_HIDE_WATTSON_MAUVILLE
+ setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
+ setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
+ setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
+ setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
+ setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+ setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
+ setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
+ setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
+ setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+ setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+ setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
setflag FLAG_HIDE_STEVEN_ROUTE128
- setflag 944
- setflag 945
- setflag 947
- setflag 948
+ setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+ setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+ setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+ setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
- setflag 950
- setflag 968
+ setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+ setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
setflag 1133
setflag FLAG_HIDE_STEVENS_LETTER
setflag 979
@@ -1297,10 +1297,10 @@ gUnknown_0819FA81:: @ 819FA81
end
EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
- clearflag 925
+ clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
call EverGrandeCity_HallOfFame_EventScript_19FD09
setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
- clearflag 950
+ clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
clearflag FLAG_HIDE_STEVENS_LETTER
setvar 0x40c6, 1
clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
@@ -1318,7 +1318,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
return
EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
- clearflag 968
+ clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
return
EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E
@@ -1346,7 +1346,7 @@ EventScript_19FC84:
goto_if_eq Route101_EventScript_1A14DC
checkflag 1213
goto_if 0, Route101_EventScript_1A14DC
- clearflag 929
+ clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1
setvar 0x4053, 2
return
@@ -4772,11 +4772,11 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED
special sub_80BF2C4
compare RESULT, 1
goto_if_eq BattleTower_Lobby_EventScript_1AE30F
- clearflag 918
+ clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER
return
BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
- setflag 918
+ setflag FLAG_HIDE_REPORTER_BATTLE_TOWER
return
.include "data/scripts/gabby_and_ty.inc"