diff options
| author | garak <garakmon@gmail.com> | 2018-10-17 22:07:23 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-17 22:07:23 -0400 |
| commit | d1b7f32b0ae88e3f2c4d9ed03513cbd30f8f4a74 (patch) | |
| tree | 71524c7f2409f54816a9a6cbbaa2c409e5c3724e /data/scripts | |
| parent | 7d88b9647f92d099177fc734f32e94fc472f2cbf (diff) | |
begin event flag names, add temporary hidden item macro
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/apprentice.inc | 2 | ||||
| -rw-r--r-- | data/scripts/cable_club.inc | 4 | ||||
| -rw-r--r-- | data/scripts/pokeblocks.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index a644008d0..bbb7662ba 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: end Script_Apprentice_SetLeavingFlags: - setflag FLAG_0x2BD + setflag FLAG_HIDE_APPRENTICE setflag FLAG_0x934 return diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index ce3dea170..3408eb2a8 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -29,11 +29,11 @@ OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 end OldaleTown_PokemonCenter_2F_EventScript_276AFB:: @ 8276AFB - clearflag FLAG_0x2BE + clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return OldaleTown_PokemonCenter_2F_EventScript_276AFF:: @ 8276AFF - setflag FLAG_0x2BE + setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return BattleFrontier_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 3187c95f4..e77db6b00 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4 EventScript_Pblock1_Ask:: @ 8293C3E lockall - checkflag FLAG_0x340 + checkflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB setvar VAR_0x8009, 1 applymovement 16, LilycoveCity_ContestLobby_Movement_294053 |