fix rom3 conflicts

1 files changed, 6 insertions, 1 deletions

diff --git a/include/fieldmap.h b/include/fieldmap.h
index 7174d98cc..e95e4e0ce 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -8,9 +8,14 @@
 // Exported type declarations
 
 // Exported RAM declarations
+extern struct MapCoords {
+    int width;
+    int height;
+} gUnknown_03005DC0;
 
 // Exported ROM declarations
-u8 MapGridGetMetatileBehaviorAt(s16, s16);
+u32 MapGridGetMetatileBehaviorAt(int, int);
+void MapGridSetMetatileIdAt(int, int, u16);
 void GetCameraCoords(u16*, u16*);
 bool8 MapGridIsImpassableAt(s16, s16);
 s32 GetMapBorderIdAt(s16, s16);