mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-09 02:45:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name a lot of the weekeventregs for when the player receives a Heart Piece (#1615)

Browse Source
This commit is contained in:
Tom Overton
2024-04-22 05:59:34 -07:00
committed by GitHub
parent 13e02518cd
commit c88ed51f17
17 changed files with 88 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_sram_NES.c
+16 -15
View File
@@ -96,11 +96,12 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 19 */ 0,
/* 20 */ 0,
/* 21 */ 0,
/* 22 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_22_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_22_80),
/* 22 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_22_02) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE),
/* 23 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_23_80),
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE),
/* 24 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_24_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_24_80),
/* 25 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_25_01),
/* 25 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE),
/* 26 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_26_40),
/* 27 */ 0,
/* 28 */ 0,
@@ -112,7 +113,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_01) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_02) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_20),
/* 32 */
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_32_01) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_HEART_PIECE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_HEART_PIECE),
/* 33 */ 0,
@@ -124,11 +125,11 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_ROMANI_RANCH) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_GREAT_BAY) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_TINGLE_MAP_BOUGHT_STONE_TOWER) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_35_80),
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FROG_CHOIR_HEART_PIECE),
/* 36 */ 0,
/* 37 */ 0,
/* 38 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_38_20),
/* 39 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_39_20),
/* 39 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE),
/* 40 */ 0,
/* 41 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_41_08),
/* 42 */ 0,
@@ -143,19 +144,19 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 51 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_51_04),
/* 52 */ 0,
/* 53 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_40),
/* 54 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_54_40),
/* 54 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE),
/* 55 */ 0,
/* 56 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_56_02),
/* 56 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE),
/* 57 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_57_08),
/* 58 */ 0,
/* 59 */
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_08) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_QUIVER_UPGRADE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_QUIVER_UPGRADE),
/* 60 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_REWARD),
/* 60 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_HEART_PIECE),
/* 61 */ 0,
/* 62 */ 0,
/* 63 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_63_20),
/* 63 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE),
/* 64 */ 0,
/* 65 */ 0,
/* 66 */
@@ -225,12 +226,12 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 74 */ 0,
/* 75 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_75_80),
/* 76 */ 0,
/* 77 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_77_01),
/* 77 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE),
/* 78 */ 0,
/* 79 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_79_80),
/* 79 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE),
/* 80 */ 0,
/* 81 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_81_08),
/* 82 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_82_10),
/* 82 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE),
/* 83 */ 0,
/* 84 */ 0,
/* 85 */ 0,
@@ -241,7 +242,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_87_40) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_87_80),
/* 88 */ 0,
/* 89 */ 0,
/* 90 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_90_10),
/* 90 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE),
/* 91 */ 0,
/* 92 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_92_80),
/* 93 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_93_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_93_08),
src/overlays/actors/ovl_En_Az/z_en_az.c
+7 -7
View File
@@ -1004,11 +1004,11 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
case 0x10F1:
SET_WEEKEVENTREG(WEEKEVENTREG_93_01);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_23_80)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE)) {
this->getItemId = GI_RUPEE_RED;
} else {
this->getItemId = GI_BOTTLE;
SET_WEEKEVENTREG(WEEKEVENTREG_23_80);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE);
}
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationSpeedInfo, BEAVER_ANIM_IDLE,
&this->animIndex);
@@ -1059,7 +1059,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
case 0x10F8:
if (play->msgCtx.choiceIndex == 0) {
Audio_PlaySfx_MessageDecide();
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE)) {
this->actor.textId = 0x1107;
} else {
this->actor.textId = 0x10FA;
@@ -1117,7 +1117,7 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
case 0x10FE:
if (play->msgCtx.choiceIndex == 0) {
Audio_PlaySfx_MessageDecide();
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE)) {
this->actor.textId = 0x1108;
} else {
this->actor.textId = 0x1101;
@@ -1176,11 +1176,11 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
break;
case 0x1105:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE)) {
this->getItemId = GI_RUPEE_PURPLE;
} else {
this->getItemId = GI_HEART_PIECE;
SET_WEEKEVENTREG(WEEKEVENTREG_25_01);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE);
}
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationSpeedInfo, BEAVER_ANIM_IDLE,
&this->animIndex);
@@ -1593,7 +1593,7 @@ void func_80A97D5C(EnAz* this, PlayState* play) {
play->interfaceCtx.minigameState = MINIGAME_STATE_COUNTDOWN_SETUP_3;
if ((this->unk_2FA == 1) || (this->unk_2FA == 3)) {
Interface_StartTimer(TIMER_ID_MINIGAME_2, 120);
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE)) {
Interface_StartTimer(TIMER_ID_MINIGAME_2, 100);
} else {
Interface_StartTimer(TIMER_ID_MINIGAME_2, 110);
src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c
+4 -4
View File
@@ -94,7 +94,7 @@ void EnColMan_Destroy(Actor* thisx, PlayState* play) {
}
void func_80AFDD60(EnColMan* this) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_56_02)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE)) {
this->actor.draw = func_80AFE414;
this->actor.shape.yOffset = 700.0f;
if (this->actor.params == EN_COL_MAN_HEART_PIECE) {
@@ -123,14 +123,14 @@ void func_80AFDE00(EnColMan* this, PlayState* play) {
this->actor.speed = 0.0f;
}
}
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_56_02)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE)) {
this->actor.shape.rot.y += 0x3E8;
}
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actor.draw = NULL;
this->actionFunc = EnColMan_SetHeartPieceCollectedAndKill;
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_56_02)) {
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE)) {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 40.0f, 40.0f);
} else {
Actor_OfferGetItem(&this->actor, play, GI_RECOVERY_HEART, 40.0f, 40.0f);
@@ -139,7 +139,7 @@ void func_80AFDE00(EnColMan* this, PlayState* play) {
void EnColMan_SetHeartPieceCollectedAndKill(EnColMan* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
SET_WEEKEVENTREG(WEEKEVENTREG_56_02);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE);
Actor_Kill(&this->actor);
}
}
src/overlays/actors/ovl_En_Dt/z_en_dt.c
+2 -2
View File
@@ -356,7 +356,7 @@ void EnDt_SetupCutsceneNpcs(EnDt* this, PlayState* play) {
void EnDt_SetupRegularState(EnDt* this, PlayState* play) {
this->textIdIndex = 0;
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_REWARD)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_HEART_PIECE)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RESOLVED_MAYOR_MEETING)) {
this->textIdIndex = 21;
this->appearancePhase = EN_DT_APPEARANCE_RESOLVED_MEETING;
@@ -698,7 +698,7 @@ void EnDt_TriggerMeetingRewardEvent(EnDt* this, PlayState* play) {
Actor_OfferTalkExchange(&this->actor, play, 400.0f, 400.0f, PLAYER_IA_MINUS1);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_REWARD);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_HEART_PIECE);
this->actionFunc = EnDt_TriggerMeetingNotebookEvent;
} else {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 300.0f, 300.0f);
src/overlays/actors/ovl_En_Fu/z_en_fu.c
+3 -3
View File
@@ -903,7 +903,7 @@ void func_80963560(EnFu* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
func_80963610(this);
} else if ((this->unk_552 == 0x2880) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_22_80)) {
} else if ((this->unk_552 == 0x2880) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE)) {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 500.0f, 100.0f);
} else {
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_PURPLE, 500.0f, 100.0f);
@@ -925,8 +925,8 @@ void func_80963630(EnFu* this, PlayState* play) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_22_40)) {
Message_StartTextbox(play, 0x2884, &this->actor);
this->unk_552 = 0x2884;
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_22_80)) {
SET_WEEKEVENTREG(WEEKEVENTREG_22_80);
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE)) {
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE);
Message_StartTextbox(play, 0x2882, &this->actor);
this->unk_552 = 0x2882;
} else {
src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
+2 -2
View File
@@ -633,7 +633,7 @@ void func_80B10868(EnGb2* this, PlayState* play) {
void func_80B10924(EnGb2* this, PlayState* play) {
s32 getItemId;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_54_40)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE)) {
getItemId = GI_RUPEE_PURPLE;
} else {
getItemId = GI_HEART_PIECE;
@@ -642,7 +642,7 @@ void func_80B10924(EnGb2* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
if (getItemId == GI_HEART_PIECE) {
SET_WEEKEVENTREG(WEEKEVENTREG_54_40);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE);
} else {
Rupees_ChangeBy(50);
}
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+3 -3
View File
@@ -551,7 +551,7 @@ void EnGinkoMan_BankAward(EnGinkoMan* this, PlayState* play) {
}
} else if (this->curTextId == 0x45C) {
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_BLUE, 500.0f, 100.0f);
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_59_08)) {
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE)) {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 500.0f, 100.0f);
} else {
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_BLUE, 500.0f, 100.0f);
@@ -579,8 +579,8 @@ void EnGinkoMan_BankAward2(EnGinkoMan* this, PlayState* play) {
EnGinkoMan_SetupDialogue(this);
} else if (this->curTextId == 0x45D) { // saved up 5000 rupees for HP
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_59_08)) {
SET_WEEKEVENTREG(WEEKEVENTREG_59_08);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE)) {
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_HEART_PIECE);
}
EnGinkoMan_SetupIdle(this);
}
src/overlays/actors/ovl_En_Gs/z_en_gs.c
+2 -2
View File
@@ -504,8 +504,8 @@ void func_8099874C(EnGs* this, PlayState* play) {
break;
}
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_90_10)) {
SET_WEEKEVENTREG(WEEKEVENTREG_90_10);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE)) {
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE);
this->getItemId = GI_HEART_PIECE;
}
src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
+3 -3
View File
@@ -391,11 +391,11 @@ void func_80C14540(EnJgameTsn* this) {
void func_80C14554(EnJgameTsn* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_82_10)) {
SET_WEEKEVENTREG(WEEKEVENTREG_82_10);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE)) {
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE);
}
func_80C145FC(this);
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_82_10)) {
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FISHERMANS_JUMPING_GAME_HEART_PIECE)) {
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_PURPLE, 500.0f, 100.0f);
} else {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 500.0f, 100.0f);
src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
+3 -3
View File
@@ -671,7 +671,7 @@ void func_80B276D8(EnKendoJs* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
func_80B27760(this);
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_63_20)) {
} else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE)) {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 800.0f, 100.0f);
} else {
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_RED, 800.0f, 100.0f);
@@ -686,8 +686,8 @@ void func_80B27774(EnKendoJs* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_63_20)) {
SET_WEEKEVENTREG(WEEKEVENTREG_63_20);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE)) {
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWORDSMANS_SCHOOL_HEART_PIECE);
Message_StartTextbox(play, 0x272F, &this->actor);
this->unk_288 = 0x272F;
} else {
src/overlays/actors/ovl_En_Kitan/z_en_kitan.c
+2 -2
View File
@@ -188,12 +188,12 @@ void EnKitan_OfferPrize(EnKitan* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actionFunc = EnKitan_WaitForPrizeTextboxClosed;
SET_WEEKEVENTREG(WEEKEVENTREG_79_80);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE);
return;
}
// Reward the player with a heart piece, or a red rupee if the heart piece was already obtained.
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_79_80)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE)) {
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_RED, 2000.0f, 1000.0f);
} else {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 2000.0f, 1000.0f);
src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
+2 -2
View File
@@ -540,11 +540,11 @@ void EnMinifrog_YellowFrogDialog(EnMinifrog* this, PlayState* play) {
break;
case 0xD7C:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_35_80)) { // Obtained Heart Piece
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FROG_CHOIR_HEART_PIECE)) {
Message_ContinueTextbox(play, 0xD7E);
} else {
Message_ContinueTextbox(play, 0xD7D); // Get Heart Piece
SET_WEEKEVENTREG(WEEKEVENTREG_35_80);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_FROG_CHOIR_HEART_PIECE);
}
break;
src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
+3 -3
View File
@@ -445,12 +445,12 @@ void func_80A6FE1C(EnMm3* this) {
void func_80A6FE30(EnMm3* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_77_01)) {
SET_WEEKEVENTREG(WEEKEVENTREG_77_01);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE)) {
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE);
}
this->actor.parent = NULL;
func_80A6FED8(this);
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_77_01)) {
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE)) {
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_PURPLE, 500.0f, 100.0f);
} else {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 500.0f, 100.0f);
src/overlays/actors/ovl_En_Ot/z_en_ot.c
+5 -4
View File
@@ -201,7 +201,7 @@ void EnOt_Init(Actor* thisx, PlayState* play) {
this->unk_394.y = this->actor.world.pos.y;
this->unk_394.z = (this->actor.world.pos.z + this->unk_360->actor.world.pos.z) * 0.5f;
Math_Vec3f_Copy(&this->unk_360->unk_394, &this->unk_394);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_32_01)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE)) {
func_80B5C244(this, play);
} else {
func_80B5C684(this, play);
@@ -260,7 +260,7 @@ void EnOt_Init(Actor* thisx, PlayState* play) {
case 1:
Actor_SetScale(&this->actor, 1.3f * 0.01f);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_84_10)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_32_01)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE)) {
func_80B5C244(this, play);
} else {
func_80B5C684(this, play);
@@ -394,12 +394,13 @@ void func_80B5BFB8(EnOt* this, PlayState* play) {
}
void func_80B5C154(EnOt* this, PlayState* play) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_32_01)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE)) {
this->getItemId = GI_RUPEE_RED;
} else {
this->getItemId = GI_HEART_PIECE;
SET_WEEKEVENTREG(WEEKEVENTREG_32_01);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SEAHORSE_HEART_PIECE);
}
Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer, this->actor.playerHeightRel);
this->actionFunc = func_80B5C1CC;
}
src/overlays/actors/ovl_En_Zos/z_en_zos.c
+2 -2
View File
@@ -264,11 +264,11 @@ void func_80BBB354(EnZos* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actionFunc = func_80BBB2C4;
SET_WEEKEVENTREG(WEEKEVENTREG_39_20);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE);
this->actor.flags |= ACTOR_FLAG_10000;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_39_20)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE)) {
getItemId = GI_RUPEE_PURPLE;
} else {
getItemId = GI_HEART_PIECE;