Merge branch 'master' into field_map_obj

2017-09-16 15:41:54 -04:00
parent c7f28f034c 19d2d73c70
commit 559833ccf6
96 changed files with 5928 additions and 10623 deletions
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -11,5 +11,6 @@

 // Exported ROM declarations
 u8 MapGridGetMetatileBehaviorAt(s16, s16);
+void GetCameraCoords(u16*, u16*);

 #endif //GUARD_FIELDMAP_H