diff options
| author | cplaster <nixhex@gmail.com> | 2024-11-19 19:51:17 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-19 20:51:17 -0500 |
| commit | ce4bf1f4ccddcabb2233d57ee32bca3b84f31ef1 (patch) | |
| tree | 3b21da7bfbef73382a95c9c2f0028adb907fcdcc /mm/src/code | |
| parent | 5a735395da23f0531d546832cc0e4117faad9873 (diff) | |
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 <archez39@me.com>
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_bgcheck.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 <stdio.h> +#include <stdio.h> #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) { |