diff options
author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-11-07 18:06:37 -0500 |
---|---|---|
committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-11-07 18:06:37 -0500 |
commit | a29b18ed2f27c2991b0894a69fa04738ba9522ca (patch) | |
tree | 4db08c6d6a2d585a0a42ee6f023faa9f6e8d13fb /src/berry.c | |
parent | 8d2d34aae9767f283b3c34140920828e37540d23 (diff) | |
parent | 8b1c2c946b3b58cc938f0496a9af11a641749a1e (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/berry.c')
-rw-r--r-- | src/berry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/berry.c b/src/berry.c index d70e8c353..98264f37b 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1331,7 +1331,7 @@ void ResetBerryTreeSparkleFlags(void) s16 bottom; int i; - GetCameraCoords((u16*)&cam_left, (u16*)&cam_top); + GetCameraCoords(&cam_left, &cam_top); left = cam_left; top = cam_top + 3; right = cam_left + 14; |