falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename `PRESS_A` to `THROTTLE` 

Rename `PRESS_A` to `THROTTLE` to describe the Kart state, which may be slightly different than just pressing A.
This commit is contained in:
Jed Grabman 2025-09-15 20:30:21 -04:00
parent 5b7ed2d20f
commit 474124bf53
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/defines.h
View File

@ -375,7 +375,7 @@ player spins. Something with avoding rollover of aniamation frame data? */
#define LEFT_TURN 0x4 // non-drifting (more than 5 degrees)
#define MOVE_BACKWARDS 0x8 // includes lakitu
#define LOSE_GP_RACE 0x10 // pointless, only unsets itself
#define PRESS_A 0x20
#define THROTTLE 0x20 // Closely tied to just pressing A. Possible exception for AB-spins
#define EARLY_SPINOUT_RIGHT 0x40 // Spinning out while facing right (not actually used for anything)
#define EARLY_SPINOUT_LEFT 0x80 // Spinning out while facing left
#define POST_TUMBLE_GAS 0x100 // Causes particles after a vertical tumble, I think

8
src/audio/external.c
View File

@ -1824,7 +1824,7 @@ void func_800C5CB8(void) {
}
void func_800C5D04(u8 playerId) {
if ((gPlayers[playerId].kartProps & PRESS_A) == PRESS_A) {
if ((gPlayers[playerId].kartProps & THROTTLE) == THROTTLE) {
D_800E9E34[playerId] = 0;
if (D_800E9E24[playerId] < 0x4E20) {
if ((u8) D_800EA16C == 0) {
@ -1853,7 +1853,7 @@ void func_800C5D04(u8 playerId) {
void func_800C5E38(u8 playerId) {
if (D_800EA108 == 0) {
if (((gPlayers[playerId].kartProps & PRESS_A) != PRESS_A) && (gPlayers[playerId].unk_098 > 400.0f)) {
if (((gPlayers[playerId].kartProps & THROTTLE) != THROTTLE) && (gPlayers[playerId].unk_098 > 400.0f)) {
D_800E9E14[playerId] = 1;
if (D_800EA0EC[playerId] == 0) {
D_800E9F7C[playerId].unk_10 = 0.6f - D_800E9F54[playerId];
@ -1905,7 +1905,7 @@ void func_800C6108(u8 playerId) {
player = &gPlayers[playerId];
D_800E9E64[playerId] = (player->unk_098 / D_800E9DC4[playerId]) + D_800E9DD4[playerId];
if ((player->unk_098 < 1800.0f) && ((player->kartProps & PRESS_A) != PRESS_A)) {
if ((player->unk_098 < 1800.0f) && ((player->kartProps & THROTTLE) != THROTTLE)) {
D_800E9E64[playerId] = (player->unk_098 / D_800E9F7C[playerId].unk_34) + D_800E9F7C[playerId].unk_28;
if (D_800E9EC4) {} // ?
}
@ -2003,7 +2003,7 @@ void func_800C64A0(u8 playerId) {
if (D_800E9EF4[playerId] < 0.0f) {
D_800E9EF4[playerId] = 0.0f;
}
if ((gPlayers[playerId].kartProps & PRESS_A) == PRESS_A) {
if ((gPlayers[playerId].kartProps & THROTTLE) == THROTTLE) {
D_800E9F04[playerId] = 0.56f - (D_800E9E24[playerId] * 0.06f);
} else {
D_800E9F04[playerId] = (D_800E9E34[playerId] / 50.0f) + 0.25f;

4
src/code_80057C60.c
View File

@ -3561,7 +3561,7 @@ void func_80060504(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
s32 temp_v0;
UNUSED s32 test;
if ((player->kartProps & PRESS_A) == PRESS_A) {
if ((player->kartProps & THROTTLE) == THROTTLE) {
var_v0 = 5;
} else {
var_v0 = 0xE;
@ -3583,7 +3583,7 @@ void func_80060504(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
}
}
player->particles[arg1].unk_024 = 0.0f;
if ((player->kartProps & PRESS_A) == PRESS_A) {
if ((player->kartProps & THROTTLE) == THROTTLE) {
player->particles[arg1].unk_040 = 0;
if ((player->effects & MUSHROOM_EFFECT) == MUSHROOM_EFFECT) {
set_particle_colour(&player->particles[arg1], 0x00FFFF00, 0x0080);

2
src/effects.c
View File

@ -470,7 +470,7 @@ void func_8008D170(Player* player, s8 playerIndex) {
var_v1 = 0;
var_a3 = -var_a3;
var_f0 *= 0.9;
if (((player->effects & BRAKING_EFFECT) == BRAKING_EFFECT) || !(player->kartProps & PRESS_A)) {
if (((player->effects & BRAKING_EFFECT) == BRAKING_EFFECT) || !(player->kartProps & THROTTLE)) {
player->effects |= BANANA_SPINOUT_SAVE_EFFECT;
}
if (var_f0 <= 1.3) {

16
src/player_controller.c
View File

@ -3405,7 +3405,7 @@ void player_accelerate_alternative(Player* player) {
if (!((player->effects & MIDAIR_EFFECT)) || ((player->effects & LIGHTNING_EFFECT))) {
player->unk_08C = (player->currentSpeed * player->currentSpeed) / 25.0f;
}
player->kartProps |= PRESS_A;
player->kartProps |= THROTTLE;
// Hacky way to check for START_SPINOUT_TRIGGER
if ((player->triggers * 8) < 0) {
func_8008F104(player, player_index);
@ -3430,7 +3430,7 @@ void player_decelerate_alternative(Player* player, f32 speed) {
if ((player->effects & MIDAIR_EFFECT) != MIDAIR_EFFECT) {
player->unk_08C = (player->currentSpeed * player->currentSpeed) / 25.0f;
}
player->kartProps &= ~PRESS_A;
player->kartProps &= ~THROTTLE;
// Hacky way to check for START_SPINOUT_TRIGGER
if ((player->triggers * 8) < 0) {
func_8008F104(player, player_index);
@ -3673,7 +3673,7 @@ void player_accelerate_during_start_sequence(Player* player) {
} else {
var_v0 = 8;
}
if ((time_delta < var_v0) && ((player->kartProps & PRESS_A) != PRESS_A)) {
if ((time_delta < var_v0) && ((player->kartProps & THROTTLE) != THROTTLE)) {
player->triggers |= START_BOOST_TRIGGER;
} else if ((player->topSpeed * 0.9f) <= player->currentSpeed) {
if ((player->triggers & START_BOOST_TRIGGER) != START_BOOST_TRIGGER) {
@ -3682,7 +3682,7 @@ void player_accelerate_during_start_sequence(Player* player) {
}
}
}
player->kartProps |= PRESS_A;
player->kartProps |= THROTTLE;
player->unk_098 = (player->currentSpeed * player->currentSpeed) / 25.0f;
}
@ -3701,7 +3701,7 @@ void player_decelerate_during_start_sequence(Player* player, f32 speedReduction)
player->triggers &= ~START_SPINOUT_TRIGGER;
}
player->triggers &= ~START_BOOST_TRIGGER;
player->kartProps &= ~PRESS_A;
player->kartProps &= ~THROTTLE;
player->unk_098 = (player->currentSpeed * player->currentSpeed) / 25.0f;
}
@ -3791,7 +3791,7 @@ void player_accelerate_global(Player* player, s32 playerIndex) {
if (((player->topSpeed * 0.9) <= gPlayerCurrentSpeed[playerIndex]) && (gPlayerCurrentSpeed[playerIndex] <= (player->topSpeed * 1.0))) {
gPlayerCurrentSpeed[playerIndex] += gKartAccelerationTables[player->characterId][9] * 2.8;
}
player->kartProps |= PRESS_A;
player->kartProps |= THROTTLE;
if (gPlayerCurrentSpeed[playerIndex] < 0.0f) {
gPlayerCurrentSpeed[playerIndex] = 0.0f;
}
@ -3799,7 +3799,7 @@ void player_accelerate_global(Player* player, s32 playerIndex) {
}
void player_decelerate_global(Player* player, f32 speedReduction, s32 playerIndex) {
player->kartProps &= ~PRESS_A;
player->kartProps &= ~THROTTLE;
gPlayerCurrentSpeed[playerIndex] -= speedReduction;
if (gPlayerCurrentSpeed[playerIndex] <= 0.0f) {
gPlayerCurrentSpeed[playerIndex] = 0.0f;
@ -4909,7 +4909,7 @@ void func_80038BE4(Player* player, s16 arg1) {
if (player->currentSpeed >= 250.0f) {
player->currentSpeed = 250.0f;
}
player->kartProps |= PRESS_A;
player->kartProps |= THROTTLE;
player->unk_08C = (player->currentSpeed * player->currentSpeed) / 25.0f;
}