mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-17 12:59:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename cpu behaviour related symbols (#586)

Browse Source 
* Rename cpu related symbols
This commit is contained in:
coco875
2024-04-06 19:35:13 +02:00
committed by GitHub
parent c4d596d297
commit 2b66867af1
26 changed files with 997 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/racing/actors.c
+2 -2
View File
@@ -1626,7 +1626,7 @@ bool collision_yoshi_egg(Player *player, struct YoshiValleyEgg *egg) {
func_800C90F4(player - gPlayerOne, (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x0D));
} else {
apply_hit_sound_effect(player, player - gPlayerOne);
if ((gModeSelection == TIME_TRIALS) && ((player->type & PLAYER_CPU) == 0)) {
if ((gModeSelection == TIME_TRIALS) && ((player->type & PLAYER_KART_AI) == 0)) {
D_80162DF8 = 1;
}
}
@@ -2138,7 +2138,7 @@ void evaluate_collision_between_player_actor(Player *player, struct Actor *actor
if (!(player->effects & BOO_EFFECT) && !(player->type & PLAYER_INVISIBLE_OR_BOMB)) {
if (query_collision_player_vs_actor_item(player, actor) == COLLISION) {
func_800C98B8(actor->pos, actor->velocity, SOUND_ACTION_EXPLOSION);
if ((gModeSelection == TIME_TRIALS) && !(player->type & PLAYER_CPU)) {
if ((gModeSelection == TIME_TRIALS) && !(player->type & PLAYER_KART_AI)) {
D_80162DF8 = 1;
}
if (player->effects & STAR_EFFECT) {
src/racing/race_logic.c
+5 -5
View File
@@ -534,7 +534,7 @@ void func_8028EF28(void) {
func_8028EEF0(i);
currentPosition = gPlayers[i].currentRank;
gPlayers[i].type |= PLAYER_CPU;
gPlayers[i].type |= PLAYER_KART_AI;
if (currentPosition < 4) {
D_80150120 = 1;
@@ -573,7 +573,7 @@ void func_8028EF28(void) {
D_800DC510 = 5;
i = gPlayerPositionLUT[1];
gPlayers[i].soundEffects |= 0x200000;
gPlayers[i].type |= PLAYER_CPU;
gPlayers[i].type |= PLAYER_KART_AI;
func_800CA118((u8)i);
break;
case 3:
@@ -591,7 +591,7 @@ void func_8028EF28(void) {
*(gNmiUnknown2 + i * 3 + 2) = 99;
}
gPlayers[i].soundEffects |= 0x200000;
gPlayers[i].type |= PLAYER_CPU;
gPlayers[i].type |= PLAYER_KART_AI;
func_800CA118((u8)i);
}
break;
@@ -606,7 +606,7 @@ void func_8028EF28(void) {
D_800DC510 = 5;
i = gPlayerPositionLUT[3];
gPlayers[i].soundEffects |= 0x200000;
gPlayers[i].type |= PLAYER_CPU;
gPlayers[i].type |= PLAYER_KART_AI;
func_800CA118((u8)i);
}
break;
@@ -801,7 +801,7 @@ void func_8028F970(void) {
struct Controller *controller = &gControllers[i];
if (!(player->type & PLAYER_HUMAN)) { continue; }
if (player->type & PLAYER_CPU) { continue; }
if (player->type & PLAYER_KART_AI) { continue; }
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
if ((controller->buttonPressed & L_TRIG) && !(controller->button & R_TRIG)) {