mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
En_Horse_Link_Child and object_horse_link_child partially documented. (#1353)
* ChildHorse: some documentation * OOT Horse: more documentation * OOT Horse: more documentation * OOT Horse: more documentation * might be busted * OOT Epona: more documents aft * OOT Epona: some object documentation, continued documentation * format * OOT Epona: requested changes * OOT Epona: minor documentation changes * what is this warning, c pls * OOT Horse: git nudge * OOT Epona: requested changes to enums * OOT Epona: Anim * Update src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * OOT Epona: change enum name * OOT Epona: Requested changes * OOT Epona: More requested changes * OOT Epona: removed incorrect padding guess --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Isghj
engineer124
@@ -1,4 +1,5 @@
|
||||
<Root>
|
||||
<!-- Epona -->
|
||||
<File Name="object_horse_link_child" Segment="6">
|
||||
<DList Name="object_horse_link_child_DL_000C70" Offset="0xC70" />
|
||||
<DList Name="object_horse_link_child_DL_001028" Offset="0x1028" />
|
||||
@@ -9,10 +10,13 @@
|
||||
<DList Name="object_horse_link_child_DL_0014B8" Offset="0x14B8" />
|
||||
<DList Name="object_horse_link_child_DL_001568" Offset="0x1568" />
|
||||
<DList Name="object_horse_link_child_DL_001678" Offset="0x1678" />
|
||||
<Texture Name="object_horse_link_child_Tex_001728" OutName="tex_001728" Format="rgba16" Width="16" Height="16" Offset="0x1728" />
|
||||
<Texture Name="object_horse_link_child_Tex_001928" OutName="tex_001928" Format="ci8" Width="32" Height="16" Offset="0x1928" />
|
||||
<Texture Name="object_horse_link_child_Tex_001B28" OutName="tex_001B28" Format="ci8" Width="32" Height="16" Offset="0x1B28" />
|
||||
<Texture Name="object_horse_link_child_Tex_001D28" OutName="tex_001D28" Format="ci8" Width="32" Height="16" Offset="0x1D28" />
|
||||
|
||||
<Texture Name="gEponaTLUT" OutName="epona_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1728" />
|
||||
|
||||
<Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728" />
|
||||
<Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728" />
|
||||
<Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728" />
|
||||
|
||||
<Texture Name="object_horse_link_child_Tex_001F28" OutName="tex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" />
|
||||
<Texture Name="object_horse_link_child_Tex_001F68" OutName="tex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" />
|
||||
<Texture Name="object_horse_link_child_Tex_002168" OutName="tex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" />
|
||||
@@ -20,16 +24,20 @@
|
||||
<Texture Name="object_horse_link_child_Tex_002568" OutName="tex_002568" Format="rgba16" Width="4" Height="4" Offset="0x2568" />
|
||||
<Texture Name="object_horse_link_child_Tex_002588" OutName="tex_002588" Format="rgba16" Width="8" Height="32" Offset="0x2588" />
|
||||
<Texture Name="object_horse_link_child_Tex_002788" OutName="tex_002788" Format="rgba16" Width="16" Height="16" Offset="0x2788" />
|
||||
<Animation Name="object_horse_link_child_Anim_002F98" Offset="0x2F98" /> <!-- Original name is "hlc_anim_fastrun_30" -->
|
||||
|
||||
<Animation Name="gEponaGallopAnim" Offset="0x2F98" /> <!-- Original name is "hlc_anim_fastrun_30" -->
|
||||
<Animation Name="object_horse_link_child_Anim_0035B0" Offset="0x35B0" /> <!-- Original name is "hlc_anim_jump100" -->
|
||||
<Animation Name="object_horse_link_child_Anim_003D38" Offset="0x3D38" /> <!-- Original name is "hlc_anim_jump200" -->
|
||||
<Animation Name="object_horse_link_child_Anim_0043AC" Offset="0x43AC" /> <!-- Original name is "hlc_anim_slowrun_30" -->
|
||||
<Animation Name="gEponaTrotAnim" Offset="0x43AC" /> <!-- Original name is "hlc_anim_slowrun_30" -->
|
||||
<Animation Name="object_horse_link_child_Anim_004DE8" Offset="0x4DE8" /> <!-- Original name is "hlc_anim_stand" -->
|
||||
<Animation Name="object_horse_link_child_Anim_005F64" Offset="0x5F64" /> <!-- Original name is "hlc_anim_stop" -->
|
||||
<Animation Name="object_horse_link_child_Anim_006D44" Offset="0x6D44" /> <!-- Original name is "hlc_anim_wait" -->
|
||||
<Animation Name="object_horse_link_child_Anim_007468" Offset="0x7468" /> <!-- Original name is "hlc_anim_wait02" -->
|
||||
<Animation Name="object_horse_link_child_Anim_007D50" Offset="0x7D50" /> <!-- Original name is "hlc_anim_walk_30" -->
|
||||
<Animation Name="gEponaIdleAnim" Offset="0x6D44" /> <!-- Original name is "hlc_anim_wait" -->
|
||||
<Animation Name="gEponaWhinnyAnim" Offset="0x7468" /> <!-- Original name is "hlc_anim_wait02" -->
|
||||
<Animation Name="gEponaWalkAnim" Offset="0x7D50" /> <!-- Original name is "hlc_anim_walk_30" -->
|
||||
|
||||
<!-- <Blob Name="object_horse_link_child_Blob_007D60" Size="0x2388" Offset="0x7D60" /> -->
|
||||
|
||||
<!-- z64Utils will not render because of skin type skeleton -->
|
||||
<Limb Name="object_horse_link_child_Skinlimb_00A0E8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_01" Offset="0xA0E8" />
|
||||
<Limb Name="object_horse_link_child_Skinlimb_00A0F8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_02" Offset="0xA0F8" />
|
||||
<Limb Name="object_horse_link_child_Skinlimb_00A108" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_03" Offset="0xA108" />
|
||||
@@ -76,14 +84,17 @@
|
||||
<Limb Name="object_horse_link_child_Skinlimb_00A398" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2C" Offset="0xA398" />
|
||||
<Limb Name="object_horse_link_child_Skinlimb_00A3A8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2D" Offset="0xA3A8" />
|
||||
<Limb Name="object_horse_link_child_Skinlimb_00A3B8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2E" Offset="0xA3B8" />
|
||||
<Skeleton Name="object_horse_link_child_Skel_00A480" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HORSE_LINK_CHILD_LIMB_NONE" LimbMax="OBJECT_HORSE_LINK_CHILD_LIMB_MAX" EnumName="ObjectHorseLinkChildLimb" Offset="0xA480" />
|
||||
<Skeleton Name="gEponaSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HORSE_LINK_CHILD_LIMB_NONE" LimbMax="OBJECT_HORSE_LINK_CHILD_LIMB_MAX" EnumName="ObjectHorseLinkChildLimb" Offset="0xA480" />
|
||||
|
||||
<Animation Name="object_horse_link_child_Anim_00A8DC" Offset="0xA8DC" /> <!-- Original name is "hlc_inanaki" -->
|
||||
<Animation Name="object_horse_link_child_Anim_00AD08" Offset="0xAD08" /> <!-- Original name is "hlc_inanaki_modori" -->
|
||||
<Animation Name="object_horse_link_child_Anim_00B3E0" Offset="0xB3E0" /> <!-- Original name is "hlc_inanaki_wait" -->
|
||||
<Animation Name="object_horse_link_child_Anim_00BDE0" Offset="0xBDE0" /> <!-- Original name is "hlc_lost_house2" -->
|
||||
<Animation Name="object_horse_link_child_Anim_00D178" Offset="0xD178" /> <!-- Original name is "hlc_lost_house_inanaki" -->
|
||||
<Animation Name="object_horse_link_child_Anim_00D4E8" Offset="0xD4E8" /> <!-- Original name is "hlc_lost_house_inanaki_run" -->
|
||||
|
||||
<DList Name="object_horse_link_child_DL_00D500" Offset="0xD500" />
|
||||
<!-- skin textures -->
|
||||
<Texture Name="object_horse_link_child_Tex_00DAF0" OutName="tex_00DAF0" Format="rgba16" Width="16" Height="16" Offset="0xDAF0" />
|
||||
<Texture Name="object_horse_link_child_Tex_00DCF0" OutName="tex_00DCF0" Format="rgba16" Width="32" Height="32" Offset="0xDCF0" />
|
||||
</File>
|
||||
|
||||
@@ -110,9 +110,15 @@ typedef struct {
|
||||
} RaceInfo; // size = 0x8
|
||||
|
||||
static AnimationHeader* sEponaAnimations[] = {
|
||||
&object_horse_link_child_Anim_006D44, &object_horse_link_child_Anim_007468, &object_horse_link_child_Anim_005F64,
|
||||
&object_horse_link_child_Anim_004DE8, &object_horse_link_child_Anim_007D50, &object_horse_link_child_Anim_0043AC,
|
||||
&object_horse_link_child_Anim_002F98, &object_horse_link_child_Anim_0035B0, &object_horse_link_child_Anim_003D38,
|
||||
&gEponaIdleAnim,
|
||||
&gEponaWhinnyAnim,
|
||||
&object_horse_link_child_Anim_005F64,
|
||||
&object_horse_link_child_Anim_004DE8,
|
||||
&gEponaWalkAnim,
|
||||
&gEponaTrotAnim,
|
||||
&gEponaGallopAnim,
|
||||
&object_horse_link_child_Anim_0035B0,
|
||||
&object_horse_link_child_Anim_003D38,
|
||||
};
|
||||
|
||||
static AnimationHeader* sHniAnimations[] = {
|
||||
@@ -130,7 +136,7 @@ static f32 sPlaybackSpeeds[] = {
|
||||
};
|
||||
|
||||
static SkeletonHeader* sSkeletonHeaders[] = {
|
||||
NULL, NULL, &object_horse_link_child_Skel_00A480, NULL, NULL,
|
||||
NULL, NULL, &gEponaSkel, NULL, NULL,
|
||||
};
|
||||
|
||||
ActorInit En_Horse_InitVars = {
|
||||
@@ -4633,9 +4639,9 @@ void EnHorse_PostDraw(Actor* thisx, PlayState* play, Skin* skin) {
|
||||
|
||||
s32 EnHorse_OverrideLimbDraw(Actor* thisx, PlayState* play, s32 limbIndex, Skin* skin) {
|
||||
static TexturePtr D_80889204[] = {
|
||||
object_horse_link_child_Tex_001D28,
|
||||
object_horse_link_child_Tex_001928,
|
||||
object_horse_link_child_Tex_001B28,
|
||||
gEponaEyeOpenTex,
|
||||
gEponaEyeHalfTex,
|
||||
gEponaEyeClosedTex,
|
||||
};
|
||||
static u8 D_80889210[] = { 0, 1, 2, 1 };
|
||||
EnHorse* this = THIS;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,17 +6,17 @@
|
||||
|
||||
struct EnHorseLinkChild;
|
||||
|
||||
typedef void (*EnHorseLinkChildUnkFunc)(struct EnHorseLinkChild*, PlayState*);
|
||||
typedef void (*EnHorseLinkChildActionFunc)(struct EnHorseLinkChild*, PlayState*);
|
||||
|
||||
typedef struct EnHorseLinkChild {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ s32 unk_144;
|
||||
/* 0x148 */ s32 unk_148;
|
||||
/* 0x144 */ s32 action; // index to action func list
|
||||
/* 0x148 */ s32 animIndex;
|
||||
/* 0x14C */ Skin skin;
|
||||
/* 0x1DC */ s32 unk_1DC;
|
||||
/* 0x1DC */ s32 unk_1E0;
|
||||
/* 0x1E4 */ u8 unk_1E4;
|
||||
/* 0x1E8 */ s32 unk_1E8;
|
||||
/* 0x1DC */ s32 timer;
|
||||
/* 0x1DC */ s32 isReturningHome;
|
||||
/* 0x1E4 */ u8 eyeTexIndex;
|
||||
/* 0x1E8 */ s32 footstepCounter; // two sfx per animation loop
|
||||
/* 0x1EC */ ColliderCylinder colldierCylinder;
|
||||
/* 0x238 */ ColliderJntSph colliderJntSph;
|
||||
/* 0x258 */ ColliderJntSphElement colliderJntSphElements[1];
|
||||
|
||||
+15
-15
@@ -6473,24 +6473,24 @@
|
||||
0x808DD970:("func_808DD970",),
|
||||
0x808DDE74:("func_808DDE74",),
|
||||
0x808DDE9C:("func_808DDE9C",),
|
||||
0x808DE5C0:("func_808DE5C0",),
|
||||
0x808DE660:("func_808DE660",),
|
||||
0x808DE728:("func_808DE728",),
|
||||
0x808DE5C0:("EnHorseLinkChild_PlayWalkingSound",),
|
||||
0x808DE660:("EnHorseLinkChild_PlaySound",),
|
||||
0x808DE728:("EnHorseLinkChild_GetAnimSpeed",),
|
||||
0x808DE7F0:("EnHorseLinkChild_Init",),
|
||||
0x808DE958:("EnHorseLinkChild_Destroy",),
|
||||
0x808DE9A8:("func_808DE9A8",),
|
||||
0x808DEA0C:("func_808DEA0C",),
|
||||
0x808DEA54:("func_808DEA54",),
|
||||
0x808DEB14:("func_808DEB14",),
|
||||
0x808DECA0:("func_808DECA0",),
|
||||
0x808DED40:("func_808DED40",),
|
||||
0x808DEFE8:("func_808DEFE8",),
|
||||
0x808DE9A8:("EnHorseLinkChild_SetupActionFunc0",),
|
||||
0x808DEA0C:("EnHorseLinkChild_ActionFunc0",),
|
||||
0x808DEA54:("EnHorseLinkChild_SetupWaitForPlayer",),
|
||||
0x808DEB14:("EnHorseLinkChild_WaitForPlayer",),
|
||||
0x808DECA0:("EnHorseLinkChild_SetupGreetPlayer",),
|
||||
0x808DED40:("EnHorseLinkChild_GreetPlayer",),
|
||||
0x808DEFE8:("EnHorseLinkChild_SetupLonLonIdle",),
|
||||
0x808DF088:("func_808DF088",),
|
||||
0x808DF194:("func_808DF194",),
|
||||
0x808DF560:("func_808DF560",),
|
||||
0x808DF620:("func_808DF620",),
|
||||
0x808DF788:("func_808DF788",),
|
||||
0x808DF838:("func_808DF838",),
|
||||
0x808DF194:("EnHorseLinkChild_LonLonIdle",),
|
||||
0x808DF560:("EnHorseLinkChild_SetupActionFunc5",),
|
||||
0x808DF620:("EnHorseLinkChild_ActionFunc5",),
|
||||
0x808DF788:("EnHorseLinkChild_SetupActionFunc4",),
|
||||
0x808DF838:("EnHorseLinkChild_ActionFunc4",),
|
||||
0x808DFB14:("EnHorseLinkChild_Update",),
|
||||
0x808DFC3C:("EnHorseLinkChild_PostSkinDraw",),
|
||||
0x808DFDC8:("EnHorseLinkChild_OverrideSkinDraw",),
|
||||
|
||||
Reference in New Issue
Block a user