github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 21:33:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update lus (#1965)

Browse source 
* update lus

* rename things to fix build

Co-authored-by: briaguya <briaguya@alice>
This commit is contained in:
briaguya 2022-11-14 23:01:06 -05:00 • committed by GitHub
commit c9a3dcdb44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 44 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
View file

@ -503,15 +503,15 @@ void EnGSwitch_DrawRupee(Actor* thisx, PlayState* play) {
if (this->type == ENGSWITCH_TARGET_RUPEE) {
GetItem_Draw(play, sRupeeTexturesNew[this->colorIdx]);
} else {
gsDPSetGrayscaleColor(POLY_OPA_DISP++, 255, 255, 255, 255);
gsSPGrayscale(POLY_OPA_DISP++, true);
gDPSetGrayscaleColor(POLY_OPA_DISP++, 255, 255, 255, 255);
gSPGrayscale(POLY_OPA_DISP++, true);
func_80093D18(play->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, gGiRupeeInnerDL);
gSPDisplayList(POLY_OPA_DISP++, gGiGoldRupeeInnerColorDL);
func_80093D84(play->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, gGiRupeeOuterDL);
gSPDisplayList(POLY_OPA_DISP++, gGiGoldRupeeOuterColorDL);
gsSPGrayscale(POLY_OPA_DISP++, false);
gSPGrayscale(POLY_OPA_DISP++, false);
}
} else {
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRupeeTextures[this->colorIdx]));

7
soh/src/overlays/actors/ovl_End_Title/z_end_title.c
View file

@ -85,7 +85,7 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) {
OVERLAY_DISP = func_80093F34(OVERLAY_DISP);
if (D_801614B0.a > 0)
gsSPGrayscale(OVERLAY_DISP++, false);
gSPGrayscale(OVERLAY_DISP++, false);
gDPSetTextureLUT(OVERLAY_DISP++, G_TT_NONE);
gDPSetEnvColor(OVERLAY_DISP++, 255, 120, 30, 0);
gDPSetRenderMode(OVERLAY_DISP++, G_RM_PASS, G_RM_XLU_SURF2);
@ -110,8 +110,9 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) {
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
gSPTextureRectangle(OVERLAY_DISP++, 104 << 2, 177 << 2, 216 << 2, 192 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10,
1 << 10);
if (D_801614B0.a > 0)
gsSPGrayscale(OVERLAY_DISP++, true);
if (D_801614B0.a > 0) {
gSPGrayscale(OVERLAY_DISP++, true);
}
CLOSE_DISPS(play->state.gfxCtx);
}

24
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file

@ -671,29 +671,29 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
if (drawGreyItems &&
((sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_SILVER ||
(sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_GOLD)) { // Grey Out the Gauntlets
gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gsSPGrayscale(POLY_KAL_DISP++, true);
gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gSPGrayscale(POLY_KAL_DISP++, true);
}
KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + point - 1], 32, 32, 0);
gsSPGrayscale(POLY_KAL_DISP++, false);
gSPGrayscale(POLY_KAL_DISP++, false);
}
} else {
if ((i == 0) && (CUR_UPG_VALUE(sAdultUpgrades[i]) == 0)) { // If the player doesn't have the bow, load the current slingshot ammo upgrade instead.
if (drawGreyItems) {
gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255); // Grey Out Slingshot Bullet Bags
gsSPGrayscale(POLY_KAL_DISP++, true);
gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255); // Grey Out Slingshot Bullet Bags
gSPGrayscale(POLY_KAL_DISP++, true);
}
KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1], 32, 32, 0);
gsSPGrayscale(POLY_KAL_DISP++, false);
gSPGrayscale(POLY_KAL_DISP++, false);
} else if (CUR_UPG_VALUE(sAdultUpgrades[i]) != 0) {
if (drawGreyItems &&
((sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1) == ITEM_BRACELET &&
!(gSaveContext.n64ddFlag))) { // Grey Out the Goron Bracelet when Not Randomized
gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gsSPGrayscale(POLY_KAL_DISP++, true);
gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gSPGrayscale(POLY_KAL_DISP++, true);
}
KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1], 32, 32, 0);
gsSPGrayscale(POLY_KAL_DISP++, false);
gSPGrayscale(POLY_KAL_DISP++, false);
}
}
// Draw inventory screen icons
@ -702,8 +702,8 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
int itemId = ITEM_SWORD_KOKIRI + temp;
bool age_restricted = !CHECK_ITEM_AGE(itemId);
if (age_restricted) {
gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gsSPGrayscale(POLY_KAL_DISP++, true);
gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gSPGrayscale(POLY_KAL_DISP++, true);
}
if (((u32)i == 0) && (k == 2) && (gSaveContext.bgsFlag != 0)) {
KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gBiggoronSwordIconTex, 32, 32, point);
@ -712,7 +712,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
} else if (gBitFlags[bit] & gSaveContext.inventory.equipment) {
KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[itemId], 32, 32, point);
}
gsSPGrayscale(POLY_KAL_DISP++, false);
gSPGrayscale(POLY_KAL_DISP++, false);
}
}

6
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View file

@ -516,12 +516,12 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
int itemId = gSaveContext.inventory.items[i];
bool not_acquired = !CHECK_ITEM_AGE(itemId);
if (not_acquired) {
gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gsSPGrayscale(POLY_KAL_DISP++, true);
gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gSPGrayscale(POLY_KAL_DISP++, true);
}
KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[itemId], 32,
32, 0);
gsSPGrayscale(POLY_KAL_DISP++, false);
gSPGrayscale(POLY_KAL_DISP++, false);
}
}