mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-02 11:35:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename WEEKEVENTREG_73_80 (#1842)

Browse Source
This commit is contained in:
Jordan Longstaff
2025-12-09 06:22:23 -05:00
committed by GitHub
parent d6143abe52
commit 18a8a1bea7
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_elf_message.c
+1 -1
View File
@@ -74,7 +74,7 @@ u16 QuestHint_GetTatlTextId(PlayState* play) {
return 0x223;
}
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_73_80)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE)) {
return 0x222;
}
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+2 -2
View File
@@ -154,8 +154,8 @@ void EnBomBowlMan_Init(Actor* thisx, PlayState* play) {
this->path = SubS_GetPathByIndex(play, this->pathIndex, ENBOMBOWLMAN_PATH_INDEX_NONE);
this->unk_2C8 = 80.0f;
if ((gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2)) && CHECK_WEEKEVENTREG(WEEKEVENTREG_73_80) &&
!CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
if ((gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2)) &&
CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE) && !CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
this->csId = this->actor.csId;
if (this->csId == 0) {
Actor_Kill(&this->actor);
src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c
+3 -2
View File
@@ -114,7 +114,8 @@ void EnBombers2_Init(Actor* thisx, PlayState* play) {
this->actor.attentionRangeType = ATTENTION_RANGE_6;
Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_73_80) || (gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2))) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE) ||
(gSaveContext.save.entrance == ENTRANCE(EAST_CLOCK_TOWN, 2))) {
this->actor.world.pos.x += Math_SinS(this->actor.home.rot.y + 0xC100) * 50.0f;
cos = Math_CosS(this->actor.home.rot.y + 0xC100) * 50.0f;
this->unk_2AC = true;
@@ -363,7 +364,7 @@ void func_80C0520C(EnBombers2* this, PlayState* play) {
EnBombers2_ChangeAnim(this, ENBOMBERS_ANIM_6, 1.0f);
this->unk_2A8 = 0;
this->unk_2C0 = 1;
SET_WEEKEVENTREG(WEEKEVENTREG_73_80);
SET_WEEKEVENTREG(WEEKEVENTREG_ENTERED_BOMBERS_CODE);
CutsceneManager_Stop(this->csId);
this->unk_2AC = true;
this->actor.textId = sTextIds[this->textIdIndex];