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_Sth (#625)

Browse Source 
* En_Sth

* Skull tokens

* PR
This commit is contained in:
Maide
2022-02-19 20:49:57 +00:00
committed by GitHub
parent e2d546c8f0
commit 717adf8ed8
6 changed files with 694 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/overlays/ovl_En_Sth.xml
+14
View File
@@ -0,0 +1,14 @@
<Root>
<File Name="ovl_En_Sth" BaseAddress="0x80B66D30" RangeStart="0x1890" RangeEnd="0x646C">
<DList Name="ovl_En_Sth_DL_0034A0" Offset="0x34A0"/>
<DList Name="ovl_En_Sth_DL_0037C0" Offset="0x37C0"/>
<Animation Name="ovl_En_Sth_Anim_003F50" Offset="0x3F50" />
<Animation Name="ovl_En_Sth_Anim_0045B4" Offset="0x45B4" />
<Animation Name="ovl_En_Sth_Anim_004CC0" Offset="0x4CC0" />
<Animation Name="ovl_En_Sth_Anim_00533C" Offset="0x533C" />
<Animation Name="ovl_En_Sth_Anim_0059B8" Offset="0x59B8" />
<Animation Name="ovl_En_Sth_Anim_005E40" Offset="0x5E40" />
<Animation Name="ovl_En_Sth_Anim_006354" Offset="0x6354" />
<Animation Name="ovl_En_Sth_Anim_00645C" Offset="0x645C" />
</File>
</Root>
spec
+1 -2
View File
@@ -4177,8 +4177,7 @@ beginseg
name "ovl_En_Sth"
compress
include "build/src/overlays/actors/ovl_En_Sth/z_en_sth.o"
include "build/data/ovl_En_Sth/ovl_En_Sth.data.o"
include "build/data/ovl_En_Sth/ovl_En_Sth.reloc.o"
include "build/src/overlays/actors/ovl_En_Sth/ovl_En_Sth_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Sth/z_en_sth.c
+655 -36
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Sth/z_en_sth.h
+23 -1
View File
@@ -5,9 +5,31 @@
struct EnSth;
typedef void (*EnSthActionFunc)(struct EnSth*, GlobalContext*);
#define ENSTH_GET_F(thisx) ((thisx)->params & 0xF)
#define ENSTH_GET_100(thisx) ((thisx)->params & 0x100)
enum {
/* 1 */ ENSTH_F_1 = 1,
/* 2 */ ENSTH_F_2,
/* 3 */ ENSTH_F_3,
/* 4 */ ENSTH_F_4,
/* 5 */ ENSTH_F_5,
};
typedef struct EnSth {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x160];
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ SkelAnime skelAnime;
/* 0x1D4 */ Vec3s jointTable[16];
/* 0x234 */ Vec3s morphTable[16];
/* 0x294 */ Vec3s unk_294;
/* 0x29A */ s16 unk_29A;
/* 0x29C */ u16 unk_29C;
/* 0x29E */ u8 unk_29E;
/* 0x29F */ u8 unk_29F;
/* 0x2A0 */ EnSthActionFunc actionFunc;
} EnSth; // size = 0x2A4
extern const ActorInit En_Sth_InitVars;
tools/actorfixer.py
+1
View File
@@ -396,6 +396,7 @@ animdict = {
"func_80114E90": "Interface_HasEmptyBottle",
"func_80114F2C": "Interface_HasItemInBottle",
"func_80123C90": "Player_SetEquipmentData",
"func_8012F22C": "Inventory_GetSkullTokenCount",
# Structs members
"skelAnime.unk03": "skelAnime.taper",
undefined_syms.txt
-5
View File
@@ -1822,11 +1822,6 @@ D_06001AA0 = 0x06001AA0;
D_06000304 = 0x06000304;
// ovl_En_Sth
D_060031F8 = 0x060031F8;
D_06005998 = 0x06005998;
// ovl_En_Sth2
D_060031F8 = 0x060031F8;