From 3211b440063e0cb54a5a2175172ddd538b524501 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Thu, 2 May 2024 17:32:12 -0600 Subject: [PATCH] Fixed bools --- src/render_player.h | 2 +- src/spawn_players.h | 4 ++-- src/update_objects.h | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/render_player.h b/src/render_player.h index 264741fea..ede2d5033 100644 --- a/src/render_player.h +++ b/src/render_player.h @@ -48,7 +48,7 @@ void func_80022DB4(Player*, s8); void func_80022E84(Player*, s8, s8, s8); void change_player_color_effect_rgb(Player*, s8, s32, f32); void change_player_color_effect_cmy(Player*, s8, s32, f32); -s32 is_player_under_light_luigi_raceway(Player*, s8); +bool is_player_under_light_luigi_raceway(Player*, s8); void render_light_environment_on_player(Player*, s8); void func_800235AC(Player*, s8); void func_80023BF0(Player*, s8, s8, s8); diff --git a/src/spawn_players.h b/src/spawn_players.h index 504e2b057..c0b45e1da 100644 --- a/src/spawn_players.h +++ b/src/spawn_players.h @@ -44,11 +44,11 @@ extern s32 gFrameSinceLastACombo[]; extern s32 gCountASwitch[]; extern bool gIsPlayerTripleAButtonCombo[]; extern s32 gTimerBoostTripleACombo[]; -extern s32 gPlayerIsBrakeActive[]; +extern bool gPlayerIsBrakeActive[]; extern s32 D_801654C0[]; extern s32 gFrameSinceLastBCombo[]; extern s32 gCountBChangement[]; -extern s32 gIsPlayerTripleBButtonCombo[]; +extern bool gIsPlayerTripleBButtonCombo[]; extern s32 gTimerBoostTripleBCombo[]; extern s16 chooseKartAIPlayers[]; extern s16 D_8016556E; diff --git a/src/update_objects.h b/src/update_objects.h index a0fac60b5..4c592f23f 100644 --- a/src/update_objects.h +++ b/src/update_objects.h @@ -19,13 +19,13 @@ void func_80072180(void); void set_object_flag_status_true(s32, s32); void set_object_flag_status_false(s32, s32); void func_80072214(s32, s32); -s32 is_obj_flag_status_active(s32, s32); +bool is_obj_flag_status_active(s32, s32); s32 is_obj_index_flag_status_inactive(s32, s32); void func_800722A4(s32, s32); void func_800722CC(s32, s32); void func_800722F8(s32, s32); -s32 func_80072320(s32, s32); -s32 func_80072354(s32, s32); +bool func_80072320(s32, s32); +bool func_80072354(s32, s32); void set_object_unk_0CB(s32, s32); void init_object(s32, s32); void func_80072408(s32); @@ -55,8 +55,8 @@ s32 func_80072B48(s32, s32); void func_80072C00(s32, s32, s32, s32); void func_80072D3C(s32, s32, s32, s32, s32); s32 func_80072E54(s32, s32, s32, s32, s32, s32); -s32 func_80072F88(s32, s32, s32, s32, s32, s32); -s32 func_800730BC(s32, s32, s32, s32, s32, s32); +bool func_80072F88(s32, s32, s32, s32, s32, s32); +bool func_800730BC(s32, s32, s32, s32, s32, s32); s32 func_8007326C(s32, s32, s32, s32, s32, s32); void func_80073404(s32, u8, u8, Vtx*); void init_texture_object(s32, u8*, u8*, u8, u16); @@ -71,7 +71,7 @@ void func_80073654(s32); void func_8007369C(s32, s32); void func_800736E0(s32); void func_80073720(s32); -s32 func_8007375C(s32, s32); +bool func_8007375C(s32, s32); void func_80073800(s32, s32); void func_8007381C(s32); void func_80073844(s32); @@ -79,21 +79,21 @@ void func_80073884(s32); s32 func_800738A8(s32, s16*, s32, s32, s32, s32, s32); void func_80073998(s32, s16*, s32, s32, s32, s32, s32); void func_800739CC(s32, s16*, s32, s32, s32, s32, s32); -s32 func_80073A10(s32, s16*, s32, s32, s32, s32, s32); +bool func_80073A10(s32, s16*, s32, s32, s32, s32, s32); s32 func_80073B00(s32, s16*, s32, s32, s32, s32, s32); s32 func_80073B34(s32, s16*, s32, s32, s32, s32, s32); -s32 func_80073B78(s32, s32, s16*, s32, s32, s32, s32, s32); +bool func_80073B78(s32, s32, s16*, s32, s32, s32, s32, s32); bool func_80073CB0(s32, s16*, s32, s32, s32, s32, s32); bool func_80073D0C(s32, s16*, s32, s32, s32, s32, s32); void func_80073D68(s32, s16*, s16, s32); void func_80073DC0(s32, s16*, s16, s32); -s32 func_80073E18(s32, u16*, u16, s32); -s32 func_80073ED4(s32, u16*, u16, s32); +bool func_80073E18(s32, u16*, u16, s32); +UNUSED bool func_80073ED4(s32, u16*, u16, s32); void func_80073F90(s32, s32); void func_80073FAC(s32); void func_80073FD4(s32); void func_80074014(void); -s32 func_8007401C(s32, f32*, f32, f32, f32, s32, s32); +bool func_8007401C(s32, f32*, f32, f32, f32, s32, s32); s32 func_80074118(s32, f32*, f32, f32, f32, s32, s32); s32 func_8007415C(s32, f32*, f32, f32, f32, s32, s32); s32 func_800741B4(s32, f32*, f32, f32, f32, s32, s32);