add SAFE_DIV macro and usages

This commit is contained in:
Kurausukun
2021-07-03 17:18:41 -04:00
parent ee0f35b866
commit ff94d49a45
5 changed files with 14 additions and 12 deletions
+2 -8
View File
@@ -3668,14 +3668,8 @@ static void Task_MoveDeoxysRock_Step(u8 taskId)
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] << 4) - data[4]) / DIVISOR;
data[7] = ((data[3] << 4) - data[5]) / DIVISOR;
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: