diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
| commit | eff6795887cc27f2c5139df9a6da70f4f02338b4 (patch) | |
| tree | f91be2b0b7194b4ddff13f4935a0edafc4284a43 /data/scripts/safari_zone.inc | |
| parent | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff) | |
| parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) | |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'data/scripts/safari_zone.inc')
| -rw-r--r-- | data/scripts/safari_zone.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 892630ac8..5dba65b8a 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,11 +1,11 @@ gUnknown_081C340A:: @ 81C340A - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_1C341B: @ 81C341B - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate @@ -53,7 +53,7 @@ gUnknown_081C346A:: @ 81C346A EventScript_1C348E: fadescreen 1 - special sub_810BAF4 + special OpenPokeblockCaseOnFeeder waitstate compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A0 |