diff options
author | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
commit | e9a3cc6d51ce3818eed11de585f5084342450093 (patch) | |
tree | 414ed687f836521c1a966531e87122951c070083 /src/rock.c | |
parent | c3feb9871f4d05cd9874dd8fc0c2016eaa072864 (diff) | |
parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) |
Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
Diffstat (limited to 'src/rock.c')
-rw-r--r-- | src/rock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rock.c b/src/rock.c index 14ffc63e0..814b1d88b 100644 --- a/src/rock.c +++ b/src/rock.c @@ -12,8 +12,6 @@ extern const union AnimCmd *const gUnknown_085950E0[]; extern const union AnimCmd *const gUnknown_085954D0[]; -extern void AnimMoveTwisterParticle(struct Sprite *); - void sub_81109F0(struct Sprite *); void sub_8110AB4(struct Sprite *); void AnimDirtParticleAcrossScreen(struct Sprite *); |