diff options
author | Kurausukun <lord.uber1@gmail.com> | 2021-03-18 22:30:59 -0400 |
---|---|---|
committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-18 22:30:59 -0400 |
commit | f41d7b222c7e66a44d1001434ec988d143456d12 (patch) | |
tree | 4f8ab6a4dafe8226ef1a8deb0b4a76eb4b1a47a6 /src/trainer_see.c | |
parent | a2367448b87427c22bd4132781e1c6dfff3fc2dd (diff) |
[LEAK-INFORMED] match InitObjectEventStateFromTemplate
additionally, port range fixes from emerald as well as a couple other
things
Diffstat (limited to 'src/trainer_see.c')
-rw-r--r-- | src/trainer_see.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index f393c4bbd..644b87c37 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -219,15 +219,15 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 ap } // preserve mapobj_unk_19 before clearing. - unk19_temp = trainerObj->range.as_nybbles.x; - unk19b_temp = trainerObj->range.as_nybbles.y; - trainerObj->range.as_nybbles.x = 0; - trainerObj->range.as_nybbles.y = 0; + unk19_temp = trainerObj->rangeX; + unk19b_temp = trainerObj->rangeY; + trainerObj->rangeX = 0; + trainerObj->rangeY = 0; collision = GetCollisionAtCoords(trainerObj, x, y, direction); - trainerObj->range.as_nybbles.x = unk19_temp; - trainerObj->range.as_nybbles.y = unk19b_temp; + trainerObj->rangeX = unk19_temp; + trainerObj->rangeY = unk19b_temp; if (collision == 4) return approachDistance; |