diff options
author | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
commit | 0f5b0005676cd3db623eb557f86cf92b1e020827 (patch) | |
tree | 257857a4bed89a1d9410a9945efd63a76ea16582 /data-de/field_move_scripts.inc | |
parent | 28e98d9df7db41f9dcc813ad4e0b37c568833aee (diff) | |
parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) |
Merge branch 'master' into decompile_easy_chat
Diffstat (limited to 'data-de/field_move_scripts.inc')
-rw-r--r-- | data-de/field_move_scripts.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 2b86dc4dc..edecb0312 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 removeobject LAST_TALKED - specialvar RESULT, sub_810F5BC + specialvar RESULT, TryUpdateRusturfTunnelState compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter |