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

`En_Po_Sisters`: fixed mismatch, more comments, moved enum, new macro

This commit is contained in:
blackgamma7 2025-12-08 17:09:52 -05:00
parent 8db70d33bd
commit 106a877535
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,17 +115,11 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit sColChkInfoInit = { 10, 25, 60, 40 };
typedef enum PoeSisDamageReaction {
EN_PO_SISTERS_DMG_REACT_OTHER,
EN_PO_SISTERS_DMG_REACT_SWORD=14,
EN_PO_SISTERS_DMG_REACT_NUT,
};
typedef enum EnPoSisterFlags {
EN_PO_SISTERS_FLAG_ACCOL=1<<0, // set AC collision
EN_PO_SISTERS_FLAG_ROTATE=1<<1, // set shape.rot.y to world.rot.y
EN_PO_SISTERS_FLAG_VANISH=1<<2, // tick vanishTimer, then disappear if 0.
EN_PO_SISTERS_FLAG_HOVER=1<<3, // hover up and down a few inches
EN_PO_SISTERS_FLAG_HOVER=1<<3, // hover up and down a few units towards y-target
EN_PO_SISTERS_FLAG_BGCHECK=1<<4,// BGCheck floors and walls
EN_PO_SISTERS_FLAG_UPDATEMASK=(EN_PO_SISTERS_FLAG_ACCOL|EN_PO_SISTERS_FLAG_ROTATE|
EN_PO_SISTERS_FLAG_VANISH|EN_PO_SISTERS_FLAG_HOVER|EN_PO_SISTERS_FLAG_BGCHECK),
@ -134,6 +128,12 @@ typedef enum EnPoSisterFlags {
EN_PO_SISTERS_FLAG_NOMTXF=1<<7, //don't read or write torchMtx
} EnPoSisterFlags;
typedef enum PoeSisDamageReaction {
EN_PO_SISTERS_DMG_REACT_OTHER,
EN_PO_SISTERS_DMG_REACT_SWORD=14,
EN_PO_SISTERS_DMG_REACT_NUT,
};
static DamageTable sDamageTable = {
/* Deku nut */ DMG_ENTRY(0, EN_PO_SISTERS_DMG_REACT_NUT),
@ -351,7 +351,7 @@ void EnPoSisters_HitSetup(EnPoSisters* this) {
if (this->sisterID != EN_PO_SISTERS_MEG) {
this->actor.speed = 10.0f;
}
this->sisterFlags &= ~(EN_PO_SISTERS_FLAG_HOVER | EN_PO_SISTERS_FLAG_ROTATE);
this->sisterFlags &= ~(EN_PO_SISTERS_FLAG_HOVER | EN_PO_SISTERS_FLAG_ROTATE | EN_PO_SISTERS_FLAG_ACCOL);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 16);
this->actionFunc = EnPoSisters_Hit;
}
@ -624,6 +624,8 @@ void EnPoSisters_Hover(EnPoSisters* this, PlayState* play) {
} else if (this->sisterID == EN_PO_SISTERS_MEG || this->sisterID == EN_PO_SISTERS_AMY) {
targetY = player->actor.world.pos.y + 5.0f;
} else {
// Beth and Joelle are hard-coded to the worldspace-y
// at the botttom of their rooms' staircase
targetY = 832.0f;
}
Math_ApproachF(&this->actor.world.pos.y, targetY, 0.5f, 3.0f);

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

@ -18,7 +18,7 @@ typedef struct EnPoSisters {
/* 0x0196 */ u8 hoverPulse;
/* 0x0197 */ u8 vanishTimer;
/* 0x0198 */ u8 torchFlames; // number of torch flames to draw
/* 0x0199 */ u8 sisterFlags; // uses EnPoSisFlags
/* 0x0199 */ u8 sisterFlags; // uses EnPoSisterFlags
/* 0x019A */ s16 sisterTimer; // timer used for various situations
/* 0x019C */ s16 megVar; // Meg and her decoys use it as a behaviour timer
/* 0x019E */ Vec3s jointTable[12];
@ -39,7 +39,7 @@ typedef enum EnPoSisterNames {
EN_PO_SISTERS_AMY, // green sister, hides in block puzzle
} EnPoSisterNames;
#define EN_PO_SISTERS_PARAM(name) (EN_PO_SISTERS_#name << 8) // param for which sister
#define EN_PO_SISTERS_DECOY_PARAM (1 << 10) // param for Meg's decoys
#define EN_PO_SISTERS_INTRO_PARAM (1 << 12) // param for Poe Sisters when first entering foyer