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

En_Baba (#592)

Browse Source 
* En_Baba

* Merge

* Merge

* PR

* PR

* Apply suggestions from code review

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Baba/z_en_baba.c

* format

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
This commit is contained in:
Maide
2022-02-19 20:38:52 +00:00
committed by GitHub
co-authored by EllipticEllipsis Isghj angie
parent 2b5fe949fe
commit c91423abae
5 changed files with 706 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -4508,8 +4508,7 @@ beginseg
name "ovl_En_Baba"
compress
include "build/src/overlays/actors/ovl_En_Baba/z_en_baba.o"
include "build/data/ovl_En_Baba/ovl_En_Baba.data.o"
include "build/data/ovl_En_Baba/ovl_En_Baba.reloc.o"
include "build/src/overlays/actors/ovl_En_Baba/ovl_En_Baba_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Baba/z_en_baba.c
+658 -44
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Baba/z_en_baba.h
+44 -2
View File
@@ -7,11 +7,53 @@ struct EnBaba;
typedef void (*EnBabaActionFunc)(struct EnBaba*, GlobalContext*);
#define ENBABA_GET_3F00(thisx) (((thisx)->params & 0x3F00) >> 8)
#define ENBABA_GET_C000(thisx) (((thisx)->params & 0xC000) >> 0xE)
#define ENBABA_3F00_3F 0x3F
enum {
/* 0 */ ENBABA_C000_0,
/* 1 */ ENBABA_C000_1,
/* 2 */ ENBABA_C000_2,
};
typedef struct EnBaba {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x4];
/* 0x0144 */ struct EnOssan* unk_144;
/* 0x0148 */ EnBabaActionFunc actionFunc;
/* 0x014C */ char unk_14C[0x2F4];
/* 0x014C */ UNK_TYPE1 unk14C[4];
/* 0x0150 */ SkelAnime skelAnime;
/* 0x0194 */ ColliderCylinder collider;
/* 0x01E0 */ u16 unk_1E0;
/* 0x01E2 */ u8 unk_1E2;
/* 0x01E4 */ Path* path;
/* 0x01E8 */ s16 unk_1E8;
/* 0x01EA */ UNK_TYPE1 unk1EA[0x1C];
/* 0x0206 */ Vec3s jointTable[18];
/* 0x0272 */ Vec3s morphTable[18];
/* 0x02DE */ Vec3s unk_2DE;
/* 0x02E4 */ Vec3s unk_2E4;
/* 0x02EA */ Vec3s unk_2EA;
/* 0x02F0 */ UNK_TYPE1 unk2F0[0x12];
/* 0x0302 */ s16 unk_302[18];
/* 0x0326 */ s16 unk_326[18];
/* 0x034A */ UNK_TYPE1 unk34A[0xBA];
/* 0x0404 */ s16 unk_404;
/* 0x0406 */ UNK_TYPE1 unk406[4];
/* 0x040A */ u16 unk_40A;
/* 0x040C */ s32 unk_40C;
/* 0x0410 */ Path* unk_410;
/* 0x0414 */ Vec3f unk_414;
/* 0x0420 */ f32 unk_420;
/* 0x0424 */ s32 unk_424;
/* 0x0428 */ s32 unk_428;
/* 0x042C */ s32 unk_42C;
/* 0x0430 */ s32 unk_430;
/* 0x0434 */ u8 unk_434;
/* 0x0436 */ s16 unk_436;
/* 0x0438 */ s32 unk_438;
/* 0x043C */ s32 unk_43C;
} EnBaba; // size = 0x440
extern const ActorInit En_Baba_InitVars;
tools/disasm/functions.txt
+3 -3
View File
@@ -15192,9 +15192,9 @@
0x80BA9E6C:("EnBaba_Init",),
0x80BA9F24:("EnBaba_Destroy",),
0x80BA9F50:("EnBaba_Update",),
0x80BA9FB0:("func_80BA9FB0",),
0x80BAA198:("func_80BAA198",),
0x80BAA20C:("func_80BAA20C",),
0x80BA9FB0:("EnBaba_OverrideLimbDraw",),
0x80BAA198:("EnBaba_PostLimbDraw",),
0x80BAA20C:("EnBaba_TransformDraw",),
0x80BAA220:("EnBaba_Draw",),
0x80BAA6D0:("EnSuttari_UpdateCollider",),
0x80BAA848:("EnSuttari_GetActorById",),
undefined_syms.txt
-6
View File
@@ -1128,12 +1128,6 @@ D_06017990 = 0x06017990;
D_0601ABF0 = 0x0601ABF0;
D_0601AD00 = 0x0601AD00;
// ovl_En_Baba
D_06005EF0 = 0x06005EF0;
D_06006B10 = 0x06006B10;
D_060092A0 = 0x060092A0;
// ovl_En_Bal
D_060005FC = 0x060005FC;