summaryrefslogtreecommitdiff
path: root/src/trainer_see.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-12-14 23:22:41 -0500
committerGitHub <noreply@github.com>2020-12-14 23:22:41 -0500
commit15c2856b24c91d1fe4c3d5f3fe4d84d87827f386 (patch)
tree3367bb9a7ae8b701acf43cb8df6e137cf94f72bb /src/trainer_see.c
parentc61142188292a0edfe9154a93e440739560490cf (diff)
parent69cfe5ad01f135e16c330891d3b6d9fc7853e632 (diff)
Merge pull request #1265 from Kurausukun/berry_crush
fakematch fixes, begin documenting Berry Crush (based on #1187)
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 4f4aaea08..46fafa7e3 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -377,15 +377,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;