diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-20 20:41:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 20:41:33 -0400 |
| commit | 4ba573ed1eba7c37160ce6107d95447f42902385 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/trainer_see.c | |
| parent | 13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff) | |
| parent | b22e5219ba01c70da9a03397430bff10d0b99060 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index 9d58faab8..9b7a47f6b 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -1,7 +1,5 @@ #include "global.h" #include "trainer_see.h" -#include "asm.h" -#include "asm_fieldmap.h" #include "battle_setup.h" #include "field_effect.h" #include "field_map_obj.h" @@ -9,6 +7,7 @@ #include "script.h" #include "sprite.h" #include "task.h" +#include "util.h" extern bool8 (*gIsTrainerInRange[])(struct MapObject *, u16, s16, s16); extern bool8 (*gTrainerSeeFuncList[])(u8, struct Task *, struct MapObject *); @@ -373,9 +372,9 @@ void sub_80846E4(u8 taskId) mapObj->mapobj_bit_7 = 0; } -void sub_8084794(u32 var) +void sub_8084794(struct MapObject *var) { - StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80846E4, 0)].data[1], var); + StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80846E4, 0)].data[1], (u32)var); } void sub_80847C8(void) |