From 6d55f84c596a82846d1cbc7306b76969e6409d07 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Wed, 1 Nov 2023 01:02:59 -0600 Subject: [PATCH] z_en_jso2 func_80A778D8 matching --- src/overlays/actors/ovl_En_Jso2/z_en_jso2.c | 6 +++++- src/overlays/actors/ovl_En_Jso2/z_en_jso2.h | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index f4ff79480..91f36542b 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -118,7 +118,11 @@ extern UNK_TYPE D_060081F4; #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Jso2/func_80A77880.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Jso2/func_80A778D8.s") +void func_80A778D8(EnJso2* this) { + this->unk284 = 0; + this->unk36C = 2; + this->actionFunc = func_80A778F8; +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Jso2/func_80A778F8.s") diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h index 274aaa284..a0b2d21c0 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h @@ -11,7 +11,10 @@ typedef struct EnJso2 { /* 0x0000 */ Actor actor; /* 0x0144 */ char unk_144[0x134]; /* 0x0278 */ EnJso2ActionFunc actionFunc; - /* 0x027C */ char unk_27C[0xE14]; + /* 0x027C */ char unk_27C[0x8]; + /* 0x0284 */ s16 unk284; + /* 0x0286 */ char unk_286[0xE6]; + /* 0x036C */ s32 unk36C; } EnJso2; // size = 0x1090 #endif // Z_EN_JSO2_H