From ce4bf1f4ccddcabb2233d57ee32bca3b84f31ef1 Mon Sep 17 00:00:00 2001 From: cplaster Date: Tue, 19 Nov 2024 19:51:17 -0600 Subject: Hookshot Anywhere (#699) * initial commit * formatting fix * formatting fix * remove conflict files * Updated per garrettjoecox suggestions * Cleanup comments * initial commit * formatting fix * Updated per garrettjoecox suggestions * Cleanup comments * Merge fixes * cleanup for review feedback --------- Co-authored-by: Archez --- mm/src/code/z_bgcheck.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mm/src/code') diff --git a/mm/src/code/z_bgcheck.c b/mm/src/code/z_bgcheck.c index 4b1992e94..9576334ab 100644 --- a/mm/src/code/z_bgcheck.c +++ b/mm/src/code/z_bgcheck.c @@ -4,9 +4,10 @@ #include "fixed_point.h" #include "vt.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" -#include +#include #include "2s2h/BenPort.h" +#include "2s2h/GameInteractor/GameInteractor.h" #define DYNA_RAYCAST_FLOORS 1 #define DYNA_RAYCAST_WALLS 2 @@ -4276,7 +4277,8 @@ u32 SurfaceType_GetEcho(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId) } u32 SurfaceType_IsHookshotSurface(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId) { - return SurfaceType_GetData(colCtx, poly, bgId, 1) >> 17 & 1; + return GameInteractor_Should(VB_BE_HOOKSHOT_SURFACE, SurfaceType_GetData(colCtx, poly, bgId, 1) >> 17 & 1, poly, + bgId); } s32 SurfaceType_IsIgnoredByEntities(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId) { -- cgit v1.2.3