falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`En_Po_Sisters`: macro fix.

This commit is contained in:
blackgamma7 2025-12-10 17:24:57 -05:00
parent f7bbfebb77
commit 661c2e7920
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
View File

@ -204,7 +204,7 @@ void EnPoSisters_Init(Actor* thisx, PlayState* play) {
this->flags = EN_PO_SISTERS_FLAG_TORCH;
this->circleDist = 110.0f;
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
if (POE_SISTER_GET_INTRO(&this->actor)) {
if (POE_SISTER_GET_INTRO(this)) {
EnPoSisters_SetupIntro(this, play);
} else if (this->sisterID == EN_PO_SISTERS_MEG) {
if (this->decoyID == 0) {

2
src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
View File

@ -41,7 +41,7 @@ typedef enum EnPoSisterNames {
#define POE_SISTER_GET_ID(x) PARAMS_GET_U(x->params, 8, 2)
#define POE_SISTER_GET_DECOY(x) PARAMS_GET_U(x->params, 10, 2)
#define POE_SISTER_GET_INTRO(x) PARAMS_GET_U(x->params, 12, 1)
#define POE_SISTER_GET_INTRO(x) PARAMS_GET_U(x->actor.params, 12, 1)
#define EN_PO_SISTERS_PARAM_N(n) (n << 8) // param for which sister by number
#define EN_PO_SISTERS_PARAM(name) (EN_PO_SISTERS_##name << 8) // param for which sister by name