Skip to content

Document EnNiwLady #2762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JordanLongstaff wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Document EnNiwLady #2762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81af034
Document `EnNiwLady`
JordanLongstaff May 27, 2026
662323b
Label Cuccos by location
JordanLongstaff May 27, 2026
5896c00
Better name for INFTABLE flag
JordanLongstaff May 30, 2026
b0e4cfa
Better function names for context
JordanLongstaff May 30, 2026
bc225a2
"Wait for object" function
JordanLongstaff May 30, 2026
b4563af
Merge branch 'main' into enNiwLady
JordanLongstaff May 30, 2026
b538e51
Format
JordanLongstaff Jun 1, 2026
24ac89f
Merge branch 'main' into enNiwLady
JordanLongstaff Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions assets/xml/objects/object_os_anime.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Animation Name="gObjOsAnim_00B4" Offset="0x0B4"/>
<Animation Name="gObjOsAnim_0170" Offset="0x170"/>
<Animation Name="gObjOsAnim_0228" Offset="0x228"/>
<Animation Name="gObjOsAnim_0718" Offset="0x718"/>
<Animation Name="gObjOsAnim_07D0" Offset="0x7D0"/>
<Animation Name="gCuccoLadyArmsOutAnim" Offset="0x718"/>
<Animation Name="gCuccoLadyIdleAnim" Offset="0x7D0"/>
<Animation Name="gObjOsAnim_0894" Offset="0x894"/>
<Animation Name="gObjOsAnim_092C" Offset="0x92C"/>
<Animation Name="gObjOsAnim_0BFC" Offset="0xBFC"/>
Expand Down Expand Up @@ -63,7 +63,7 @@
<Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/> <!-- unused -->
<Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
<Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
<Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
<Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
<Animation Name="gCuccoLadyHandsTogetherAnim" Offset="0x9F94"/>
<Animation Name="gCuccoLadyWorriedAnim" Offset="0xA630"/>
</File>
</Root>
22 changes: 11 additions & 11 deletions include/save.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ typedef enum LinkAge {
#define ITEMGETINF_09 0x09
#define ITEMGETINF_0A 0x0A
#define ITEMGETINF_DEKU_HEART_PIECE 0x0B
#define ITEMGETINF_0C 0x0C
#define ITEMGETINF_CUCCO_MINIGAME_BOTTLE 0x0C
#define ITEMGETINF_0D 0x0D
#define ITEMGETINF_0E 0x0E
#define ITEMGETINF_0F 0x0F
Expand Down Expand Up @@ -771,8 +771,8 @@ typedef enum LinkAge {
#define ITEMGETINF_25 0x25
#define ITEMGETINF_26 0x26
#define ITEMGETINF_2A 0x2A
#define ITEMGETINF_2C 0x2C
#define ITEMGETINF_2E 0x2E
#define ITEMGETINF_POCKET_EGG 0x2C
#define ITEMGETINF_COJIRO 0x2E
#define ITEMGETINF_30 0x30
#define ITEMGETINF_31 0x31
#define ITEMGETINF_38 0x38
Expand Down Expand Up @@ -923,14 +923,14 @@ typedef enum LinkAge {
#define INFTABLE_198 0x198

// INFTABLE 0x199-0x19F
#define INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F 25
#define INFTABLE_199 0x199
#define INFTABLE_19A 0x19A
#define INFTABLE_19B 0x19B
#define INFTABLE_19C 0x19C
#define INFTABLE_19D 0x19D
#define INFTABLE_19E 0x19E
#define INFTABLE_19F 0x19F
#define INFTABLE_INDEX_KAKARIKO_CUCCOS 25
#define INFTABLE_CUCCO_NEAR_FRONT_GATE 0x199
#define INFTABLE_CUCCO_NEAR_MOUNTAIN_GATE 0x19A
#define INFTABLE_CUCCO_NEAR_GRAVEYARD 0x19B
#define INFTABLE_CUCCO_NEAR_WINDMILL 0x19C
#define INFTABLE_CUCCO_IN_BOX 0x19D
#define INFTABLE_CUCCO_NEAR_SKULLTULA_HOUSE 0x19E
#define INFTABLE_CUCCO_BEHIND_POTION_SHOP 0x19F

// INFTABLE 0x1A0-0x1AF
#define INFTABLE_INDEX_1AX 26
Expand Down
17 changes: 11 additions & 6 deletions src/overlays/actors/ovl_En_Niw/z_en_niw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,13 @@ static Vec3f sKakarikoPosList[] = {
};

static s16 sKakarikoFlagList[] = {
INFTABLE_MASK(INFTABLE_199), INFTABLE_MASK(INFTABLE_19A), INFTABLE_MASK(INFTABLE_19B), INFTABLE_MASK(INFTABLE_19C),
INFTABLE_MASK(INFTABLE_19D), INFTABLE_MASK(INFTABLE_19E), INFTABLE_MASK(INFTABLE_19F),
INFTABLE_MASK(INFTABLE_CUCCO_NEAR_FRONT_GATE),
INFTABLE_MASK(INFTABLE_CUCCO_NEAR_MOUNTAIN_GATE),
INFTABLE_MASK(INFTABLE_CUCCO_NEAR_GRAVEYARD),
INFTABLE_MASK(INFTABLE_CUCCO_NEAR_WINDMILL),
INFTABLE_MASK(INFTABLE_CUCCO_IN_BOX),
INFTABLE_MASK(INFTABLE_CUCCO_NEAR_SKULLTULA_HOUSE),
INFTABLE_MASK(INFTABLE_CUCCO_BEHIND_POTION_SHOP),
};

static u8 sLowerRiverSpawned = false;
Expand Down Expand Up @@ -183,10 +188,10 @@ void EnNiw_Init(Actor* thisx, PlayState* play) {
for (i = 0; i < ARRAY_COUNT(sKakarikoPosList); i++) {
if (fabsf(this->actor.world.pos.x - sKakarikoPosList[i].x) < 40.0f &&
fabsf(this->actor.world.pos.z - sKakarikoPosList[i].z) < 40.0f) {
this->unk_2AA = i;
PRINTF(VT_FGCOL(YELLOW) T(" 通常鶏index %d\n", " Normal chicken index %d\n") VT_RST, this->unk_2AA);
if (gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F] &
sKakarikoFlagList[i]) {
this->kakarikoIndex = i;
PRINTF(VT_FGCOL(YELLOW) T(" 通常鶏index %d\n", " Normal chicken index %d\n") VT_RST,
this->kakarikoIndex);
if (gSaveContext.save.info.infTable[INFTABLE_INDEX_KAKARIKO_CUCCOS] & sKakarikoFlagList[i]) {
this->actor.world.pos.x = 300.0f;
this->actor.world.pos.y = 100.0f;
this->actor.world.pos.z = 1530.0f;
Expand Down
2 changes: 1 addition & 1 deletion src/overlays/actors/ovl_En_Niw/z_en_niw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ typedef struct EnNiw {
/* 0x02A4 */ s16 unk_2A4;
/* 0x02A6 */ s16 unk_2A6;
/* 0x02A8 */ s16 unk_2A8;
/* 0x02AA */ s16 unk_2AA;
/* 0x02AA */ s16 kakarikoIndex;
/* 0x02AC */ Vec3f unk_2AC;
/* 0x02B8 */ Vec3f unk_2B8;
/* 0x02C4 */ f32 unk_2C4;
Expand Down
Loading