diff options
Diffstat (limited to 'src/kart_dma.c')
| -rw-r--r-- | src/kart_dma.c | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/kart_dma.c b/src/kart_dma.c index b6cd7df75..18076d006 100644 --- a/src/kart_dma.c +++ b/src/kart_dma.c @@ -584,8 +584,8 @@ u8** gKartTextureTumbles[] = { }; u8* gKartPalettes[] = { - gKartMarioPalette, gKartLuigiPalette, gKartYoshiPalette, gKartToadPalette, - gKartDKPalette, gKartWarioPalette, gKartPeachPalette, gKartBowserPalette, + (u8*) gKartMarioPalette, (u8*) gKartLuigiPalette, (u8*) gKartYoshiPalette, (u8*) gKartToadPalette, + (u8*) gKartDKPalette, (u8*) gKartWarioPalette, (u8*) gKartPeachPalette, (u8*) gKartBowserPalette, }; /** @@ -610,25 +610,25 @@ void load_kart_texture(Player* player, s8 playerId, s8 screenId, s8 screenId2, s if (player->animFrameSelector[screenId] != 0) { osInvalDCache(&gEncodedKartTexture[index][screenId2][playerId], D_800DDEB0[player->characterId]); gEncodedKartTexture[index][screenId2][playerId].unk_00 = - gKartTextureTable1[player->characterId][player->animGroupSelector[screenId]] - [player->animFrameSelector[screenId]][wheelid]; + (const char*) gKartTextureTable1[player->characterId][player->animGroupSelector[screenId]] + [player->animFrameSelector[screenId]][wheelid]; } else { osInvalDCache(&gEncodedKartTexture[index][screenId2][playerId], D_800DDEB0[player->characterId]); gEncodedKartTexture[index][screenId2][playerId].unk_00 = - gKartTextureTable0[player->characterId][player->animGroupSelector[screenId]] - [player->animFrameSelector[screenId]][wheelid]; + (const char*) gKartTextureTable0[player->characterId][player->animGroupSelector[screenId]] + [player->animFrameSelector[screenId]][wheelid]; } } else if (((temp & 0x400) == 0x400) || ((temp & 0x01000000) == 0x01000000) || ((temp & 0x02000000) == 0x02000000) || ((temp & 0x10000) == 0x10000)) { osInvalDCache(&gEncodedKartTexture[index][screenId2][playerId], 0x780U); // player->unk_0A8 >> 8 converts an 8.8 fixed-point animation frame to a whole number. gEncodedKartTexture[index][screenId2][playerId].unk_00 = - gKartTextureTumbles[player->characterId][player->unk_0A8 >> 8]; + (const char*) gKartTextureTumbles[player->characterId][player->unk_0A8 >> 8]; } else { osInvalDCache(&gEncodedKartTexture[index][screenId2][playerId], D_800DDEB0[player->characterId]); gEncodedKartTexture[index][screenId2][playerId].unk_00 = - gKartTextureTable0[player->characterId][player->animGroupSelector[screenId]] - [player->animFrameSelector[screenId]][wheelid]; + (const char*) gKartTextureTable0[player->characterId][player->animGroupSelector[screenId]] + [player->animFrameSelector[screenId]][wheelid]; } } @@ -642,23 +642,25 @@ void load_kart_texture_non_blocking(Player* player, s8 arg1, s8 arg2, s8 arg3, s if (player->animFrameSelector[arg2] != 0) { osInvalDCache(&gEncodedKartTexture[arg4][arg3][arg1], D_800DDEB0[player->characterId]); gEncodedKartTexture[arg4][arg3][arg1].unk_00 = - gKartTextureTable1[player->characterId][player->animGroupSelector[arg2]] - [player->animFrameSelector[arg2]][wheelid]; + (const char*) gKartTextureTable1[player->characterId][player->animGroupSelector[arg2]] + [player->animFrameSelector[arg2]][wheelid]; } else { osInvalDCache(&gEncodedKartTexture[arg4][arg3][arg1], D_800DDEB0[player->characterId]); gEncodedKartTexture[arg4][arg3][arg1].unk_00 = - gKartTextureTable0[player->characterId][player->animGroupSelector[arg2]] - [player->animFrameSelector[arg2]][wheelid]; + (const char*) gKartTextureTable0[player->characterId][player->animGroupSelector[arg2]] + [player->animFrameSelector[arg2]][wheelid]; } } else if (((temp & 0x400) == 0x400) || ((temp & 0x01000000) == 0x01000000) || ((temp & 0x02000000) == 0x02000000) || ((temp & 0x10000) == 0x10000)) { osInvalDCache(&gEncodedKartTexture[arg4][arg3][arg1], 0x780); // player->unk_0A8 >> 8 converts an 8.8 fixed-point animation frame to a whole number. - gEncodedKartTexture[arg4][arg3][arg1].unk_00 = gKartTextureTumbles[player->characterId][player->unk_0A8 >> 8]; + gEncodedKartTexture[arg4][arg3][arg1].unk_00 = + (const char*) gKartTextureTumbles[player->characterId][player->unk_0A8 >> 8]; } else { osInvalDCache(&gEncodedKartTexture[arg4][arg3][arg1], D_800DDEB0[player->characterId]); gEncodedKartTexture[arg4][arg3][arg1].unk_00 = - gKartTextureTable0[player->characterId][player->animGroupSelector[arg2]][player->animFrameSelector[arg2]][wheelid]; + (const char*) gKartTextureTable0[player->characterId][player->animGroupSelector[arg2]] + [player->animFrameSelector[arg2]][wheelid]; } } @@ -672,21 +674,21 @@ void load_kart_palette(Player* player, s8 playerId, s8 screenId, s8 buffer) { case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: osInvalDCache(temp_s0, sizeof(struct_D_802F1F80)); - size = ResourceGetTexSizeByName(gKartPalettes[player->characterId]); + size = ResourceGetTexSizeByName((const char*) gKartPalettes[player->characterId]); asset = (u8*) LOAD_ASSET(gKartPalettes[player->characterId]); memcpy(&temp_s0->kart_palette[0], asset, size); break; case SCREEN_MODE_3P_4P_SPLITSCREEN: // Code identical to above osInvalDCache(temp_s0, sizeof(struct_D_802F1F80)); - size = ResourceGetTexSizeByName(gKartPalettes[player->characterId]); + size = ResourceGetTexSizeByName((const char*) gKartPalettes[player->characterId]); asset = (u8*) LOAD_ASSET(gKartPalettes[player->characterId]); memcpy(&temp_s0->kart_palette[0], asset, size); break; } } -void load_player_data(UNUSED Player* player, s32 arg1, void* vAddr, u16 size) { +void load_player_data(UNUSED Player* player, UNUSED s32 arg1, void* vAddr, u16 size) { osInvalDCache(vAddr, size); #ifdef TARGET_N64 @@ -713,7 +715,7 @@ void load_wheel_palette_non_blocking(UNUSED Player* player, const char* texture, (uintptr_t) &_kart_texturesSegmentRomStart[SEGMENT_OFFSET(arg1)], vAddr, size, &gDmaMesgQueue); #else u16* tex = (u16*) LOAD_ASSET(texture); - size_t textureSize = ResourceGetTexSizeByName(texture); + // size_t textureSize = ResourceGetTexSizeByName(texture); memcpy(vAddr, tex, size); #endif } |