diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-28 11:10:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 11:10:00 -0400 |
| commit | 70617d56e4ef0ef1432e0cc7fb3214a63d773578 (patch) | |
| tree | 9f1551240478be6722a0be797d35eb4034e5608c /src/trainer_see.c | |
| parent | e8568b79efa2f12ce929a4db15c8786f1dccc359 (diff) | |
| parent | 1e8ffcb8986aa0560bcb1113717ce26a58526be2 (diff) | |
Merge pull request #1104 from PokeCodec/Explcit-Casting
Reduce "Implicit conversion" warnings
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index 68a16e208..93daab421 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -603,7 +603,7 @@ static void sub_80B44C8(u8 taskId) struct ObjectEvent *objEvent; // another objEvent loaded into by loadword? - LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent); + LoadWordFromTwoHalfwords((u16*)&task->data[1], (u32 *)&objEvent); if (!task->data[7]) { ObjectEventClearHeldMovement(objEvent); @@ -624,7 +624,7 @@ static void sub_80B44C8(u8 taskId) void sub_80B4578(struct ObjectEvent *var) { - StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var); + StoreWordInTwoHalfwords((u16 *)&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var); } void EndTrainerApproach(void) |