Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd

2017-10-13 20:29:11 -05:00
parent 2852f4f1b8 f6af9e7013
commit 924c0c6b5a
106 changed files with 14610 additions and 25063 deletions
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -1,7 +1,12 @@
 #ifndef GUARD_FIELDMAP_H
 #define GUARD_FIELDMAP_H

-u8 MapGridGetMetatileBehaviorAt(s16, s16);
+extern struct MapCoords {
+    int width;
+    int height;
+} gUnknown_03005DC0;
+
+u32 MapGridGetMetatileBehaviorAt(int, int);
 void MapGridSetMetatileIdAt(int, int, u16);
 void GetCameraCoords(u16*, u16*);
 bool8 MapGridIsImpassableAt(s16, s16);