revert merge coz its bugged

This commit is contained in:
DizzyEggg
2017-10-23 13:36:55 +02:00
parent 7d1373e3fa
commit 5b70307962
137 changed files with 15649 additions and 11131 deletions

View File

@@ -74,7 +74,6 @@ u8 npc_block_way(struct MapObject *, s16, s16, u32);
void MoveCoords(u8, s16 *, s16 *);
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
// Exported data declarations