En_Karebaba (#590)

* En_Karebaba

* merge

* Merge

* PR
This commit is contained in:
Maide
2022-02-19 19:17:20 +00:00
committed by GitHub
parent 2d6a74c0aa
commit 9ddf530f9b
4 changed files with 643 additions and 66 deletions
+1 -2
View File
@@ -1279,8 +1279,7 @@ beginseg
name "ovl_En_Karebaba"
compress
include "build/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.o"
include "build/data/ovl_En_Karebaba/ovl_En_Karebaba.data.o"
include "build/data/ovl_En_Karebaba/ovl_En_Karebaba.reloc.o"
include "build/src/overlays/actors/ovl_En_Karebaba/ovl_En_Karebaba_reloc.o"
endseg
beginseg
File diff suppressed because it is too large Load Diff
@@ -7,11 +7,27 @@ struct EnKarebaba;
typedef void (*EnKarebabaActionFunc)(struct EnKarebaba*, GlobalContext*);
enum {
/* 0 */ ENKAREBABA_0,
/* 1 */ ENKAREBABA_1,
/* 2 */ ENKAREBABA_2,
};
typedef struct EnKarebaba {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnKarebabaActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x13C];
/* 0x018C */ Vec3s jointTable[8];
/* 0x01BC */ Vec3s morphTable[8];
/* 0x01EC */ u8 unk_1EC;
/* 0x01EE */ s16 unk_1EE;
/* 0x01F0 */ f32 unk_1F0;
/* 0x01F4 */ f32 unk_1F4;
/* 0x01F8 */ f32 unk_1F8;
/* 0x01FC */ Vec3f unk_1FC[4];
/* 0x022C */ CollisionPoly* unk_22C;
/* 0x0230 */ ColliderCylinder collider1;
/* 0x027C */ ColliderCylinder collider2;
} EnKarebaba; // size = 0x2C8
extern const ActorInit En_Karebaba_InitVars;
-8
View File
@@ -1547,14 +1547,6 @@ D_0600D828 = 0x0600D828;
D_06000C30 = 0x06000C30;
D_06001630 = 0x06001630;
// ovl_En_Karebaba
D_060002B8 = 0x060002B8;
D_060010F0 = 0x060010F0;
D_06001828 = 0x06001828;
D_06002A40 = 0x06002A40;
D_06003070 = 0x06003070;
// ovl_En_Kbt
D_06004274 = 0x06004274;