diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-19 14:25:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-19 14:25:37 -0800 |
| commit | cd3c7a9efa4728d3b5883f0780e7deebe44c110b (patch) | |
| tree | 588cb51a2fa57da396d650459e8bbdd6697046a4 /src | |
| parent | c84d788ebfb4ff0f1a3dd1cf6ce820c403fbf169 (diff) | |
| parent | cd98f109f79445ac454f46ede6d286f14ac6b65e (diff) | |
Merge pull request #104 from TwitchPlaysPokemon/master
make ROM match again with a lazy temporary fix
Diffstat (limited to 'src')
| -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 57a53634a..968f7c0a1 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -31,7 +31,7 @@ extern bool8 (*gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject *); extern u32 gUnknown_0202FF84[]; bool8 CheckTrainer(u8); -bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject *, u8, u8); +bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *, u8, u8); void sub_80842C8(struct MapObject *, u8); void RunTrainerSeeFuncList(u8); void sub_80847D8(u8); @@ -138,7 +138,7 @@ bool8 IsTrainerInRangeEast(struct MapObject *trainerObj, s16 vision, s16 x, s16 return FALSE; } -bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 playerCoord, u8 direction) +bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 playerCoord, u8 direction) { s16 x, y; u8 unk19_temp; |