mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-06-17 23:41:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename some texture (#530)

Browse Source 
* rename some texture

* format common_texture
This commit is contained in:
coco875
2024-01-17 03:07:37 +01:00
committed by GitHub
parent 6114540359
commit eb69ec2493
51 changed files with 906 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80057C60.c
+10 -10
View File
@@ -1080,7 +1080,7 @@ void func_80059360(void) {
if (D_801657B0 == 0) {
func_8004FA78(0);
if (playerHUD[PLAYER_ONE].lapCount != 3) {
func_8004CB60(playerHUD[PLAYER_ONE].lapX, playerHUD[PLAYER_ONE].lapY, D_0D00A958);
func_8004CB60(playerHUD[PLAYER_ONE].lapX, playerHUD[PLAYER_ONE].lapY, common_texture_hud_lap);
func_8004FC78(playerHUD[PLAYER_ONE].lapX + 0xC, playerHUD[PLAYER_ONE].lapY - 4, playerHUD[PLAYER_ONE].alsoLapCount);
func_8004E638(0);
}
@@ -1095,7 +1095,7 @@ void func_800593F8(void) {
if (D_801657B0 == 0) {
func_8004FA78(1);
if (playerHUD[PLAYER_TWO].lapCount != 3) {
func_8004CB60(playerHUD[PLAYER_TWO].lapX, playerHUD[PLAYER_TWO].lapY, D_0D00A958);
func_8004CB60(playerHUD[PLAYER_TWO].lapX, playerHUD[PLAYER_TWO].lapY, common_texture_hud_lap);
func_8004FC78(playerHUD[PLAYER_TWO].lapX + 0xC, playerHUD[PLAYER_TWO].lapY - 4, playerHUD[PLAYER_TWO].alsoLapCount);
func_8004E638(1);
}
@@ -1133,12 +1133,12 @@ void func_80059530(void) {
void func_80059560(s32 playerId) {
if (gModeSelection != BATTLE) {
if (D_801657F8 && gIsHUDVisible) {
func_8004CB60(playerHUD[playerId].lapX, playerHUD[playerId].lapY, D_0D00A958);
func_8004CB60(playerHUD[playerId].lapX, playerHUD[playerId].lapY, common_texture_hud_lap);
func_8004FC78(playerHUD[playerId].lapX - 12, playerHUD[playerId].lapY + 4, playerHUD[playerId].alsoLapCount);
}
if (D_801657E4 == 2) {
if (playerHUD[playerId].unk_74 && D_80165608) {
func_80047910(playerHUD[playerId].unk_6C, playerHUD[playerId].unk_6E, 0, 1.0f, gTLUTPortraitBombKartAndQuestionMark, gTexturePortraitBombKart, D_0D005AE0, 0x20, 0x20, 0x20, 0x20);
func_80047910(playerHUD[playerId].unk_6C, playerHUD[playerId].unk_6E, 0, 1.0f, common_tlut_portrait_bomb_kart_and_question_mark, common_texture_portrait_bomb_kart, D_0D005AE0, 0x20, 0x20, 0x20, 0x20);
}
}
}
@@ -4840,7 +4840,7 @@ void func_8006538C(Player *player, s8 arg1, s16 arg2, s8 arg3) {
primAlpha = player->unk_258[arg2].unk_03E;
func_800652D4(spB4, spAC, ((player->unk_258[arg2].unk_00C * player->size) * 1.4));
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_0D02BC58[player->unk_258[arg2].unk_010], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_smoke[player->unk_258[arg2].unk_010], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_DITHER);
gSPDisplayList(gDisplayListHead++, D_0D008E48);
@@ -4854,7 +4854,7 @@ void func_8006538C(Player *player, s8 arg1, s16 arg2, s8 arg3) {
primAlpha = player->unk_258[arg2].unk_03E;
func_800652D4(spB4, spAC, player->unk_258[arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_0D02BC58[player->unk_258[arg2].unk_010], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_smoke[player->unk_258[arg2].unk_010], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha);
gSPDisplayList(gDisplayListHead++, D_0D008E48);
}
@@ -5059,7 +5059,7 @@ void func_80066714(Player *player, UNUSED s32 arg1, s16 arg2, s8 arg3) {
func_800652D4(sp5C, sp54, player->unk_258[10 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008C90);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
gDPLoadTextureBlock(gDisplayListHead++, D_0D000200, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_fire, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
func_8004B35C(red, green, blue, alpha);
gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2);
gSPVertex(gDisplayListHead++, D_800E8B00, 4, 0);
@@ -5194,12 +5194,12 @@ void func_80067604(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
func_800652D4(sp8C, sp84, player->unk_258[30 + arg2].unk_00C * player->size);
if (player->unk_258[30 + arg2].unk_010 == 1) {
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_0D02AC58, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_spark, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
func_8004B72C(0x000000FF, 0x000000FF, 0x000000DF, 0x000000FF, 0x0000005F, 0, 0x00000060);
gSPDisplayList(gDisplayListHead++, D_0D008E70);
} else {
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_0D02AC58, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_spark, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
func_8004B72C(0x000000FF, 0x000000FF, 0x000000DF, 0x000000FF, 0x0000005F, 0, 0x00000060);
gSPDisplayList(gDisplayListHead++, D_0D008E48);
}
@@ -5978,7 +5978,7 @@ void func_8006C4D4(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha, s16 arg4) {
sp44[2] = 0;
func_800652D4(sp4C, sp44, arg1);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_0D02AC58[arg4], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_spark[arg4], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
func_8004B414(red, green, blue, alpha);
gSPDisplayList(gDisplayListHead++, D_0D008E48);
gMatrixEffectCount += 1;
src/code_8006E9C0.c
+4 -4
View File
@@ -150,10 +150,10 @@ void init_item_window(s32 objectIndex) {
temp_v0 = &gObjectList[objectIndex];
temp_v0->currentItem = ITEM_NONE;
temp_v0->itemDisplay = temp_v0->currentItem;
temp_v0->tlutList = (s32 *) gTLUTItemWindowNone;
temp_v0->activeTLUT = (s32 *) gTLUTItemWindowNone;
temp_v0->textureList = gTextureItemWindowNone;
temp_v0->activeTexture = gTextureItemWindowNone;
temp_v0->tlutList = (s32 *) common_tlut_item_window_none;
temp_v0->activeTLUT = (s32 *) common_tlut_item_window_none;
temp_v0->textureList = common_texture_item_window_none;
temp_v0->activeTexture = common_texture_item_window_none;
temp_v0->unk_04C = -1;
temp_v0->unk_09C = 0x00A0; // Screen X position
temp_v0->unk_09E = -0x0020; // Screen Y position
src/code_80071F00.c
+37 -37
View File
@@ -67,31 +67,31 @@ Vtx D_800E44B0[] = {
};
u8 *gItemWindowTLUTs[] = {
gTLUTItemWindowNone, gTLUTItemWindowBanana, gTLUTItemWindowBananaBunch, gTLUTItemWindowGreenShell,
gTLUTItemWindowTripleGreenShell, gTLUTItemWindowRedShell, gTLUTItemWindowTripleRedShell, gTLUTItemWindowBlueShell,
gTLUTItemWindowThunderBolt, gTLUTItemWindowFakeItemBox, gTLUTItemWindowStar, gTLUTItemWindowBoo,
gTLUTItemWindowMushroom, gTLUTItemWindowDoubleMushroom, gTLUTItemWindowTripleMushroom, gTLUTItemWindowSuperMushroom
common_tlut_item_window_none, common_tlut_item_window_banana, common_tlut_item_window_banana_bunch, common_tlut_item_window_green_shell,
common_tlut_item_window_triple_green_shell, common_tlut_item_window_red_shell, common_tlut_item_window_triple_red_shell, common_tlut_item_window_blue_shell,
common_tlut_item_window_thunder_bolt, common_tlut_item_window_fake_item_box, common_tlut_item_window_star, common_tlut_item_window_boo,
common_tlut_item_window_mushroom, common_tlut_item_window_double_mushroom, common_tlut_item_window_triple_mushroom, common_tlut_item_window_super_mushroom
};
u8 *gItemWindowTextures[] = {
gTextureItemWindowNone, gTextureItemWindowBanana, gTextureItemWindowBananaBunch, gTextureItemWindowGreenShell,
gTextureItemWindowTripleGreenShell, gTextureItemWindowRedShell, gTextureItemWindowTripleRedShell, gTextureItemWindowBlueShell,
gTextureItemWindowThunderBolt, gTextureItemWindowFakeItemBox, gTextureItemWindowStar, gTextureItemWindowBoo,
gTextureItemWindowMushroom, gTextureItemWindowDoubleMushroom, gTextureItemWindowTripleMushroom, gTextureItemWindowSuperMushroom
common_texture_item_window_none, common_texture_item_window_banana, common_texture_item_window_banana_bunch, common_texture_item_window_green_shell,
common_texture_item_window_triple_green_shell, common_texture_item_window_red_shell, common_texture_item_window_triple_red_shell, common_texture_item_window_blue_shell,
common_texture_item_window_thunder_bolt, common_texture_item_window_fake_item_box, common_texture_item_window_star, common_texture_item_window_boo,
common_texture_item_window_mushroom, common_texture_item_window_double_mushroom, common_texture_item_window_triple_mushroom, common_texture_item_window_super_mushroom
};
u8 *D_800E4570[] = {
D_0D00B158, D_0D00B558, D_0D00B958
common_texture_hud_lap_1_on_3, common_texture_hud_lap_2_on_3, common_texture_hud_lap_3_on_3
};
u8 *gPortraitTLUTs[] = {
gTLUTPortraitMario, gTLUTPortraitLuigi, gTLUTPortraitYoshi, gTLUTPortraitToad,
gTLUTPortraitDonkeyKong, gTLUTPortraitWario, gTLUTPortraitPeach, gTLUTPortraitBowser
common_tlut_portrait_mario, common_tlut_portrait_luigi, common_tlut_portrait_yoshi, common_tlut_portrait_toad,
common_tlut_portrait_donkey_kong, common_tlut_portrait_wario, common_tlut_portrait_peach, common_tlut_portrait_bowser
};
u8 *gPortraitTextures[] = {
gTexturePortraitMario, gTexturePortraitLuigi, gTexturePortraitYoshi, gTexturePortraitToad,
gTexturePortraitDonkeyKong, gTexturePortraitWario, gTexturePortraitPeach, gTexturePortraitBowser
common_texture_portrait_mario, common_texture_portrait_luigi, common_texture_portrait_yoshi, common_texture_portrait_toad,
common_texture_portrait_donkey_kong, common_texture_portrait_wario, common_texture_portrait_peach, common_texture_portrait_bowser
};
s32 find_unused_obj_index(s32* arg0) {
@@ -1881,8 +1881,8 @@ void func_8007634C(s32 objectIndex) {
Objects *temp_v0;
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_0D02BC58;
temp_v0->textureList = D_0D02BC58;
temp_v0->activeTexture = common_texture_particle_smoke;
temp_v0->textureList = common_texture_particle_smoke;
temp_v0->unk_0A0 = 0x00FF;
func_8008B8BC(objectIndex, 0U, 0U, 0U);
func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f);
@@ -2051,8 +2051,8 @@ void func_80076958(s32 objectIndex) {
Objects *temp_v0;
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_0D02BC58;
temp_v0->textureList = D_0D02BC58;
temp_v0->activeTexture = common_texture_particle_smoke;
temp_v0->textureList = common_texture_particle_smoke;
temp_v0->unk_0A0 = 0x00FF;
func_8008B8BC(objectIndex, 0U, 0U, 0U);
func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f);
@@ -2144,8 +2144,8 @@ void func_80076C9C(s32 objectIndex, Vec3f arg1, s16 arg2) {
init_object(objectIndex, (s32) arg2);
temp_v0 = &gObjectList[objectIndex];
temp_v0->unk_0D5 = 0x0A;
temp_v0->activeTexture = D_0D02BC58;
temp_v0->textureList = D_0D02BC58;
temp_v0->activeTexture = common_texture_particle_smoke;
temp_v0->textureList = common_texture_particle_smoke;
temp_v0->sizeScaling = 0.3f;
func_8008B7D4(objectIndex, arg1[0], arg1[1], arg1[2]);
temp_v0->type = 0x00FF;
@@ -2220,8 +2220,8 @@ void func_80076FEC(s32 objectIndex, s32 flameIndex) {
init_object(objectIndex, 3);
gObjectList[objectIndex].unk_0D5 = 0xB;
gObjectList[objectIndex].activeTexture = D_0D02BC58;
gObjectList[objectIndex].textureList = D_0D02BC58;
gObjectList[objectIndex].activeTexture = common_texture_particle_smoke;
gObjectList[objectIndex].textureList = common_texture_particle_smoke;
gObjectList[objectIndex].sizeScaling = 0.8f;
gObjectList[objectIndex].unk_010[0] = (f32)*(gTorchSpawns + (flameIndex * 3) + 0) * xOrientation;
@@ -2380,8 +2380,8 @@ void func_80077700(s32 objectIndex, Vec3f arg1, s32 arg2) {
init_object(objectIndex, 0);
gObjectList[objectIndex].unk_0D5 = 7;
gObjectList[objectIndex].activeTLUT = (u32 *) D_0D028DD8;
gObjectList[objectIndex].tlutList = (u32 *) D_0D028DD8;
gObjectList[objectIndex].activeTLUT = (u32 *) common_texture_particle_leaf;
gObjectList[objectIndex].tlutList = (u32 *) common_texture_particle_leaf;
gObjectList[objectIndex].sizeScaling = 0.1f;
gObjectList[objectIndex].unk_044 = arg1[1];
switch (gCurrentCourseId) {
@@ -2976,7 +2976,7 @@ void func_800792D8(s32 objectIndex, s32 arg1) {
D_801656F0 = 0;
D_8018D168 = 0;
}
init_texture_object(objectIndex, (u8 *) gTLUTLakituCountdown, gTextureLakituNoLights1, 0x38U, (u16) 0x00000048);
init_texture_object(objectIndex, (u8 *) common_tlut_lakitu_countdown, gTextureLakituNoLights1, 0x38U, (u16) 0x00000048);
gObjectList[objectIndex].vertex = D_0D005EB0;
gObjectList[objectIndex].sizeScaling = 0.15f;
set_object_flag_unk_054_false(objectIndex, 0x00000010);
@@ -3067,7 +3067,7 @@ void func_8007963C(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0;
func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, gTLUTLakituCheckeredFlag, gTextureLakituCheckeredFlag01, 0x48U, (u16) 0x00000038);
init_texture_object(objectIndex, common_tlut_lakitu_checkered_flag, gTextureLakituCheckeredFlag01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = D_0D006730;
@@ -3144,7 +3144,7 @@ void func_8007993C(s32 objectIndex, Player *player) {
void func_800799A8(s32 objectIndex, s32 arg1) {
func_800791F0(objectIndex, arg1);
init_texture_object(objectIndex, gTLUTLakituFishing, gTextureLakituFishing1, 0x38U, (u16) 0x00000048);
init_texture_object(objectIndex, common_tlut_lakitu_fishing, gTextureLakituFishing1, 0x38U, (u16) 0x00000048);
gObjectList[objectIndex].vertex = D_0D005F30;
gObjectList[objectIndex].sizeScaling = 0.15f;
func_80086E70(objectIndex);
@@ -3317,7 +3317,7 @@ void func_8007A060(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0;
func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, gTLUTLakituSecondLap, gTextureLakituSecondLap01, 0x48U, (u16) 0x00000038);
init_texture_object(objectIndex, common_tlut_lakitu_second_lap, gTextureLakituSecondLap01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = D_0D006730;
@@ -3365,7 +3365,7 @@ void func_8007A228(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0;
func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, gTLUTLakituFinalLap, gTextureLakituFinalLap01, 0x48U, (u16) 0x00000038);
init_texture_object(objectIndex, common_tlut_lakitu_final_lap, gTextureLakituFinalLap01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = D_0D006730;
@@ -3412,7 +3412,7 @@ void func_8007A2EC(s32 objectIndex, s32 playerIndex) {
void func_8007A3F0(s32 objectIndex, s32 arg1) {
f32 var = 5000.0f;
func_800791F0(objectIndex, arg1);
init_texture_object(objectIndex, gTLUTLakituReverse, gTextureLakituReverse01, 0x48U, (u16) 0x00000038);
init_texture_object(objectIndex, common_tlut_lakitu_reverse, gTextureLakituReverse01, 0x48U, (u16) 0x00000038);
gObjectList[objectIndex].activeTexture = D_8018C028;
gObjectList[objectIndex].vertex = D_0D006730;
gObjectList[objectIndex].pos[2] = var;
@@ -3641,26 +3641,26 @@ u8 gen_random_item(s16 rank, s16 isCpu)
if (gModeSelection == VERSUS) {
switch (gPlayerCountSelection1) {
case TWO_PLAYERS_SELECTED:
curve = segmented_to_virtual((void *) gVersus2PlayerItemCurve);
curve = segmented_to_virtual((void *) common_versus_2_player_item_curve);
break;
case THREE_PLAYERS_SELECTED:
curve = segmented_to_virtual((void *) gVersus3PlayerItemCurve);
curve = segmented_to_virtual((void *) common_versus_3_player_item_curve);
break;
case FOUR_PLAYERS_SELECTED:
curve = segmented_to_virtual((void *) gVersus4PlayerItemCurve);
curve = segmented_to_virtual((void *) common_versus_4_player_item_curve);
break;
}
randomItem = *((rank * 100) + curve + sRandomItemIndex);
} else if (gModeSelection == BATTLE) {
curve = segmented_to_virtual((void *) gBattleItemCurve);
curve = segmented_to_virtual((void *) common_battle_item_curve);
randomItem = curve[sRandomItemIndex];
} else { // GP Mode
if (isCpu == 0) {
curve = segmented_to_virtual((void *) gGrandPrixHumanItemCurve);
curve = segmented_to_virtual((void *) common_grand_prix_human_item_curve);
}
else {
curve = segmented_to_virtual((void *) gGrandPrixCPUItemCurve);
curve = segmented_to_virtual((void *) common_grand_prix_cpu_item_curve);
}
randomItem = *((rank * 100) + curve + sRandomItemIndex);
}
@@ -3762,8 +3762,8 @@ void func_8007B254(s32 objectIndex, s32 arg1) {
func_80072428(objectIndex);
gObjectList[objectIndex].state = 2;
gObjectList[objectIndex].type = 0;
gObjectList[objectIndex].tlutList = (u8 *) gTLUTItemWindowNone;
gObjectList[objectIndex].textureList = gTextureItemWindowNone;
gObjectList[objectIndex].tlutList = (u8 *) common_tlut_item_window_none;
gObjectList[objectIndex].textureList = common_texture_item_window_none;
gObjectList[objectIndex].textureWidth = 0x28;
gObjectList[objectIndex].textureHeight = 0x20;
gObjectList[objectIndex].unk_04C = 0x00000032;
src/common_textures.h
+114 -110
View File
@@ -10,8 +10,10 @@ typedef struct {
/* 0x4 */ s32 unk4;
} UnkCommonTextureStruct0; // size = 0x8
extern s8 gTLUTFinishLineBanner[];
extern s8 D_0D000200[];
/** @cond */
extern s8 common_tlut_finish_line_banner[];
extern s8 common_texture_particle_fire[];
extern Vtx D_0D001200[];
extern Vtx D_0D001210[];
extern Vtx D_0D001240[];
@@ -50,7 +52,7 @@ extern Vtx D_0D001E28[];
extern Vtx D_0D001E58[];
extern Vtx D_0D001E88[];
extern Vtx D_0D001EB8[];
extern s8 gItemBoxQuestionMark_Texture[];
extern s8 common_texture_item_box_question_mark[];
extern Gfx D_0D002EE8[];
extern Vtx common_fake_item_box_question_mark_vertices[];
extern Gfx common_model_fake_itembox[];
@@ -68,13 +70,13 @@ extern Gfx D_0D003278[];
extern Gfx D_0D003288[];
extern Vtx common_vtx_banana[];
extern Vtx common_vtx_flat_banana[];
extern s8 gBananaTexture[];
extern s8 common_texture_banana[];
extern s8 common_texture_flat_banana[];
extern Gfx common_model_banana[];
extern Gfx common_model_flat_banana[];
extern s8 D_0D004C68[];
extern s8 gTLUTGreenShell[];
extern s8 gTLUTBlueShell[];
extern s8 common_tlut_trees_import[];
extern s8 common_tlut_green_shell[];
extern s8 common_tlut_blue_shell[];
extern Vtx D_0D005238[];
extern Vtx D_0D005278[];
extern Gfx D_0D0052B8[];
@@ -141,8 +143,8 @@ extern Gfx D_0D006A28[];
extern Gfx D_0D006A40[];
extern s8 D_0D006A58[];
extern s8 D_0D006AD8[];
extern s8 gTLUTDebugFont[];
extern s8 gTextureDebugFont[];
extern s8 common_tlut_debug_font[];
extern s8 common_texture_debug_font[];
extern Gfx D_0D0076F8[];
extern Gfx D_0D007780[];
extern Gfx D_0D0077A0[];
@@ -207,12 +209,12 @@ extern Gfx D_0D008080[];
extern Gfx D_0D008108[];
extern Gfx D_0D008120[];
extern Gfx D_0D008138[];
extern u8 gGrandPrixHumanItemCurve[][100];
extern u8 gGrandPrixCPUItemCurve[][100];
extern u8 gVersus2PlayerItemCurve[][100];
extern u8 gVersus3PlayerItemCurve[][100];
extern u8 gVersus4PlayerItemCurve[][100];
extern u8 gBattleItemCurve[][100];
extern u8 common_grand_prix_human_item_curve[][100];
extern u8 common_grand_prix_cpu_item_curve[][100];
extern u8 common_versus_2_player_item_curve[][100];
extern u8 common_versus_3_player_item_curve[][100];
extern u8 common_versus_4_player_item_curve[][100];
extern u8 common_battle_item_curve[][100];
extern Vtx D_0D008B78[];
extern Vtx D_0D008BB8[];
extern Vtx D_0D008BF8[];
@@ -252,18 +254,18 @@ extern f32 D_0D009568[][4];
extern f32 D_0D0096B8[][4];
extern f32 D_0D009808[][4];
extern s32 unkPad;
extern s8 D_0D009958[];
extern s8 D_0D00A558[];
extern s8 D_0D00A958[];
extern u8 D_0D00AB58[];
extern s8 D_0D00AD58[];
extern s8 D_0D00B158[];
extern s8 D_0D00B558[];
extern s8 D_0D00B958[];
extern s8 D_0D00BD58[];
extern s8 D_0D00C158[];
extern u8 D_0D00C558[];
extern u8 D_0D00D258[][4096];
extern s8 common_texture_speedometer[];
extern s8 common_texture_speedometer_needle[];
extern s8 common_texture_hud_lap[];
extern u8 common_texture_hud_123[];
extern s8 common_texture_hud_lap_time[];
extern s8 common_texture_hud_lap_1_on_3[];
extern s8 common_texture_hud_lap_2_on_3[];
extern s8 common_texture_hud_lap_3_on_3[];
extern s8 common_texture_hud_total_time[];
extern s8 common_texture_hud_time[];
extern u8 common_texture_hud_normal_digit[];
extern u8 common_texture_hud_place[][4096];
extern s8 D_0D00E258[];
extern s8 D_0D00F258[];
extern s8 D_0D010258[];
@@ -275,97 +277,99 @@ extern u8 D_0D015258[][2048];
extern s8 D_0D015A58[];
extern s8 D_0D016258[];
extern s8 D_0D016A58[];
extern u8 D_0D017258[];
extern u8 common_tlut_player_emblem[];
extern s16 tlutPad[];
extern u8 D_0D017458[][2048];
extern u8 gTLUTHudTypeCRankFont[];
extern u8 gTextureHudTypeCRankFont[][256];
extern u8 gTLUTHudTypeCRankTinyFont[];
extern u8 gTextureHudTypeCRankTinyFont[][64];
extern u8 gTextureCharacterPortraitBorder[];
extern s8 gTLUTPortraitMario[];
extern s8 gTLUTPortraitLuigi[];
extern s8 gTLUTPortraitPeach[];
extern s8 gTLUTPortraitToad[];
extern s8 gTLUTPortraitYoshi[];
extern s8 gTLUTPortraitDonkeyKong[];
extern s8 gTLUTPortraitWario[];
extern s8 gTLUTPortraitBowser[];
extern s8 gTLUTPortraitBombKartAndQuestionMark[];
extern s8 gTexturePortraitMario[];
extern s8 gTexturePortraitLuigi[];
extern s8 gTexturePortraitPeach[];
extern s8 gTexturePortraitToad[];
extern s8 gTexturePortraitYoshi[];
extern s8 gTexturePortraitDonkeyKong[];
extern s8 gTexturePortraitWario[];
extern u8 gTexturePortraitBowser[];
extern u8 gTexturePortraitBombKart[];
extern u8 gTexturePortraitQuestionMark[];
extern s8 gTLUTItemWindowNone[];
extern s8 gTLUTItemWindowBanana[];
extern s8 gTLUTItemWindowBananaBunch[];
extern s8 gTLUTItemWindowMushroom[];
extern s8 gTLUTItemWindowDoubleMushroom[];
extern s8 gTLUTItemWindowTripleMushroom[];
extern s8 gTLUTItemWindowSuperMushroom[];
extern s8 gTLUTItemWindowBlueShell[];
extern s8 gTLUTItemWindowBoo[];
extern s8 gTLUTItemWindowGreenShell[];
extern s8 gTLUTItemWindowTripleGreenShell[];
extern s8 gTLUTItemWindowRedShell[];
extern s8 gTLUTItemWindowTripleRedShell[];
extern s8 gTLUTItemWindowStar[];
extern s8 gTLUTItemWindowThunderBolt[];
extern s8 gTLUTItemWindowFakeItemBox[];
extern u8 gTextureItemWindowNone[];
extern s8 gTextureItemWindowBanana[];
extern s8 gTextureItemWindowBananaBunch[];
extern s8 gTextureItemWindowMushroom[];
extern s8 gTextureItemWindowDoubleMushroom[];
extern s8 gTextureItemWindowTripleMushroom[];
extern s8 gTextureItemWindowSuperMushroom[];
extern s8 gTextureItemWindowBlueShell[];
extern s8 gTextureItemWindowBoo[];
extern s8 gTextureItemWindowGreenShell[];
extern s8 gTextureItemWindowTripleGreenShell[];
extern s8 gTextureItemWindowRedShell[];
extern s8 gTextureItemWindowTripleRedShell[];
extern s8 gTextureItemWindowStar[];
extern s8 gTextureItemWindowThunderBolt[];
extern s8 gTextureItemWindowFakeItemBox[];
extern u8 gTLUTLakituCountdown[][512];
extern u8 gTLUTLakituCheckeredFlag[];
extern u8 gTLUTLakituSecondLap[];
extern u8 gTLUTLakituFinalLap[];
extern u8 gTLUTLakituReverse[];
extern u8 gTLUTLakituFishing[];
extern u8 common_texture_player_emblem[][2048];
extern u8 common_tlut_hud_type_C_rank_font[];
extern u8 common_texture_hud_type_C_rank_font[][256];
extern u8 common_tlut_hud_type_C_rank_tiny_font[];
extern u8 common_texture_hud_type_C_rank_tiny_font[][64];
extern u8 common_texture_character_portrait_border[];
extern s8 common_tlut_portrait_mario[];
extern s8 common_tlut_portrait_luigi[];
extern s8 common_tlut_portrait_peach[];
extern s8 common_tlut_portrait_toad[];
extern s8 common_tlut_portrait_yoshi[];
extern s8 common_tlut_portrait_donkey_kong[];
extern s8 common_tlut_portrait_wario[];
extern s8 common_tlut_portrait_bowser[];
extern s8 common_tlut_portrait_bomb_kart_and_question_mark[];
extern s8 common_texture_portrait_mario[];
extern s8 common_texture_portrait_luigi[];
extern s8 common_texture_portrait_peach[];
extern s8 common_texture_portrait_toad[];
extern s8 common_texture_portrait_yoshi[];
extern s8 common_texture_portrait_donkey_kong[];
extern s8 common_texture_portrait_wario[];
extern u8 common_texture_portrait_bowser[];
extern u8 common_texture_portrait_bomb_kart[];
extern u8 common_texture_portrait_question_mark[];
extern s8 common_tlut_item_window_none[];
extern s8 common_tlut_item_window_banana[];
extern s8 common_tlut_item_window_banana_bunch[];
extern s8 common_tlut_item_window_mushroom[];
extern s8 common_tlut_item_window_double_mushroom[];
extern s8 common_tlut_item_window_triple_mushroom[];
extern s8 common_tlut_item_window_super_mushroom[];
extern s8 common_tlut_item_window_blue_shell[];
extern s8 common_tlut_item_window_boo[];
extern s8 common_tlut_item_window_green_shell[];
extern s8 common_tlut_item_window_triple_green_shell[];
extern s8 common_tlut_item_window_red_shell[];
extern s8 common_tlut_item_window_triple_red_shell[];
extern s8 common_tlut_item_window_star[];
extern s8 common_tlut_item_window_thunder_bolt[];
extern s8 common_tlut_item_window_fake_item_box[];
extern u8 common_texture_item_window_none[];
extern s8 common_texture_item_window_banana[];
extern s8 common_texture_item_window_banana_bunch[];
extern s8 common_texture_item_window_mushroom[];
extern s8 common_texture_item_window_double_mushroom[];
extern s8 common_texture_item_window_triple_mushroom[];
extern s8 common_texture_item_window_super_mushroom[];
extern s8 common_texture_item_window_blue_shell[];
extern s8 common_texture_item_window_boo[];
extern s8 common_texture_item_window_green_shell[];
extern s8 common_texture_item_window_triple_green_shell[];
extern s8 common_texture_item_window_red_shell[];
extern s8 common_texture_item_window_triple_red_shell[];
extern s8 common_texture_item_window_star[];
extern s8 common_texture_item_window_thunder_bolt[];
extern s8 common_texture_item_window_fake_item_box[];
extern u8 common_tlut_lakitu_countdown[][512];
extern u8 common_tlut_lakitu_checkered_flag[];
extern u8 common_tlut_lakitu_second_lap[];
extern u8 common_tlut_lakitu_final_lap[];
extern u8 common_tlut_lakitu_reverse[];
extern u8 common_tlut_lakitu_fishing[];
extern u8 D_0D028DD8[];
extern s8 D_0D025ED8[];
extern s8 D_0D0260D8[];
extern s8 D_0D026558[];
extern s8 D_0D0269D8[];
extern s8 D_0D026E58[];
extern s8 D_0D0272D8[];
extern s8 D_0D027758[];
extern s8 D_0D027BD8[];
extern s8 D_0D028058[];
extern s8 D_0D0284D8[];
extern s8 D_0D028958[];
extern s8 D_0D0291D8[];
extern u8 common_texture_particle_leaf[];
extern s8 common_tlut_traffic_light[];
extern s8 common_texture_traffic_light_01[];
extern s8 common_texture_traffic_light_02[];
extern s8 common_texture_traffic_light_03[];
extern s8 common_texture_traffic_light_04[];
extern s8 common_texture_traffic_light_05[];
extern s8 common_texture_traffic_light_06[];
extern s8 common_texture_traffic_light_07[];
extern s8 common_texture_traffic_light_08[];
extern s8 common_texture_traffic_light_09[];
extern s8 common_texture_traffic_light_10[];
extern s8 common_texture_unused_particle_leaf[];
extern u8 D_0D0293D8[];
extern s8 D_0D029458[];
extern u8 D_0D029858[][1024];
extern u8 common_texture_bomb[][1024];
extern s8 D_0D029C58[];
extern s8 D_0D02A058[];
extern s8 D_0D02A458[];
extern u8 D_0D02A858[];
extern u8 common_tlut_bomb[];
extern u8 D_0D02AA58[];
extern u8 D_0D02AC58[][1024];
extern u8 D_0D02BC58[][1024];
extern s8 gTextureMiniMapFinishLine[];
extern s8 gMiniMapKartTextures[][128];
extern u8 common_texture_particle_spark[][1024];
extern u8 common_texture_particle_smoke[][1024];
extern s8 common_texture_minimap_finish_line[];
extern s8 common_texture_minimap_kart_character[][128];
extern s8 common_texture_minimap_progress_dot[];
/** @endcond */
#endif
src/data/common_textures.inc.c
+267 -267
View File
File diff suppressed because it is too large Load Diff
src/hud_renderer.c
+38 -38
View File
@@ -2229,7 +2229,7 @@ void func_8004E6C4(s32 playerId) {
}
void func_8004E78C(s32 playerId) {
func_8004CB60((s32) playerHUD[playerId].lapX, playerHUD[playerId].lapY + 3, (s32) D_0D00A958);
func_8004CB60((s32) playerHUD[playerId].lapX, playerHUD[playerId].lapY + 3, (s32) common_texture_hud_lap);
func_8004CB90(playerHUD[playerId].lapX + 0x1C, (s32) playerHUD[playerId].lapY, D_800E4570[playerHUD[playerId].alsoLapCount]);
}
@@ -2237,11 +2237,11 @@ void func_8004E800(s32 playerId) {
if (playerHUD[playerId].unk_81 != 0) {
if (playerHUD[playerId].lapCount != 3) {
func_8004A384(playerHUD[playerId].rankX + playerHUD[playerId].slideRankX, playerHUD[playerId].rankY + playerHUD[playerId].slideRankY, 0U,
playerHUD[playerId].rankScaling, 0x000000FF, D_800E55F8[D_8018CF98[playerId]], 0, 0x000000FF, D_0D00D258[D_8018CF98[playerId]],
playerHUD[playerId].rankScaling, 0x000000FF, D_800E55F8[D_8018CF98[playerId]], 0, 0x000000FF, common_texture_hud_place[D_8018CF98[playerId]],
D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040);
} else {
func_8004A384(playerHUD[playerId].rankX + playerHUD[playerId].slideRankX, playerHUD[playerId].rankY + playerHUD[playerId].slideRankY, 0U,
playerHUD[playerId].rankScaling, 0x000000FF, D_800E55F8[D_80165594], 0, 0x000000FF, D_0D00D258[gGPCurrentRaceRankByPlayerId[playerId]],
playerHUD[playerId].rankScaling, 0x000000FF, D_800E55F8[D_80165594], 0, 0x000000FF, common_texture_hud_place[gGPCurrentRaceRankByPlayerId[playerId]],
D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040);
}
}
@@ -2270,26 +2270,26 @@ void func_8004EB38(s32 playerId) {
temp_s0 = &playerHUD[playerId];
if ((u8) temp_s0->unk_7B != 0) {
func_8004C9D8(temp_s0->lap1CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000080, (s32) D_0D00C158, 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004C9D8(temp_s0->lap1CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000080, (s32) common_texture_hud_time, 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004F950((s32) temp_s0->lap1CompletionTimeX, (s32) temp_s0->timerY, 0x00000080, (s32) temp_s0->someTimer);
}
if ((u8) temp_s0->unk_7C != 0) {
func_8004C9D8(temp_s0->lap2CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000050, (s32) D_0D00C158, 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004C9D8(temp_s0->lap2CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000050, (s32) common_texture_hud_time, 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004F950((s32) temp_s0->lap2CompletionTimeX, (s32) temp_s0->timerY, 0x00000050, (s32) temp_s0->someTimer);
}
if ((u8) temp_s0->unk_7E != 0) {
func_8004C9D8((s32) temp_s0->lapAfterImage1X, temp_s0->lapY + 3, 0x00000080, (s32) D_0D00A958, 0x00000020, 8, 0x00000020, 8);
func_8004C9D8((s32) temp_s0->lapAfterImage1X, temp_s0->lapY + 3, 0x00000080, (s32) common_texture_hud_lap, 0x00000020, 8, 0x00000020, 8);
func_8004C9D8(temp_s0->lapAfterImage1X + 0x1C, (s32) temp_s0->lapY, 0x00000080, D_800E4570[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010);
}
if ((u8) temp_s0->unk_7F != 0) {
func_8004C9D8((s32) temp_s0->lapAfterImage2X, temp_s0->lapY + 3, 0x00000050, (s32) D_0D00A958, 0x00000020, 8, 0x00000020, 8);
func_8004C9D8((s32) temp_s0->lapAfterImage2X, temp_s0->lapY + 3, 0x00000050, (s32) common_texture_hud_lap, 0x00000020, 8, 0x00000020, 8);
func_8004C9D8(temp_s0->lapAfterImage2X + 0x1C, (s32) temp_s0->lapY, 0x00000050, D_800E4570[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010);
}
}
void func_8004ED40(s32 arg0) {
func_8004A2F4(playerHUD[arg0].speedometerX, playerHUD[arg0].speedometerY, 0U, 1.0f, D_8018D300, D_8018D308, D_8018D310, 0xFF, (u8* ) D_0D009958, D_0D0064B0, 0x40, 0x60, 0x40, 0x30);
func_8004A258(D_8018CFEC, D_8018CFF4, D_8016579E, 1.0f, (u8* ) D_0D00A558, &D_0D005FF0, 0x40, 0x20, 0x40, 0x20);
func_8004A2F4(playerHUD[arg0].speedometerX, playerHUD[arg0].speedometerY, 0U, 1.0f, D_8018D300, D_8018D308, D_8018D310, 0xFF, (u8* ) common_texture_speedometer, D_0D0064B0, 0x40, 0x60, 0x40, 0x30);
func_8004A258(D_8018CFEC, D_8018CFF4, D_8016579E, 1.0f, (u8* ) common_texture_speedometer_needle, &D_0D005FF0, 0x40, 0x20, 0x40, 0x20);
}
void func_8004EE54(s32 arg0) {
@@ -2326,7 +2326,7 @@ void func_8004F020(s32 arg0) {
var_f0 = var_f0 + 4.0;
break;
}
func_8004CAD0(var_f2, var_f0, gTextureMiniMapFinishLine);
func_8004CAD0(var_f2, var_f0, common_texture_minimap_finish_line);
}
#ifdef NON_MATCHING
@@ -2344,10 +2344,10 @@ void func_8004F168(s32 arg0, s32 playerId, s32 characterId) {
temp_a1 = ((D_8018D2D8[arg0] + D_8018D2F8) - ((s16) D_8018D2B8 / 2)) + D_8018D2E8 + (s32) (player->pos[2] * D_8018D2A0);
if (characterId != 8) {
if ((gGPCurrentRaceRankByPlayerId[playerId] == 0) && (gModeSelection != BATTLE) && (gModeSelection != TIME_TRIALS)) {
func_80046424((s32) temp_a0, (s32) temp_a1, (player->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) gMiniMapKartTextures[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
func_80046424((s32) temp_a0, (s32) temp_a1, (player->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
// return;
} else {
func_800463B0((s32) temp_a0, (s32) temp_a1, (player->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) gMiniMapKartTextures[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
func_800463B0((s32) temp_a0, (s32) temp_a1, (player->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
}
//return;
} else {
@@ -2457,7 +2457,7 @@ void print_timer(s32 arg0, s32 arg1, s32 arg2) {
gSPDisplayList(gDisplayListHead++, D_0D008108);
gSPDisplayList(gDisplayListHead++, D_0D007EF8);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD);
func_80043D50(D_0D00C558, 104, 16);
func_80043D50(common_texture_hud_normal_digit, 104, 16);
func_8004F6D0(arg2);
func_8004F774(arg0, arg1);
gSPDisplayList(gDisplayListHead++, D_0D007EB8);
@@ -2476,7 +2476,7 @@ void func_8004F8CC(s32 arg0, s32 arg1) {
void func_8004F950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
gSPDisplayList(gDisplayListHead++, D_0D007F38);
set_transparency(arg2);
func_80043D50(D_0D00C558, 104, 16);
func_80043D50(common_texture_hud_normal_digit, 104, 16);
func_8004F6D0(arg3);
func_8004F8CC(arg0, arg1);
}
@@ -2484,7 +2484,7 @@ void func_8004F950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
void func_8004F9CC(s32 arg0, s32 arg1, s32 arg2) {
gSPDisplayList(gDisplayListHead++, D_0D007F38);
func_8004B614(D_801656C0, D_801656D0, D_801656E0, 128, 128, 128, 255);
func_80043D50(D_0D00C558, 104, 16);
func_80043D50(common_texture_hud_normal_digit, 104, 16);
func_8004F6D0(arg2);
func_8004F8CC(arg0, arg1);
}
@@ -2502,7 +2502,7 @@ void func_8004FA78(s32 playerId) {
func_8004F9CC(playerHUD[playerId].lapCompletionTimeXs[var_s0], playerHUD[playerId].timerY + (var_s0*0x10), playerHUD[playerId].lapDurations[var_s0]);
}
}
func_8004CB90(playerHUD[playerId].totalTimeX - 0x13, playerHUD[playerId].timerY + 0x38, D_0D00BD58);
func_8004CB90(playerHUD[playerId].totalTimeX - 0x13, playerHUD[playerId].timerY + 0x38, common_texture_hud_total_time);
if (D_801657E5 != 0) {
func_8004F9CC(playerHUD[playerId].totalTimeX, playerHUD[playerId].timerY + 0x30, playerHUD[playerId].someTimer);
} else {
@@ -2511,10 +2511,10 @@ void func_8004FA78(s32 playerId) {
}
} else {
if (playerHUD[playerId].blinkTimer == 0) {
func_8004CB90(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, D_0D00C158);
func_8004CB90(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, common_texture_hud_time);
print_timer(playerHUD[playerId].timerX, playerHUD[playerId].timerY, playerHUD[playerId].someTimer);
} else {
func_8004CB90(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, D_0D00AD58);
func_8004CB90(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, common_texture_hud_lap_time);
if (D_801657E3 != 0) {
func_8004F9CC(playerHUD[playerId].timerX, playerHUD[playerId].timerY, playerHUD[playerId].someTimer1);
} else if (playerHUD[playerId].blinkState == 0) {
@@ -2529,7 +2529,7 @@ void func_8004FC78(s16 arg0, s16 arg1, s8 arg2) {
gSPDisplayList(gDisplayListHead++, D_0D008108);
gSPDisplayList(gDisplayListHead++, D_0D007EF8);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD);
func_80043D50(D_0D00AB58, 32, 8);
func_80043D50(common_texture_hud_123, 32, 8);
func_8004BA98(arg0, arg1, 8, 8, arg2 * 8, 0, 0);
func_8004BA98(arg0 + 8, arg1, 8, 8, 24, 0, 0);
func_8004BA98(arg0 + 16, arg1, 8, 8, 16, 0, 0);
@@ -2541,8 +2541,8 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 characterId, s32
func_80042330((s32) arg0, (s32) arg1, 0U, 1.0f);
gSPDisplayList(gDisplayListHead++, D_0D007DB8);
func_8004B35C(0x000000FF, 0x000000FF, 0x000000FF, D_8018D3E0);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTPortraitBombKartAndQuestionMark);
rsp_load_texture(gTexturePortraitQuestionMark, 0x00000020, 0x00000020);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_portrait_bomb_kart_and_question_mark);
rsp_load_texture(common_texture_portrait_question_mark, 0x00000020, 0x00000020);
gSPDisplayList(gDisplayListHead++, D_0D0069E0);
} else {
func_80042330(arg0, arg1, 0U, 1.0f);
@@ -2559,14 +2559,14 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 characterId, s32
func_80042330(arg0, arg1, 0U, 1.0f);
gSPDisplayList(gDisplayListHead++, D_0D007A60);
func_8004B35C(D_8018D3E4, D_8018D3E8, D_8018D3EC, 0x000000FF);
func_80044924(gTextureCharacterPortraitBorder, 0x20, 0x20);
func_80044924(common_texture_character_portrait_border, 0x20, 0x20);
gSPDisplayList(gDisplayListHead++, D_0D0069E0);
}
gSPDisplayList(gDisplayListHead++, D_0D007DB8);
func_8004B35C(0x000000FF, 0x000000FF, 0x000000FF, arg5);
gSPDisplayList(gDisplayListHead++, D_0D007CB8);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTHudTypeCRankFont);
rsp_load_texture(gTextureHudTypeCRankFont[arg2], 0x00000010, 0x00000010);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_hud_type_C_rank_font);
rsp_load_texture(common_texture_hud_type_C_rank_font[arg2], 0x00000010, 0x00000010);
if (arg7 != 0) {
func_80042330((s32) (arg0 + 9.0f), (s32) (arg1 + 7.0f), 0U, 1.0f);
} else {
@@ -2784,8 +2784,8 @@ void func_80050C68(void) {
if ((gBombKarts[var_s1].state != BOMB_STATE_EXPLODED) && (gBombKarts[var_s1].state != BOMB_STATE_INACTIVE)) {
func_800507D8(var_s1, &sp88, &sp84);
gSPDisplayList(gDisplayListHead++, D_0D007DB8);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTPortraitBombKartAndQuestionMark);
rsp_load_texture(gTexturePortraitBombKart, 0x00000020, 0x00000020);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_portrait_bomb_kart_and_question_mark);
rsp_load_texture(common_texture_portrait_bomb_kart, 0x00000020, 0x00000020);
func_80042330(sp88 + 0x20, sp84 + 0x12, 0U, 0.6f);
gSPDisplayList(gDisplayListHead++, D_0D0069E0);
}
@@ -2829,8 +2829,8 @@ void func_80050E34(s32 playerId, s32 arg1) {
if ((gCurrentCourseId == COURSE_YOSHI_VALLEY) && (lapCount < 3)) {
gSPDisplayList(gDisplayListHead++, D_0D007DB8);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTPortraitBombKartAndQuestionMark);
rsp_load_texture(gTexturePortraitQuestionMark, 0x00000020, 0x00000020);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_portrait_bomb_kart_and_question_mark);
rsp_load_texture(common_texture_portrait_question_mark, 0x00000020, 0x00000020);
object = &gObjectList[objectIndex];
object->pos[0] = object->unk_028[0] + ((f32) (spD0 + 0x20));
object->pos[1] = object->unk_028[1] + ((f32) (spC4 + spCC));
@@ -2856,8 +2856,8 @@ void func_80050E34(s32 playerId, s32 arg1) {
} else {
gSPDisplayList(gDisplayListHead++, D_0D0069E0);
}
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTHudTypeCRankTinyFont);
rsp_load_texture(gTextureHudTypeCRankTinyFont[arg1 + 1], 8, 8);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_hud_type_C_rank_tiny_font);
rsp_load_texture(common_texture_hud_type_C_rank_tiny_font[arg1 + 1], 8, 8);
if (spB8 != 0) {
func_80042330(spD0 + 0x26, (spC4 + spCC) + 4, 0U, 1.0f);
} else {
@@ -2867,7 +2867,7 @@ void func_80050E34(s32 playerId, s32 arg1) {
if ((player == gPlayerOne) && (gScreenModeSelection == SCREEN_MODE_1P)) {
gSPDisplayList(gDisplayListHead++, D_0D007A40);
func_8004B35C(D_8018D3E4, D_8018D3E8, D_8018D3EC, 0x000000FF);
func_80044924(gTextureCharacterPortraitBorder, 0x00000020, 0x00000020);
func_80044924(common_texture_character_portrait_border, 0x00000020, 0x00000020);
rsp_set_matrix_transformation(object->pos, object->unk_0BE, object->sizeScaling);
gSPDisplayList(gDisplayListHead++, D_0D0069E0);
}
@@ -2913,7 +2913,7 @@ void func_80051638(UNUSED s32 arg0) {
gSPDisplayList(gDisplayListHead++, D_0D0079C8);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH);
func_80043D50(D_0D028DD8, 0x00000020, 0x00000010);
func_80043D50(common_texture_particle_leaf, 0x00000020, 0x00000010);
for(someIndex = 0; someIndex < D_8018C970_SIZE; someIndex++) {
leafIndex = D_8018C970[someIndex];
if (leafIndex != -1) {
@@ -3672,7 +3672,7 @@ void func_80054664(s32 cameraId) {
s32 objectIndex;
gSPDisplayList(gDisplayListHead++, D_0D007AE0);
func_8004477C(D_0D02BC58[D_80165598], 0x00000020, 0x00000020);
func_8004477C(common_texture_particle_smoke[D_80165598], 0x00000020, 0x00000020);
func_8004B414(0, 0, 0, 0x000000FF);
D_80183E80[0] = 0;
D_80183E80[2] = 0x8000;
@@ -3716,7 +3716,7 @@ void func_80054938(s32 cameraId) {
sp54 = &camera1[cameraId];
gSPDisplayList(gDisplayListHead++, D_0D007AE0);
func_8004477C(D_0D02BC58[D_80165598], 32, 32);
func_8004477C(common_texture_particle_smoke[D_80165598], 32, 32);
func_8004B72C(255, 255, 255, 255, 255, 255, 255);
D_80183E80[0] = 0;
D_80183E80[2] = 0x8000;
@@ -4171,7 +4171,7 @@ void func_800562E4(s32 arg0, s32 arg1, s32 arg2) {
D_80165878 = D_800E46F8[arg0][2];
func_8004B138(D_80165860, D_8016586C, D_80165878, arg2);
rsp_set_matrix_transformation(D_80183E40, D_80183E80, 0.2f);
func_80044BF8(D_0D02AC58[arg1], 0x00000020, 0x00000020);
func_80044BF8(common_texture_particle_spark[arg1], 0x00000020, 0x00000020);
gSPVertex(gDisplayListHead++, D_0D005AE0, 4, 0);
gSPDisplayList(gDisplayListHead++, common_rectangle_display);
}
@@ -4195,7 +4195,7 @@ void func_800563DC(s32 objectIndex, s32 cameraId, s32 arg2) {
rsp_set_matrix_transformation(D_80183E40, D_80183E80, 0.2f);
gSPDisplayList(gDisplayListHead++, D_0D007E98);
func_8004B310(arg2);
draw_rectangle_texture_overlap(D_0D02A858, D_0D029858[residue], D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020);
draw_rectangle_texture_overlap(common_tlut_bomb, common_texture_bomb[residue], D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020);
temp_s0 = D_8018D400;
gSPDisplayList(gDisplayListHead++, D_0D007B00);
func_8004B414(0, 0, 0, arg2);
@@ -4299,11 +4299,11 @@ void func_80056BF0(s32 bombIndex) {
temp_v0 = D_801655CC % 6U;
thing = D_800E471C[temp_v0];
bombFrame = D_0D029858[thing];
bombFrame = common_texture_bomb[thing];
D_80183E40[0] = sp40.bombPos[0];
D_80183E40[1] = sp40.bombPos[1] + 1.0;
D_80183E40[2] = sp40.bombPos[2];
func_800480B4(D_80183E40, D_80183E80, 0.25f, D_0D02A858, bombFrame, D_0D005AE0, 0x20, 0x20, 0x20, 0x20);
func_800480B4(D_80183E40, D_80183E80, 0.25f, common_tlut_bomb, bombFrame, D_0D005AE0, 0x20, 0x20, 0x20, 0x20);
temp_s0 = D_8018D400;
gSPDisplayList(gDisplayListHead++, D_0D007B00);
func_8004B414(0, 0, 0, 0xFF);
src/racing/actors.c
+10 -10
View File
@@ -392,7 +392,7 @@ void func_802977E4(Player *arg0) {
// Invert green and red on green shell texture
void init_red_shell_texture(void) {
s16 *red_shell_texture = (s16 *) &gTLUTRedShell[0];
s16 *green_shell_texture = (s16 *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(gTLUTGreenShell)] + SEGMENT_OFFSET(gTLUTGreenShell));
s16 *green_shell_texture = (s16 *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(common_tlut_green_shell)] + SEGMENT_OFFSET(common_tlut_green_shell));
s16 color_pixel, red_color, green_color, blue_color, alpha_color;
s32 i;
for (i = 0; i < 256; i++) {
@@ -943,7 +943,7 @@ void render_actor_tree_mario_raceway(Camera *camera, Mat4 arg1, struct Actor *ar
arg1[3][2] = arg2->pos[2];
if (render_set_position(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_tree);
}
}
@@ -966,7 +966,7 @@ void render_actor_tree_yoshi_valley(Camera *camera, Mat4 arg1, struct Actor *arg
arg1[3][2] = arg2->pos[2];
if (render_set_position(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_tree);
}
}
@@ -989,7 +989,7 @@ void render_actor_tree_royal_raceway(Camera *camera, Mat4 arg1, struct Actor *ar
arg1[3][2] = arg2->pos[2];
if (render_set_position(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_tree);
}
}
@@ -1012,7 +1012,7 @@ void render_actor_tree_moo_moo_farm(Camera *camera, Mat4 arg1, struct Actor *arg
arg1[3][2] = arg2->pos[2];
if (render_set_position(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_tree);
}
}
@@ -1035,7 +1035,7 @@ void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
arg1[3][2] = arg2->pos[2];
if (render_set_position(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
// Why is a TLUT being used a DL here? That makes no sense
// Based on the TLUT being loaded above, this ought to be be another
// tree related DL, presumably one found in a course other than Moo Moo farm
@@ -1062,7 +1062,7 @@ void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *ar
arg1[3][2] = arg2->pos[2];
if (render_set_position(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
}
}
@@ -1085,7 +1085,7 @@ void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *ar
arg1[3][2] = arg2->pos[2];
if (render_set_position(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
}
}
@@ -1262,7 +1262,7 @@ UNUSED s16 D_802B8810[] = {
};
void render_actor_green_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTGreenShell); // set texture
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_green_shell); // set texture
render_actor_shell(camera, matrix, shell);
}
@@ -1273,7 +1273,7 @@ void render_actor_red_shell(Camera *camera, Mat4 matrix, struct ShellActor *shel
// Middle of a tlut access
void render_actor_blue_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTBlueShell); // set texture
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_blue_shell); // set texture
render_actor_shell(camera, matrix, shell);
}
src/racing/actors.h
+1 -1
View File
@@ -124,7 +124,7 @@ extern s16 gCurrentCourseId;
extern u16 isCrossingTriggeredByIndex[];
extern Lights1 D_800DC610[];
extern s8 D_0D004C68[];
extern s8 common_tlut_trees_import[];
extern Gfx D_0D005338[];
extern Gfx D_0D005368[];
extern Gfx D_0D007B20[];