diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-11-03 09:28:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 09:28:45 -0500 |
| commit | 99dd461befcfe3bef3ce188fea2fb372c2f21b98 (patch) | |
| tree | 2b0198d394186c371987f018677d12f929a66a44 /src/berry_blender.c | |
| parent | 9e55ae22b19d58eca8fc0cdd2fcea9f2cca14319 (diff) | |
| parent | ca950a8daf6dd95ab5dacc51f250fea7b605361c (diff) | |
Merge pull request #1189 from aaaaaa123456789/reverts
Undo PokeCodec's PRs and port changes
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 2cdb841ee..16ba42bd7 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -168,8 +168,8 @@ struct BerryBlender u16 progressBarValue; u16 maxProgressBarValue; u16 centerScale; - s16 bg_X; - s16 bg_Y; + u16 bg_X; + u16 bg_Y; u8 opponentTaskIds[BLENDER_MAX_PLAYERS - 1]; u8 perfectOpponents; // for debugging, NPCs will always hit Best u16 scores[BLENDER_MAX_PLAYERS][NUM_SCORE_TYPES]; @@ -3387,13 +3387,13 @@ static void RestoreBgCoord(s16* coord) // For "unshaking" the screen after ShakeBgCoordForHit is called static void RestoreBgCoords(void) { - RestoreBgCoord((s16 *)&sBerryBlender->bg_X); - RestoreBgCoord((s16 *)&sBerryBlender->bg_Y); + RestoreBgCoord(&sBerryBlender->bg_X); + RestoreBgCoord(&sBerryBlender->bg_Y); } static void BlenderLandShakeBgCoord(s16* coord, u16 timer) { - u8 strength; + s32 strength; if (timer < 10) strength = 16; |