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_Zos (#609)

Browse Source 
* En_Zos

* Merge
This commit is contained in:
Maide
2022-01-30 16:48:40 -03:00
committed by GitHub
parent f5740dab41
commit a00601671d
5 changed files with 701 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_zos.xml
+4 -1
View File
@@ -35,7 +35,10 @@
<Texture Name="object_zos_Tex_00FC98" OutName="tex_00FC98" Format="rgba16" Width="32" Height="32" Offset="0xFC98" />
<Texture Name="object_zos_Tex_010498" OutName="tex_010498" Format="rgba16" Width="16" Height="32" Offset="0x10498" />
<Texture Name="object_zos_Tex_010898" OutName="tex_010898" Format="rgba16" Width="8" Height="8" Offset="0x10898" />
<!-- <Blob Name="object_zos_Blob_010918" Size="0x1800" Offset="0x10918" /> -->
<Texture Name="object_zos_Tex_010918" OutName="tex_010918" Format="rgba16" Width="32" Height="32" Offset="0x10918" />
<Texture Name="object_zos_Tex_011118" OutName="tex_011118" Format="rgba16" Width="32" Height="32" Offset="0x11118" />
<Texture Name="object_zos_Tex_011918" OutName="tex_011918" Format="rgba16" Width="32" Height="32" Offset="0x11918" />
<!-- <Blob Name="object_zos_Blob_012118" Size="0xF70" Offset="0x12118" /> -->
<DList Name="object_zos_DL_013088" Offset="0x13088" />
<DList Name="object_zos_DL_0136E0" Offset="0x136E0" />
<Texture Name="object_zos_Tex_013728" OutName="tex_013728" Format="rgba16" Width="32" Height="32" Offset="0x13728" />
spec
+1 -2
View File
@@ -4612,8 +4612,7 @@ beginseg
name "ovl_En_Zos"
compress
include "build/src/overlays/actors/ovl_En_Zos/z_en_zos.o"
include "build/data/ovl_En_Zos/ovl_En_Zos.data.o"
include "build/data/ovl_En_Zos/ovl_En_Zos.reloc.o"
include "build/src/overlays/actors/ovl_En_Zos/ovl_En_Zos_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Zos/z_en_zos.c
+678 -39
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Zos/z_en_zos.h
+18 -1
View File
@@ -7,9 +7,26 @@ struct EnZos;
typedef void (*EnZosActionFunc)(struct EnZos*, GlobalContext*);
#define ENZOS_GET_F(thisx) ((thisx)->params & 0xF)
enum {
/* 1 */ ENZOS_F_1 = 1,
/* 2 */ ENZOS_F_2,
};
typedef struct EnZos {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x17C];
/* 0x0144 */ Vec3s jointTable[18];
/* 0x01B0 */ Vec3s morphTable[18];
/* 0x021C */ SkelAnime skelAnime;
/* 0x0260 */ ColliderCylinder collider;
/* 0x02AC */ s16 unk_2AC;
/* 0x02AE */ s16 unk_2AE;
/* 0x02B0 */ UNK_TYPE1 unk2B0[6];
/* 0x02B6 */ u16 unk_2B6;
/* 0x02B8 */ s16 unk_2B8;
/* 0x02BA */ s16 unk_2BA;
/* 0x02BC */ s16 unk_2BC;
/* 0x02C0 */ EnZosActionFunc actionFunc;
} EnZos; // size = 0x2C4
undefined_syms.txt
-7
View File
@@ -2166,13 +2166,6 @@ D_06004FE4 = 0x06004FE4;
D_06005098 = 0x06005098;
D_06005250 = 0x06005250;
// ovl_En_Zos
D_0600A164 = 0x0600A164;
D_06013088 = 0x06013088;
D_060136E0 = 0x060136E0;
D_06015238 = 0x06015238;
// ovl_En_Zov
D_0600D3EC = 0x0600D3EC;