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

Name the weekeventreg that corresponds with the Clock Tower opening (#1303)

Browse Source 
* Name the weekeventreg that corresponds with the Clock Tower opening

* Explanatory comment

* Drop IS

* Try to clean up the comment
This commit is contained in:
Tom Overton
2023-06-23 07:36:12 -07:00
committed by GitHub
parent 96a1d37084
commit 11dac8d020
7 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_elf_message.c
+1 -1
View File
@@ -26,7 +26,7 @@ u16 QuestHint_GetTatlTextId(PlayState* play) {
}
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_79_10)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_08_40)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED)) {
return 0;
}
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+1 -1
View File
@@ -1173,7 +1173,7 @@ void DmStk_StartTelescopeCutscene(DmStk* this, PlayState* play) {
if (gSaveContext.save.day < 3) {
csId = dayOneAndTwoCsId;
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_08_40) ||
} else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED) ||
((CURRENT_DAY == 3) && (gSaveContext.save.time < CLOCK_TIME(6, 0)))) {
csId = finalHoursCsId;
} else {
src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
+2 -2
View File
@@ -183,7 +183,7 @@ void ElfMsg6_Init(Actor* thisx, PlayState* play) {
return;
}
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_08_40)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_88_20)) {
Actor_Kill(&this->actor);
return;
@@ -276,7 +276,7 @@ void func_80BA1CF8(ElfMsg6* this, PlayState* play) {
return;
}
if ((this->actor.textId == 0x224) && CHECK_WEEKEVENTREG(WEEKEVENTREG_08_40)) {
if ((this->actor.textId == 0x224) && CHECK_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED)) {
this->actor.textId = 0x25B;
} else if (func_80BA1C00(this) && (player->actor.speed > 1.0f)) {
player->tatlTextId = -this->actor.textId;
src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c
+1 -1
View File
@@ -56,7 +56,7 @@ void EnTimeTag_Init(Actor* thisx, PlayState* play) {
switch (TIMETAG_GET_TYPE(&this->actor)) {
case TIMETAG_KICKOUT_FINAL_HOURS:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_08_40) || (CURRENT_DAY != 3)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED) || (CURRENT_DAY != 3)) {
Actor_Kill(&this->actor);
return;
}
src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
+5 -5
View File
@@ -128,7 +128,7 @@ void ObjTokeidai_ExteriorGear_Init(ObjTokeidai* this, PlayState* play) {
this->actionFunc = ObjTokeidai_ExteriorGear_OpenedIdle;
this->actor.world.pos.y += this->actor.scale.y * 1900.0f;
this->actor.shape.yOffset = 1500.0f;
SET_WEEKEVENTREG(WEEKEVENTREG_08_40);
SET_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED);
} else {
this->actionFunc = ObjTokeidai_ExteriorGear_Idle;
}
@@ -444,7 +444,7 @@ void ObjTokeidai_TerminaFieldWalls_Idle(ObjTokeidai* this, PlayState* play) {
void ObjTokeidai_TowerOpening_EndCutscene(ObjTokeidai* this, PlayState* play) {
if (Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_132) &&
(play->csCtx.actorCues[Cutscene_GetCueChannel(play, CS_CMD_ACTOR_CUE_132)]->id == 5)) {
SET_WEEKEVENTREG(WEEKEVENTREG_08_40);
SET_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED);
if (((play->sceneId == SCENE_CLOCKTOWER) && (gSaveContext.sceneLayer == 2) && (play->csCtx.scriptIndex == 0)) ||
((play->sceneId == SCENE_00KEIKOKU) && (gSaveContext.sceneLayer == 2) && (play->csCtx.scriptIndex == 0))) {
Audio_SetCutsceneFlag(false);
@@ -593,7 +593,7 @@ void ObjTokeidai_TowerOpening_RaiseTower(ObjTokeidai* this, PlayState* play) {
void ObjTokeidai_TowerOpening_Start(ObjTokeidai* this, PlayState* play) {
if ((Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_132) &&
(play->csCtx.actorCues[Cutscene_GetCueChannel(play, CS_CMD_ACTOR_CUE_132)]->id == 4)) ||
CHECK_WEEKEVENTREG(WEEKEVENTREG_08_40)) {
CHECK_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED)) {
this->actionFunc = ObjTokeidai_TowerOpening_RaiseTower;
}
}
@@ -616,7 +616,7 @@ void ObjTokeidai_DoNothing(ObjTokeidai* this, PlayState* play) {
void ObjTokeidai_StaircaseToRooftop_Idle(ObjTokeidai* this, PlayState* play) {
if ((((CURRENT_DAY == 3) && (gSaveContext.save.time < CLOCK_TIME(6, 0))) || (CURRENT_DAY >= 4)) ||
CHECK_WEEKEVENTREG(WEEKEVENTREG_08_40)) {
CHECK_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED)) {
this->actor.draw = ObjTokeidai_Draw;
} else {
this->actor.draw = NULL;
@@ -691,7 +691,7 @@ void ObjTokeidai_TowerClock_Idle(ObjTokeidai* this, PlayState* play) {
if ((CURRENT_DAY == 3) && (this->clockHour < 6) && (gSaveContext.save.time < CLOCK_TIME(6, 0))) {
this->actor.draw = ObjTokeidai_Clock_Draw;
ObjTokeidai_SetupTowerOpening(this);
SET_WEEKEVENTREG(WEEKEVENTREG_08_40);
SET_WEEKEVENTREG(WEEKEVENTREG_CLOCK_TOWER_OPENED);
return;
}