diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /include/fieldmap.h | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/fieldmap.h')
| -rw-r--r-- | include/fieldmap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index 4af4342f7..f1107100f 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -16,6 +16,7 @@ extern const struct MapData Route1_Layout; u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileBehaviorAt(int, int); +u8 MapGridGetMetatileLayerTypeAt(s16 x, s16 y); void MapGridSetMetatileIdAt(int, int, u16); void MapGridSetMetatileEntryAt(int, int, u16); void GetCameraCoords(u16*, u16*); |