From a03c89906b7467fa6519b4c8f441e59c038eba6b Mon Sep 17 00:00:00 2001 From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com> Date: Sat, 14 Nov 2020 20:10:52 -0800 Subject: [PATCH] BgGanonOtyuka_Update --- .../actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 8 +++++++- .../actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 761c55e4cd..aa44a40cb2 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -131,7 +131,13 @@ void BgGanonOtyuka_Destroy(Actor* thisx, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/func_808760DC.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Update.s") +void BgGanonOtyuka_Update(Actor* thisx, GlobalContext* globalCtx) { + BgGanonOtyuka* this = THIS; + + this->actionFunc(this, globalCtx); + this->unk_16D++; + DECR(this->unk_168); +} void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { BgGanonOtyuka* this = THIS; diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h index 001876e82a..ccc6046523 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h @@ -11,7 +11,7 @@ typedef void (*BgGanonOtyukaActionFunc)(struct BgGanonOtyuka*, GlobalContext*); typedef struct BgGanonOtyuka { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ BgGanonOtyukaActionFunc actionFunc; - /* 0x0168 */ char unk_168[0x02]; + /* 0x0168 */ s16 unk_168; /* 0x016A */ u8 unk_16A; /* 0x016B */ u8 unk_16B; /* 0x016C */ u8 unk_16C;