summaryrefslogtreecommitdiff
path: root/src/field_map_obj.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-05-20 23:32:57 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-05-20 23:32:57 -0400
commit5e98afefa4fd62fa7b6ed83696315582419843de (patch)
tree2286b44f5fa72b357b6e8750a4f9f5ac46a28991 /src/field_map_obj.c
parentea181bea7652e6ea28705302ce7e85998e248986 (diff)
sub_805C930
Diffstat (limited to 'src/field_map_obj.c')
-rw-r--r--src/field_map_obj.c15
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;
+}
+