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_Zob (#593)

Browse Source 
* En_Zob

* Merge

* Merge

* Merge

* PR

* fixer
This commit is contained in:
Maide
2022-02-28 02:44:29 +00:00
committed by GitHub
parent c9f64d3344
commit 6f4b349020
4 changed files with 711 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -4458,8 +4458,7 @@ beginseg
name "ovl_En_Zob"
compress
include "build/src/overlays/actors/ovl_En_Zob/z_en_zob.o"
include "build/data/ovl_En_Zob/ovl_En_Zob.data.o"
include "build/data/ovl_En_Zob/ovl_En_Zob.reloc.o"
include "build/src/overlays/actors/ovl_En_Zob/ovl_En_Zob_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Zob/z_en_zob.c
+690 -40
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Zob/z_en_zob.h
+20 -1
View File
@@ -7,9 +7,28 @@ struct EnZob;
typedef void (*EnZobActionFunc)(struct EnZob*, GlobalContext*);
#define ENZOB_GET_F(thisx) ((thisx)->params & 0xF)
enum {
/* 1 */ ENZOB_F_1 = 1,
/* 2 */ ENZOB_F_2,
};
typedef struct EnZob {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x1D0];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[24];
/* 0x0218 */ Vec3s morphTable[24];
/* 0x02A8 */ ColliderCylinder collider;
/* 0x02F4 */ u16 unk_2F4;
/* 0x02F6 */ Vec3s unk_2F6;
/* 0x02FC */ Vec3s unk_2FC;
/* 0x0302 */ s16 unk_302;
/* 0x0304 */ u16 unk_304;
/* 0x0306 */ s16 unk_306[4];
/* 0x030E */ s16 unk_30E;
/* 0x0310 */ s16 unk_310;
/* 0x0312 */ s16 unk_312;
/* 0x0314 */ EnZobActionFunc actionFunc;
} EnZob; // size = 0x318
undefined_syms.txt
-5
View File
@@ -1964,11 +1964,6 @@ D_06000700 = 0x06000700;
D_06013328 = 0x06013328;
// ovl_En_Zob
D_06006998 = 0x06006998;
D_06010810 = 0x06010810;
// ovl_En_Zod
D_06000D94 = 0x06000D94;