diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /data/scripts/safari_zone.inc | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/safari_zone.inc')
| -rw-r--r-- | data/scripts/safari_zone.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index a052c90cc..c2d217f93 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -14,7 +14,7 @@ EventScript_2A4B5D:: @ 82A4B5D EventScript_2A4B6F:: @ 82A4B6F lockall msgbox Text_2A4BF4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_2A4B85 releaseall end @@ -43,19 +43,19 @@ EventScript_2A4B9B:: @ 82A4B9B EventScript_2A4BAC:: @ 82A4BAC lockall special GetPokeblockFeederInFront - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, EventScript_2A4BEB msgbox Text_2A4C90, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_2A4BD0 releaseall end EventScript_2A4BD0:: @ 82A4BD0 fadescreen 1 - special sub_8135908 + special OpenPokeblockCaseOnFeeder waitstate - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, EventScript_2A4BE2 end |