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

Merge branch 'zret' of github.com:HarbourMasters/mm into zret

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti
2023-11-01 05:01:17 -03:00
parent 3cc5b95456 6d55f84c59
commit eb42ced343
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Jso2/z_en_jso2.c
+5 -1
View File
@@ -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")
src/overlays/actors/ovl_En_Jso2/z_en_jso2.h
+4 -1
View File
@@ -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