diff options
| author | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
| commit | 89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch) | |
| tree | f5387471637b5e9e62fa5b6a0614a935b2921118 /data/scripts/maps/Route101.inc | |
| parent | 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff) | |
| parent | 3c5f725de49371aced1788a21f5e53df5b498b5f (diff) | |
Merge branch 'master' into decompile_data
Diffstat (limited to 'data/scripts/maps/Route101.inc')
| -rw-r--r-- | data/scripts/maps/Route101.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 747b56197..1810a6495 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,8 +217,8 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag 2048 - setflag 82 + setflag FLAG_SYS_POKEMON_GET + setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 setobjectxy 255, 6, 13 @@ -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 |