diff --git a/include/defines.h b/include/defines.h index 530c9cd12..f85a96957 100644 --- a/include/defines.h +++ b/include/defines.h @@ -347,6 +347,7 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE }; * @brief effect of player's * for effects */ +// clang-format off #define BRAKING_EFFECT 0x1 // pressing brake #define HOP_EFFECT 0x2 // from when you hop to when you land #define BOOST_RAMP_WOOD_EFFECT 0x4 // being boosted by DKJP ramp @@ -380,6 +381,7 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE }; #define LIGHTNING_EFFECT 0x40000000 // suffering the effects of lightning #define BOO_EFFECT 0x80000000 // being a boo #define ALL_EFFECTS 0xFFFFFFFF +// clang-format on /** * @brief durations of effects diff --git a/src/audio/external.c b/src/audio/external.c index 8d647389f..90f47842e 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -2190,8 +2190,7 @@ void func_800C683C(u8 cameraId) { void func_800C70A8(u8 playerId) { if (D_800EA0EC[playerId] == 0) { D_800E9E74[playerId] = 0; - if ((D_800E9E54[playerId] > 3500.0f) || - ((gPlayers[playerId].effects & DRIFTING_EFFECT) == DRIFTING_EFFECT)) { + if ((D_800E9E54[playerId] > 3500.0f) || ((gPlayers[playerId].effects & DRIFTING_EFFECT) == DRIFTING_EFFECT)) { D_800E9E74[playerId] = 1; switch (gPlayers[playerId].tyres[AUDIO_LEFT_TYRE].surfaceType) { case DIRT: /* switch 1 */ @@ -2379,12 +2378,16 @@ void func_800C70A8(u8 playerId) { (D_800E9E74[playerId] != 0x0000001C)) { D_800E9E74[playerId] = 0; } - if ((((gPlayers[playerId].effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) && ((gPlayers[playerId].type & 0x2000) != 0x2000)) || - ((gPlayers[playerId].effects & BANANA_NEAR_SPINOUT_EFFECT) == BANANA_NEAR_SPINOUT_EFFECT) || ((gPlayers[playerId].effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || - ((gPlayers[playerId].effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || ((gPlayers[playerId].unk_044 & 0x4000) == 0x4000)) { + if ((((gPlayers[playerId].effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) && + ((gPlayers[playerId].type & 0x2000) != 0x2000)) || + ((gPlayers[playerId].effects & BANANA_NEAR_SPINOUT_EFFECT) == BANANA_NEAR_SPINOUT_EFFECT) || + ((gPlayers[playerId].effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((gPlayers[playerId].effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((gPlayers[playerId].unk_044 & 0x4000) == 0x4000)) { D_800E9E74[playerId] = 0x00000012; } - if ((((gPlayers[playerId].effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT) && ((gPlayers[playerId].type & 0x2000) != 0x2000)) || + if ((((gPlayers[playerId].effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT) && + ((gPlayers[playerId].type & 0x2000) != 0x2000)) || ((gPlayers[playerId].effects & BANANA_NEAR_SPINOUT_EFFECT) == BANANA_NEAR_SPINOUT_EFFECT)) { D_800E9E74[playerId] = 0x00000013; } @@ -2754,9 +2757,12 @@ void func_800C8770(u8 playerId) { // Checks the same field for all players before doing something? void func_800C8920(void) { if (((u8) D_800EA168 != 0) && ((gPlayers[0].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && - ((gPlayers[1].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && ((gPlayers[2].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && - ((gPlayers[3].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && ((gPlayers[4].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && - ((gPlayers[5].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && ((gPlayers[6].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && + ((gPlayers[1].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && + ((gPlayers[2].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && + ((gPlayers[3].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && + ((gPlayers[4].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && + ((gPlayers[5].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && + ((gPlayers[6].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT) && ((gPlayers[7].effects & LIGHTNING_EFFECT) != LIGHTNING_EFFECT)) { func_800CAC08(); } @@ -2928,7 +2934,8 @@ void func_800C90F4(u8 playerId, u32 soundBits) { ((soundBits & ~0xF0) == SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x05))) { D_800EA180 = 1; } - if (((gPlayers[playerId].effects & LIGHTNING_EFFECT) == LIGHTNING_EFFECT) && ((s32) D_800E9F2C[playerId] >= 0x1F)) { + if (((gPlayers[playerId].effects & LIGHTNING_EFFECT) == LIGHTNING_EFFECT) && + ((s32) D_800E9F2C[playerId] >= 0x1F)) { play_sound(soundBits, &D_800E9F7C[playerId].pos, playerId, &D_800EA150, &D_800EA1D4, (s8*) &D_800E9F7C[playerId].unk_14); } else { @@ -2957,7 +2964,8 @@ void func_800C92CC(u8 playerId, u32 soundBits) { (u8) var_s0, soundBits); if (temp_v0 != NULL) { temp_v0->unk34 = 170.0f; - if (((gPlayers[playerId].effects & LIGHTNING_EFFECT) == LIGHTNING_EFFECT) && ((s32) D_800E9F2C[playerId] >= 0x1F)) { + if (((gPlayers[playerId].effects & LIGHTNING_EFFECT) == LIGHTNING_EFFECT) && + ((s32) D_800E9F2C[playerId] >= 0x1F)) { play_sound((gPlayers[playerId].characterId * 0x10) + soundBits, &temp_v0->unk18, var_s0, &D_800EA150, &D_800EA1D4, (s8*) &D_800EA06C[playerId].unk0C); } else { diff --git a/src/camera.c b/src/camera.c index ec2f96b8b..db2f58d8c 100644 --- a/src/camera.c +++ b/src/camera.c @@ -746,9 +746,12 @@ void func_8001E45C(Camera* camera, Player* player, s8 arg2) { var_a3 = (player->unk_078 / 2) + 0xA5; } } - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || - ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || - ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || (((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT) && (player->unk_078 != 0)) || + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || + ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || + (((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT) && (player->unk_078 != 0)) || (player->collision.surfaceDistance[0] <= 0.0f) || (player->collision.surfaceDistance[1] <= 0.0f) || ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT)) { func_8001CCEC(player, camera, sp64, &sp84, &sp80, &sp7C, &sp58, (s32) camera->unk_2C, (s32) arg2); @@ -869,9 +872,12 @@ void func_8001EA0C(Camera* camera, Player* player, s8 arg2) { var_a3 = (player->unk_078 / 2) + 0xA5; } } - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || - ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || - ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || (((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT) && (player->unk_078 != 0)) || + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || + ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || + (((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT) && (player->unk_078 != 0)) || (player->collision.surfaceDistance[0] <= 0.0f) || (player->collision.surfaceDistance[1] <= 0.0f) || ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT)) { func_8001D944(player, camera, sp64, &sp84, &sp80, &sp7C, &sp58, (s32) camera->unk_2C, (s32) arg2); @@ -1036,7 +1042,8 @@ void func_8001F394(Player* player, f32* arg1) { if ((player->soundEffects & 0x100) == 0x100) { D_80164A08[playerIndex] = 4; } - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { D_80164A08[playerIndex] = 5; } D_80164498[playerIndex] = 0.0f; @@ -1094,7 +1101,8 @@ void func_8001F394(Player* player, f32* arg1) { } break; case 5: - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { move_f32_towards(&D_80164498[playerIndex], 18.0f, 0.2f); } else { if (D_80164498[playerIndex] > 1.0f) { diff --git a/src/code_80057C60.c b/src/code_80057C60.c index e921fa145..9d6619977 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -1442,7 +1442,8 @@ void func_8005A14C(s32 playerId) { objectIndex = D_8018CE10[playerId].objectIndex; lapCount = gLapCountByPlayerId[playerId]; if (player->type & PLAYER_EXISTS) { - if (player->effects & (LIGHTNING_STRIKE_EFFECT | HIT_BY_GREEN_SHELL_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT)) { + if (player->effects & + (LIGHTNING_STRIKE_EFFECT | HIT_BY_GREEN_SHELL_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT)) { gObjectList[objectIndex].direction_angle[2] += 0x1000; } else { if (gObjectList[objectIndex].direction_angle[2] != 0) { @@ -4933,7 +4934,8 @@ void func_800650FC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { player->particles[20 + arg3].rotation -= 4732; } - if (((player->effects & BANANA_SPINOUT_EFFECT) != BANANA_SPINOUT_EFFECT) && ((player->effects & DRIVING_SPINOUT_EFFECT) != DRIVING_SPINOUT_EFFECT)) { + if (((player->effects & BANANA_SPINOUT_EFFECT) != BANANA_SPINOUT_EFFECT) && + ((player->effects & DRIVING_SPINOUT_EFFECT) != DRIVING_SPINOUT_EFFECT)) { player->particles[20 + arg3].IsAlive = 0; player->particles[20 + arg3].timer = 0; player->particles[20 + arg3].type = 0; @@ -4993,7 +4995,8 @@ void func_8006538C(Player* player, s8 playerIndex, s16 arg2, s8 arg3) { spAC[0] = 0; spAC[1] = player->unk_048[arg3]; spAC[2] = 0; - if ((player->effects & STAR_EFFECT) && (((s32) gCourseTimer - gPlayerStarEffectStartTime[playerIndex]) < STAR_EFFECT_DURATION - 1)) { + if ((player->effects & STAR_EFFECT) && + (((s32) gCourseTimer - gPlayerStarEffectStartTime[playerIndex]) < STAR_EFFECT_DURATION - 1)) { primRed = (primColors[1] >> 0x10) & 0xFF; primGreen = (primColors[1] >> 0x08) & 0xFF; primBlue = (primColors[1] >> 0x00) & 0xFF; @@ -6269,10 +6272,12 @@ void func_8006C6AC(Player* player, s16 arg1, s8 arg2, s8 arg3) { } else if (((f64) (D_801652A0[arg2_copy] - player->tyres[BACK_RIGHT].baseHeight) >= 3.5) || ((f64) (D_801652A0[arg2_copy] - player->tyres[BACK_LEFT].baseHeight) >= 3.5)) { func_8005EA94(player, arg1, sp28, arg2_copy, arg3); - } else if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { + } else if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { func_8005F90C(player, arg1, sp28, arg2_copy, arg3); } else if (((player->effects & EARLY_START_SPINOUT_EFFECT) && !(player->type & PLAYER_START_SEQUENCE)) || - (player->effects & BANANA_NEAR_SPINOUT_EFFECT) || (player->effects & AB_SPIN_EFFECT) || (player->unk_044 & 0x4000)) { + (player->effects & BANANA_NEAR_SPINOUT_EFFECT) || (player->effects & AB_SPIN_EFFECT) || + (player->unk_044 & 0x4000)) { func_8005ED48(player, arg1, sp28, arg2_copy, arg3); } else { setup_tyre_particles(player, arg1, sp28, arg2_copy, arg3); @@ -6350,7 +6355,8 @@ void func_8006C9B8(Player* player, s16 arg1, s8 playerIndex, s8 arg3) { player->unk_044 &= ~0x0100; return; } - if ((player->effects & STAR_EFFECT) && ((((s32) gCourseTimer) - gPlayerStarEffectStartTime[playerIndex]) < STAR_EFFECT_DURATION - 1)) { + if ((player->effects & STAR_EFFECT) && + ((((s32) gCourseTimer) - gPlayerStarEffectStartTime[playerIndex]) < STAR_EFFECT_DURATION - 1)) { func_800615AC(player, arg1, sp28, playerIndex, arg3); player->unk_046 &= ~0x0008; player->unk_044 &= ~0x0100; @@ -6428,7 +6434,8 @@ void func_8006CEC0(Player* arg0, s16 arg1, s8 arg2, s8 arg3) { } switch (gActiveScreenMode) { case SCREEN_MODE_1P: - if (((arg0->effects & SQUISH_EFFECT) != SQUISH_EFFECT) && ((arg0->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && + if (((arg0->effects & SQUISH_EFFECT) != SQUISH_EFFECT) && + ((arg0->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && ((arg0->effects & EXPLOSION_CRASH_EFFECT) != EXPLOSION_CRASH_EFFECT)) { if (((arg0->unk_0CA & 2) != 2) && ((arg0->unk_0CA & 0x10) != 0x10) && !(arg0->unk_0CA & 0x100)) { func_80060504(arg0, arg1, sp20, arg2, arg3); diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 11f21f3be..d9bdcde61 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -1234,7 +1234,8 @@ s32 func_80089E18(s32 objectIndex) { player = gPlayerOne; if (is_obj_flag_status_active(objectIndex, 0x00000200) != 0) { for (playerIndex = 0; playerIndex < D_8018D158; playerIndex++, player++) { - if ((gObjectList[objectIndex].state != 0) && !(player->effects & (BOO_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT)) && + if ((gObjectList[objectIndex].state != 0) && + !(player->effects & (BOO_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT)) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) { if (player->effects & STAR_EFFECT) { var_s6 = 1; @@ -1256,7 +1257,8 @@ s32 func_80089F24(s32 objectIndex) { player = gPlayerOne; if (is_obj_flag_status_active(objectIndex, 0x00000200) != 0) { for (playerIndex = 0; playerIndex < D_8018D158; playerIndex++, player++) { - if ((gObjectList[objectIndex].state != 0) && !(player->effects & (BOO_EFFECT | STAR_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT))) { + if ((gObjectList[objectIndex].state != 0) && + !(player->effects & (BOO_EFFECT | STAR_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT))) { if ((player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) { var_s7 = 1; diff --git a/src/cpu_vehicles_camera_path.c b/src/cpu_vehicles_camera_path.c index 66634ce3c..659e67890 100644 --- a/src/cpu_vehicles_camera_path.c +++ b/src/cpu_vehicles_camera_path.c @@ -1353,14 +1353,15 @@ void update_vehicles(void) { void play_cpu_sound_effect(s32 arg0, Player* player) { if (D_80163398[arg0] >= 0xB) { - if ((player->effects & BANANA_SPINOUT_EFFECT) || (player->effects & DRIVING_SPINOUT_EFFECT) || (player->effects & LIGHTNING_STRIKE_EFFECT)) { + if ((player->effects & BANANA_SPINOUT_EFFECT) || (player->effects & DRIVING_SPINOUT_EFFECT) || + (player->effects & LIGHTNING_STRIKE_EFFECT)) { func_800C92CC(arg0, SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x0A)); D_80163398[arg0] = 0; } } if (D_801633B0[arg0] >= 0xB) { - if ((player->soundEffects & 0x400000) || (player->soundEffects & 0x01000000) || - (player->soundEffects & 2) || (player->soundEffects & 4) || (player->effects & SQUISH_EFFECT)) { + if ((player->soundEffects & 0x400000) || (player->soundEffects & 0x01000000) || (player->soundEffects & 2) || + (player->soundEffects & 4) || (player->effects & SQUISH_EFFECT)) { func_800C92CC(arg0, SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x0B)); D_801633B0[arg0] = 0; } @@ -1543,7 +1544,8 @@ void update_player(s32 playerId) { determine_ideal_cpu_position_offset(playerId, gCurrentNearestPathPoint); distX = gOffsetPosition[0] - player->pos[0]; minAngle = gOffsetPosition[2] - player->pos[2]; - if (!(player->effects & BANANA_SPINOUT_EFFECT) && !(player->effects & DRIVING_SPINOUT_EFFECT) && !(player->effects & BANANA_NEAR_SPINOUT_EFFECT)) { + if (!(player->effects & BANANA_SPINOUT_EFFECT) && !(player->effects & DRIVING_SPINOUT_EFFECT) && + !(player->effects & BANANA_NEAR_SPINOUT_EFFECT)) { if (((distX * distX) + (minAngle * minAngle)) > 6400.0f) { if (gPlayerPathIndex == 0) { func_8000B140(playerId); diff --git a/src/cpu_vehicles_camera_path/cpu_speed_control.inc.c b/src/cpu_vehicles_camera_path/cpu_speed_control.inc.c index 7766b2bf8..3a637bd71 100644 --- a/src/cpu_vehicles_camera_path/cpu_speed_control.inc.c +++ b/src/cpu_vehicles_camera_path/cpu_speed_control.inc.c @@ -133,9 +133,9 @@ void regulate_cpu_speed(s32 playerId, f32 targetSpeed, Player* player) { s32 var_a1; speed = player->speed; - if (!(player->effects & BANANA_SPINOUT_EFFECT) && !(player->effects & DRIVING_SPINOUT_EFFECT) && !(player->effects & LIGHTNING_STRIKE_EFFECT) && - !(player->soundEffects & 0x400000) && !(player->soundEffects & 0x01000000) && !(player->soundEffects & 2) && - !(player->soundEffects & 4)) { + if (!(player->effects & BANANA_SPINOUT_EFFECT) && !(player->effects & DRIVING_SPINOUT_EFFECT) && + !(player->effects & LIGHTNING_STRIKE_EFFECT) && !(player->soundEffects & 0x400000) && + !(player->soundEffects & 0x01000000) && !(player->soundEffects & 2) && !(player->soundEffects & 4)) { if (gCurrentCourseId == COURSE_AWARD_CEREMONY) { func_80007FA4(playerId, player, speed); } else if ((bStopAICrossing[playerId] == true) && !(player->effects & (STAR_EFFECT | BOO_EFFECT))) { diff --git a/src/effects.c b/src/effects.c index b2ac9ad9b..186119401 100644 --- a/src/effects.c +++ b/src/effects.c @@ -149,7 +149,8 @@ void clean_effect(Player* player, s8 playerIndex) { func_8008C6D0(player, playerIndex); } - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || (player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) { + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + (player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) { func_8008C8C4(player, playerIndex); } if ((player->effects & BANANA_NEAR_SPINOUT_EFFECT) == BANANA_NEAR_SPINOUT_EFFECT) { @@ -257,7 +258,8 @@ void func_8008C6D0(Player* player, s8 playerIndex) { void func_8008C73C(Player* player, s8 playerIndex) { clean_effect(player, playerIndex); - if (((player->effects & BANANA_SPINOUT_EFFECT) != BANANA_SPINOUT_EFFECT) && ((player->effects & DRIVING_SPINOUT_EFFECT) != DRIVING_SPINOUT_EFFECT)) { + if (((player->effects & BANANA_SPINOUT_EFFECT) != BANANA_SPINOUT_EFFECT) && + ((player->effects & DRIVING_SPINOUT_EFFECT) != DRIVING_SPINOUT_EFFECT)) { player->effects &= ~DRIFTING_EFFECT; if ((player->unk_0C0 / 182) >= 0) { @@ -863,7 +865,8 @@ void apply_hit_rotating_sound_effect(Player* player, s8 playerIndex) { void apply_lightning_effect(Player* player, s8 playerIndex) { s16 test; - if (((player->effects & ENEMY_BONK_EFFECT) == ENEMY_BONK_EFFECT) && ((player->effects & SQUISH_EFFECT) != SQUISH_EFFECT)) { + if (((player->effects & ENEMY_BONK_EFFECT) == ENEMY_BONK_EFFECT) && + ((player->effects & SQUISH_EFFECT) != SQUISH_EFFECT)) { player->effects &= ~LIGHTNING_STRIKE_EFFECT; player->unk_0A8 = 0; player->unk_07C = 0; @@ -982,7 +985,8 @@ void func_8008E4A4(Player* player, s8 playerIndex) { if (gModeSelection == BATTLE) { pop_player_balloon(player, playerIndex); } - if ((gIsPlayerTripleAButtonCombo[playerIndex] == true) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { + if ((gIsPlayerTripleAButtonCombo[playerIndex] == true) && + ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { player->currentSpeed += 100.0f; } @@ -1089,7 +1093,8 @@ void apply_hit_by_star_effect(Player* player, s8 playerIndex) { D_80165190[2][playerIndex] = 1; D_80165190[3][playerIndex] = 1; player->unk_042 = 0; - if ((gIsPlayerTripleAButtonCombo[playerIndex] == true) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { + if ((gIsPlayerTripleAButtonCombo[playerIndex] == true) && + ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { player->currentSpeed += 100.0f; } @@ -1972,10 +1977,11 @@ void func_80090970(Player* player, s8 playerId, s8 arg2) { } } -#define BLOCK_ITEM_USE_EFFECTS \ - LIGHTNING_EFFECT | UNKNOWN_EFFECT_0x10000000 | POST_SQUISH_EFFECT | SQUISH_EFFECT | HIT_BY_STAR_EFFECT | EXPLOSION_CRASH_EFFECT | UNKNOWN_EFFECT_0x800000 | \ - BOOST_RAMP_ASPHALT_EFFECT | LIGHTNING_STRIKE_EFFECT | TERRAIN_TUMBLE_EFFECT | EARLY_START_SPINOUT_EFFECT | BANANA_NEAR_SPINOUT_EFFECT | HIT_BY_GREEN_SHELL_EFFECT | STAR_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT | \ - BOOST_RAMP_WOOD_EFFECT +#define BLOCK_ITEM_USE_EFFECTS \ + LIGHTNING_EFFECT | UNKNOWN_EFFECT_0x10000000 | POST_SQUISH_EFFECT | SQUISH_EFFECT | HIT_BY_STAR_EFFECT | \ + EXPLOSION_CRASH_EFFECT | UNKNOWN_EFFECT_0x800000 | BOOST_RAMP_ASPHALT_EFFECT | LIGHTNING_STRIKE_EFFECT | \ + TERRAIN_TUMBLE_EFFECT | EARLY_START_SPINOUT_EFFECT | BANANA_NEAR_SPINOUT_EFFECT | HIT_BY_GREEN_SHELL_EFFECT | \ + STAR_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT | BOOST_RAMP_WOOD_EFFECT bool prevent_item_use(Player* player) { s32 phi_v0 = 0; diff --git a/src/kart_dma.c b/src/kart_dma.c index 64a64ed00..5695a5449 100644 --- a/src/kart_dma.c +++ b/src/kart_dma.c @@ -1187,8 +1187,11 @@ u8* gKartPalettes[] = { **/ void load_kart_texture(Player* player, s8 playerId, s8 screenId, s8 screenId2, s8 index) { s32 temp = player->effects; - if (((temp & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((temp & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || ((temp & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || - ((temp & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || ((temp & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || ((player->unk_044 & 0x800) != 0)) { + if (((temp & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((temp & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((temp & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((temp & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || + ((temp & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || ((player->unk_044 & 0x800) != 0)) { if (player->animFrameSelector[screenId] != 0) { osInvalDCache(&gEncodedKartTexture[index][screenId2][playerId], D_800DDEB0[player->characterId]); @@ -1212,8 +1215,10 @@ void load_kart_texture(Player* player, s8 playerId, s8 screenId, s8 screenId2, s osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK); } - } else if (((temp & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || ((temp & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT) || - ((temp & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT) || ((temp & TERRAIN_TUMBLE_EFFECT) == TERRAIN_TUMBLE_EFFECT)) { + } else if (((temp & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || + ((temp & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT) || + ((temp & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT) || + ((temp & TERRAIN_TUMBLE_EFFECT) == TERRAIN_TUMBLE_EFFECT)) { osInvalDCache(&gEncodedKartTexture[index][screenId2][playerId], 0x780U); // player->unk_0A8 >> 8 converts an 8.8 fixed-point animation frame to a whole number. osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, @@ -1238,8 +1243,11 @@ void load_kart_texture(Player* player, s8 playerId, s8 screenId, s8 screenId2, s void load_kart_texture_non_blocking(Player* player, s8 arg1, s8 arg2, s8 arg3, s8 arg4) { s32 temp = player->effects; - if (((temp & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((temp & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || ((temp & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || - ((temp & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || ((temp & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || ((player->unk_044 & 0x800) != 0)) { + if (((temp & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((temp & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((temp & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((temp & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || + ((temp & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || ((player->unk_044 & 0x800) != 0)) { if (player->animFrameSelector[arg2] != 0) { osInvalDCache(&gEncodedKartTexture[arg4][arg3][arg1], D_800DDEB0[player->characterId]); @@ -1257,8 +1265,10 @@ void load_kart_texture_non_blocking(Player* player, s8 arg1, s8 arg2, s8 arg3, s [player->animFrameSelector[arg2]])], &gEncodedKartTexture[arg4][arg3][arg1], D_800DDEB0[player->characterId], &gDmaMesgQueue); } - } else if (((temp & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || ((temp & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT) || - ((temp & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT) || ((temp & TERRAIN_TUMBLE_EFFECT) == TERRAIN_TUMBLE_EFFECT)) { + } else if (((temp & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || + ((temp & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT) || + ((temp & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT) || + ((temp & TERRAIN_TUMBLE_EFFECT) == TERRAIN_TUMBLE_EFFECT)) { osInvalDCache(&gEncodedKartTexture[arg4][arg3][arg1], 0x780); // player->unk_0A8 >> 8 converts an 8.8 fixed-point animation frame to a whole number. osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, diff --git a/src/player_controller.c b/src/player_controller.c index 18b7f2db1..baebed19a 100644 --- a/src/player_controller.c +++ b/src/player_controller.c @@ -536,9 +536,12 @@ void func_80028864(Player* player, Camera* camera, s8 playerId, s8 screenId) { //! @todo make a proper match ((*(D_801633F8 + (playerId))) == ((s16) 1U))) { player->effects &= ~LOST_RACE_EFFECT; - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || - ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || - ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || + ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || + ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || ((player->effects & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT) || ((player->effects & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT) || ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || (player->unk_044 & 0x800)) { @@ -565,12 +568,16 @@ void func_80028864(Player* player, Camera* camera, s8 playerId, s8 screenId) { void func_80028C44(Player* player, Camera* camera, s8 playerId, s8 screenId) { if ((player->type & PLAYER_START_SEQUENCE) == 0) { player->effects &= ~LOST_RACE_EFFECT; - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || - ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || - ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || + ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || + ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || ((player->effects & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT) || ((player->effects & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT) || - ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || ((player->unk_044 & 0x800) != 0)) { + ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || + ((player->unk_044 & 0x800) != 0)) { func_8002E594(player, camera, screenId, playerId); } else { func_8002D268(player, camera, screenId, playerId); @@ -583,16 +590,20 @@ void func_80028C44(Player* player, Camera* camera, s8 playerId, s8 screenId) { void func_80028D3C(Player* player, Camera* camera, s8 playerId, s8 screenId) { if ((((player->type & PLAYER_START_SEQUENCE) == 0) && (D_800DC510 != 5)) || (player->unk_0CA & 2) != 0 || (player->unk_0CA & 8) != 0 || - (player->effects & (LIGHTNING_EFFECT | EXPLOSION_CRASH_EFFECT | HIT_BY_STAR_EFFECT | SQUISH_EFFECT | POST_SQUISH_EFFECT | - TERRAIN_TUMBLE_EFFECT | 0xC00 | 0xC0)) != 0) { + (player->effects & (LIGHTNING_EFFECT | EXPLOSION_CRASH_EFFECT | HIT_BY_STAR_EFFECT | SQUISH_EFFECT | + POST_SQUISH_EFFECT | TERRAIN_TUMBLE_EFFECT | 0xC00 | 0xC0)) != 0) { player->effects &= ~LOST_RACE_EFFECT; - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || - ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || - ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) || + ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT) || + ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || ((player->effects & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT) || ((player->effects & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT) || - ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || ((player->unk_044 & 0x800) != 0)) { + ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || + ((player->unk_044 & 0x800) != 0)) { func_8002E594(player, camera, screenId, playerId); } else { func_8002D268(player, camera, screenId, playerId); @@ -760,8 +771,10 @@ void func_8002934C(Player* player, Camera* camera, s8 screenId, s8 playerId) { var_a0 = 0x201 - var_a0; player->unk_002 |= (4 << (screenId * 4)); } - if (((player->effects & BANANA_SPINOUT_EFFECT) != BANANA_SPINOUT_EFFECT) && ((player->effects & DRIVING_SPINOUT_EFFECT) != DRIVING_SPINOUT_EFFECT) && - ((player->effects & UNKNOWN_EFFECT_0x80000) != UNKNOWN_EFFECT_0x80000) && ((player->effects & UNKNOWN_EFFECT_0x800000) != UNKNOWN_EFFECT_0x800000) && + if (((player->effects & BANANA_SPINOUT_EFFECT) != BANANA_SPINOUT_EFFECT) && + ((player->effects & DRIVING_SPINOUT_EFFECT) != DRIVING_SPINOUT_EFFECT) && + ((player->effects & UNKNOWN_EFFECT_0x80000) != UNKNOWN_EFFECT_0x80000) && + ((player->effects & UNKNOWN_EFFECT_0x800000) != UNKNOWN_EFFECT_0x800000) && ((player->effects & LIGHTNING_STRIKE_EFFECT) != LIGHTNING_STRIKE_EFFECT) && (!(player->unk_044 & 0x800))) { if (var_a0 < 0x51) { var_a1 = 0x208; @@ -774,16 +787,18 @@ void func_8002934C(Player* player, Camera* camera, s8 screenId, s8 playerId) { var_a1 = 0x666; var_t0 = 0; } - if (((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || - (player->unk_044 & 0x800)) { + if (((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || (player->unk_044 & 0x800)) { player->unk_050[screenId] = 0; } if (((player->effects & MIDAIR_EFFECT) == MIDAIR_EFFECT) && ((player->unk_0CA & 2) == 2)) { player->unk_050[screenId] = 0; } var_a0 = (player->unk_048[screenId] + player->rotation[1] + player->unk_0C0); - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || - ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT) || (player->unk_044 & 0x800)) { if (var_a0 >= 0x7FF9) { var_a0 = -var_a0; @@ -804,8 +819,9 @@ void func_8002934C(Player* player, Camera* camera, s8 screenId, s8 playerId) { if ((player->animFrameSelector[screenId]) >= 0x23) { player->animFrameSelector[screenId] = 0x22; } - if ((player->effects & BANANA_SPINOUT_EFFECT) || (player->effects & DRIVING_SPINOUT_EFFECT) || (player->effects & UNKNOWN_EFFECT_0x80000) || - (player->effects & UNKNOWN_EFFECT_0x800000) || (player->effects & LIGHTNING_STRIKE_EFFECT) || (player->unk_044 & 0x800)) { + if ((player->effects & BANANA_SPINOUT_EFFECT) || (player->effects & DRIVING_SPINOUT_EFFECT) || + (player->effects & UNKNOWN_EFFECT_0x80000) || (player->effects & UNKNOWN_EFFECT_0x800000) || + (player->effects & LIGHTNING_STRIKE_EFFECT) || (player->unk_044 & 0x800)) { if ((player->animFrameSelector[screenId]) >= 0x14) { player->animFrameSelector[screenId] = 0; @@ -814,8 +830,8 @@ void func_8002934C(Player* player, Camera* camera, s8 screenId, s8 playerId) { if ((player->animGroupSelector[screenId]) >= 9) { player->animGroupSelector[screenId] = 4; } - if (((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || - (player->unk_044 & 0x800)) { + if (((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000) || + ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000) || (player->unk_044 & 0x800)) { player->animGroupSelector[screenId] = 4; } @@ -958,7 +974,8 @@ void func_80029B4C(Player* player, UNUSED f32 arg1, f32 arg2, UNUSED f32 arg3) { } } if (player->surfaceType == BOOST_RAMP_WOOD) { - if (((player->effects & BOOST_RAMP_WOOD_EFFECT) != BOOST_RAMP_WOOD_EFFECT) && ((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT)) { + if (((player->effects & BOOST_RAMP_WOOD_EFFECT) != BOOST_RAMP_WOOD_EFFECT) && + ((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT)) { player->soundEffects |= BOOST_RAMP_WOOD_SOUND_EFFECT; } } @@ -1043,7 +1060,8 @@ void func_8002A194(Player* player, f32 x, f32 y, f32 z) { } } if (player->surfaceType == BOOST_RAMP_WOOD) { - if (((player->effects & BOOST_RAMP_WOOD_EFFECT) != BOOST_RAMP_WOOD_EFFECT) && ((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT)) { + if (((player->effects & BOOST_RAMP_WOOD_EFFECT) != BOOST_RAMP_WOOD_EFFECT) && + ((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT)) { player->soundEffects |= BOOST_RAMP_WOOD_SOUND_EFFECT; } } @@ -1281,8 +1299,8 @@ void func_8002AE38(Player* player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 ar sp28 = (sins(-player->rotation[1]) * player->speed) + arg2; temp_f16 = (coss(-player->rotation[1]) * player->speed) + arg3; - if (((player->effects & BANANA_NEAR_SPINOUT_EFFECT) != BANANA_NEAR_SPINOUT_EFFECT) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT) && - !(player->unk_044 & 0x4000) && + if (((player->effects & BANANA_NEAR_SPINOUT_EFFECT) != BANANA_NEAR_SPINOUT_EFFECT) && + ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT) && !(player->unk_044 & 0x4000) && ((((player->speed / 18.0f) * 216.0f) <= 8.0f) || (((player->unk_07C >> 0x10) < 5) && ((player->unk_07C >> 0x10) > -5)))) { if ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT) { @@ -1414,7 +1432,8 @@ void func_8002B5C0(Player* player, UNUSED s8 playerId, UNUSED s8 screenId) { if ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) { player->soundEffects &= 0xFF5D457E; } - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { player->soundEffects &= 0xFF5F457E; } if ((player->effects & BANANA_NEAR_SPINOUT_EFFECT) == BANANA_NEAR_SPINOUT_EFFECT) { @@ -1957,7 +1976,8 @@ void apply_effect(Player* player, s8 playerIndex, s8 arg2) { if (((player->effects & DRIFT_OUTSIDE_EFFECT) == DRIFT_OUTSIDE_EFFECT) && (player->unk_228 >= 0x64)) { player_decelerate_alternative(player, 4.0f); } - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) { func_8008C9EC(player, playerIndex); } if ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) == HIT_BY_GREEN_SHELL_EFFECT) { @@ -2107,12 +2127,13 @@ void func_8002D268(Player* player, UNUSED Camera* camera, s8 screenId, s8 player temp3 = 10; } gravityX = -1 * (player->unk_064[0] + sp16C[0]) + - ((-player->collision.orientationVector[0] * player->kartGravity) * sp104[temp3]); + ((-player->collision.orientationVector[0] * player->kartGravity) * sp104[temp3]); gravityY = (-player->collision.orientationVector[1] * player->kartGravity); gravityZ = -1 * (player->unk_064[2] + sp16C[2]) + - ((-player->collision.orientationVector[2] * player->kartGravity) * sp104[temp3]); + ((-player->collision.orientationVector[2] * player->kartGravity) * sp104[temp3]); } - if (((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT) && ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { + if (((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT) && + ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { gravityX = 0 * (player->unk_064[0] + sp16C[0]); gravityY = -1 * player->kartGravity / 4; gravityZ = 0 * (player->unk_064[2] + sp16C[2]); @@ -2129,7 +2150,8 @@ void func_8002D268(Player* player, UNUSED Camera* camera, s8 screenId, s8 player } else { player->unk_044 &= 0xFFF7; } - if (((player->unk_08C <= 0.0f) && ((temp_v0_3 = player->effects, (temp_v0_3 & BRAKING_EFFECT) == BRAKING_EFFECT))) && + if (((player->unk_08C <= 0.0f) && + ((temp_v0_3 = player->effects, (temp_v0_3 & BRAKING_EFFECT) == BRAKING_EFFECT))) && ((temp_v0_3 & AB_SPIN_EFFECT) != AB_SPIN_EFFECT)) { sp178[2] = temp_f2_2 * 4500.0f; } else { @@ -2150,30 +2172,37 @@ void func_8002D268(Player* player, UNUSED Camera* camera, s8 screenId, s8 player if (((player->unk_07C >> 16) >= 0x28) || ((player->unk_07C >> 16) < (-0x27))) { - newVelocity[0] += (((((f64) ((sp184[0] + gravityX) + sp160[0])) - (newVelocity[0] * (0.12 * ((f64) player->kartFriction)))) / - 6000.0) / - (((((f64) player->unk_20C) * 0.6) + 1.0) + sp7C)); - newVelocity[2] += (((((f64) ((sp184[2] + gravityZ) + sp160[2])) - (newVelocity[2] * (0.12 * ((f64) player->kartFriction)))) / - 6000.0) / - (((((f64) player->unk_20C) * 0.6) + 1.0) + sp7C)); + newVelocity[0] += (((((f64) ((sp184[0] + gravityX) + sp160[0])) - + (newVelocity[0] * (0.12 * ((f64) player->kartFriction)))) / + 6000.0) / + (((((f64) player->unk_20C) * 0.6) + 1.0) + sp7C)); + newVelocity[2] += (((((f64) ((sp184[2] + gravityZ) + sp160[2])) - + (newVelocity[2] * (0.12 * ((f64) player->kartFriction)))) / + 6000.0) / + (((((f64) player->unk_20C) * 0.6) + 1.0) + sp7C)); } else { - newVelocity[0] += (((((f64) ((sp184[0] + gravityX) + sp160[0])) - (newVelocity[0] * (0.12 * ((f64) player->kartFriction)))) / - 6000.0) / - (sp7C + 1)); - newVelocity[2] += (((((f64) ((sp184[2] + gravityZ) + sp160[2])) - (newVelocity[2] * (0.12 * ((f64) player->kartFriction)))) / - 6000.0) / - (sp7C + 1)); + newVelocity[0] += (((((f64) ((sp184[0] + gravityX) + sp160[0])) - + (newVelocity[0] * (0.12 * ((f64) player->kartFriction)))) / + 6000.0) / + (sp7C + 1)); + newVelocity[2] += (((((f64) ((sp184[2] + gravityZ) + sp160[2])) - + (newVelocity[2] * (0.12 * ((f64) player->kartFriction)))) / + 6000.0) / + (sp7C + 1)); } } else { newVelocity[0] += - (((((f64) ((sp184[0] + gravityX) + sp160[0])) - (newVelocity[0] * (0.12 * ((f64) player->kartFriction)))) / 6000.0) / + (((((f64) ((sp184[0] + gravityX) + sp160[0])) - (newVelocity[0] * (0.12 * ((f64) player->kartFriction)))) / + 6000.0) / 30.0); newVelocity[2] += - (((((f64) ((sp184[2] + gravityZ) + sp160[2])) - (newVelocity[2] * (0.12 * ((f64) player->kartFriction)))) / 6000.0) / + (((((f64) ((sp184[2] + gravityZ) + sp160[2])) - (newVelocity[2] * (0.12 * ((f64) player->kartFriction)))) / + 6000.0) / 30.0); } newVelocity[1] += - (((((f64) ((sp184[1] + gravityY) + sp160[1])) - (newVelocity[1] * (0.12 * ((f64) player->kartFriction)))) / 6000.0) / + (((((f64) ((sp184[1] + gravityY) + sp160[1])) - (newVelocity[1] * (0.12 * ((f64) player->kartFriction)))) / + 6000.0) / ((f64) player->unk_DAC)); if (((((player->unk_0CA & 2) == 2) || ((player->unk_0CA & 8) == 8)) || ((player->effects & SQUISH_EFFECT) == SQUISH_EFFECT)) || @@ -2401,7 +2430,8 @@ void func_8002E594(Player* player, UNUSED Camera* camera, s8 screenId, s8 player Vec3f sp48; s16 sp46; func_8002B830(player, playerId, screenId); - if ((((((((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) || + if ((((((((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) || ((player->effects & EARLY_START_SPINOUT_EFFECT) == EARLY_START_SPINOUT_EFFECT)) || ((player->effects & UNKNOWN_EFFECT_0x80000) == UNKNOWN_EFFECT_0x80000)) || ((player->effects & UNKNOWN_EFFECT_0x800000) == UNKNOWN_EFFECT_0x800000)) || @@ -2414,9 +2444,11 @@ void func_8002E594(Player* player, UNUSED Camera* camera, s8 screenId, s8 player apply_effect(player, playerId, screenId); func_8002AB70(player); func_8002FCA8(player, playerId); - if ((((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) || + if ((((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) || ((player->effects & LIGHTNING_STRIKE_EFFECT) == LIGHTNING_STRIKE_EFFECT)) { - gravityX = -1 * (player->unk_064[0]) + (((-player->collision.orientationVector[0]) * player->kartGravity) * 0.1); + gravityX = + -1 * (player->unk_064[0]) + (((-player->collision.orientationVector[0]) * player->kartGravity) * 0.1); gravityY = (-player->collision.orientationVector[1]) * player->kartGravity; gravityZ = -1 * (player->unk_064[2]) + (((-player->collision.orientationVector[2]) * player->kartGravity) * 0.1); } else { @@ -2443,7 +2475,8 @@ void func_8002E594(Player* player, UNUSED Camera* camera, s8 screenId, s8 player newVelocity[0] = player->velocity[0]; newVelocity[1] = player->velocity[1]; newVelocity[2] = player->velocity[2]; - if ((player->unk_10C < 3) && ((player->unk_256) < 3) && ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && + if ((player->unk_10C < 3) && ((player->unk_256) < 3) && + ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && ((player->effects & EXPLOSION_CRASH_EFFECT) != EXPLOSION_CRASH_EFFECT) && ((player->effects & HIT_BY_STAR_EFFECT) != HIT_BY_STAR_EFFECT)) { newVelocity[0] += (((((spEC[0] + gravityX) + spD4[0])) - (newVelocity[0] * (0.12 * player->kartFriction))) / 6000) / @@ -2599,9 +2632,10 @@ void func_8002E594(Player* player, UNUSED Camera* camera, s8 screenId, s8 player temp = (newVelocity[0] * newVelocity[0]) + (newVelocity[2] * newVelocity[2]); player->previousSpeed = player->speed; player->speed = sqrtf(temp); - if ((((player->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && (player->unk_08C <= 0) && (player->speed < 0.13)) || - (((player->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && (player->unk_08C <= 0) && (player->speed < 0.20) && - ((player->effects & BRAKING_EFFECT) == BRAKING_EFFECT))) { + if ((((player->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && (player->unk_08C <= 0) && + (player->speed < 0.13)) || + (((player->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && (player->unk_08C <= 0) && + (player->speed < 0.20) && ((player->effects & BRAKING_EFFECT) == BRAKING_EFFECT))) { newVelocity[0] = newVelocity[0] + (-1 * newVelocity[0]); newVelocity[2] = newVelocity[2] + (-1 * newVelocity[2]); } else { @@ -2781,7 +2815,8 @@ void func_8002F730(Player* player, UNUSED Camera* camera, UNUSED s8 screenId, s8 player->previousSpeed = player->speed; player->speed = sqrtf(sqrt); if (((player->unk_08C <= 0.0f) && ((f64) player->speed < 0.13)) || - ((player->unk_08C <= 0.0f) && ((f64) player->speed < 0.2) && ((player->effects & BRAKING_EFFECT) == BRAKING_EFFECT))) { + ((player->unk_08C <= 0.0f) && ((f64) player->speed < 0.2) && + ((player->effects & BRAKING_EFFECT) == BRAKING_EFFECT))) { newVelocity[0] = newVelocity[0] + (newVelocity[0] * -1.0f); newVelocity[2] = newVelocity[2] + (newVelocity[2] * -1.0f); } else { @@ -3027,7 +3062,8 @@ f32 func_80030150(Player* player, s8 playerIndex) { ((player->type & PLAYER_START_SEQUENCE) == PLAYER_START_SEQUENCE)) { return (1.0f - player->unk_104) * var_f2; } - if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || + if (((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT) || ((player->effects & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT) || ((player->effects & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT)) { return (1.0f - player->unk_104) * var_f2; @@ -3673,13 +3709,16 @@ void player_accelerate_global(Player* player, s32 playerIndex) { if (((player->topSpeed * 0.1) <= gPlayerCurrentSpeed[playerIndex]) && (gPlayerCurrentSpeed[playerIndex] < (player->topSpeed * 0.2))) { gPlayerCurrentSpeed[playerIndex] += gKartAccelerationTables[player->characterId][1] * 3.2; } - if (((player->topSpeed * 0.2) <= gPlayerCurrentSpeed[playerIndex]) && (gPlayerCurrentSpeed[playerIndex] < (player->topSpeed * 0.3))) { + if (((player->topSpeed * 0.2) <= gPlayerCurrentSpeed[playerIndex]) && + (gPlayerCurrentSpeed[playerIndex] < (player->topSpeed * 0.3))) { gPlayerCurrentSpeed[playerIndex] += gKartAccelerationTables[player->characterId][2] * 3.2; } - if (((player->topSpeed * 0.3) <= gPlayerCurrentSpeed[playerIndex]) && (gPlayerCurrentSpeed[playerIndex] < (player->topSpeed * 0.4))) { + if (((player->topSpeed * 0.3) <= gPlayerCurrentSpeed[playerIndex]) && + (gPlayerCurrentSpeed[playerIndex] < (player->topSpeed * 0.4))) { gPlayerCurrentSpeed[playerIndex] += gKartAccelerationTables[player->characterId][3] * 3.2; } - if (((player->topSpeed * 0.4) <= gPlayerCurrentSpeed[playerIndex]) && (gPlayerCurrentSpeed[playerIndex] < (player->topSpeed * 0.5))) { + if (((player->topSpeed * 0.4) <= gPlayerCurrentSpeed[playerIndex]) && + (gPlayerCurrentSpeed[playerIndex] < (player->topSpeed * 0.5))) { gPlayerCurrentSpeed[playerIndex] += gKartAccelerationTables[player->characterId][4] * 3.2; } if (((player->topSpeed * 0.5) <= gPlayerCurrentSpeed[playerIndex]) && (gPlayerCurrentSpeed[playerIndex] < (player->topSpeed * 0.6))) { @@ -3823,8 +3862,9 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8 }; - if (((((player->effects & HOP_EFFECT) != HOP_EFFECT) && ((((player->unk_0C0 / 182) <= 6) && ((player->unk_0C0 / 182) >= (-6))) || - ((controller->button & R_TRIG) != R_TRIG))) || + if (((((player->effects & HOP_EFFECT) != HOP_EFFECT) && + ((((player->unk_0C0 / 182) <= 6) && ((player->unk_0C0 / 182) >= (-6))) || + ((controller->button & R_TRIG) != R_TRIG))) || (((player->speed / 18.0f) * 216.0f) <= 20.0f)) || ((player->effects & ENEMY_BONK_EFFECT) == ENEMY_BONK_EFFECT)) { func_80036CB4(player); @@ -3854,8 +3894,7 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { sp2D0 = sp2D0 >> 16; player->unk_0FA = (s16) sp2D0; if (((sp2D0 >= 0x5A) || (sp2D0 < (-0x59))) && (!(player->unk_044 & 0x4000))) { - if ((((((!(player->effects & DRIFTING_EFFECT)) && (gCCSelection == CC_150)) && - (gModeSelection != BATTLE)) && + if ((((((!(player->effects & DRIFTING_EFFECT)) && (gCCSelection == CC_150)) && (gModeSelection != BATTLE)) && (!(player->effects & MIDAIR_EFFECT))) && (((player->speed / 18.0f) * 216.0f) >= 40.0f)) && (player->unk_204 == 0)) { @@ -3872,7 +3911,8 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) { sp2C8 = 10; sp2CC = 10; } else { - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && + ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { var_a0 = 3; } else { var_a0 = 0; @@ -4140,10 +4180,10 @@ void apply_cpu_turn(Player* player, s16 targetAngle) { 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, }; - if (!((player->effects & BANANA_SPINOUT_EFFECT) || (player->effects & DRIVING_SPINOUT_EFFECT) || (player->effects & HIT_BY_GREEN_SHELL_EFFECT) || - (player->effects & TERRAIN_TUMBLE_EFFECT) || (player->effects & LIGHTNING_STRIKE_EFFECT) || - (player->effects & EXPLOSION_CRASH_EFFECT) || (player->effects & HIT_BY_STAR_EFFECT) || - (player->effects & SQUISH_EFFECT))) { + if (!((player->effects & BANANA_SPINOUT_EFFECT) || (player->effects & DRIVING_SPINOUT_EFFECT) || + (player->effects & HIT_BY_GREEN_SHELL_EFFECT) || (player->effects & TERRAIN_TUMBLE_EFFECT) || + (player->effects & LIGHTNING_STRIKE_EFFECT) || (player->effects & EXPLOSION_CRASH_EFFECT) || + (player->effects & HIT_BY_STAR_EFFECT) || (player->effects & SQUISH_EFFECT))) { if (!(((player->speed / 18.0f) * 216.0f) >= 110.0f)) { player->effects &= ~DRIFT_OUTSIDE_EFFECT; player->unk_228 = 0; @@ -4168,7 +4208,8 @@ void apply_cpu_turn(Player* player, s16 targetAngle) { var_f0; } player->unk_07C = sp304; - if (((player->effects & HOP_EFFECT) != HOP_EFFECT) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT)) { + if (((player->effects & HOP_EFFECT) != HOP_EFFECT) && + ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT)) { if ((player->effects & BRAKING_EFFECT) != BRAKING_EFFECT) { player->unk_078 = (player->unk_07C >> 0x10) * var_f0; } else { @@ -4209,8 +4250,7 @@ void func_80036C5C(Player* player) { void func_80036CB4(Player* player) { s32 test; - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && - ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { if ((player->unk_0C0 / 182) > 0) { test = ((((player->unk_07C >> 0x10) * 0xD) + 0x2B1) / 106) + 0x28; player->unk_07C = test << 0x10; @@ -4221,8 +4261,7 @@ void func_80036CB4(Player* player) { } player->effects &= ~DRIFTING_EFFECT; } - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && - ((player->type & PLAYER_HUMAN) != PLAYER_HUMAN)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->type & PLAYER_HUMAN) != PLAYER_HUMAN)) { player->effects &= ~DRIFTING_EFFECT; } } @@ -4234,13 +4273,15 @@ void func_80036DB4(Player* player, Vec3f arg1, Vec3f arg2) { f32 var_f18; s32 temp_t6; - if (((player->effects & LOST_RACE_EFFECT) == LOST_RACE_EFFECT) || ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { + if (((player->effects & LOST_RACE_EFFECT) == LOST_RACE_EFFECT) || + ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { arg1[0] = 0.0f; arg1[1] = 0.0f; arg1[2] = 0.0f; mtxf_transform_vec3f_mat3(arg1, player->orientationMatrix); } else { - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && + ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { var_f18 = player->unk_208 + ((-(player->speed / 18.0f) * 216.0f) * 3.0f) + (-player->unk_20C * 10.0f); sp20 = player->unk_084 * 3.0f; } else if (!(player->effects & BANANA_NEAR_SPINOUT_EFFECT) && !(player->unk_044 & 0x4000)) { @@ -4268,7 +4309,8 @@ void func_80036DB4(Player* player, Vec3f arg1, Vec3f arg2) { sp20 = player->unk_084; } if ((player->effects & STAR_EFFECT) == STAR_EFFECT) { - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && + ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { var_f18 = player->unk_208 + ((-(player->speed / 18.0f) * 216.0f) * 3.0f) + (-player->unk_20C * 10.0f); sp20 = player->unk_084 * 3.0f; } else { @@ -4292,13 +4334,15 @@ void func_800371F4(Player* player, Vec3f arg1, Vec3f arg2) { f32 var_f18; s32 temp_t6; - if (((player->effects & LOST_RACE_EFFECT) == LOST_RACE_EFFECT) || ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { + if (((player->effects & LOST_RACE_EFFECT) == LOST_RACE_EFFECT) || + ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { arg1[0] = 0.0f; arg1[1] = 0.0f; arg1[2] = 0.0f; mtxf_transform_vec3f_mat3(arg1, player->orientationMatrix); } else { - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && + ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { var_f18 = player->unk_208 + ((-(player->speed / 18.0f) * 216.0f) * 3.0f) + (-player->unk_20C * 50.0f); sp20 = player->unk_084 * 3.0f; } else if (!(player->effects & BANANA_NEAR_SPINOUT_EFFECT) && !(player->unk_044 & 0x4000)) { @@ -4329,7 +4373,8 @@ void func_800371F4(Player* player, Vec3f arg1, Vec3f arg2) { sp20 = player->unk_084; } if ((player->effects & STAR_EFFECT) == STAR_EFFECT) { - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && + ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { var_f18 = player->unk_208 + ((-(player->speed / 18.0f) * 216.0f) * 3.0f) + (-player->unk_20C * 50.0f); sp20 = player->unk_084 * 3.0f; } else { @@ -4351,13 +4396,15 @@ void func_80037614(Player* player, Vec3f arg1, Vec3f arg2) { f32 var_f12; f32 var_f2; - if (((player->effects & LOST_RACE_EFFECT) == LOST_RACE_EFFECT) || ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { + if (((player->effects & LOST_RACE_EFFECT) == LOST_RACE_EFFECT) || + ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { arg1[0] = 0.0f; arg1[1] = 0.0f; arg1[2] = 0.0f; mtxf_transform_vec3f_mat3(arg1, player->orientationMatrix); } else { - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && + ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { var_f2 = ((-(player->speed / 18.0f) * 216.0f) * 2) + -80.0f; var_f12 = -80.0f; } else { @@ -4379,13 +4426,15 @@ void func_8003777C(Player* player, Vec3f arg1, Vec3f arg2) { f32 var_f12; f32 var_f2; - if (((player->effects & LOST_RACE_EFFECT) == LOST_RACE_EFFECT) || ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { + if (((player->effects & LOST_RACE_EFFECT) == LOST_RACE_EFFECT) || + ((player->effects & AB_SPIN_EFFECT) == AB_SPIN_EFFECT)) { arg1[0] = 0.0f; arg1[1] = 0.0f; arg1[2] = 0.0f; mtxf_transform_vec3f_mat3(arg1, player->orientationMatrix); } else { - if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { + if (((player->effects & DRIFTING_EFFECT) == DRIFTING_EFFECT) && + ((player->effects & HOP_EFFECT) != HOP_EFFECT)) { var_f2 = ((-(player->speed / 18.0f) * 216.0f) * 2) + -80.0f; var_f12 = -80.0f; } else { @@ -4496,15 +4545,17 @@ void func_80037BB4(Player* player, Vec3f arg1) { } void func_80037CFC(Player* player, struct Controller* controller, s8 playerIndex) { - if (((player->effects & BANANA_SPINOUT_EFFECT) != BANANA_SPINOUT_EFFECT) && ((player->effects & DRIVING_SPINOUT_EFFECT) != DRIVING_SPINOUT_EFFECT) && - ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && ((player->effects & EARLY_START_SPINOUT_EFFECT) != EARLY_START_SPINOUT_EFFECT) && + if (((player->effects & BANANA_SPINOUT_EFFECT) != BANANA_SPINOUT_EFFECT) && + ((player->effects & DRIVING_SPINOUT_EFFECT) != DRIVING_SPINOUT_EFFECT) && + ((player->effects & HIT_BY_GREEN_SHELL_EFFECT) != HIT_BY_GREEN_SHELL_EFFECT) && + ((player->effects & EARLY_START_SPINOUT_EFFECT) != EARLY_START_SPINOUT_EFFECT) && ((player->effects & EXPLOSION_CRASH_EFFECT) != EXPLOSION_CRASH_EFFECT) && ((player->effects & HIT_BY_STAR_EFFECT) != HIT_BY_STAR_EFFECT) && ((player->effects & TERRAIN_TUMBLE_EFFECT) != TERRAIN_TUMBLE_EFFECT) && ((player->effects & LIGHTNING_STRIKE_EFFECT) != LIGHTNING_STRIKE_EFFECT)) { - if (((player->effects & SQUISH_EFFECT) != SQUISH_EFFECT) && ((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT) && - ((player->effects & HOP_EFFECT) != HOP_EFFECT) && ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT) && - (controller->buttonPressed & R_TRIG)) { + if (((player->effects & SQUISH_EFFECT) != SQUISH_EFFECT) && + ((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT) && ((player->effects & HOP_EFFECT) != HOP_EFFECT) && + ((player->effects & DRIFTING_EFFECT) != DRIFTING_EFFECT) && (controller->buttonPressed & R_TRIG)) { kart_hop(player); if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { @@ -4576,7 +4627,8 @@ void func_80037CFC(Player* player, struct Controller* controller, s8 playerIndex player_decelerate_alternative(player, 5.0f); } } - if (((((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) || + if (((((player->effects & BANANA_SPINOUT_EFFECT) == BANANA_SPINOUT_EFFECT) || + ((player->effects & DRIVING_SPINOUT_EFFECT) == DRIVING_SPINOUT_EFFECT)) || ((player->effects & EXPLOSION_CRASH_EFFECT) == EXPLOSION_CRASH_EFFECT)) || ((player->effects & HIT_BY_STAR_EFFECT) == HIT_BY_STAR_EFFECT)) { if (controller->button & A_BUTTON) { @@ -4605,7 +4657,7 @@ void handle_a_press_for_player_during_race(Player* player, struct Controller* co func_80037CFC(player, controller, playerIndex); } D_80164A89 = 1; - // If start sequence and unknown condition + // If start sequence and unknown condition } else if (D_8018D168 == 1) { if (D_801656F0 == 1) { if (D_801652E0[playerIndex] == 0) { diff --git a/src/racing/actors.c b/src/racing/actors.c index 73e0e91e6..d38144330 100644 --- a/src/racing/actors.c +++ b/src/racing/actors.c @@ -2077,7 +2077,8 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor } break; case ACTOR_BANANA: - if (player->effects & (BOO_EFFECT | BANANA_NEAR_SPINOUT_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT)) { + if (player->effects & + (BOO_EFFECT | BANANA_NEAR_SPINOUT_EFFECT | BANANA_SPINOUT_EFFECT | DRIVING_SPINOUT_EFFECT)) { break; } if (player->soundEffects & 1) {