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_Horse_Link_Child (#806)

Browse Source 
* EnHorseLinkChild

* PR

* PR
This commit is contained in:
Maide
2022-06-19 03:23:25 +01:00
committed by GitHub
parent dd8221c798
commit 98ba755751
6 changed files with 551 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64skin.h
+2 -2
View File
@@ -78,8 +78,8 @@ typedef struct {
/* 0x04C */ SkelAnime skelAnime;
} Skin; // size = 0x90
typedef void (*SkinPostDraw)(struct Actor*, struct GlobalContext*, Skin*);
typedef s32 (*SkinOverrideLimbDraw)(struct Actor*, struct GlobalContext*, s32, Skin*);
typedef void (*SkinPostDraw)(struct Actor* thisx, struct GlobalContext* globalCtx, Skin* skin);
typedef s32 (*SkinOverrideLimbDraw)(struct Actor* thisx, struct GlobalContext* globalCtx, s32 limbIndex, Skin* skin);
#define SKIN_DRAW_FLAG_CUSTOM_TRANSFORMS (1 << 0)
#define SKIN_DRAW_FLAG_CUSTOM_MATRIX (1 << 1)
spec
+1 -2
View File
@@ -1169,8 +1169,7 @@ beginseg
name "ovl_En_Horse_Link_Child"
compress
include "build/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.o"
include "build/data/ovl_En_Horse_Link_Child/ovl_En_Horse_Link_Child.data.o"
include "build/data/ovl_En_Horse_Link_Child/ovl_En_Horse_Link_Child.reloc.o"
include "build/src/overlays/actors/ovl_En_Horse_Link_Child/ovl_En_Horse_Link_Child_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+533 -40
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
+13 -1
View File
@@ -6,9 +6,21 @@
struct EnHorseLinkChild;
typedef void (*EnHorseLinkChildUnkFunc)(struct EnHorseLinkChild*, GlobalContext*);
typedef struct EnHorseLinkChild {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x158];
/* 0x144 */ s32 unk_144;
/* 0x148 */ s32 unk_148;
/* 0x14C */ Skin skin;
/* 0x1DC */ s32 unk_1DC;
/* 0x1DC */ s32 unk_1E0;
/* 0x1E4 */ u8 unk_1E4;
/* 0x1E8 */ s32 unk_1E8;
/* 0x1EC */ ColliderCylinder colldierCylinder;
/* 0x238 */ ColliderJntSph colliderJntSph;
/* 0x258 */ ColliderJntSphElement colliderJntSphElements[1];
/* 0x298 */ UNK_TYPE1 unk298[4];
} EnHorseLinkChild; // size = 0x29C
extern const ActorInit En_Horse_Link_Child_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -6492,8 +6492,8 @@
0x808DF788:("func_808DF788",),
0x808DF838:("func_808DF838",),
0x808DFB14:("EnHorseLinkChild_Update",),
0x808DFC3C:("func_808DFC3C",),
0x808DFDC8:("func_808DFDC8",),
0x808DFC3C:("EnHorseLinkChild_PostSkinDraw",),
0x808DFDC8:("EnHorseLinkChild_OverrideSkinDraw",),
0x808DFE3C:("EnHorseLinkChild_Draw",),
0x808E01A0:("DoorAna_SetupAction",),
0x808E01AC:("DoorAna_Init",),
undefined_syms.txt
-5
View File
@@ -1205,11 +1205,6 @@ D_0600B644 = 0x0600B644;
D_0600F248 = 0x0600F248;
D_06012A58 = 0x06012A58;
// ovl_En_Horse_Link_Child
D_06002F98 = 0x06002F98;
D_0600A480 = 0x0600A480;
// ovl_En_Ik
D_06000CE8 = 0x06000CE8;