mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-09-02 10:31:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document player alpha (#396)

Browse Source 
* Document player alpha

* Fix typo

* Document further alpha things

* Document movement

* Fix indentation
This commit is contained in:
Maciek Baron
2025-07-03 13:35:42 +01:00
committed by GitHub
parent 7937896598
commit 99689a3f70
12 changed files with 374 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80057C60.c
+25 -25
View File
@@ -6463,52 +6463,52 @@ void func_8006C9B8(Player* player, s16 arg1, s8 arg2, s8 arg3) {
}
}
void func_8006CEC0(Player* arg0, s16 arg1, s8 arg2, s8 arg3) {
void func_8006CEC0(Player* player, s16 arg1, s8 arg2, s8 arg3) {
UNUSED u16 temp_v0_3;
s32 sp20 = arg1;
if (--sp20 < 0) {
sp20 = 9;
}
if (arg0->particlePool0[arg1].isAlive == 1) {
switch (arg0->particlePool0[arg1].type) {
if (player->particlePool0[arg1].isAlive == 1) {
switch (player->particlePool0[arg1].type) {
case 1:
func_80062C74(arg0, arg1, arg2, arg3);
func_80062C74(player, arg1, arg2, arg3);
break;
case 3:
func_80064184(arg0, arg1, arg2, arg3);
func_80064184(player, arg1, arg2, arg3);
break;
case 5:
set_oob_splash_particle_position(arg0, arg1, arg2, arg3);
set_oob_splash_particle_position(player, arg1, arg2, arg3);
break;
case 6:
func_800631A8(arg0, arg1, arg2, arg3);
func_800631A8(player, arg1, arg2, arg3);
break;
case 7:
func_80063268(arg0, arg1, arg2, arg3);
func_80063268(player, arg1, arg2, arg3);
break;
}
} else {
if ((arg0->unk_044 & 0x200) && (arg0->type & 0x4000)) {
func_80061224(arg0, arg1, sp20, arg2, arg3);
if ((player->unk_044 & 0x200) && (player->type & 0x4000)) {
func_80061224(player, arg1, sp20, arg2, arg3);
return;
} else if (((arg0->effects & 0x40000000) == 0x40000000) && (arg0->unk_0B0 < 0x32)) {
func_80061094(arg0, arg1, sp20, arg2, arg3);
} else if (((player->effects & 0x40000000) == 0x40000000) && (player->unk_0B0 < 0x32)) {
func_80061094(player, arg1, sp20, arg2, arg3);
return;
} else if ((arg0->type & 0x4000) == 0x4000) {
if ((arg0->unk_0DE & 8) == 8) {
func_80060F50(arg0, arg1, sp20, arg2, arg3);
} else if ((player->type & 0x4000) == 0x4000) {
if ((player->unk_0DE & 8) == 8) {
func_80060F50(player, arg1, sp20, arg2, arg3);
return;
} else if ((arg0->unk_0DE & 2) || (arg0->unk_0DE & 1)) {
func_80060B14(arg0, arg1, sp20, arg2, arg3);
} else if ((player->unk_0DE & 2) || (player->unk_0DE & 1)) {
func_80060B14(player, arg1, sp20, arg2, arg3);
return;
}
}
switch (gActiveScreenMode) {
case SCREEN_MODE_1P:
if (((arg0->effects & 0x04000000) != 0x04000000) && ((arg0->effects & 0x400) != 0x400) &&
((arg0->effects & 0x01000000) != 0x01000000)) {
if (((arg0->unk_0CA & 2) != 2) && ((arg0->unk_0CA & 0x10) != 0x10) && !(arg0->unk_0CA & 0x100)) {
func_80060504(arg0, arg1, sp20, arg2, arg3);
if (((player->effects & 0x04000000) != 0x04000000) && ((player->effects & 0x400) != 0x400) &&
((player->effects & 0x01000000) != 0x01000000)) {
if (((player->unk_0CA & 2) != 2) && ((player->unk_0CA & 0x10) != 0x10) && !(player->unk_0CA & 0x100)) {
func_80060504(player, arg1, sp20, arg2, arg3);
}
}
break;
@@ -6517,10 +6517,10 @@ void func_8006CEC0(Player* arg0, s16 arg1, s8 arg2, s8 arg3) {
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
if (((arg0->type & 0x4000) != 0) && ((arg0->effects & 0x04000000) != 0x04000000) &&
((arg0->effects & 0x400) != 0x400) && ((arg0->effects & 0x01000000) != 0x01000000)) {
if (((arg0->unk_0CA & 2) != 2) && ((arg0->unk_0CA & 0x10) != 0x10) && !(arg0->unk_0CA & 0x100)) {
func_80060504(arg0, arg1, sp20, arg2, arg3);
if (((player->type & 0x4000) != 0) && ((player->effects & 0x04000000) != 0x04000000) &&
((player->effects & 0x400) != 0x400) && ((player->effects & 0x01000000) != 0x01000000)) {
if (((player->unk_0CA & 2) != 2) && ((player->unk_0CA & 0x10) != 0x10) && !(player->unk_0CA & 0x100)) {
func_80060504(player, arg1, sp20, arg2, arg3);
}
}
break;