diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-26 19:50:49 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-26 19:50:49 -0400 |
| commit | 826d62b737f8012dbd5865098ac84c94cedd5139 (patch) | |
| tree | b459973cf9b90d741ff52d662f95b9fe4ee062e1 /src/field_tasks.c | |
| parent | 830b3a9e1f58133e4b4d1fa6a9e65600bccd4b86 (diff) | |
Matching PerStepCallback_8069864
Diffstat (limited to 'src/field_tasks.c')
| -rwxr-xr-x | src/field_tasks.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/field_tasks.c b/src/field_tasks.c index 407fa7776..a266f8c8b 100755 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -287,7 +287,7 @@ void sub_8069708(s16 x, s16 y, bool32 flag) sub_8069638(gUnknown_083763C4, x, y, flag); } -bool8 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2) +bool32 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2) { s8 metatileBehavior = MapGridGetMetatileBehaviorAt(x2, y2); if (sub_80576A0(metatileBehavior)) @@ -321,7 +321,7 @@ bool8 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2) return TRUE; } -bool8 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2) +bool32 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2) { s8 metatileBehavior = MapGridGetMetatileBehaviorAt(x1, y1); if (sub_80576A0(metatileBehavior)) @@ -357,8 +357,9 @@ bool8 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2) void PerStepCallback_8069864(u8 taskId) { + s16 *data; s16 x, y; - s16 *data = gTasks[taskId].data; + data = gTasks[taskId].data; PlayerGetDestCoords(&x, &y); switch (data[1]) { @@ -397,8 +398,8 @@ void PerStepCallback_8069864(u8 taskId) { PlaySE(SE_MIZU); } - break; } + break; case 2: if ((--data[6]) == 0) { @@ -409,5 +410,6 @@ void PerStepCallback_8069864(u8 taskId) } data[1] = 1; } + break; } } |