Merge branch 'master' into event_object_movement

2020-03-13 00:32:04 -07:00
parent 339c2914af 6af8c04d8f
commit 99e4de062a
3241 changed files with 80742 additions and 133435 deletions
@@ -318,5 +318,6 @@ void ResetAffineAnimData(void);
 void sub_8007FFC(struct Sprite* sprite, s16 a2, s16 a3);
 void sub_80075C0(struct Sprite *sprite);
 s16 AllocSpriteTiles(u16 tileCount);
+void obj_pos2_update_enable(struct Sprite* sprite, s16 xmod, s16 ymod);

 #endif //GUARD_SPRITE_H