diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-19 18:17:43 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2021-03-21 13:43:14 -0500 |
| commit | dfc6ee0e9e20658a80e4080da16c2f6423b85457 (patch) | |
| tree | c7b56332eb5fcb99e4b2b10ae7eb6ec59346f744 /src/field_effect.c | |
| parent | 28aff5b179d14aa8cb440d2f72c3e098482f6a75 (diff) | |
Add SAFE_DIV
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 162a530ca..a70ef2892 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3853,16 +3853,8 @@ static void Task_MoveDeoxysRock(u8 taskId) case 0: data[4] = sprite->pos1.x << 4; data[5] = sprite->pos1.y << 4; - - // UB: Possible divide by zero - #ifdef UBFIX - #define DIVISOR (data[8] ? data[8] : 1); - #else - #define DIVISOR (data[8]) - #endif - - data[6] = (data[2] * 16 - data[4]) / DIVISOR; - data[7] = (data[3] * 16 - data[5]) / DIVISOR; + data[6] = SAFE_DIV(data[2] * 16 - data[4], data[8]); + data[7] = SAFE_DIV(data[3] * 16 - data[5], data[8]); data[0]++; case 1: if (data[8] != 0) |