From ff97873c309e28beec91efe11393c093a08b19d3 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 12:25:12 -0400 Subject: label temp flags, test replace script --- data/event_scripts.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index dc308f8b1..68c6d9baf 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5680,7 +5680,7 @@ SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 lock faceplayer - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 setvar VAR_0x8005, 6 special InterviewBefore @@ -5726,7 +5726,7 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 msgbox LilycoveCity_ContestLobby_Text_27F0EC, 4 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 setvar VAR_0x8005, 6 goto LilycoveCity_ContestLobby_EventScript_28C7E9 end @@ -5762,7 +5762,7 @@ LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 lock faceplayer - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A setvar VAR_0x8005, 7 special InterviewBefore @@ -5814,7 +5814,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, 4 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 copyvar VAR_0x8004, VAR_0x8008 setvar VAR_0x8005, 7 goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 -- cgit v1.2.3 From d1b7f32b0ae88e3f2c4d9ed03513cbd30f8f4a74 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 22:07:23 -0400 Subject: begin event flag names, add temporary hidden item macro --- data/event_scripts.s | 84 ++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index ab1a6fe82..d9dc8e969 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1089,19 +1089,19 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x2E3 setflag FLAG_0x371 setflag FLAG_0x2E2 - setflag FLAG_0x2E4 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_0x2E5 - setflag FLAG_0x2E7 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_0x2E8 setflag FLAG_0x38A setflag FLAG_0x345 - setflag FLAG_0x306 - setflag FLAG_0x37F - setflag FLAG_0x308 - setflag FLAG_0x309 - setflag FLAG_0x30A - setflag FLAG_0x30B - setflag FLAG_0x30C + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS setflag FLAG_0x30D setflag FLAG_0x338 setflag FLAG_0x2E9 @@ -1115,7 +1115,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_FANCLUB_BOY setflag FLAG_HIDE_FANCLUB_LITTLE_BOY setflag FLAG_HIDE_FANCLUB_LADY - setflag FLAG_0x2DA + setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER setflag FLAG_0x31D setflag FLAG_0x31E setflag FLAG_0x31F @@ -1124,7 +1124,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x387 setflag FLAG_0x388 setflag FLAG_0x323 - setflag FLAG_0x322 + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER setflag FLAG_0x326 setflag FLAG_0x328 setflag FLAG_0x329 @@ -1142,7 +1142,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x34D setflag FLAG_0x34E setflag FLAG_0x35C - setflag FLAG_0x35D + setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL setflag FLAG_0x343 setflag FLAG_0x348 setflag FLAG_0x350 @@ -1164,7 +1164,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x374 setflag FLAG_0x375 setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION - setflag FLAG_0x378 + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT setflag FLAG_0x2F0 setflag FLAG_0x2F5 setflag FLAG_0x31A @@ -1173,26 +1173,26 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x380 setflag FLAG_0x381 setflag FLAG_0x382 - setflag FLAG_0x38D - setflag FLAG_0x2EC + setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR + setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER setflag FLAG_0x38E setflag FLAG_0x38F setflag FLAG_0x393 setflag FLAG_0x358 setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON setflag FLAG_0x2FD - setflag FLAG_0x398 - setflag FLAG_0x399 + setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL + setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH setflag FLAG_0x39A setflag FLAG_0x39B setflag FLAG_0x2CF - setflag FLAG_0x39D - setflag FLAG_0x3A1 - setflag FLAG_0x3A2 + setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 setflag FLAG_0x3A6 setflag FLAG_0x3AA - setflag FLAG_0x3AC - setflag FLAG_0x3A0 + setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN + setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO setflag FLAG_0x3E0 setflag FLAG_0x342 setflag FLAG_0x3B0 @@ -1217,16 +1217,16 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x33B setflag FLAG_0x36C setflag FLAG_0x36B - setflag FLAG_0x36A + setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL setflag FLAG_0x337 setflag FLAG_0x2F4 setflag FLAG_0x35E setflag FLAG_0x35F - setflag FLAG_0x340 - setflag FLAG_0x2FB + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + setflag FLAG_HIDE_DEOXYS setflag FLAG_0x2EB - setflag FLAG_0x2FF - setflag FLAG_0x319 + setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT setflag FLAG_0x357 setflag FLAG_0x050 call EventScript_27149D @@ -1238,7 +1238,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 call EverGrandeCity_HallOfFame_EventScript_271829 compare VAR_0x40CC, 0 call_if 1, EverGrandeCity_HallOfFame_EventScript_271839 - clearflag FLAG_0x39D + clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS call EverGrandeCity_HallOfFame_EventScript_2718CC setflag FLAG_0x365 clearflag FLAG_0x3B6 @@ -1247,10 +1247,10 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 setflag FLAG_0x35A clearflag FLAG_0x2EF clearflag FLAG_0x35C - clearflag FLAG_0x35D + clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL setflag FLAG_0x2CD clearflag FLAG_0x2EB - setflag FLAG_0x3CB + setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL special sub_813BA60 checkflag FLAG_0x123 call_if 0, EverGrandeCity_HallOfFame_EventScript_271843 @@ -1303,8 +1303,8 @@ EventScript_271862:: @ 8271862 end EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 - setflag FLAG_0x2E4 - setflag FLAG_0x2E7 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_0x2E5 setflag FLAG_0x2E8 clearflag FLAG_0x2E6 @@ -1319,8 +1319,8 @@ EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A setflag FLAG_0x2E6 setflag FLAG_0x2E3 setflag FLAG_0x371 - clearflag FLAG_0x2E4 - clearflag FLAG_0x2E7 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN end EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3 @@ -1328,8 +1328,8 @@ EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3 setflag FLAG_0x2E6 setflag FLAG_0x2E3 setflag FLAG_0x371 - setflag FLAG_0x2E4 - setflag FLAG_0x2E7 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN clearflag FLAG_0x2E5 clearflag FLAG_0x2E8 end @@ -1357,7 +1357,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E checkflag FLAG_0x2E6 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C - checkflag FLAG_0x2E4 + checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912 checkflag FLAG_0x2E5 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918 @@ -2341,8 +2341,8 @@ SlateportCity_Harbor_Movement_2721F0: @ 82721F0 step_end PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 - setflag FLAG_0x2E4 - setflag FLAG_0x2E7 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_0x2E5 setflag FLAG_0x2E8 setflag FLAG_0x2E2 @@ -5753,7 +5753,7 @@ LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B end LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 - clearflag FLAG_0x322 + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER return LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 @@ -5837,11 +5837,11 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 special InterviewBefore compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 - clearflag FLAG_0x396 + clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER return BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 - setflag FLAG_0x396 + setflag FLAG_HIDE_BATTLE_TOWER_REPORTER return .include "data/scripts/gabby_and_ty.inc" -- cgit v1.2.3 From c27043bd3cf51d00b846d5ed38d8bf7c079992bc Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Oct 2018 15:28:59 -0400 Subject: more event flags --- data/event_scripts.s | 188 +++++++++++++++++++++++++-------------------------- 1 file changed, 94 insertions(+), 94 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index d9dc8e969..27cd4354a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1070,22 +1070,22 @@ EventScript_27149D:: @ 827149D return EventScript_2715DE:: @ 82715DE - setflag FLAG_0x056 + setflag FLAG_LINK_CONTEST_POKE_BALL setflag FLAG_0x301 setflag FLAG_0x302 setflag FLAG_0x303 - setflag FLAG_0x2D1 - setflag FLAG_0x379 - setflag FLAG_0x32B - setflag FLAG_0x32C - setflag FLAG_0x346 - setflag FLAG_0x2D6 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA + setflag FLAG_HIDE_PETALBURG_CITY_WALLY setflag FLAG_0x363 - setflag FLAG_0x2DB - setflag FLAG_0x2DC - setflag FLAG_0x32E - setflag FLAG_0x34C - setflag FLAG_0x364 + setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT + setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 + setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST + setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN setflag FLAG_0x2E3 setflag FLAG_0x371 setflag FLAG_0x2E2 @@ -1102,15 +1102,15 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - setflag FLAG_0x30D - setflag FLAG_0x338 - setflag FLAG_0x2E9 - setflag FLAG_0x2EA - setflag FLAG_0x2F8 - setflag FLAG_0x2D2 - setflag FLAG_0x2DE - setflag FLAG_0x351 - setflag FLAG_0x32F + setflag FLAG_HIDE_PETALBURG_GYM_GREETER + setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_PLAYERS_HOUSE_DAD + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL setflag FLAG_HIDE_FANCLUB_OLD_LADY setflag FLAG_HIDE_FANCLUB_BOY setflag FLAG_HIDE_FANCLUB_LITTLE_BOY @@ -1130,45 +1130,45 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x329 setflag FLAG_0x3D8 setflag FLAG_0x2FE - setflag FLAG_0x33E - setflag FLAG_0x362 + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + setflag FLAG_HIDE_PETALBURG_GYM_WALLY setflag FLAG_0x365 - setflag FLAG_0x33C - setflag FLAG_0x33D - setflag FLAG_0x33F - setflag FLAG_0x35B - setflag FLAG_0x355 - setflag FLAG_0x349 - setflag FLAG_0x34D - setflag FLAG_0x34E - setflag FLAG_0x35C + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 + setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - setflag FLAG_0x343 - setflag FLAG_0x348 - setflag FLAG_0x350 + setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY + setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW setflag FLAG_0x353 setflag FLAG_0x312 setflag FLAG_0x3CD setflag FLAG_0x330 setflag FLAG_0x366 setflag FLAG_0x368 - setflag FLAG_0x36D - setflag FLAG_0x3E2 - setflag FLAG_0x36F + setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS + setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY + setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN setflag FLAG_0x37B - setflag FLAG_0x370 - setflag FLAG_0x36E - setflag FLAG_0x327 - setflag FLAG_0x3D7 + setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO + setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN setflag FLAG_0x376 setflag FLAG_0x374 setflag FLAG_0x375 setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT - setflag FLAG_0x2F0 - setflag FLAG_0x2F5 - setflag FLAG_0x31A - setflag FLAG_0x31B + setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE + setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_0x37C setflag FLAG_0x380 setflag FLAG_0x381 @@ -1178,9 +1178,9 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x38E setflag FLAG_0x38F setflag FLAG_0x393 - setflag FLAG_0x358 - setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON - setflag FLAG_0x2FD + setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE + setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON + setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH setflag FLAG_0x39A @@ -1189,8 +1189,8 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 - setflag FLAG_0x3A6 - setflag FLAG_0x3AA + setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL + setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO setflag FLAG_0x3E0 @@ -1198,17 +1198,17 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x3B0 setflag FLAG_0x3B1 setflag FLAG_0x3B3 - setflag FLAG_0x3B4 - setflag FLAG_0x2ED + setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN + setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT setflag FLAG_0x35A setflag FLAG_0x2EF setflag FLAG_0x3B6 - setflag FLAG_0x3C7 - setflag FLAG_0x3C8 - setflag FLAG_0x2D7 - setflag FLAG_0x3D3 + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setflag FLAG_HIDE_OLDALE_TOWN_RIVAL setflag FLAG_0x3DF - setflag FLAG_0x3E3 + setflag FLAG_HIDE_PETALBURG_CITY_SCOTT setflag FLAG_0x3E4 setflag FLAG_0x3E5 setflag FLAG_0x3E6 @@ -1218,17 +1218,17 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x36C setflag FLAG_0x36B setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - setflag FLAG_0x337 - setflag FLAG_0x2F4 - setflag FLAG_0x35E - setflag FLAG_0x35F + setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS setflag FLAG_HIDE_DEOXYS - setflag FLAG_0x2EB + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT - setflag FLAG_0x357 - setflag FLAG_0x050 + setflag FLAG_HIDE_SKY_PILLAR_WALLACE + setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT call EventScript_27149D end @@ -1242,22 +1242,22 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 call EverGrandeCity_HallOfFame_EventScript_2718CC setflag FLAG_0x365 clearflag FLAG_0x3B6 - clearflag FLAG_0x2D7 + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY setvar VAR_0x40C6, 2 setflag FLAG_0x35A clearflag FLAG_0x2EF - clearflag FLAG_0x35C + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - setflag FLAG_0x2CD - clearflag FLAG_0x2EB + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS + clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL special sub_813BA60 checkflag FLAG_0x123 call_if 0, EverGrandeCity_HallOfFame_EventScript_271843 checkflag FLAG_0x12A call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F - setflag FLAG_0x2F8 - setflag FLAG_0x2D2 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM compare VAR_0x40D3, 0 call_if 1, EverGrandeCity_HallOfFame_EventScript_271851 return @@ -1275,13 +1275,13 @@ EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839 return EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F - clearflag FLAG_0x3C8 + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL return EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 setvar VAR_0x4082, 3 setvar VAR_0x408C, 3 - clearflag FLAG_0x2DE + clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 @@ -1884,7 +1884,7 @@ DewfordTown_Gym_EventScript_271E84:: @ 8271E84 LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84 MauvilleCity_Gym_EventScript_271E84:: @ 8271E84 RustboroCity_Gym_EventScript_271E84:: @ 8271E84 - clearflag FLAG_0x30D + clearflag FLAG_HIDE_PETALBURG_GYM_GREETER setflag FLAG_0x128 return @@ -2250,7 +2250,7 @@ Route103_EventScript_2720AD:: @ 82720AD return Route101_EventScript_27211A:: @ 827211A - clearflag FLAG_0x2D1 + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH clearflag FLAG_0x380 setflag FLAG_0x381 setflag FLAG_0x382 @@ -2258,7 +2258,7 @@ Route101_EventScript_27211A:: @ 827211A Route101_EventScript_272127:: @ 8272127 clearflag FLAG_0x381 - setflag FLAG_0x2D1 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_0x380 setflag FLAG_0x382 return @@ -2266,7 +2266,7 @@ Route101_EventScript_272127:: @ 8272127 Route101_EventScript_272134:: @ 8272134 clearflag FLAG_0x382 setflag FLAG_0x381 - setflag FLAG_0x2D1 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_0x380 return @@ -4536,7 +4536,7 @@ EventScript_275B5B:: @ 8275B5B closemessage playse SE_KAIDAN setvar VAR_0x4097, 0 - setflag FLAG_0x0AD + setflag FLAG_DECORATION_0 special sub_80E8E18 special sub_80E9068 setvar VAR_0x8004, 0 @@ -4577,14 +4577,14 @@ EventScript_275BB7:: @ 8275BB7 special sub_80E9744 compare VAR_RESULT, 0 goto_eq EventScript_275BDB - clearflag FLAG_0x0AD + clearflag FLAG_DECORATION_0 special sub_80E9068 setvar VAR_0x4089, 0 waitstate end EventScript_275BDB:: @ 8275BDB - setflag FLAG_0x0AD + setflag FLAG_DECORATION_0 special sub_80E9068 setvar VAR_0x4089, 0 waitstate @@ -4655,20 +4655,20 @@ EventScript_275CDE:: @ 8275CDE LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 - setflag FLAG_0x0AE - setflag FLAG_0x0AF - setflag FLAG_0x0B0 - setflag FLAG_0x0B1 - setflag FLAG_0x0B2 - setflag FLAG_0x0B3 - setflag FLAG_0x0B4 - setflag FLAG_0x0B5 - setflag FLAG_0x0B6 - setflag FLAG_0x0B7 - setflag FLAG_0x0B8 - setflag FLAG_0x0B9 - setflag FLAG_0x0BA - setflag FLAG_0x0BB + setflag FLAG_DECORATION_1 + setflag FLAG_DECORATION_2 + setflag FLAG_DECORATION_3 + setflag FLAG_DECORATION_4 + setflag FLAG_DECORATION_5 + setflag FLAG_DECORATION_6 + setflag FLAG_DECORATION_7 + setflag FLAG_DECORATION_8 + setflag FLAG_DECORATION_9 + setflag FLAG_DECORATION_10 + setflag FLAG_DECORATION_11 + setflag FLAG_DECORATION_12 + setflag FLAG_DECORATION_13 + setflag FLAG_DECORATION_14 return EventScript_275D0C:: @ 8275D0C -- cgit v1.2.3 From cb5981cdf26f7681f1d67ac3c63e1605b4311c8a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 18 Oct 2018 21:32:21 -0400 Subject: name more event flags --- data/event_scripts.s | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 27cd4354a..e0494d6ea 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1125,14 +1125,14 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x388 setflag FLAG_0x323 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - setflag FLAG_0x326 - setflag FLAG_0x328 - setflag FLAG_0x329 - setflag FLAG_0x3D8 - setflag FLAG_0x2FE + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN + setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE setflag FLAG_HIDE_PETALBURG_GYM_WALLY - setflag FLAG_0x365 + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS @@ -1148,8 +1148,8 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW setflag FLAG_0x353 setflag FLAG_0x312 - setflag FLAG_0x3CD - setflag FLAG_0x330 + setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN + setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE setflag FLAG_0x366 setflag FLAG_0x368 setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS @@ -1160,9 +1160,9 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN - setflag FLAG_0x376 - setflag FLAG_0x374 - setflag FLAG_0x375 + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE @@ -1175,8 +1175,8 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x382 setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER - setflag FLAG_0x38E - setflag FLAG_0x38F + setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE + setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON setflag FLAG_0x393 setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON @@ -1200,21 +1200,21 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x3B3 setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT - setflag FLAG_0x35A - setflag FLAG_0x2EF - setflag FLAG_0x3B6 + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY setflag FLAG_HIDE_OLDALE_TOWN_RIVAL setflag FLAG_0x3DF setflag FLAG_HIDE_PETALBURG_CITY_SCOTT - setflag FLAG_0x3E4 - setflag FLAG_0x3E5 - setflag FLAG_0x3E6 - setflag FLAG_0x356 - setflag FLAG_0x33A - setflag FLAG_0x33B + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA + setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE setflag FLAG_0x36C setflag FLAG_0x36B setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL @@ -1240,12 +1240,12 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 call_if 1, EverGrandeCity_HallOfFame_EventScript_271839 clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS call EverGrandeCity_HallOfFame_EventScript_2718CC - setflag FLAG_0x365 - clearflag FLAG_0x3B6 + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY setvar VAR_0x40C6, 2 - setflag FLAG_0x35A - clearflag FLAG_0x2EF + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS @@ -2355,8 +2355,8 @@ PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 RusturfTunnel_EventScript_272216:: @ 8272216 removeobject 1 removeobject 10 - clearflag FLAG_0x328 - clearflag FLAG_0x3D8 + clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN setvar VAR_RUSTURF_TUNNEL_STATE, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED return -- cgit v1.2.3 From 1441ee6bc3731387f7a3cb31f0058d81a38a8db5 Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 13:04:47 -0400 Subject: finish event object flags --- data/event_scripts.s | 136 +++++++++++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index e0494d6ea..3ac08769d 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1071,9 +1071,9 @@ EventScript_27149D:: @ 827149D EventScript_2715DE:: @ 82715DE setflag FLAG_LINK_CONTEST_POKE_BALL - setflag FLAG_0x301 - setflag FLAG_0x302 - setflag FLAG_0x303 + setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL @@ -1086,15 +1086,15 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN - setflag FLAG_0x2E3 - setflag FLAG_0x371 - setflag FLAG_0x2E2 + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - setflag FLAG_0x2E5 + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - setflag FLAG_0x2E8 - setflag FLAG_0x38A - setflag FLAG_0x345 + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST + setflag FLAG_HIDE_ROUTE_110_BIRCH setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 @@ -1116,13 +1116,13 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_FANCLUB_LITTLE_BOY setflag FLAG_HIDE_FANCLUB_LADY setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER - setflag FLAG_0x31D - setflag FLAG_0x31E - setflag FLAG_0x31F - setflag FLAG_0x385 - setflag FLAG_0x386 - setflag FLAG_0x387 - setflag FLAG_0x388 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 setflag FLAG_0x323 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY @@ -1146,16 +1146,16 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW - setflag FLAG_0x353 - setflag FLAG_0x312 + setflag FLAG_HIDE_ROUTE_119_RIVAL + setflag FLAG_HIDE_ROUTE_119_SCOTT setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - setflag FLAG_0x366 - setflag FLAG_0x368 + setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE + setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN - setflag FLAG_0x37B + setflag FLAG_HIDE_ROUTE_116_MR_BRINEY setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN @@ -1163,16 +1163,16 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 - setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION + setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH - setflag FLAG_0x37C + setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS setflag FLAG_0x380 - setflag FLAG_0x381 - setflag FLAG_0x382 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE @@ -1183,9 +1183,9 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH - setflag FLAG_0x39A - setflag FLAG_0x39B - setflag FLAG_0x2CF + setflag FLAG_HIDE_ROUTE_110_RIVAL_2 + setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE + setflag FLAG_HIDE_ROUTE_104_RIVAL setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 @@ -1193,11 +1193,11 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO - setflag FLAG_0x3E0 - setflag FLAG_0x342 - setflag FLAG_0x3B0 - setflag FLAG_0x3B1 - setflag FLAG_0x3B3 + setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M + setflag FLAG_HIDE_ROUTE_128_STEVEN + setflag FLAG_HIDE_ROUTE_128_ARCHIE + setflag FLAG_HIDE_ROUTE_128_MAXIE + setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY @@ -1207,7 +1207,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY setflag FLAG_HIDE_OLDALE_TOWN_RIVAL - setflag FLAG_0x3DF + setflag FLAG_HIDE_ROUTE_101_BOY setflag FLAG_HIDE_PETALBURG_CITY_SCOTT setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE @@ -1215,8 +1215,8 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE - setflag FLAG_0x36C - setflag FLAG_0x36B + setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL + setflag FLAG_HIDE_ROUTE_111_DESERT_RIVAL setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA @@ -1305,33 +1305,33 @@ EventScript_271862:: @ 8271862 EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - setflag FLAG_0x2E5 - setflag FLAG_0x2E8 - clearflag FLAG_0x2E6 - clearflag FLAG_0x2E3 - clearflag FLAG_0x371 + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO end EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A - setflag FLAG_0x2E5 - setflag FLAG_0x2E8 - setflag FLAG_0x2E2 - setflag FLAG_0x2E6 - setflag FLAG_0x2E3 - setflag FLAG_0x371 + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN end EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3 - setflag FLAG_0x2E2 - setflag FLAG_0x2E6 - setflag FLAG_0x2E3 - setflag FLAG_0x371 + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - clearflag FLAG_0x2E5 - clearflag FLAG_0x2E8 + clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY + clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT end EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC @@ -1355,11 +1355,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27374E checkflag FLAG_0x4F4 goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E - checkflag FLAG_0x2E6 + checkflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912 - checkflag FLAG_0x2E5 + checkflag FLAG_HIDE_ROUTE_108_MR_BRINEY goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918 return @@ -2252,20 +2252,20 @@ Route103_EventScript_2720AD:: @ 82720AD Route101_EventScript_27211A:: @ 827211A clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH clearflag FLAG_0x380 - setflag FLAG_0x381 - setflag FLAG_0x382 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH return Route101_EventScript_272127:: @ 8272127 - clearflag FLAG_0x381 + clearflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_0x380 - setflag FLAG_0x382 + setflag FLAG_HIDE_ROUTE_103_BIRCH return Route101_EventScript_272134:: @ 8272134 - clearflag FLAG_0x382 - setflag FLAG_0x381 + clearflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_0x380 return @@ -2343,12 +2343,12 @@ SlateportCity_Harbor_Movement_2721F0: @ 82721F0 PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - setflag FLAG_0x2E5 - setflag FLAG_0x2E8 - setflag FLAG_0x2E2 - setflag FLAG_0x2E6 - setflag FLAG_0x2E3 - setflag FLAG_0x371 + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_0x4096, 0 return -- cgit v1.2.3 From 113a8d1efd45ed387a0ede7b7aa8744b622c662f Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 14:59:18 -0400 Subject: clean flags and remove temp macro --- data/event_scripts.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 3ac08769d..46ba34db5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1080,7 +1080,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA setflag FLAG_HIDE_PETALBURG_CITY_WALLY - setflag FLAG_0x363 + setflag FLAG_UNKNOWN_0x363 setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL @@ -1123,7 +1123,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - setflag FLAG_0x323 + setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN @@ -1170,7 +1170,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - setflag FLAG_0x380 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR @@ -2251,7 +2251,7 @@ Route103_EventScript_2720AD:: @ 82720AD Route101_EventScript_27211A:: @ 827211A clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - clearflag FLAG_0x380 + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_ROUTE_103_BIRCH return @@ -2259,7 +2259,7 @@ Route101_EventScript_27211A:: @ 827211A Route101_EventScript_272127:: @ 8272127 clearflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_0x380 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_ROUTE_103_BIRCH return @@ -2267,7 +2267,7 @@ Route101_EventScript_272134:: @ 8272134 clearflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_0x380 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 return LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 -- cgit v1.2.3