Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* remove fake match * merge master * animations * dog limbs * textures * KZ limbs and DL * a few KZ textures and make a file for link_boy * the rest of KZ * Far Limb DLs * near DLs and limbs * small fix to child * boots and some sword and more child clean ups * a bunch of DLs * fix boy * fix link child for real this time * adult should be good now * progress * all undefined symbols done * progress * done (for now) * restore makefile * child -> adult * child -> adult * dog fixes * KZ fixes * more player fixes * remove unneeded enum in dog * rename hookshot stuff * Update z_player_lib.c * revert model group stuff * move comment * fix mirror shield upper * remove useless 2 * OOT -> Oot * gauntlet plate 2 fix * fix Co-authored-by: Louis <louist103@pop-os.localdomain>
- Loading branch information
Showing
14 changed files
with
622 additions
and
343 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,41 @@ | ||
| <Root> | ||
| <File Name="object_dog" Segment="6"> | ||
| <Animation Name="object_dog_Anim_000278" Offset="0x278"/> | ||
| <Animation Name="object_dog_Anim_000928" Offset="0x928"/> | ||
| <Animation Name="object_dog_Anim_000C28" Offset="0xC28"/> | ||
| <Animation Name="object_dog_Anim_000D78" Offset="0xD78"/> | ||
| <Animation Name="object_dog_Anim_001150" Offset="0x1150"/> | ||
| <Animation Name="object_dog_Anim_001368" Offset="0x1368"/> | ||
| <Texture Name="object_dog_Tex_001380" OutName="tex_001380" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> | ||
| <Texture Name="object_dog_Tex_001B80" OutName="tex_001B80" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> | ||
| <Texture Name="object_dog_Tex_002380" OutName="tex_002380" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> | ||
| <Texture Name="object_dog_Tex_002B80" OutName="tex_002B80" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/> | ||
| <Texture Name="object_dog_Tex_003380" OutName="tex_003380" Format="rgba16" Width="32" Height="32" Offset="0x3380"/> | ||
| <Texture Name="object_dog_Tex_003B80" OutName="tex_003B80" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> | ||
| <Texture Name="object_dog_Tex_004380" OutName="tex_004380" Format="rgba16" Width="16" Height="16" Offset="0x4380"/> | ||
| <Texture Name="object_dog_Tex_004580" OutName="tex_004580" Format="rgba16" Width="32" Height="32" Offset="0x4580"/> | ||
| <DList Name="object_dog_DL_0060E0" Offset="0x60E0"/> | ||
| <DList Name="object_dog_DL_006448" Offset="0x6448"/> | ||
| <DList Name="object_dog_DL_0064E8" Offset="0x64E8"/> | ||
| <DList Name="object_dog_DL_006588" Offset="0x6588"/> | ||
| <DList Name="object_dog_DL_0067A0" Offset="0x67A0"/> | ||
| <DList Name="object_dog_DL_006950" Offset="0x6950"/> | ||
| <DList Name="object_dog_DL_006B00" Offset="0x6B00"/> | ||
| <DList Name="object_dog_DL_006CA0" Offset="0x6CA0"/> | ||
| <DList Name="object_dog_DL_006E50" Offset="0x6E50"/> | ||
| <DList Name="object_dog_DL_007000" Offset="0x7000"/> | ||
| <Limb Name="object_dog_Limb_0071D0" LimbType="Standard" Offset="0x71D0"/> | ||
| <Limb Name="object_dog_Limb_0071DC" LimbType="Standard" Offset="0x71DC"/> | ||
| <Limb Name="object_dog_Limb_0071E8" LimbType="Standard" Offset="0x71E8"/> | ||
| <Limb Name="object_dog_Limb_0071F4" LimbType="Standard" Offset="0x71F4"/> | ||
| <Limb Name="object_dog_Limb_007200" LimbType="Standard" Offset="0x7200"/> | ||
| <Limb Name="object_dog_Limb_00720C" LimbType="Standard" Offset="0x720C"/> | ||
| <Limb Name="object_dog_Limb_007218" LimbType="Standard" Offset="0x7218"/> | ||
| <Limb Name="object_dog_Limb_007224" LimbType="Standard" Offset="0x7224"/> | ||
| <Limb Name="object_dog_Limb_007230" LimbType="Standard" Offset="0x7230"/> | ||
| <Limb Name="object_dog_Limb_00723C" LimbType="Standard" Offset="0x723C"/> | ||
| <Limb Name="object_dog_Limb_007248" LimbType="Standard" Offset="0x7248"/> | ||
| <Limb Name="object_dog_Limb_007254" LimbType="Standard" Offset="0x7254"/> | ||
| <Skeleton Name="object_dog_Skel_007290" Type="Flex" LimbType="Standard" Offset="0x7290"/> | ||
| <Animation Name="gDogBarkAnim" Offset="0x278"/> | ||
| <Animation Name="gDogBowAnim" Offset="0x928"/> | ||
| <Animation Name="gDogBow2Anim" Offset="0xC28"/> | ||
| <Animation Name="gDogRunAnim" Offset="0xD78"/> | ||
| <Animation Name="gDogSitAnim" Offset="0x1150"/> | ||
| <Animation Name="gDogWalkAnim" Offset="0x1368"/> | ||
| <Texture Name="gDogFur1Tex" OutName="fur_1" Format="rgba16" Width="32" Height="32" Offset="0x1380"/> <!-- Lower body--> | ||
| <Texture Name="gDogFur2Tex" OutName="fur_2" Format="rgba16" Width="32" Height="32" Offset="0x1B80"/> <!-- Front of ears, upper part of the tail, and around the feet--> | ||
| <Texture Name="gDogFur3Tex" OutName="fur_3" Format="rgba16" Width="32" Height="32" Offset="0x2380"/> <!-- Upper body, top of head--> | ||
| <Texture Name="gDogFaceEyeTex" OutName="face_and_eye" Format="rgba16" Width="32" Height="32" Offset="0x2B80"/> | ||
| <Texture Name="gDogFaceNoseTex" OutName="face_and_nose" Format="rgba16" Width="32" Height="32" Offset="0x3380"/> | ||
| <Texture Name="gDogFur4Tex" OutName="fur_4" Format="rgba16" Width="32" Height="32" Offset="0x3B80"/> <!-- Back of ears, side of head, and part of front body--> | ||
| <Texture Name="gDogPawTex" OutName="paw" Format="rgba16" Width="16" Height="16" Offset="0x4380"/> | ||
| <Texture Name="gDogFaceHairTex" OutName="face_hair" Format="rgba16" Width="32" Height="32" Offset="0x4580"/> | ||
| <DList Name="gDogHeadDL" Offset="0x60E0"/> | ||
| <DList Name="gDogRightFaceHairDL" Offset="0x6448"/> | ||
| <DList Name="gDogLeftFaceHairDL" Offset="0x64E8"/> | ||
| <DList Name="gDogFrontBodyDL" Offset="0x6588"/> | ||
| <DList Name="gDogFrontRightLegDL" Offset="0x67A0"/> | ||
| <DList Name="gDogFrontLeftLegDL" Offset="0x6950"/> | ||
| <DList Name="gDogBackBodyDL" Offset="0x6B00"/> | ||
| <DList Name="gDogBackRightLegDL" Offset="0x6CA0"/> | ||
| <DList Name="gDogBackLeftLegDL" Offset="0x6E50"/> | ||
| <DList Name="gDogTailDL" Offset="0x7000"/> | ||
| <Limb Name="gDogRootLimb" LimbType="Standard" Offset="0x71D0"/> | ||
| <Limb Name="gDogBodyBackLimb" LimbType="Standard" Offset="0x71DC"/> | ||
| <Limb Name="gDogBodyFrontLimb" LimbType="Standard" Offset="0x71E8"/> | ||
| <Limb Name="gDogHeadControlLimb" LimbType="Standard" Offset="0x71F4"/> | ||
| <Limb Name="gDogHeadLimb" LimbType="Standard" Offset="0x7200"/> | ||
| <Limb Name="gDogRightFaceHairLimb" LimbType="Standard" Offset="0x720C"/> | ||
| <Limb Name="gDogLeftFaceHairLimb" LimbType="Standard" Offset="0x7218"/> | ||
| <Limb Name="gDogFrontRightLegLimb" LimbType="Standard" Offset="0x7224"/> | ||
| <Limb Name="gDogFrontLeftLegLimb" LimbType="Standard" Offset="0x7230"/> | ||
| <Limb Name="gDogBackRightLegLimb" LimbType="Standard" Offset="0x723C"/> | ||
| <Limb Name="gDogBackLeftLegLimb" LimbType="Standard" Offset="0x7248"/> | ||
| <Limb Name="gDogTailLimb" LimbType="Standard" Offset="0x7254"/> | ||
| <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" Offset="0x7290"/> | ||
| </File> | ||
| </Root> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,45 @@ | ||
| <Root> | ||
| <File Name="object_kz" Segment="6"> | ||
| <Animation Name="object_kz_Anim_00046C" Offset="0x46C"/> | ||
| <Animation Name="object_kz_Anim_00075C" Offset="0x75C"/> | ||
| <Texture Name="object_kz_TLUT_000770" OutName="tlut_000770" Format="rgba16" Width="16" Height="16" Offset="0x770"/> | ||
| <Texture Name="object_kz_TLUT_000970" OutName="tlut_000970" Format="rgba16" Width="16" Height="16" Offset="0x970"/> | ||
| <Texture Name="object_kz_Tex_000B70" OutName="tex_000B70" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_000F70" OutName="tex_000F70" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_000FF0" OutName="tex_000FF0" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_0013F0" OutName="tex_0013F0" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_001470" OutName="tex_001470" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/> | ||
| <Texture Name="object_kz_Tex_001870" OutName="tex_001870" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/> | ||
| <Texture Name="object_kz_Tex_001C70" OutName="tex_001C70" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/> | ||
| <Blob Name="object_kz_Blob_002070" Size="0x400" Offset="0x2070"/> | ||
| <Texture Name="object_kz_Tex_002470" OutName="tex_002470" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_002670" OutName="tex_002670" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/> | ||
| <DList Name="object_kz_DL_005920" Offset="0x5920"/> | ||
| <DList Name="object_kz_DL_006420" Offset="0x6420"/> | ||
| <DList Name="object_kz_DL_007298" Offset="0x7298"/> | ||
| <DList Name="object_kz_DL_0074B0" Offset="0x74B0"/> | ||
| <DList Name="object_kz_DL_0076C8" Offset="0x76C8"/> | ||
| <DList Name="object_kz_DL_0079E0" Offset="0x79E0"/> | ||
| <DList Name="object_kz_DL_007C00" Offset="0x7C00"/> | ||
| <DList Name="object_kz_DL_007D40" Offset="0x7D40"/> | ||
| <DList Name="object_kz_DL_008000" Offset="0x8000"/> | ||
| <DList Name="object_kz_DL_008220" Offset="0x8220"/> | ||
| <DList Name="object_kz_DL_008360" Offset="0x8360"/> | ||
| <Limb Name="object_kz_Limb_008620" LimbType="Standard" Offset="0x8620"/> | ||
| <Limb Name="object_kz_Limb_00862C" LimbType="Standard" Offset="0x862C"/> | ||
| <Limb Name="object_kz_Limb_008638" LimbType="Standard" Offset="0x8638"/> | ||
| <Limb Name="object_kz_Limb_008644" LimbType="Standard" Offset="0x8644"/> | ||
| <Limb Name="object_kz_Limb_008650" LimbType="Standard" Offset="0x8650"/> | ||
| <Limb Name="object_kz_Limb_00865C" LimbType="Standard" Offset="0x865C"/> | ||
| <Limb Name="object_kz_Limb_008668" LimbType="Standard" Offset="0x8668"/> | ||
| <Animation Name="gKzMweepAnim" Offset="0x46C"/> | ||
| <Animation Name="gKzIdleAnim" Offset="0x75C"/> | ||
| <Texture Name="gKzTlut" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/> | ||
| <Texture Name="gKzEyeTlut" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/> | ||
| <Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/> | ||
| <Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/> | ||
| <Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/> | ||
| <Texture Name="gKzSkinGradient2Tex" OutName="skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x13F0" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_001430" OutName="tex_001430" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x770"/> | ||
|
|
||
| <Texture Name="gKzEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1470" TlutOffset="0x970"/> | ||
| <Texture Name="gKzEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x1870" TlutOffset="0x970"/> | ||
| <Texture Name="gKzEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x1C70" TlutOffset="0x970"/> | ||
| <Texture Name="gKzEyeOpen2Tex" OutName="eye_open_2" Format="ci8" Width="32" Height="32" Offset="0x2070" TlutOffset="0x970"/> | ||
|
|
||
| <Texture Name="gKzHandAndFootTex" OutName="hand_and_foot" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x770"/> | ||
| <Texture Name="object_kz_Tex_002570" OutName="tex_002570" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x770"/> | ||
| <Texture Name="gKzCloakOutlineTex" OutName="cloak_outline" Format="ci8" Width="32" Height="32" Offset="0x2670" TlutOffset="0x770"/> | ||
| <DList Name="gKzCloakAndTorsoDL" Offset="0x5920"/> | ||
| <DList Name="gKzHeadDL" Offset="0x6420"/> | ||
| <DList Name="gKzRightHandDL" Offset="0x7298"/> | ||
| <DList Name="gKzLeftHandDL" Offset="0x74B0"/> | ||
| <DList Name="gKzPelvisDL" Offset="0x76C8"/> | ||
| <DList Name="gKzRightThighDL" Offset="0x79E0"/> | ||
| <DList Name="gKzRightLegDL" Offset="0x7C00"/> | ||
| <DList Name="gKzRightFootDL" Offset="0x7D40"/> | ||
| <DList Name="gKzLeftThighDL" Offset="0x8000"/> | ||
| <DList Name="gKzLeftLegDL" Offset="0x8220"/> | ||
| <DList Name="gKzLeftFootDL" Offset="0x8360"/> | ||
| <Limb Name="gKzPelvisLimb" LimbType="Standard" Offset="0x8620"/> | ||
| <Limb Name="gKzLeftThighLimb" LimbType="Standard" Offset="0x862C"/> | ||
| <Limb Name="gKzLeftLegLimb" LimbType="Standard" Offset="0x8638"/> | ||
| <Limb Name="gKzLeftFootLimb" LimbType="Standard" Offset="0x8644"/> | ||
| <Limb Name="gKzRightThighLimb" LimbType="Standard" Offset="0x8650"/> | ||
| <Limb Name="gKzRightLegLimb" LimbType="Standard" Offset="0x865C"/> | ||
| <Limb Name="gKzRightFootLimb" LimbType="Standard" Offset="0x8668"/> | ||
| <Limb Name="object_kz_Limb_008674" LimbType="Standard" Offset="0x8674"/> | ||
| <Limb Name="object_kz_Limb_008680" LimbType="Standard" Offset="0x8680"/> | ||
| <Limb Name="object_kz_Limb_00868C" LimbType="Standard" Offset="0x868C"/> | ||
| <Limb Name="object_kz_Limb_008698" LimbType="Standard" Offset="0x8698"/> | ||
| <Skeleton Name="object_kz_Skel_0086D0" Type="Flex" LimbType="Standard" Offset="0x86D0"/> | ||
| <Limb Name="gKzLeftHandLimb" LimbType="Standard" Offset="0x8680"/> | ||
| <Limb Name="gKzRightHandLimb" LimbType="Standard" Offset="0x868C"/> | ||
| <Limb Name="gKzHeadLimb" LimbType="Standard" Offset="0x8698"/> | ||
| <Skeleton Name="gKzSkel" Type="Flex" LimbType="Standard" Offset="0x86D0"/> | ||
| </File> | ||
| </Root> |
Oops, something went wrong.