From 72f5d638d779e0a012238038405b354aeffbba50 Mon Sep 17 00:00:00 2001 From: angie Date: Thu, 26 Oct 2023 13:19:37 -0300 Subject: [PATCH] fix merge --- src/overlays/actors/ovl_En_An/z_en_an.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 5c9bc0b96..7dc4620df 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -1514,7 +1514,7 @@ s32 EnAn_MsgEvent_MidnightMeeting(Actor* thisx, PlayState* play) { EnAn* this = THIS; if (this->msgEventState == 0) { - func_800B7298(play, &this->actor, PLAYER_CSMODE_WAIT); + func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT); play->nextEntrance = ENTRANCE(STOCK_POT_INN, 3); gSaveContext.nextCutsceneIndex = 0; play->transitionTrigger = TRANS_TRIGGER_START;