diff options
| author | garak <garakmon@gmail.com> | 2019-07-20 12:30:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:30:41 -0400 |
| commit | c39d25ff4d3cf6cb8b3a6fea208de0cc3c6a7c8c (patch) | |
| tree | bce0030d8901a6b84e705baca169989fff1a4f71 /include/fieldmap.h | |
| parent | dfa3e079c0f55565fc60a6a1ba0ef04de9be94c2 (diff) | |
| parent | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (diff) | |
Merge branch 'master' into navdata
Diffstat (limited to 'include/fieldmap.h')
| -rw-r--r-- | include/fieldmap.h | 4 |
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); |