diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 17:58:19 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 17:58:19 -0500 |
commit | 70cc2c16becca3a66b21a71f0a781654dc55290b (patch) | |
tree | ee931ee96a0438cd56ca67b0a765bbd650bf7d55 /src/fieldmap.c | |
parent | 2c7a4e1406b078cf9bcc2a16e92a58497390aa17 (diff) | |
parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) |
Merge remote-tracking branch 'upstream/master' into assets
Diffstat (limited to 'src/fieldmap.c')
-rw-r--r-- | src/fieldmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 7d0aaf2f8..874df23b0 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -676,8 +676,8 @@ int GetPostCameraMoveMapBorderId(int x, int y) int CanCameraMoveInDirection(int direction) { int x, y; - x = gSaveBlock1.pos.x + 7 + gUnknown_0821664C[direction].x; - y = gSaveBlock1.pos.y + 7 + gUnknown_0821664C[direction].y; + x = gSaveBlock1.pos.x + 7 + gDirectionToVectors[direction].x; + y = gSaveBlock1.pos.y + 7 + gDirectionToVectors[direction].y; if (GetMapBorderIdAt(x, y) == -1) { return 0; |