diff options
| author | Evan <eroelke@gmail.com> | 2019-12-04 21:35:31 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-04 21:35:31 -0700 |
| commit | 9f2a53eec3a34f6f675ac41e4b17bb8011025f4f (patch) | |
| tree | 08d7f406ee1add06123f3ea846416aebbc6b9b99 /include/fieldmap.h | |
| parent | c8b22e2680d64f3a52e8f9ba8ccc81de9480ad5f (diff) | |
| parent | 67f48e5f28b1773d3570630540a082e99f7cab4e (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*); |