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_Hint_Skb (#554)

Browse Source 
* En_Hint_Skb

* Merge

* Actorfixer fail

* Merge

* PR
This commit is contained in:
Maide
2022-01-30 17:13:46 -03:00
committed by GitHub
parent 5f425bf73c
commit 5eb1b417de
5 changed files with 799 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -5382,8 +5382,7 @@ beginseg
name "ovl_En_Hint_Skb"
compress
include "build/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.o"
include "build/data/ovl_En_Hint_Skb/ovl_En_Hint_Skb.data.o"
include "build/data/ovl_En_Hint_Skb/ovl_En_Hint_Skb.reloc.o"
include "build/src/overlays/actors/ovl_En_Hint_Skb/ovl_En_Hint_Skb_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c
+776 -63
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h
+20 -2
View File
@@ -7,11 +7,29 @@ struct EnHintSkb;
typedef void (*EnHintSkbActionFunc)(struct EnHintSkb*, GlobalContext*);
#define ENHINTSKB_GET_FF(thisx) ((thisx)->params & 0xFF)
typedef struct EnHintSkb {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xE4];
/* 0x0144 */ ColliderJntSph collider;
/* 0x0164 */ ColliderJntSphElement colliderElement[2];
/* 0x01E4 */ SkelAnime skelAnime;
/* 0x0228 */ EnHintSkbActionFunc actionFunc;
/* 0x022C */ char unk_22C[0x1C0];
/* 0x022C */ Vec3f unk_22C[14];
/* 0x02D4 */ f32 unk_2D4;
/* 0x02D8 */ f32 unk_2D8;
/* 0x02DC */ s32 unk_2DC;
/* 0x02E0 */ Vec3s jointTable[20];
/* 0x0358 */ Vec3s morphtable[20];
/* 0x03D0 */ UNK_TYPE1 unk3D0[0xC];
/* 0x03DC */ s16 unk_3DC;
/* 0x03DE */ s16 unk_3DE;
/* 0x03E0 */ s16 unk_3E0;
/* 0x03E2 */ s16 unk_3E2;
/* 0x03E4 */ s16 unk_3E4;
/* 0x03E6 */ u16 unk_3E6;
/* 0x03E8 */ u8 unk_3E8;
/* 0x03E9 */ u8 unk_3E9;
} EnHintSkb; // size = 0x3EC
extern const ActorInit En_Hint_Skb_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -17046,8 +17046,8 @@
0x80C21468:("func_80C21468",),
0x80C215E4:("func_80C215E4",),
0x80C21790:("EnHintSkb_Update",),
0x80C21858:("func_80C21858",),
0x80C219D4:("func_80C219D4",),
0x80C21858:("EnHintSkb_OverrideLimbDraw",),
0x80C219D4:("EnHintSkb_PostLimbDraw",),
0x80C21B9C:("EnHintSkb_Draw",),
0x80C22350:("func_80C22350",),
0x80C22400:("func_80C22400",),
undefined_syms.txt
-7
View File
@@ -1530,13 +1530,6 @@ D_06012A58 = 0x06012A58;
D_060023B8 = 0x060023B8;
D_060024CC = 0x060024CC;
// ovl_En_Hint_Skb
D_06002190 = 0x06002190;
D_06003584 = 0x06003584;
D_06005EF8 = 0x06005EF8;
D_0600697C = 0x0600697C;
// ovl_En_Horse
D_06008C68 = 0x06008C68;