Merge branch 'master' into master

1 files changed, 2 insertions, 2 deletions

diff --git a/include/fieldmap.h b/include/fieldmap.h
index 2384ed46a..be5610a46 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -23,9 +23,9 @@ int GetMapBorderIdAt(int x, int y);
 int CanCameraMoveInDirection(int direction);
 u16 GetBehaviorByMetatileId(u16 metatileId);
 void GetCameraFocusCoords(u16 *x, u16 *y);
-u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y);
+u8 MapGridGetMetatileLayerTypeAt(int x, int y);
 u8 MapGridGetZCoordAt(int x, int y);
-u8 CameraMove(s32 deltaX, s32 deltaY);
+bool8 CameraMove(int deltaX, int deltaY);
 struct MapConnection *sub_8088950(u8 direction, int x, int y);
 bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection);
 bool8 sub_8088A0C(int x, int src_width, int dest_width, int offset);