From e6b79a047000ecdef173e6d0012cac0b2791a186 Mon Sep 17 00:00:00 2001 From: blackgamma7 Date: Wed, 28 May 2025 00:26:22 -0400 Subject: [PATCH] Update z_en_sw.h use PARAMS_GET_S in ENSW_GET_TYPE macro --- src/overlays/actors/ovl_En_Sw/z_en_sw.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h index 4d4fc587b9..2b70fe9ac4 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -49,9 +49,9 @@ typedef struct EnSw { } EnSw; // size = 0x04D8 // Skullwalltula type stored in last 3 bits of params. -#define ENSW_GET_TYPE(thisx) ((thisx->params & 0xE000) >> 0xD) +#define ENSW_GET_TYPE(thisx) PARAMS_GET_S(thisx->params,13,3) // version of the macro used for the whole entity struct. -#define ENSW_GET_TYPE_EN(this) ((this->actor.params & 0xE000) >> 0xD) +#define ENSW_GET_TYPE_EN(this) PARAMS_GET_S(this->actor.params,13,3) typedef enum { SW_TYPE_NORMAL, // normal Skull(wall)tula