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_Zov (#649)

Browse Source 
* En_Zov

* PR

* PR
This commit is contained in:
Maide
2022-02-14 01:18:42 +00:00
committed by GitHub
parent 3597e4809f
commit a5e631d03f
6 changed files with 600 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_zov.xml
+6 -4
View File
@@ -37,15 +37,17 @@
<Texture Name="object_zov_Tex_013478" OutName="tex_013478" Format="rgba16" Width="8" Height="16" Offset="0x13478" />
<Texture Name="object_zov_Tex_013578" OutName="tex_013578" Format="ci8" Width="8" Height="8" Offset="0x13578" />
<Texture Name="object_zov_Tex_0135B8" OutName="tex_0135B8" Format="ci8" Width="8" Height="8" Offset="0x135B8" />
<!-- <Blob Name="object_zov_Blob_0135F8" Size="0x400" Offset="0x135F8" /> -->
<Texture Name="object_zov_Tex_0135F8" OutName="tex_0135F8" Format="ci8" Width="32" Height="32" Offset="0x135F8" />
<Texture Name="object_zov_Tex_0139F8" OutName="tex_0139F8" Format="ci8" Width="16" Height="16" Offset="0x139F8" />
<Texture Name="object_zov_Tex_013AF8" OutName="tex_013AF8" Format="ci8" Width="8" Height="8" Offset="0x13AF8" />
<Texture Name="object_zov_Tex_013B38" OutName="tex_013B38" Format="ci8" Width="16" Height="16" Offset="0x13B38" />
<!-- <Blob Name="object_zov_Blob_013C38" Size="0x400" Offset="0x13C38" /> -->
<Texture Name="object_zov_Tex_013C38" OutName="tex_013C38" Format="ci8" Width="32" Height="32" Offset="0x13C38" />
<Texture Name="object_zov_Tex_014038" OutName="tex_014038" Format="ci8" Width="16" Height="16" Offset="0x14038" />
<!-- <Blob Name="object_zov_Blob_014138" Size="0x800" Offset="0x14138" /> -->
<Texture Name="object_zov_Tex_014138" OutName="tex_014138" Format="ci8" Width="32" Height="32" Offset="0x14138" />
<Texture Name="object_zov_Tex_014538" OutName="tex_014538" Format="ci8" Width="32" Height="32" Offset="0x14538" />
<Texture Name="object_zov_Tex_014938" OutName="tex_014938" Format="ci8" Width="32" Height="32" Offset="0x14938" />
<!-- <Blob Name="object_zov_Blob_014D38" Size="0x800" Offset="0x14D38" /> -->
<!-- <Blob Name="object_zov_Blob_014D38" Size="0x400" Offset="0x14D38" /> -->
<Texture Name="object_zov_Tex_015138" OutName="tex_015138" Format="ci8" Width="32" Height="32" Offset="0x15138" />
<Texture Name="object_zov_Tex_015538" OutName="tex_015538" Format="ci8" Width="8" Height="8" Offset="0x15538" />
<Texture Name="object_zov_Tex_015578" OutName="tex_015578" Format="ci8" Width="16" Height="16" Offset="0x15578" />
<Texture Name="object_zov_Tex_015678" OutName="tex_015678" Format="ci8" Width="16" Height="16" Offset="0x15678" />
spec
+1 -2
View File
@@ -4741,8 +4741,7 @@ beginseg
name "ovl_En_Zov"
compress
include "build/src/overlays/actors/ovl_En_Zov/z_en_zov.o"
include "build/data/ovl_En_Zov/ovl_En_Zov.data.o"
include "build/data/ovl_En_Zov/ovl_En_Zov.reloc.o"
include "build/src/overlays/actors/ovl_En_Zov/ovl_En_Zov_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Zov/z_en_zov.c
+566 -33
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Zov/z_en_zov.h
+25 -1
View File
@@ -6,10 +6,34 @@
struct EnZov;
typedef void (*EnZovActionFunc)(struct EnZov*, GlobalContext*);
typedef s32 (*EnZovUnkFunc)(GlobalContext*, struct EnZov*);
#define ENZOV_GET_F(thisx) ((thisx)->params & 0xF)
#define ENZOV_GET_FE00(thisx) (((thisx)->params & 0xFE00) >> 9)
#define ENZOV_F_1 1
#define ENZOV_F_2 2
typedef struct EnZov {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x1EC];
/* 0x0144 */ EnZovUnkFunc unk_144;
/* 0x0148 */ Vec3s jontTable[23];
/* 0x01D2 */ Vec3s morphTable[23];
/* 0x025C */ SkelAnime skelAnime;
/* 0x02A0 */ ColliderCylinder collider;
/* 0x02EC */ s16 unk_2EC;
/* 0x02EE */ s16 unk_2EE;
/* 0x02F0 */ Vec3s unk_2F0;
/* 0x02F6 */ Vec3s unk_2F6;
/* 0x02FC */ Vec3f unk_2FC;
/* 0x0308 */ Vec3f unk_308;
/* 0x0314 */ Vec3f unk_314;
/* 0x0320 */ u16 unk_320;
/* 0x0322 */ s16 unk_322;
/* 0x0324 */ s16 unk_324;
/* 0x0326 */ s16 unk_326;
/* 0x0328 */ s16 unk_328[2];
/* 0x032C */ s16 unk_32C;
/* 0x0330 */ EnZovActionFunc actionFunc;
} EnZov; // size = 0x334
tools/disasm/functions.txt
+2 -2
View File
@@ -15730,8 +15730,8 @@
0x80BD1F1C:("func_80BD1F1C",),
0x80BD1FC8:("func_80BD1FC8",),
0x80BD20B4:("EnZov_Update",),
0x80BD2380:("func_80BD2380",),
0x80BD2404:("func_80BD2404",),
0x80BD2380:("EnZov_OverrideLimbDraw",),
0x80BD2404:("EnZov_PostLimbDraw",),
0x80BD24B4:("EnZov_Draw",),
0x80BD2A30:("func_80BD2A30",),
0x80BD2AE0:("func_80BD2AE0",),
undefined_syms.txt
-5
View File
@@ -2080,11 +2080,6 @@ D_06004FE4 = 0x06004FE4;
D_06005098 = 0x06005098;
D_06005250 = 0x06005250;
// ovl_En_Zov
D_0600D3EC = 0x0600D3EC;
D_06016258 = 0x06016258;
// ovl_En_Zow
D_060029F0 = 0x060029F0;