diff options
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/contest_hall.inc | 4 | ||||
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 40 | ||||
| -rw-r--r-- | data/scripts/players_house.inc | 4 | ||||
| -rw-r--r-- | data/scripts/pokeblocks.inc | 2 | ||||
| -rw-r--r-- | data/scripts/secret_power_tm.inc | 2 |
7 files changed, 29 insertions, 29 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/contest_hall.inc b/data/scripts/contest_hall.inc index d89c78f18..afd2ca851 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1086,7 +1086,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq LinkContestRoom1_EventScript_27AB82 lockall msgbox LinkContestRoom1_Text_27BBA8, 4 @@ -1127,7 +1127,7 @@ LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE compare VAR_CONTEST_RANK, 3 goto_eq LinkContestRoom1_EventScript_27ABCD - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 5a03a0e98..0ca624572 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -72,67 +72,67 @@ Route111_EventScript_28CD8B:: @ 828CD8B return Route111_EventScript_28CD96:: @ 828CD96 - setflag FLAG_0x31C + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 return Route111_EventScript_28CD9A:: @ 828CD9A - clearflag FLAG_0x31C + clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 return Route111_EventScript_28CD9E:: @ 828CD9E - setflag FLAG_0x31D + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 return Route111_EventScript_28CDA2:: @ 828CDA2 - clearflag FLAG_0x31D + clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 return Route111_EventScript_28CDA6:: @ 828CDA6 - setflag FLAG_0x31E + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 return Route111_EventScript_28CDAA:: @ 828CDAA - clearflag FLAG_0x31E + clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 return Route111_EventScript_28CDAE:: @ 828CDAE - setflag FLAG_0x31F + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 return Route111_EventScript_28CDB2:: @ 828CDB2 - clearflag FLAG_0x31F + clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 return Route111_EventScript_28CDB6:: @ 828CDB6 - setflag FLAG_0x385 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 return Route111_EventScript_28CDBA:: @ 828CDBA - clearflag FLAG_0x385 + clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 return Route111_EventScript_28CDBE:: @ 828CDBE - setflag FLAG_0x386 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 return Route111_EventScript_28CDC2:: @ 828CDC2 - clearflag FLAG_0x386 + clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 return Route111_EventScript_28CDC6:: @ 828CDC6 - setflag FLAG_0x387 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 return Route111_EventScript_28CDCA:: @ 828CDCA - clearflag FLAG_0x387 + clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 return Route111_EventScript_28CDCE:: @ 828CDCE - setflag FLAG_0x388 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 return Route111_EventScript_28CDD2:: @ 828CDD2 - clearflag FLAG_0x388 + clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 return Route111_EventScript_28CDD6:: @ 828CDD6 @@ -220,7 +220,7 @@ Route111_EventScript_28CF56:: @ 828CF56 call_if 1, Route111_EventScript_28CF9F compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq Route111_EventScript_28D0EE msgbox Route111_Text_28B042, 5 goto Route111_EventScript_28D0A7 @@ -254,7 +254,7 @@ Route120_EventScript_28CFC3:: @ 828CFC3 call_if 1, Route111_EventScript_28CF9F compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 @@ -323,13 +323,13 @@ Route111_EventScript_28D0A7:: @ 828D0A7 goto_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B4AB, 4 special GabbyAndTyAfterInterview - setflag FLAG_0x001 + setflag FLAG_TEMP_1 release end Route111_EventScript_28D0E1:: @ 828D0E1 msgbox Route111_Text_28B577, 4 - setflag FLAG_0x001 + setflag FLAG_TEMP_1 release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 734831f7f..9ae77ccf8 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -66,8 +66,8 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 delay 30 setvar VAR_0x4092, 6 setflag FLAG_0x051 - setflag FLAG_0x2F2 - setflag FLAG_0x2F3 + setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 + setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender compare VAR_RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF 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 diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 33e7f2e5b..27fe53a4c 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -50,7 +50,7 @@ Route111_EventScript_27661E:: @ 827661E msgbox Route111_Text_27636E, 4 closemessage setflag FLAG_0x060 - clearflag FLAG_0x3B4 + clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN compare VAR_FACING, 3 call_if 1, Route111_EventScript_27666A compare VAR_FACING, 4 |