diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-03 17:25:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 17:25:05 -0400 |
| commit | 585d92f298e1edd8f756f8362de45c9fadc6fcab (patch) | |
| tree | 2e3b17d37c4782f575329fc0fbe1f7bd406e6bad /src/field_effect.c | |
| parent | 558097f42326f19044a6351004468a46d6ee0b38 (diff) | |
| parent | ff94d49a45ef605cfaed1268aa5a230958e25cd9 (diff) | |
Merge pull request #445 from Kurausukun/ubfix
Port UBFIX Macro and Some Usages from Emerald
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 4cab3cff8..206b695b0 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3666,8 +3666,10 @@ static void Task_MoveDeoxysRock_Step(u8 taskId) case 0: data[4] = sprite->pos1.x << 4; data[5] = sprite->pos1.y << 4; - data[6] = ((data[2] << 4) - data[4]) / data[8]; - data[7] = ((data[3] << 4) - data[5]) / data[8]; + + // UB: Possible divide by zero + data[6] = SAFE_DIV(((data[2] << 4) - data[4]), data[8]); + data[7] = SAFE_DIV(((data[3] << 4) - data[5]), data[8]); data[0]++; // fallthrough case 1: |