diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:05:51 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:05:51 -0500 |
commit | cbd2718b5e06afeaa86b2deb2ce740006d9ee389 (patch) | |
tree | 926885f4baa5671703707af2d76f65dc967167d8 /data/scripts/field_move_scripts.inc | |
parent | 73b0f9eb5358b839bfa5f3d1b4c4163fe893d428 (diff) | |
parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/field_move_scripts.inc')
-rw-r--r-- | data/scripts/field_move_scripts.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index fd2ff3b01..76f2aac6b 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -116,7 +116,7 @@ Route111_EventScript_2907FB:: @ 82907FB specialvar VAR_RESULT, sub_81393FC compare_var_to_value VAR_RESULT, 1 goto_eq Route111_EventScript_290829 - special rock_smash_wild_pokemon_encounter + special RockSmashWildEncounter compare_var_to_value VAR_RESULT, 0 goto_eq Route111_EventScript_290829 waitstate |