diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-01 19:48:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-01 19:52:40 -0400 |
| commit | 0685dd4920c64eae6bcfbc9f201854b4da91bfab (patch) | |
| tree | f759feaf819167d436ab4fde480eca35ba591b04 /data/scripts/safari_zone.inc | |
| parent | d0fbed6ad50c34593002c2b540c4e3e7f4c5cd16 (diff) | |
| parent | 50dc4f429d4aa68e0365adc71d17e43a0dd7b843 (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'data/scripts/safari_zone.inc')
| -rw-r--r-- | data/scripts/safari_zone.inc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 03293115b..d0283f072 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,7 +1,7 @@ gUnknown_081C340A:: @ 81C340A setvar 0x40a4, 1 special ExitSafariMode - warp3 Route121_SafariZoneEntrance, 255, 2, 5 + setwarp Route121_SafariZoneEntrance, 255, 2, 5 end EventScript_1C341B: @ 81C341B @@ -15,39 +15,39 @@ gUnknown_081C342D:: @ 81C342D lockall msgbox UnknownString_81C34B2, 5 compare RESULT, 1 - jumpeq EventScript_1C3443 + goto_if_eq EventScript_1C3443 releaseall end EventScript_1C3443: - jump EventScript_1C341B + goto EventScript_1C341B gUnknown_081C3448:: @ 81C3448 lockall - playsfx 73 + playse 73 message UnknownString_81C34E4 - waittext + waitmessage waitbutton releaseall - jump EventScript_1C341B + goto EventScript_1C341B gUnknown_081C3459:: @ 81C3459 lockall - playsfx 73 + playse 73 message UnknownString_81C3514 - waittext + waitmessage waitbutton releaseall - jump EventScript_1C341B + goto EventScript_1C341B gUnknown_081C346A:: @ 81C346A lockall special SafariZoneGetPokeblockNameInFeeder - compare RESULT, -1 - jumpif 5, EventScript_1C34A9 + compare RESULT, 0xFFFF + goto_if 5, EventScript_1C34A9 msgbox UnknownString_81C354E, 5 compare RESULT, 1 - jumpeq EventScript_1C348E + goto_if_eq EventScript_1C348E releaseall end @@ -55,20 +55,20 @@ EventScript_1C348E: fadescreen 1 special sub_810BAF4 waitstate - compare RESULT, -1 - jumpif 5, EventScript_1C34A0 + compare RESULT, 0xFFFF + goto_if 5, EventScript_1C34A0 end EventScript_1C34A0: message UnknownString_81C35A9 - waittext + waitmessage waitbutton releaseall end EventScript_1C34A9: message UnknownString_81C3583 - waittext + waitmessage waitbutton releaseall end |