Merge branch 'master' into field_map_obj

This commit is contained in:
PikalaxALT committed 2017-09-16 15:41:54 -04:00
commit 559833ccf6
96 files changed
+5928 -10623

No files matched your search

+1
View File
@@ -11,5 +11,6 @@
// Exported ROM declarations
u8 MapGridGetMetatileBehaviorAt(s16, s16);
void GetCameraCoords(u16*, u16*);
#endif //GUARD_FIELDMAP_H