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 /src/fieldmap.c | |
| parent | c8b22e2680d64f3a52e8f9ba8ccc81de9480ad5f (diff) | |
| parent | 67f48e5f28b1773d3570630540a082e99f7cab4e (diff) | |
fix merge conflicts
Diffstat (limited to 'src/fieldmap.c')
| -rw-r--r-- | src/fieldmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 4244762c0..e5901c149 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -463,7 +463,7 @@ u32 MapGridGetMetatileBehaviorAt(s32 x, s32 y) return sub_8058F48(x, y, 0); } -u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y) +u8 MapGridGetMetatileLayerTypeAt(s16 x, s16 y) { return sub_8058F48(x, y, 6); } |