diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2019-12-04 01:57:27 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2019-12-04 01:57:27 -0500 |
| commit | cb5fe2f84f6f79748f8b67c236956371784619db (patch) | |
| tree | 24df75a4c8b2051aa2fb6c51fcd1c79bf1d3cbb0 /src/fieldmap.c | |
| parent | 1b7dc422d96ef13888139f190a5f7c2d591fb0ca (diff) | |
| parent | bc0fe11d163da1131daf63bdeb2abcba788f6036 (diff) | |
resolve conflict
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); } |