mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-12 01:40:47 +00:00
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
This commit is contained in:
parent
c780c4e147
commit
c57dff4f78
4 changed files with 12 additions and 7 deletions
|
@ -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;
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue