diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2024-12-12 10:43:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-12 10:43:58 -0500 |
| commit | c57dff4f78dbeba3defde8b9727628e3abb03c52 (patch) | |
| tree | eddc35fc5cff5a13853e3cd0af18c1c0ecedf15a /src | |
| parent | c780c4e147ddeb56c59fa44e2d9ccc7d9fbc00b8 (diff) | |
Rename item get flags for Forest Stage upgrades (#2333)
* Rename item get flags for Forest Stage upgrades
* Fix Jenkins build error
* Document shared flag bug
* Rename shared flag
* Massive documenting comments
* GDI - remove one trailing whitespace
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/z_parameter.c | 3 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 5 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index e6e451ee3..7666b1ff0 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1828,7 +1828,8 @@ u8 Item_Give(PlayState* play, u8 item) { } } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) { if (item == ITEM_POACHERS_SAW) { - SET_ITEMGETINF(ITEMGETINF_1F); + //! @bug Setting this shared flag makes getting the Deku Nut upgrade impossible + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE); } temp = INV_CONTENT(item); diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index 226a9e8d4..ad1eb7e58 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -156,7 +156,7 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { delay = 0; switch (Player_GetMask(play)) { case PLAYER_MASK_SKULL: - if (!GET_ITEMGETINF(ITEMGETINF_1E)) { + if (!GET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_STICK_UPGRADE)) { reaction = DNT_SIGNAL_CELEBRATE; this->prize = DNT_PRIZE_STICK; SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_SARIA_THEME); @@ -164,7 +164,8 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { } FALLTHROUGH; case PLAYER_MASK_TRUTH: - if (!GET_ITEMGETINF(ITEMGETINF_1F) && (Player_GetMask(play) != PLAYER_MASK_SKULL)) { + if (!GET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE) && + (Player_GetMask(play) != PLAYER_MASK_SKULL)) { Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); this->prize = DNT_PRIZE_NUTS; diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index fb0b7bc34..8cb86c8d6 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -282,7 +282,7 @@ void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) { PRINTF("実 \n"); PRINTF("実 \n"); PRINTF("実 \n"); - SET_ITEMGETINF(ITEMGETINF_1F); + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE); } else { // "stick" PRINTF("棒 \n"); @@ -291,7 +291,7 @@ void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) { PRINTF("棒 \n"); PRINTF("棒 \n"); PRINTF("棒 \n"); - SET_ITEMGETINF(ITEMGETINF_1E); + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_STICK_UPGRADE); } this->actor.textId = 0; if ((this->stage != NULL) && (this->stage->actor.update != NULL)) { |