diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:10:53 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:10:53 -0400 |
| commit | 33e4b85704e13e33d014fad6476f324116e80873 (patch) | |
| tree | 35254a63d2db0904b2426810d772e50bdc549580 | |
| parent | b3598ee395f43a3ed08b738f73576d5c76f9359f (diff) | |
Fix nonmatching types
| -rw-r--r-- | src/bike.c | 2 | ||||
| -rw-r--r-- | src/field_effect.c | 1 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/bike.c b/src/bike.c index 80cab0850..dae86bd88 100644 --- a/src/bike.c +++ b/src/bike.c @@ -10,8 +10,6 @@ #include "songs.h" #include "sound.h" -extern u8 sub_80608A4(u8); - extern u8 gUnknown_02039250; extern u8 gUnknown_02039251; extern u8 gUnknown_0202E854; diff --git a/src/field_effect.c b/src/field_effect.c index 0625e9d18..72224f299 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1894,7 +1894,6 @@ bool8 sub_80873F4(struct Task *task, struct MapObject *mapObject, struct Sprite } void sub_8087470(u8); -extern u8 sub_80608A4(u8); void mapldr_080851BC(void) { diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index c8099a73d..e7947b704 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1224,8 +1224,8 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c) { FieldObjectClearAnimIfSpecialAnimFinished(b); FieldObjectClearAnimIfSpecialAnimFinished(c); - FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId(task->data[2])); - FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId(task->data[2])); + FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId((u8)task->data[2])); + FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId((u8)task->data[2])); gFieldEffectArguments[0] = c->coords2.x; gFieldEffectArguments[1] = c->coords2.y; gFieldEffectArguments[2] = c->elevation; @@ -1385,7 +1385,7 @@ static void taskFF_0805D1D4(u8 taskId) return; } sub_8127ED0(playerMapObj->mapobj_unk_1A, 2); - FieldObjectSetSpecialAnim(playerMapObj, sub_80608D0(gTasks[taskId].data[0])); + FieldObjectSetSpecialAnim(playerMapObj, sub_80608D0((u8)gTasks[taskId].data[0])); gTasks[taskId].func = sub_805A2D0; } |