diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
| commit | 31ded7cc6f40876421c7186e15f8a9fa606ff569 (patch) | |
| tree | 831d96edb6d2b4d239affc57ef98d6ccb2f1bccb /data/scripts/safari_zone.inc | |
| parent | 2e789dbbdc18f56cba62aef51156d44136b20632 (diff) | |
| parent | 8e1537fb57dc7ed17079b30f7a3851132cf462bd (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'data/scripts/safari_zone.inc')
| -rw-r--r-- | data/scripts/safari_zone.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 1fcf5d166..3539e0970 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,11 +1,11 @@ EventScript_2A4B4C:: @ 82A4B4C - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_2A4B5D:: @ 82A4B5D - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate |