nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add hilite setup calls around all custom GI draws (#5043)

Browse Source
This commit is contained in:
Archez
2025-02-12 15:32:28 -05:00
committed by GitHub
parent 135c2e8217
commit 266792599e
7 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
soh/src/code/z_en_item00.c
View File

@@ -997,6 +997,12 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) {
EnItem00* this = (EnItem00*)thisx;
f32 mtxScale;
// Setup Hilites for 3D drops
if (CVarGetInteger(CVAR_ENHANCEMENT("NewDrops"), 0)) {
func_8002EBCC(&this->actor, play, 0);
func_8002ED80(&this->actor, play, 0);
}
if (!(this->unk_156 & this->unk_158)) {
switch (this->actor.params) {
case ITEM00_RUPEE_GREEN:

3
soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
View File

@@ -389,6 +389,9 @@ void EnExRuppy_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
if (CVarGetInteger(CVAR_ENHANCEMENT("NewDrops"), 0)) {
func_8002EBCC(&this->actor, play, 0);
func_8002ED80(&this->actor, play, 0);
// purple/gold rupees need less scaling
f32 mtxScale = this->colorIdx >= 3 ? 17.5f : 25.0f;
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);

3
soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
View File

@@ -481,6 +481,9 @@ void EnGSwitch_DrawRupee(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
if (CVarGetInteger(CVAR_ENHANCEMENT("NewDrops"), 0)) {
func_8002EBCC(&this->actor, play, 0);
func_8002ED80(&this->actor, play, 0);
// purple/gold/silver rupees need less scaling
f32 mtxScale = this->colorIdx >= 3 ? 17.5f : 25.0f;
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);

3
soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View File

@@ -1428,6 +1428,9 @@ void EnGirlA_Draw(Actor* thisx, PlayState* play) {
}
if (this->actor.params == SI_RANDOMIZED_ITEM) {
// Set all hilites for randomized items
func_80A3C498(&this->actor, play, 0);
ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->randoSlotIndex);
GetItemEntry getItemEntry = (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0) && this->actor.params == SI_RANDOMIZED_ITEM) ? GetItemMystery() :
Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);