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
@@ -12,8 +12,10 @@
 // Exported RAM declarations

 // Exported ROM declarations
+
 u8 CreateWarpArrowSprite(void);
 void sub_80DC44C(u8, u8);
+void sub_80DC478(u8, u8);
 void StartAshFieldEffect(s16, s16, u16, s16);
 void sub_80DCBB8(struct ObjectEvent *);
 bool8 sub_80DCBE0(struct ObjectEvent *);