diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-05-20 23:32:57 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-05-24 16:14:45 -0400 |
| commit | 2b8d522c6cf6de600f07e409b9148e6ce92e047d (patch) | |
| tree | 9c000748a3db20829e8a3522eb151d1ec8808aab /src | |
| parent | 6508197cbbd6a10226958d4e4b6bebb4fc754cad (diff) | |
sub_805C930
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_map_obj.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index f7e09aacf..19d4676cf 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -6,6 +6,7 @@ #include "field_player_avatar.h" #include "palette.h" #include "rom4.h" +#include "rng.h" #include "sprite.h" extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36]; @@ -1547,3 +1548,17 @@ u8 sub_805C904(struct MapObject *mapObject, struct Sprite *sprite) return 1; } +extern bool8 FieldObjectExecRegularAnim(); +extern const s16 gUnknown_0837520C[]; +extern void sub_8064820(struct Sprite *, s16); + +u8 sub_805C930(struct MapObject *mapObject, struct Sprite *sprite) +{ + if (FieldObjectExecRegularAnim(mapObject, sprite) == 0) { + return 0; + } + sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); + sprite->data1 = 3; + return 1; +} + |