summaryrefslogtreecommitdiff
path: root/src/trainer_see.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-03-24 08:15:08 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-03-24 08:15:08 -0400
commit6b64fbc5224293394cff282bb2aedcecfa56eceb (patch)
tree648a5bf848957321a13d5a489692d3d33492359e /src/trainer_see.c
parenta925d2b7b0c1d6d4386d3f647a18f4f797dbeab7 (diff)
parentd8b76e6fb545efd69bfb18322a67243520e4d11d (diff)
Merge branch 'master' of github.com:pret/pokefirered into misc_doc
Diffstat (limited to 'src/trainer_see.c')
-rw-r--r--src/trainer_see.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c
index a46799bfe..cd7e23ac8 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;