diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-04 20:48:25 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-04 20:48:25 -0800 |
| commit | 8dd25bcad09064f0b3314a71a62ad22f91b42bb3 (patch) | |
| tree | c7fa60393880ab1745f9422631fb6d55b68eb9a2 /data/scripts/maps | |
| parent | 861bd9292da04e083214f493ac064596fec397b9 (diff) | |
Start using constants for hide-show flags
Diffstat (limited to 'data/scripts/maps')
| -rw-r--r-- | data/scripts/maps/InsideOfTruck.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/LilycoveCity.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/PetalburgCity_Gym.inc | 6 | ||||
| -rw-r--r-- | data/scripts/maps/Route101.inc | 6 | ||||
| -rw-r--r-- | data/scripts/maps/RustboroCity.inc | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 737bacf71..036523bf1 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -41,7 +41,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 setflag 758 setflag 761 setflag 785 - setflag 722 + setflag FLAG_HIDE_MAY_UPSTAIRS setvar 0x4082, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 7ffffad78..b8c6b26f5 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -355,7 +355,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 call_if 1, LilycoveCity_EventScript_14CEEE compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 - clearflag 722 + clearflag FLAG_HIDE_MAY_UPSTAIRS clearflag 849 goto LilycoveCity_EventScript_14CF6B end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 19addd4b4..47601a964 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -86,7 +86,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C waitmovement 0 playse 9 removeobject 10 - setflag 726 + setflag FLAG_HIDE_WALLY_PETALBURG delay 30 applymovement 255, PetalburgCity_Gym_Movement_1A0841 waitmovement 0 @@ -205,10 +205,10 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 - setflag 728 + setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 setvar 0x4085, 1 setvar 0x4057, 2 - clearflag 726 + clearflag FLAG_HIDE_WALLY_PETALBURG clearflag 866 setflag 889 special InitBirchState diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 122e723a1..c9a364c80 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -230,9 +230,9 @@ Route101_EventScript_14EA7F:: @ 814EA7F waitmovement 0 msgbox Route101_Text_16D191, 4 special ScrSpecial_HealPlayerParty - setflag 720 - clearflag 721 - setflag 700 + setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + clearflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 8708bde71..358a946a6 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -178,7 +178,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 waitmovement 0 removeobject 9 setobjectxyperm 9, 30, 10 - clearflag 732 + clearflag FLAG_HIDE_DEVON_RUSTBORO setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 @@ -474,7 +474,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D msgbox RustboroCity_Text_16707F, 4 closemessage setflag FLAG_RETURNED_DEVON_GOODS - setflag 732 + setflag FLAG_HIDE_DEVON_RUSTBORO setvar 0x405a, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 |