diff options
Diffstat (limited to 'src/update_objects.c')
| -rw-r--r-- | src/update_objects.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/update_objects.c b/src/update_objects.c index 006e5607d..697072351 100644 --- a/src/update_objects.c +++ b/src/update_objects.c @@ -943,6 +943,7 @@ s32 func_80073B34(s32 arg0, s16* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s if (arg3 < *arg1) { return func_80073A10(arg0, arg1, arg2, arg3, arg4, arg5, arg6); } + return 0; } bool func_80073B78(s32 arg0, s32 objectIndex, s16* arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { @@ -1112,6 +1113,7 @@ s32 func_8007415C(s32 objectIndex, f32* arg1, f32 arg2, f32 arg3, f32 arg4, s32 if (*arg1 < arg3) { return func_8007401C(objectIndex, arg1, arg2, arg3, arg4, arg5, arg6); } + return 0; } s32 func_800741B4(s32 objectIndex, f32* arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) { @@ -1223,7 +1225,7 @@ void func_800745C8(s32 objectIndex, const char** lakituTexturePtr) { if ((gObjectList[objectIndex].status & 1) != 0) { phi_a1 = 0; - if (gObjectList[objectIndex].tlutList != gObjectList[objectIndex].activeTLUT) { + if (gObjectList[objectIndex].tlutList != (const u8*) gObjectList[objectIndex].activeTLUT) { gObjectList[objectIndex].activeTLUT = gObjectList[objectIndex].tlutList; } @@ -2910,7 +2912,8 @@ void func_8007D714(s32 arg0) { } void func_8007DDC0(s32 objectIndex) { - f32 sp2C; + // Initialized for the non-race CC modes the switch below doesn't cover. + f32 sp2C = 1150.0f; Object* object; object = &gObjectList[objectIndex]; @@ -2951,7 +2954,8 @@ void func_8007DDC0(s32 objectIndex) { } void func_8007E1F4(s32 objectIndex) { - f32 sp2C; + // Initialized for the non-race CC modes the check below doesn't cover. + f32 sp2C = 700.0f; Object* object; object = &gObjectList[objectIndex]; |