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

WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL

Browse Source
This commit is contained in:
angie
2023-10-29 12:58:31 -03:00
parent d99166705d
commit 729aa256d1
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64save.h
+1 -1
View File
@@ -1059,7 +1059,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_SPOKE_TO_ANJU_IN_LAUNDRY_POOL PACK_WEEKEVENTREG_FLAG(55, 0x20)
#define WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL PACK_WEEKEVENTREG_FLAG(55, 0x20)
#define WEEKEVENTREG_55_40 PACK_WEEKEVENTREG_FLAG(55, 0x40)
// Gyorg has been defeated
src/overlays/actors/ovl_En_An/z_en_an.c
+6 -3
View File
@@ -1197,6 +1197,9 @@ void EnAn_UpdateFace(EnAn* this) {
this->eyeTexIndex = ENAN_EYES_COMFORT;
}
break;
default:
break;
}
if (!skipBlink) {
@@ -1572,7 +1575,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_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) {
CHECK_WEEKEVENTREG(WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL)) {
this->msgEventState++;
goto label;
} else {
@@ -1774,7 +1777,7 @@ s32 EnAn_CheckTalk(EnAn* this, PlayState* play) {
}
if ((this->scheduleResult == ANJU_SCH_LAUNDRY_POOL_SIT) &&
CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) {
CHECK_WEEKEVENTREG(WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL)) {
this->stateFlags &= ~ENAN_STATE_ENGAGED;
}
@@ -2656,7 +2659,7 @@ s32 EnAn_ProcessSchedule_80B56880(EnAn* this, PlayState* play, ScheduleOutput* s
this->stateFlags |= ENAN_STATE_UPDATE_EYES | ENAN_STATE_LOST_ATTENTION;
this->stateFlags |= ENAN_STATE_DRAW_UMBRELLA;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_SPOKE_TO_ANJU_IN_LAUNDRY_POOL)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL)) {
EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_CRY);
this->stateFlags |= ENAN_STATE_IGNORE_GRAVITY;
this->actor.world.rot.y += 0x7FF8;
tools/weekeventregconvert.py
+1 -1
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_SPOKE_TO_ANJU_IN_LAUNDRY_POOL",
(55 << 8) | 0x20: "WEEKEVENTREG_TALKED_ANJU_IN_LAUNDRY_POOL",
(55 << 8) | 0x40: "WEEKEVENTREG_55_40",
(55 << 8) | 0x80: "WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE",
(56 << 8) | 0x01: "WEEKEVENTREG_56_01",