diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-31 18:40:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 18:40:40 -0500 |
| commit | cbc414c44115550c811d6629c23c2e749d9d7fe3 (patch) | |
| tree | 42a2274534149cb609636c3ef98a90438a11ca33 /src/field_tasks.c | |
| parent | 425cb7ec71d549bed0a73bb864c3f33a1c89f1c4 (diff) | |
| parent | bc71641386573c7e865d0cec941f84310fbd648f (diff) | |
Merge pull request #698 from Slawter666/synchronise
Synchronise with pokeemerald
Diffstat (limited to 'src/field_tasks.c')
| -rw-r--r-- | src/field_tasks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_tasks.c b/src/field_tasks.c index 8b736c949..12167eb85 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -847,7 +847,7 @@ void Task_MuddySlope(u8 taskId) break; } - if (gCamera.field_0 && mapIndices != data[0]) + if (gCamera.active && mapIndices != data[0]) { data[0] = mapIndices; x2 = gCamera.x; |