mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-26 22:32:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

WeekEventFlags: Entrance Cutscenes Watched (#1166)

Browse Source 
* entrance regs

* cleanup comments

* add comment

* comments

* missed a space

* fix placement of comment
This commit is contained in:
engineer124
2023-02-24 10:08:06 -05:00
committed by GitHub
parent 69f7540e33
commit e75c51e841
6 changed files with 80 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c
+1 -1
View File
@@ -32,7 +32,7 @@ void DmRavine_Init(Actor* thisx, PlayState* play) {
s32 pad;
DmRavine* this = THIS;
if (CHECK_WEEKEVENTREG_ALT(WEEKEVENTREG_00_10) | cREG(0)) {
if (CHECK_WEEKEVENTREG_ALT(WEEKEVENTREG_ENTERED_GORMAN_TRACK) | cREG(0)) {
Actor_Kill(&this->actor);
return;
}
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+3 -2
View File
@@ -652,7 +652,7 @@ void func_808BA10C(DoorWarp1* this, PlayState* play) {
if (this->unk_202 != 0) {
if (phi_v0_2 > 0) {
SET_WEEKEVENTREG(WEEKEVENTREG_07_80);
SET_WEEKEVENTREG(WEEKEVENTREG_ENTERED_WOODFALL_TEMPLE_PRISON);
}
switch (phi_v0_2) {
@@ -711,7 +711,8 @@ void func_808BA10C(DoorWarp1* this, PlayState* play) {
switch (phi_v0_2) {
case 0:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_20_02)) {
SET_WEEKEVENTREG(WEEKEVENTREG_07_80);
// Skips the entrance cutscene as this flag is attached to `ENTRANCE(WOODFALL_TEMPLE, 1)`
SET_WEEKEVENTREG(WEEKEVENTREG_ENTERED_WOODFALL_TEMPLE_PRISON);
play->nextEntrance = ENTRANCE(WOODFALL_TEMPLE, 1);
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_WHITE;
src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+2 -1
View File
@@ -345,7 +345,8 @@ void func_808DF194(EnHorseLinkChild* this, PlayState* play) {
sp4C = SkelAnime_Update(&this->skin.skelAnime);
if ((sp4C != 0) || (this->unk_148 == 1) || (this->unk_148 == 0)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_01_20)) {
// The carry-over of this flag from OoT was not done correctly
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_ENTERED_ZORA_HALL)) {
f32 sp44 = Math3D_Distance(&this->actor.world.pos, &this->actor.home.pos);
s32 pad;
src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* File: z_obj_demo.c
* Overlay: ovl_Obj_Demo
* Description:
* Description: Cutscene triggers when player is in range
*/
#include "z_obj_demo.h"