Skip to content

Commit

Permalink
more fix of name
Browse files Browse the repository at this point in the history
  • Loading branch information
@coco875
coco875 committed Feb 5, 2025
1 parent 67c0ee2 commit 21e792f
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion include/common_structs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ typedef struct {
/* 0x0238 */ s16 unk_238;
/* 0x023A */ s16 unk_23A;
/* 0x023C */ f32 unk_23C;
/* 0x0240 */ s32 unk_240;
/* 0x0240 */ s32 tyreSpeed;
/* 0x0244 */ u16 animFrameSelector[4]; // [0] Active texture group
/* 0x024C */ u16 animGroupSelector[4];
/* 0x0254 */ u16 characterId;
Expand Down
12 changes: 6 additions & 6 deletions src/code_8003DC40.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void func_8003E048(Player* player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4
if (player->collision.orientationVector[1] <= 0.8829f) {
arg3[0] = ((player->unk_206 / 182) * 0xB4);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
decelerate_player(player, 4.0f);
player_decelerate(player, 4.0f);
player->unk_DAC = 0.5f;
if ((player->effects & BOOST_EFFECT) != 0) {
remove_boost_effect(player);
Expand Down Expand Up @@ -99,7 +99,7 @@ void func_8003E37C(Player* player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4
arg3[0] = ((player->unk_206 / 182) * 0xB4);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
if (((player->speed / 18.0f) * 216.0f) >= 8.0f) {
decelerate_player(player, 5.0f);
player_decelerate(player, 5.0f);
}
player->unk_DAC = 0.5f;
if ((player->effects & BOOST_EFFECT) != 0) {
Expand Down Expand Up @@ -127,7 +127,7 @@ void func_8003E6EC(Player* player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4
if (player->collision.orientationVector[1] <= 0.8829f) {
arg3[0] = ((player->unk_206 / 182) * 0xB4);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
decelerate_player(player, 4.0f);
player_decelerate(player, 4.0f);
func_8003DC40(player);
} else if ((((player->speed / 18.0f) * 216.0f) > 20.0f) ||
((player->effects & UNKNOWN_EFFECT_0x10000) == UNKNOWN_EFFECT_0x10000)) {
Expand All @@ -149,7 +149,7 @@ void func_8003E9EC(Player* player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4
if (player->collision.orientationVector[1] <= 0.8357f) {
arg3[0] = ((player->unk_206 / 182) * 0x78);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
decelerate_player(player, 4.0f);
player_decelerate(player, 4.0f);
func_8003DC40(player);
} else {
if ((((player->speed / 18.0f) * 216.0f) > 20.0f) ||
Expand Down Expand Up @@ -184,7 +184,7 @@ void func_8003EE2C(Player* player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4
if (player->collision.orientationVector[1] <= 0.8357f) {
arg3[0] = ((player->unk_206 / 182) * 0x78);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
decelerate_player(player, 4.0f);
player_decelerate(player, 4.0f);
func_8003DC40(player);
} else if ((((player->speed / 18.0f) * 216.0f) > 20.0f) ||
((player->effects & UNKNOWN_EFFECT_0x10000) == UNKNOWN_EFFECT_0x10000)) {
Expand All @@ -209,7 +209,7 @@ void func_8003F138(Player* player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4
if (player->collision.orientationVector[1] <= 0.8357f) {
arg3[0] = ((player->unk_206 / 182) * 0xC8);
arg3[2] = (-(player->slopeAccel / 182) * 0xC8);
decelerate_player(player, 4.0f);
player_decelerate(player, 4.0f);
player->unk_DAC = 0.5f;
arg3[0] = 0;
} else if ((((player->speed / 18.0f) * 216.0f) > 20.0f) ||
Expand Down
32 changes: 16 additions & 16 deletions src/cpu_vehicles_camera_path/cpu_speed_control.inc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void func_80007D04(s32 playerId, Player* player) {
D_801634C0[playerId] = 2;
} else {
player->effects &= ~UNKNOWN_EFFECT_0x200000;
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
D_801634C0[playerId] = -1;
}
}
Expand All @@ -93,35 +93,35 @@ void func_80007FA4(s32 playerId, Player* player, f32 arg2) {
if (playerId == 3) {
if ((dist < 25.0f) && (D_80163410[playerId] < 5)) {
D_80163410[playerId] = 4;
(arg2 < ((2.0 * 18.0) / 216.0)) ? func_80038BE4(player, 1) : decelerate_player(player, 1.0f);
(arg2 < ((2.0 * 18.0) / 216.0)) ? func_80038BE4(player, 1) : player_decelerate(player, 1.0f);
} else if ((dist < 3600.0f) && (D_80163410[playerId] < 4)) {
D_80163410[playerId] = 3;
(arg2 < ((5.0 * 18.0) / 216.0)) ? func_80038BE4(player, 1) : decelerate_player(player, 5.0f);
(arg2 < ((5.0 * 18.0) / 216.0)) ? func_80038BE4(player, 1) : player_decelerate(player, 5.0f);
} else {
(arg2 < ((20.0 * 18.0) / 216.0)) ? func_80038BE4(player, 10) : decelerate_player(player, 1.0f);
(arg2 < ((20.0 * 18.0) / 216.0)) ? func_80038BE4(player, 10) : player_decelerate(player, 1.0f);
}
} else {
if ((dist < 25.0f) && (D_80163410[playerId] < 5)) {
D_80163410[playerId] = 4;
test = 2;
(arg2 < ((test * 18.0) / 216.0)) ? func_80038BE4(player, 1) : decelerate_player(player, 1.0f);
(arg2 < ((test * 18.0) / 216.0)) ? func_80038BE4(player, 1) : player_decelerate(player, 1.0f);
} else if ((dist < 4900.0f) && (D_80163410[playerId] < 4)) {
D_80163410[playerId] = 3;
test = 5;
(arg2 < ((test * 18.0) / 216.0)) ? func_80038BE4(player, 1) : decelerate_player(player, 15.0f);
(arg2 < ((test * 18.0) / 216.0)) ? func_80038BE4(player, 1) : player_decelerate(player, 15.0f);
} else if ((dist < 22500.0f) && (D_80163410[playerId] < 3)) {
D_80163410[playerId] = 2;
test = 20;
(arg2 < ((test * 18.0) / 216.0)) ? func_80038BE4(player, 5) : decelerate_player(player, 1.0f);
(arg2 < ((test * 18.0) / 216.0)) ? func_80038BE4(player, 5) : player_decelerate(player, 1.0f);
} else if ((dist < 90000.0f) && (D_80163410[playerId] < 2)) {
D_80163410[playerId] = 1;
test = 30;
(arg2 < ((test * 18.0) / 216.0)) ? func_80038BE4(player, 6) : decelerate_player(player, 1.0f);
(arg2 < ((test * 18.0) / 216.0)) ? func_80038BE4(player, 6) : player_decelerate(player, 1.0f);
} else if (D_80163410[playerId] == 0) {
test = 35;
(arg2 < (((test ^ 0) * 18.0) / 216.0)) ? func_80038BE4(player, 2) : decelerate_player(player, 1.0f);
(arg2 < (((test ^ 0) * 18.0) / 216.0)) ? func_80038BE4(player, 2) : player_decelerate(player, 1.0f);
} else {
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
}
}
}
Expand All @@ -139,7 +139,7 @@ void regulate_cpu_speed(s32 playerId, f32 targetSpeed, Player* player) {
if (gCurrentCourseId == COURSE_AWARD_CEREMONY) {
func_80007FA4(playerId, player, speed);
} else if ((bStopAICrossing[playerId] == true) && !(player->effects & (STAR_EFFECT | BOO_EFFECT))) {
decelerate_player(player, 10.0f);
player_decelerate(player, 10.0f);
if (player->currentSpeed == 0.0) {
player->velocity[0] = 0.0f;
player->velocity[2] = 0.0f;
Expand All @@ -166,7 +166,7 @@ void regulate_cpu_speed(s32 playerId, f32 targetSpeed, Player* player) {
player_accelerate(player);
} else {
player->effects &= ~UNKNOWN_EFFECT_0x200000;
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
}
} else if ((D_801631E0[playerId] == true) && (D_80163330[playerId] != 1)) {
if (func_800088D8(playerId, gLapCountByPlayerId[playerId], gGPCurrentRaceRankByPlayerIdDup[playerId]) ==
Expand All @@ -175,7 +175,7 @@ void regulate_cpu_speed(s32 playerId, f32 targetSpeed, Player* player) {
player_accelerate(player);
} else {
player->effects &= ~UNKNOWN_EFFECT_0x200000;
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
}
} else {
var_a1 = 1;
Expand Down Expand Up @@ -211,14 +211,14 @@ void regulate_cpu_speed(s32 playerId, f32 targetSpeed, Player* player) {
player_accelerate(player);
} else {
player->effects &= ~UNKNOWN_EFFECT_0x200000;
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
}
} else {
player->effects &= ~UNKNOWN_EFFECT_0x200000;
if (targetSpeed > 1.0f) {
decelerate_player(player, 2.0f);
player_decelerate(player, 2.0f);
} else {
decelerate_player(player, 5.0f);
player_decelerate(player, 5.0f);
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/effects.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ void func_8008C528(Player* player, s8 arg1) {

void func_8008C62C(Player* player, s8 arg1) {

decelerate_player(player, 5.0f);
player_decelerate(player, 5.0f);
player->unk_0A8 += (s16) 0xA0;
player->unk_042 += (s16) 0x71C;
if (player->unk_0A8 >= 0x2000) {
Expand Down Expand Up @@ -323,15 +323,15 @@ void func_8008C9EC(Player* player, s8 arg1) {
player->unk_206 = 0;
player->slopeAccel = 0;
if ((player->unk_046 & 0x40) == 0x40) {
decelerate_player(player, 100.0f);
player_decelerate(player, 100.0f);
} else {
if ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) {
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
} else {
decelerate_player(player, 4.0f);
player_decelerate(player, 4.0f);
}
if (!(player->type & PLAYER_HUMAN)) {
decelerate_player(player, 30.0f);
player_decelerate(player, 30.0f);
}
}
if ((player->effects & 0x80) == 0x80) {
Expand Down Expand Up @@ -893,7 +893,7 @@ void apply_lightning_effect(Player* player, s8 arg1) {
D_80165190[3][arg1] = 1;
}
}
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
} else {
player->unk_0B0 += 1;
player->unk_08C = (f32) ((f64) player->unk_08C * 0.6);
Expand Down
32 changes: 16 additions & 16 deletions src/player_controller.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1891,7 +1891,7 @@ void func_8002C954(Player* player, s8 playerId, Vec3f arg2) {
player->unk_256 = 0;
}
if ((player->slopeAccel >= 0) && (((player->speed / 18.0f) * 216.0f) > 5.0f)) {
decelerate_player(player, 18.0f);
player_decelerate(player, 18.0f);
}
if ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) {
xdist = D_80165070[playerId][0] - arg2[0];
Expand Down Expand Up @@ -1955,7 +1955,7 @@ void apply_effect(Player* player, s8 arg1, s8 arg2) {
apply_boo_effect(player, arg1);
}
if (((player->effects & 0x20000000) == 0x20000000) && (player->unk_228 >= 0x64)) {
decelerate_player(player, 4.0f);
player_decelerate(player, 4.0f);
}
if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) {
func_8008C9EC(player, arg1);
Expand All @@ -1977,7 +1977,7 @@ void apply_effect(Player* player, s8 arg1, s8 arg2) {
}
if ((player->effects & 0x800000) == 0x800000) {
func_8008D8B4(player, arg1);
decelerate_player(player, 10.0f);
player_decelerate(player, 10.0f);
}
if (D_800DC510 != 5) {
if (player->soundEffects & 0x04000000) {
Expand Down Expand Up @@ -2032,7 +2032,7 @@ void func_8002D028(Player* player, s8 arg1) {
player->unk_08C = 0;
player->speed = 0;
player->unk_104 = 0;
player->unk_240 = 0;
player->tyreSpeed = 0;
player->unk_07C = 0;
player->velocity[0] = 0;
player->velocity[1] = 0;
Expand Down Expand Up @@ -2556,13 +2556,13 @@ void func_8002E594(Player* player, UNUSED Camera* camera, s8 screenId, s8 player
if (sp74 < 0.0f) {
func_8003F734(player, sp48, sp54, &sp74, &spD0, &spCC, &spC8);
func_8002C954(player, playerId, sp54);
decelerate_player(player, 6.0f);
player_decelerate(player, 6.0f);
}
sp74 = player->collision.surfaceDistance[1];
if (sp74 < 0.0f) {
func_8003FBAC(player, sp48, sp54, &sp74, &spD0, &spCC, &spC8);
func_8002C954(player, playerId, sp54);
decelerate_player(player, 6.0f);
player_decelerate(player, 6.0f);
}
sp74 = player->collision.surfaceDistance[0];
if (sp74 >= 0.0f) {
Expand Down Expand Up @@ -3324,7 +3324,7 @@ void player_accelerate(Player* player) {
}
}

void decelerate_player(Player* player, f32 speed) {
void player_decelerate(Player* player, f32 speed) {
s32 player_index;
player_index = get_player_index_for_player(player);

Expand Down Expand Up @@ -3503,7 +3503,7 @@ void func_800323E4(Player* player) {
player->effects |= 1;
// This check will never be true, why is it here?
if ((player->effects & 0x20) == 0x20) {
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
player->unk_20C = var_f2;
} else {
if ((s32) player->tyres[BACK_RIGHT].surfaceType < 0xF) {
Expand All @@ -3523,18 +3523,18 @@ void func_800323E4(Player* player) {
}
if (gIsPlayerTripleBButtonCombo[var_v1] == true) {
if (player->unk_20C >= 2.0f) {
decelerate_player(player, (1.0f - var_f2) * 5.0f);
player_decelerate(player, (1.0f - var_f2) * 5.0f);
} else {
decelerate_player(player, (1.0f - var_f2) * 3.0f);
player_decelerate(player, (1.0f - var_f2) * 3.0f);
}
} else {
if (((player->speed / 18.0f) * 216.0f) <= 20.0f) {
decelerate_player(player, (1.0f - var_f2) * 4.0f);
player_decelerate(player, (1.0f - var_f2) * 4.0f);
}
if (player->unk_20C >= 2.0f) {
decelerate_player(player, (1.0f - var_f2) * 2.5);
player_decelerate(player, (1.0f - var_f2) * 2.5);
} else {
decelerate_player(player, (1.0f - var_f2) * 1.2);
player_decelerate(player, (1.0f - var_f2) * 1.2);
}
}
}
Expand Down Expand Up @@ -4538,9 +4538,9 @@ void func_80037CFC(Player* player, struct Controller* controller, s8 arg2) {
detect_triple_a_combo_a_pressed(player);
} else {
if (gModeSelection == BATTLE) {
decelerate_player(player, 2.0f);
player_decelerate(player, 2.0f);
} else {
decelerate_player(player, 1.0f);
player_decelerate(player, 1.0f);
}
detect_triple_a_combo_a_released(player);
}
Expand Down Expand Up @@ -4572,7 +4572,7 @@ void func_80037CFC(Player* player, struct Controller* controller, s8 arg2) {
if (controller->button & A_BUTTON) {
player_accelerate(player);
} else {
decelerate_player(player, 5.0f);
player_decelerate(player, 5.0f);
}
}
if (((((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) ||
Expand Down
2 changes: 1 addition & 1 deletion src/player_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void func_80030A34(Player*);
void detect_triple_a_combo_a_released(Player*);
void detect_triple_a_combo_a_pressed(Player*);
void player_accelerate(Player*);
void decelerate_player(Player*, f32);
void player_decelerate(Player*, f32);
void detect_triple_b_combo_b_released(Player*);
void detect_triple_b_combo_b_pressed(Player*);
void func_800323E4(Player*);
Expand Down
16 changes: 8 additions & 8 deletions src/render_player.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1746,21 +1746,21 @@ void func_80026A48(Player* player, s8 arg1) {
f32 temp_f0;

if (((player->effects & 0x4000) == 0x4000) && ((player->type & PLAYER_START_SEQUENCE) == 0)) {
player->unk_240 += D_800DDE74[8];
if (player->unk_240 >= 0x400) {
player->unk_240 = 0;
player->tyreSpeed += D_800DDE74[8];
if (player->tyreSpeed >= 0x400) {
player->tyreSpeed = 0;
}
return;
}

temp_f0 = ((player->speed * (1.0f + player->unk_104)) / 18.0f) * 216.0f;
if ((temp_f0 <= 1.0f) || (gIsPlayerTripleBButtonCombo[arg1] == true)) {
player->unk_240 = 0;
player->tyreSpeed = 0;
} else {
player->unk_240 += D_800DDE74[(s32) (temp_f0 / 12.0f)];
player->tyreSpeed += D_800DDE74[(s32) (temp_f0 / 12.0f)];
}
if (player->unk_240 >= 0x400) {
player->unk_240 = 0;
if (player->tyreSpeed >= 0x400) {
player->tyreSpeed = 0;
}
}

Expand All @@ -1774,7 +1774,7 @@ void func_80026A48(Player* player, s8 arg1) {
void update_wheel_palette(Player* player, s8 playerId, s8 screenId, s8 arg3) {
s16 frameId = gLastAnimFrameSelector[screenId][playerId];
s16 groupId = gLastAnimGroupSelector[screenId][playerId];
s16 temp_t2 = player->unk_240;
s16 temp_t2 = player->tyreSpeed;
s16 temp_num = 0x40; // setting this as a variable gets rid of regalloc

if (((player->effects & 0x4000) == 0x4000) && ((player->type & PLAYER_START_SEQUENCE) == 0)) {
Expand Down
2 changes: 1 addition & 1 deletion src/spawn_players.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ void spawn_player(Player* player, s8 playerIndex, f32 startingRow, f32 startingC
player->unk_236 = 0;
player->unk_238 = 0;
player->unk_23A = 0;
player->unk_240 = 0;
player->tyreSpeed = 0;
player->unk_256 = 0;

player->size = 1.0f;
Expand Down

0 comments on commit 21e792f

Please sign in to comment.