From 6206cd7db004ca8e6a9afa1150e539ad28ea0f89 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Tue, 16 Aug 2022 21:50:52 -0400 Subject: [PATCH] add ActorResetFunc for courtyard guards (#1213) Co-authored-by: briaguya --- soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 5a313a07f..adafa3674 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -14,6 +14,7 @@ void EnHeishi1_Init(Actor* thisx, GlobalContext* globalCtx); void EnHeishi1_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnHeishi1_Update(Actor* thisx, GlobalContext* globalCtx); void EnHeishi1_Draw(Actor* thisx, GlobalContext* globalCtx); +void EnHeishi1_Reset(void); void EnHeishi1_SetupWait(EnHeishi1* this, GlobalContext* globalCtx); void EnHeishi1_SetupWalk(EnHeishi1* this, GlobalContext* globalCtx); @@ -41,7 +42,7 @@ const ActorInit En_Heishi1_InitVars = { (ActorFunc)EnHeishi1_Destroy, (ActorFunc)EnHeishi1_Update, (ActorFunc)EnHeishi1_Draw, - NULL, + (ActorResetFunc)EnHeishi1_Reset, }; static f32 sAnimParamsInit[][8] = { @@ -64,6 +65,10 @@ static s32 sCamDataIdxs[] = { static s16 sWaypoints[] = { 0, 4, 1, 5, 2, 6, 3, 7 }; +void EnHeishi1_Reset(void) { + sHeishi1PlayerIsCaught = false; +} + void EnHeishi1_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnHeishi1* this = (EnHeishi1*)thisx;