diff options
Diffstat (limited to 'include/fieldmap.h')
| -rw-r--r-- | include/fieldmap.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index ba3ca6294..5ef292640 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -16,23 +16,23 @@ void fillSouthConnection(struct MapHeader *, struct MapHeader *, s32); void fillNorthConnection(struct MapHeader *, struct MapHeader *, s32); void fillWestConnection(struct MapHeader *, struct MapHeader *, s32); void fillEastConnection(struct MapHeader *, struct MapHeader *, s32); -u8 MapGridGetZCoordAt(); -bool8 MapGridIsImpassableAt(s16, s16); -int MapGridGetMetatileIdAt(int, int); +u16 MapGridGetZCoordAt(int s, int y); +u16 MapGridIsImpassableAt(int, int); +u16 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileBehaviorAt(int x, int y); // return: (u8|u16|int) args: (int|s16|s32) -u8 MapGridGetMetatileLayerTypeAt(/*TODO: arg types*/); -void MapGridSetMetatileIdAt(u32, u32, u16); +u16 MapGridGetMetatileLayerTypeAt(int, int); +void MapGridSetMetatileIdAt(int, int, u16); u32 GetBehaviorByMetatileId(u16 metatile); void save_serialize_map(void); void sub_8056670(); -int CameraMove(int, int); +bool8 CameraMove(int, int); struct MapConnection *sub_8056A64(u8 direction, int x, int y); bool8 sub_8056ABC(u8 direction, int x, int y, struct MapConnection *connection); bool8 sub_8056B20(int x, int src_width, int dest_width, int offset); struct MapConnection *sub_8056BA0(s16 x, s16 y); // fieldmap.c void sub_8056C50(u16, u16); -void sav1_camera_get_focus_coords(s16 *x, s16 *y); -void GetCameraCoords(s16*, s16*); +void sav1_camera_get_focus_coords(u16 *x, u16 *y); +void GetCameraCoords(u16*, u16*); void sub_8056D28(struct MapData *pData); void sub_8056D38(struct MapData *pData); void apply_map_tileset2_palette(struct MapData *pData); |