diff --git a/soh/soh/Enhancements/Items/AdditionalReticles.cpp b/soh/soh/Enhancements/Items/AdditionalReticles.cpp index 2cb3b975af..9b8b5cfcaf 100644 --- a/soh/soh/Enhancements/Items/AdditionalReticles.cpp +++ b/soh/soh/Enhancements/Items/AdditionalReticles.cpp @@ -36,7 +36,7 @@ void RegisterAdditionalReticles() { bool shouldRegister = CVAR_BOW_RETICLE_VALUE || CVAR_BOOMERANG_RETICLE_VALUE; COND_VB_SHOULD(VB_DRAW_ADDITIONAL_RETICLES, shouldRegister, { - Player* player = GET_PLAYER(gPlayState); + Player* player = va_arg(args, Player*); Actor* heldActor = player->heldActor; if (CVAR_BOW_RETICLE_VALUE && ((player->heldItemAction >= PLAYER_IA_BOW && player->heldItemAction <= PLAYER_IA_BOW_LIGHT) || diff --git a/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h b/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h index 4e13fdf33e..09ce04580a 100644 --- a/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h +++ b/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h @@ -540,10 +540,11 @@ typedef enum { // #### `result` // ```c - // true + // (this->heldItemAction == PLAYER_IA_HOOKSHOT) || + // (this->heldItemAction == PLAYER_IA_LONGSHOT) // ``` // #### `args` - // - None + // - '*Player' VB_DRAW_ADDITIONAL_RETICLES, // #### `result` diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 34750ed2cc..83dfd7608c 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -1906,8 +1906,10 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve } if (this->actor.scale.y >= 0.0f) { - if (GameInteractor_Should(VB_DRAW_ADDITIONAL_RETICLES, (this->heldItemAction == PLAYER_IA_HOOKSHOT) || - (this->heldItemAction == PLAYER_IA_LONGSHOT))) { + if (GameInteractor_Should(VB_DRAW_ADDITIONAL_RETICLES, + (this->heldItemAction == PLAYER_IA_HOOKSHOT) || + (this->heldItemAction == PLAYER_IA_LONGSHOT), + this)) { Matrix_MultVec3f(&D_80126184, &this->unk_3C8); if (heldActor != NULL) {