izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Name the remaining weekeventregs from anju

Browse Source
This commit is contained in:
Angie
2023-10-16 23:41:47 -03:00
parent 2e05d770c8
commit 79fdae13c8
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64save.h
+2 -2
View File
@@ -1058,7 +1058,7 @@ typedef enum {
#define WEEKEVENTREG_TALKED_PART_TIMER_AS_GORON PACK_WEEKEVENTREG_FLAG(55, 0x04)
#define WEEKEVENTREG_TALKED_PART_TIMER_AS_ZORA PACK_WEEKEVENTREG_FLAG(55, 0x08)
#define WEEKEVENTREG_TALKED_PART_TIMER_AS_DEKU PACK_WEEKEVENTREG_FLAG(55, 0x10)
#define WEEKEVENTREG_55_20 PACK_WEEKEVENTREG_FLAG(55, 0x20)
#define WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL PACK_WEEKEVENTREG_FLAG(55, 0x20)
#define WEEKEVENTREG_55_40 PACK_WEEKEVENTREG_FLAG(55, 0x40)
// Gyorg has been defeated
@@ -1356,7 +1356,7 @@ typedef enum {
#define WEEKEVENTREG_86_01 PACK_WEEKEVENTREG_FLAG(86, 0x01)
#define WEEKEVENTREG_86_02 PACK_WEEKEVENTREG_FLAG(86, 0x02)
#define WEEKEVENTREG_86_04 PACK_WEEKEVENTREG_FLAG(86, 0x04)
#define WEEKEVENTREG_86_08 PACK_WEEKEVENTREG_FLAG(86, 0x08)
#define WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION PACK_WEEKEVENTREG_FLAG(86, 0x08)
#define WEEKEVENTREG_86_10 PACK_WEEKEVENTREG_FLAG(86, 0x10)
#define WEEKEVENTREG_86_20 PACK_WEEKEVENTREG_FLAG(86, 0x20)
#define WEEKEVENTREG_86_40 PACK_WEEKEVENTREG_FLAG(86, 0x40)
src/overlays/actors/ovl_En_An/z_en_an.c
+4 -4
View File
@@ -1400,7 +1400,7 @@ s32 EnAn_MsgEvent_ReceiveLetterFromPostman(Actor* thisx, PlayState* play) {
case 0x1:
case 0x3:
case 0x5:
if ((CHECK_WEEKEVENTREG(WEEKEVENTREG_86_08)) && (this->msgEventState == 3)) {
if ((CHECK_WEEKEVENTREG(WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION)) && (this->msgEventState == 3)) {
CutsceneManager_Stop(csId);
} else if ((this->actor.child != NULL) && (this->actor.child->update != NULL)) {
Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)),
@@ -1558,7 +1558,7 @@ s32 EnAn_MsgEvent_LaundryPool(Actor* thisx, PlayState* play) {
switch (this->msgEventState) {
case 0x0:
if ((Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) || CHECK_WEEKEVENTREG(WEEKEVENTREG_55_20)) {
if ((Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) || CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) {
this->msgEventState++;
goto label;
} else {
@@ -1762,7 +1762,7 @@ s32 EnAn_CheckTalk(EnAn* this, PlayState* play) {
this->stateFlags |= ENAN_STATE_20;
}
if ((this->scheduleResult == ANJU_SCH_LAUNDRY_POOL_SIT) && CHECK_WEEKEVENTREG(WEEKEVENTREG_55_20)) {
if ((this->scheduleResult == ANJU_SCH_LAUNDRY_POOL_SIT) && CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) {
this->stateFlags &= ~ENAN_STATE_20;
}
@@ -2635,7 +2635,7 @@ s32 EnAn_ProcessSchedule_80B56880(EnAn* this, PlayState* play, ScheduleOutput* s
this->stateFlags |= ENAN_STATE_UPDATE_EYES | ENAN_STATE_200;
this->stateFlags |= ENAN_STATE_DRAW_UMBRELLA;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_55_20)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) {
EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_CRYING);
this->stateFlags |= ENAN_STATE_IGNORE_GRAVITY;
this->actor.world.rot.y += 0x7FF8;
src/overlays/actors/ovl_En_Pm/z_en_pm.c
+1 -1
View File
@@ -843,7 +843,7 @@ s32 func_80AF81E8(EnPm* this, PlayState* play) {
case 1:
case 3:
case 5:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_08) && (this->unk_378 == 3)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION) && (this->unk_378 == 3)) {
CutsceneManager_Stop(csId);
} else {
Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), &this->actor);
tools/weekeventregconvert.py
+2 -2
View File
@@ -449,7 +449,7 @@ weekEventReg = {
(55 << 8) | 0x04: "WEEKEVENTREG_TALKED_PART_TIMER_AS_GORON",
(55 << 8) | 0x08: "WEEKEVENTREG_TALKED_PART_TIMER_AS_ZORA",
(55 << 8) | 0x10: "WEEKEVENTREG_TALKED_PART_TIMER_AS_DEKU",
(55 << 8) | 0x20: "WEEKEVENTREG_55_20",
(55 << 8) | 0x20: "WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL",
(55 << 8) | 0x40: "WEEKEVENTREG_55_40",
(55 << 8) | 0x80: "WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE",
(56 << 8) | 0x01: "WEEKEVENTREG_56_01",
@@ -695,7 +695,7 @@ weekEventReg = {
(86 << 8) | 0x01: "WEEKEVENTREG_86_01",
(86 << 8) | 0x02: "WEEKEVENTREG_86_02",
(86 << 8) | 0x04: "WEEKEVENTREG_86_04",
(86 << 8) | 0x08: "WEEKEVENTREG_86_08",
(86 << 8) | 0x08: "WEEKEVENTREG_LISTENED_ANJU_POSTMAN_CONVERSATION",
(86 << 8) | 0x10: "WEEKEVENTREG_86_10",
(86 << 8) | 0x20: "WEEKEVENTREG_86_20",
(86 << 8) | 0x40: "WEEKEVENTREG_86_40",