Add SAFE_DIV

2021-03-19 18:17:43 -04:00
parent 28aff5b179
commit dfc6ee0e9e
6 changed files with 15 additions and 29 deletions
@@ -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)