summaryrefslogtreecommitdiff
path: root/src/render_player.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/render_player.c')
-rw-r--r--src/render_player.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/render_player.c b/src/render_player.c
index b8bd8bc27..74f3c4499 100644
--- a/src/render_player.c
+++ b/src/render_player.c
@@ -1342,19 +1342,11 @@ void render_kart(Player* player, s8 playerId, s8 screenId, s8 flipOffset) {
sp154[2] = player->pos[2] + sp140;
}
}
-#ifdef AVOID_UB
+ load_kart_palette(player, playerId, screenId, D_801651D0[screenId][playerId]);
gPlayerPalette = &gPlayerPalettesList[D_801651D0[screenId][playerId]][screenId][playerId];
-#else
- gPlayerPalette =
- (struct_D_802F1F80*) &gPlayerPalettesList[D_801651D0[screenId][playerId]][screenId][playerId * 0x100];
-#endif
+ load_kart_texture(player, playerId, screenId, screenId, D_801651D0[screenId][playerId]);
if ((screenId == 0) || (screenId == 1)) {
sKartTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId][playerId].unk_00;
- // Texture not loaded yet - load it synchronously into the current buffer slot
- if (sKartTexture == NULL) {
- load_kart_texture(player, playerId, screenId, screenId, D_801651D0[screenId][playerId]);
- sKartTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId][playerId].unk_00;
- }
} else {
sKartTexture = gEncodedKartTexture[D_801651D0[screenId][playerId]][screenId - 1][playerId - 4].unk_00;
}
@@ -1622,11 +1614,6 @@ void render_player(Player* player, s8 playerId, s8 screenId) {
if (player->boostPower >= 2.0f) {
func_80025DE8(player, playerId, screenId, var_v1);
}
- // Allows wheels to spin
- if (GameEngine_ResourceGetTexTypeByName(sKartTexture) !=
- 1) { // only invalidate texture cache if it's a palette texture
- gSPInvalidateTexCache(gDisplayListHead++, sKartTexture);
- }
}
void func_80026A48(Player* player, s8 arg1) {