diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-07-01 23:42:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-01 17:42:14 -0600 |
| commit | 7937896598f3df46eb78c158bde787bc4f12ad7f (patch) | |
| tree | 876548daaec2f8a5bb284374d834abcf9aad15b9 /src/code_80005FD0.c | |
| parent | b57afa83b42bb14e526043be4ca9f6e322788edb (diff) | |
make some texture more flexible and editable + port documentation from the decomp + fix some bug (#309)
* support a more flexible background
* remove useless function
* rename of some font
* experimental png
* migrate to the new initdata
* fix skybox and adjust minimap
* format in audio
* simplify player render
* simplify shell render and support custom texture of shell
* clean redshell texture
* format and multiple fix
* some update of name
* allow change icon of character
* more rename
* continue rename
* more documentation and simplification
* change lus and continue rename
* continue rename
* few fix for asan
* fix ghost
* Update menu_items.c
* fix mac error
* some test of tweak for texture
* some tweak
* some button constant
* finish fix ghost
* Update menu_items.c
* Update render_objects.c
* Update menu_items.c
* Update libultraship
* Update libultraship
* Delete valgrind.report
* Update libultraship
* callgrind benchmark
* Update valgrind_callgrind.sh
* fix animation
* some rename
* remove useless submodule
* Update libultraship
* fix assets
* fix mistake
* fix more mistake
* Update menu_items.c
* sync more rename with the decom + fix review
* fix a mistake
* fix more mistake
* re add the limit of fps
* fix some hd texture and minimap
* fix a name
* Update menu_items.c
* fix a regression
* fix some segment 5 texture (not all)
* Update camera.c
* improve performance of custom sprite
* fix flatten bug and add documentation on player vertex
* Update render_player.c
* fix data menu
* fix trophy for 50 and 150
* Update memory.c
* Update code_80057C60.c
* fix ghost
* fix boo tlut
* fix a mistake in yaml
* fix yaml
* Update common_data.yml
* add comment for segment 3
* allow even more change in texture
* Update common_data.yml
* Update update.inc.c
* Update camera.c
* Update some_data.c
* wip changes
* Update other_textures.yml
* More changes
* Update update_objects.c
* Fix compile
* Update memory.c
* Update memory.c
---------
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/code_80005FD0.c')
| -rw-r--r-- | src/code_80005FD0.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index e0a62a252..14098e7bf 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -1687,7 +1687,7 @@ void update_player(s32 playerId) { if (!(player->unk_0CA & 2) && !(player->unk_0CA & 8)) { gPlayerPathIndex = gPathIndexByPlayerId[playerId]; set_current_path(gPlayerPathIndex); - // if (GetCourse() == GetKalimariDesert()) { + // if (IsKalimariDesert()) { CM_VehicleCollision(playerId, player); // handle_trains_interactions(playerId, player); if (playerId == 0) { @@ -1811,7 +1811,7 @@ void update_player(s32 playerId) { return; } if ((D_801630E8[playerId] == 1) || (D_801630E8[playerId] == -1)) { - player->effects |= 0x10; + player->effects |= DRIFTING_EFFECT; } if (D_801630E8[playerId] != 0) { sPlayerAngle[playerId] = -get_angle_between_two_vectors(&player->oldPos[0], player->pos); @@ -2079,7 +2079,7 @@ void func_8000B140(s32 playerId) { Player* player; player = &gPlayers[playerId]; - if (!(player->effects & 0x10) && (D_801630E8[playerId] != 1) && (D_801630E8[playerId] != -1) && + if (!(player->effects & DRIFTING_EFFECT) && (D_801630E8[playerId] != 1) && (D_801630E8[playerId] != -1) && !(gTrackPositionFactor[playerId] < -1.0f) && !(gTrackPositionFactor[playerId] > 1.0f) && (player->characterId != 5) && (player->characterId != 7) && (player->characterId != 4) && !(player->effects & STAR_EFFECT)) { @@ -4339,7 +4339,7 @@ void func_80011EC0(s32 arg0, Player* player, s32 arg2, UNUSED u16 arg3) { if ((arg2 >= -9) && (D_80162FF8[arg0] == 0)) { if ((gTrackPositionFactor[arg0] > -0.8) && (gTrackPositionFactor[arg0] < 0.5)) { kart_hop(player); - player->effects |= 0x10; + player->effects |= DRIFTING_EFFECT; D_801630E8[arg0] = 1; break; } @@ -4351,7 +4351,7 @@ void func_80011EC0(s32 arg0, Player* player, s32 arg2, UNUSED u16 arg3) { if ((arg2 < 0xA) && (D_80162FF8[arg0] == 0)) { if ((gTrackPositionFactor[arg0] > -0.5) && (gTrackPositionFactor[arg0] < 0.8)) { kart_hop(player); - player->effects |= 0x10; + player->effects |= DRIFTING_EFFECT; D_801630E8[arg0] = -1; break; } |
