diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-08-23 02:20:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-22 18:20:13 -0600 |
| commit | e135178097f416bc54e36058e10d9b1c013929fd (patch) | |
| tree | 0903c79b59ed716497e55618631d5e76611fe032 /src/code_80057C60.c | |
| parent | 3781ce2830a143df855003b65fe069d2e26215d9 (diff) | |
Update from decomp (#34)
* Update menus.c (#634)
* Update common_data.yml (#635)
* Renames for screenId and other changes (#636)
* screenId renames
* Rename surface map to collision mesh (#637)
* Rename some stack vars (#638)
* Fix syntax error (#639)
* Rename some stack vars
* Update collision.c
* Collision Documentation (#640)
* Collision related renames
* update doxygen (#649)
* change bool (#644)
* Update (#642)
* Delete trig_tables_bss.c (#650)
* fix typo audio (#656)
* fix typo src actor (#657)
* fix typo include (#658)
* fix course (#659)
* fix typo debug (#660)
* fix typo data (#661)
* Update common_structs.h
* replace number with const (#665)
* fix typo buffers (#655)
* fix typo buffers
* tweak ld file
* rename to sMemoryPool
* add a warning
---------
* fix typo src (#654)
* fix typo src
* fix non matcing
* Update code_80091750.c
---------
* fix typo racing (#653)
* fix typo racing
* get it match
* replace G_LINE3D to G_QUAD
---------
* fix typo src (#652)
* fix ending typo (#651)
* Action more info when it doesn't match and fix first diff (#662)
* Update linux-compile.yml
* fix first-diff
* Update first-diff.py
---------
* document texture of kart (#663)
* document texture of kart
* change screenPlayerId to screenId
* some documentation around object
* Revert "some documentation around object"
This reverts commit cbb39078e036bf2a417bed67359e910213acab28.
* more rename
---------
* Make evaluate_collision_players_palm_tree better (#667)
This matches just the same as before, but using those two casts instead of
shifts seems more likely to be accurate to the original source code
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
* add fedora instruciton (#666)
* start documenting animation (#668)
* start documenting animation
* Update course_data.c
* change comment
* fix error of compilation
* fix error of compilation
* Update animation.c
Diffstat (limited to 'src/code_80057C60.c')
| -rw-r--r-- | src/code_80057C60.c | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/src/code_80057C60.c b/src/code_80057C60.c index cb8649fc2..86da985ae 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -6287,27 +6287,27 @@ void func_8006D194(Player *player, s8 arg1, s8 arg2) { } } -void func_8006D474(Player *player, s8 arg1, s8 arg2) { +void func_8006D474(Player *player, s8 playerId, s8 screenId) { s16 var_s2; - if ((player->unk_002 & (8 << (arg2 * 4))) == (8 << (arg2 * 4))) { + if ((player->unk_002 & (8 << (screenId * 4))) == (8 << (screenId * 4))) { for (var_s2 = 0; var_s2 < 10; var_s2++) { switch (player->unk_258[var_s2].unk_012) { case 1: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { - if (arg2 == arg1) { - func_8006538C(player, arg1, var_s2, arg2); + if (screenId == playerId) { + func_8006538C(player, playerId, var_s2, screenId); } } else { - func_8006538C(player, arg1, var_s2, arg2); + func_8006538C(player, playerId, var_s2, screenId); } break; case 6: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { - if (arg2 == arg1) { - func_80066BAC(player, arg1, var_s2, arg2); + if (screenId == playerId) { + func_80066BAC(player, playerId, var_s2, screenId); } - } else if (arg2 == arg1) { - func_80066BAC(player, arg1, var_s2, arg2); + } else if (screenId == playerId) { + func_80066BAC(player, playerId, var_s2, screenId); } break; } @@ -6315,69 +6315,69 @@ void func_8006D474(Player *player, s8 arg1, s8 arg2) { case 1: case 9: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_800691B8(player, arg1, var_s2, arg2); - } else if (arg2 == arg1) { - func_800691B8(player, arg1, var_s2, arg2); + func_800691B8(player, playerId, var_s2, screenId); + } else if (screenId == playerId) { + func_800691B8(player, playerId, var_s2, screenId); } break; case 2: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_800696CC(player, arg1, var_s2, arg2, player->unk_258[var_s2 + 30].unk_00C); - } else if (arg2 == arg1) { - func_800696CC(player, arg1, var_s2, arg2, player->unk_258[var_s2 + 30].unk_00C); + func_800696CC(player, playerId, var_s2, screenId, player->unk_258[var_s2 + 30].unk_00C); + } else if (screenId == playerId) { + func_800696CC(player, playerId, var_s2, screenId, player->unk_258[var_s2 + 30].unk_00C); } break; case 3: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_80067280(player, arg1, var_s2, arg2); - } else if (arg2 == arg1) { - func_80067280(player, (s32) arg1, var_s2, arg2); + func_80067280(player, playerId, var_s2, screenId); + } else if (screenId == playerId) { + func_80067280(player, (s32) playerId, var_s2, screenId); } break; case 4: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_80069444(player, arg1, var_s2, arg2); - } else if (arg2 == arg1) { - func_80069444(player, arg1, var_s2, arg2); + func_80069444(player, playerId, var_s2, screenId); + } else if (screenId == playerId) { + func_80069444(player, playerId, var_s2, screenId); } break; case 5: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_80069938(player, arg1, var_s2, arg2); - } else if (arg2 == arg1) { - func_80069938(player, arg1, var_s2, arg2); + func_80069938(player, playerId, var_s2, screenId); + } else if (screenId == playerId) { + func_80069938(player, playerId, var_s2, screenId); } break; case 6: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_80069BA8(player, arg1, var_s2, arg2); - } else if (arg2 == arg1) { - func_80069BA8(player, arg1, var_s2, arg2); + func_80069BA8(player, playerId, var_s2, screenId); + } else if (screenId == playerId) { + func_80069BA8(player, playerId, var_s2, screenId); } break; case 7: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_80069DB8(player, arg1, var_s2, arg2); - } else if (arg2 == arg1) { - func_80069DB8(player, arg1, var_s2, arg2); + func_80069DB8(player, playerId, var_s2, screenId); + } else if (screenId == playerId) { + func_80069DB8(player, playerId, var_s2, screenId); } break; case 8: if (gActiveScreenMode == SCREEN_MODE_1P) { - func_80067604(player, arg1, var_s2, arg2); - } else if (arg2 == arg1) { - func_80067604(player, arg1, var_s2, arg2); + func_80067604(player, playerId, var_s2, screenId); + } else if (screenId == playerId) { + func_80067604(player, playerId, var_s2, screenId); } break; } switch (player->unk_258[var_s2 + 10].unk_012) { case 1: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { - if (arg2 == arg1) { - func_80065AB0(player, arg1, var_s2, arg2); + if (screenId == playerId) { + func_80065AB0(player, playerId, var_s2, screenId); } } else { - func_80065AB0(player, arg1, var_s2, arg2); + func_80065AB0(player, playerId, var_s2, screenId); } break; case 2: @@ -6385,36 +6385,36 @@ void func_8006D474(Player *player, s8 arg1, s8 arg2) { case 4: case 5: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { - if (arg2 == arg1) { - func_80065F0C(player, arg1, var_s2, arg2); + if (screenId == playerId) { + func_80065F0C(player, playerId, var_s2, screenId); } } else { - func_80065F0C(player, arg1, var_s2, arg2); + func_80065F0C(player, playerId, var_s2, screenId); } break; case 9: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { - if (arg2 == arg1) { - func_800664E0(player, (s32) arg1, var_s2, arg2); + if (screenId == playerId) { + func_800664E0(player, (s32) playerId, var_s2, screenId); } } else { - func_800664E0(player, (s32) arg1, var_s2, arg2); + func_800664E0(player, (s32) playerId, var_s2, screenId); } break; case 11: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { - if (arg2 == arg1) { - func_8006A01C(player, arg1, var_s2, arg2); + if (screenId == playerId) { + func_8006A01C(player, playerId, var_s2, screenId); } - } else if (arg2 == arg1) { - func_8006A01C(player, arg1, var_s2, arg2); + } else if (screenId == playerId) { + func_8006A01C(player, playerId, var_s2, screenId); } break; } } } - if ((gModeSelection == BATTLE) && (player->unk_002 & (2 << (arg2 * 4)))) { - func_8006BA94(player, arg1, arg2); + if ((gModeSelection == BATTLE) && (player->unk_002 & (2 << (screenId * 4)))) { + func_8006BA94(player, playerId, screenId); } } @@ -6594,20 +6594,20 @@ void func_8006E420(Player* player, s8 arg1, s8 arg2) { } } -void func_8006E5AC(Player* player, s8 arg1, s8 arg2) { +void render_kart_particle_on_screen_one(Player* player, s8 playerId, s8 screenId) { if ((player->type & PLAYER_EXISTS) == PLAYER_EXISTS) { if ((player->effects & BOO_EFFECT) == BOO_EFFECT) { - if (arg1 == arg2) { - func_8006D474(player, arg1, arg2); + if (playerId == screenId) { + func_8006D474(player, playerId, screenId); } } else { - func_8006D474(player, arg1, arg2); + func_8006D474(player, playerId, screenId); } - func_8006DC54(player, arg1, arg2); + func_8006DC54(player, playerId, screenId); } } -void func_8006E634(Player* player, s8 arg1, s8 arg2) { +void render_kart_particle_on_screen_two(Player* player, s8 arg1, s8 arg2) { if ((player->type & PLAYER_EXISTS) == PLAYER_EXISTS) { if ((player->effects & BOO_EFFECT) == BOO_EFFECT) { if (arg1 == arg2) { @@ -6620,7 +6620,7 @@ void func_8006E634(Player* player, s8 arg1, s8 arg2) { } } -void func_8006E6BC(Player* player, s8 arg1, s8 arg2) { +void render_kart_particle_on_screen_three(Player* player, s8 arg1, s8 arg2) { if ((player->type & PLAYER_EXISTS) == PLAYER_EXISTS) { if ((player->effects & BOO_EFFECT) == BOO_EFFECT) { if (arg1 == arg2) { @@ -6633,7 +6633,7 @@ void func_8006E6BC(Player* player, s8 arg1, s8 arg2) { } } -void func_8006E744(Player* player, s8 arg1, s8 arg2) { +void render_kart_particle_on_screen_four(Player* player, s8 arg1, s8 arg2) { if ((player->type & PLAYER_EXISTS) == PLAYER_EXISTS) { if ((player->effects & BOO_EFFECT) == BOO_EFFECT) { if (arg1 == arg2) { |
