mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

Commit object_link_child (#2542)

Browse source 
* add Vtx resources to object_link_child.xml

* object_link_child.xml limb enum and tlut blob

* cp extracted/... assets/...

* start cleanup, delete useless declarations

* inhibit object_link_child.c source gen

* move textures _WIDTH and _HEIGHT to .c, remove useless tex decls

* comments

* fixup object_link_boy comments

* remove unreferenced DLs decls

* rm 0 padding

* format the .c

* fixup

* bss
This commit is contained in:
Dragorn421 2025-05-26 22:59:33 +02:00 • committed by GitHub
parent b3a16a61d4
commit 6b9656b42a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 1559 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/objects/object_link_boy/object_link_boy.c
View file

@ -959,7 +959,7 @@ Gfx gLinkAdultHookshotReticleDL[13] = {
#include "assets/objects/object_link_boy/gLinkAdultHookshotReticleDL.inc.c"
};
// Far skeleton vertices
// Far skeleton vertices and DLs
Vtx gLinkAdultRightFootFarVtx[] = {
#include "assets/objects/object_link_boy/gLinkAdultRightFootFarVtx.inc.c"
@ -1089,7 +1089,7 @@ Gfx gLinkAdultLeftArmFarDL[86] = {
#include "assets/objects/object_link_boy/gLinkAdultLeftArmFarDL.inc.c"
};
// Near skeleton vertices
// Near skeleton vertices and DLs
Vtx gLinkAdultRightFootNearVtx[] = {
#include "assets/objects/object_link_boy/gLinkAdultRightFootNearVtx.inc.c"

1195
assets/objects/object_link_child/object_link_child.c Normal file
View file

File diff suppressed because it is too large Load diff

87
assets/objects/object_link_child/object_link_child.h Normal file
View file

@ -0,0 +1,87 @@
#ifndef OBJECT_LINK_CHILD_H
#define OBJECT_LINK_CHILD_H
#include "ultra64.h"
#include "tex_len.h"
#include "z64animation.h"
#define LINK_CHILD_EYES_TEX_WIDTH 64
#define LINK_CHILD_EYES_TEX_HEIGHT 32
extern u64 gLinkChildEyesOpenTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)];
extern u64 gLinkChildEyesHalfTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)];
extern u64 gLinkChildEyesClosedfTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)];
extern u64 gLinkChildEyesLeftTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)];
extern u64 gLinkChildEyesRightTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)];
extern u64 gLinkChildEyesWideTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)];
extern u64 gLinkChildEyesDownTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)];
extern u64 gLinkChildEyesWincingTex[TEX_LEN(u64, LINK_CHILD_EYES_TEX_WIDTH, LINK_CHILD_EYES_TEX_HEIGHT, 8)];
#define LINK_CHILD_MOUTH_TEX_WIDTH 32
#define LINK_CHILD_MOUTH_TEX_HEIGHT 32
extern u64 gLinkChildMouthClosedTex[TEX_LEN(u64, LINK_CHILD_MOUTH_TEX_WIDTH, LINK_CHILD_MOUTH_TEX_HEIGHT, 8)];
extern u64 gLinkChildMouthHalfTex[TEX_LEN(u64, LINK_CHILD_MOUTH_TEX_WIDTH, LINK_CHILD_MOUTH_TEX_HEIGHT, 8)];
extern u64 gLinkChildMouthOpenTex[TEX_LEN(u64, LINK_CHILD_MOUTH_TEX_WIDTH, LINK_CHILD_MOUTH_TEX_HEIGHT, 8)];
extern u64 gLinkChildMouthSmileTex[TEX_LEN(u64, LINK_CHILD_MOUTH_TEX_WIDTH, LINK_CHILD_MOUTH_TEX_HEIGHT, 8)];
extern Gfx gLinkChildLinkDekuStickDL[41];
extern Gfx gLinkChildLeftHandNearDL[45];
extern Gfx gLinkChildLeftFistNearDL[36];
extern Gfx gLinkChildLeftFistAndKokiriSwordNearDL[81];
extern Gfx gLinkChildRightHandNearDL[44];
extern Gfx gLinkChildRightHandClosedNearDL[36];
extern Gfx gLinkChildRightFistAndDekuShieldNearDL[68];
extern Gfx gLinkChildLeftFistAndBoomerangNearDL[73];
extern Gfx gLinkChildHylianShieldSwordAndSheathNearDL[83];
extern Gfx gLinkChildHylianShieldAndSheathNearDL[69];
extern Gfx gLinkChildDekuShieldSwordAndSheathNearDL[85];
extern Gfx gLinkChildDekuShieldAndSheathNearDL[71];
extern Gfx gLinkChildSwordAndSheathNearDL[56];
extern Gfx gLinkChildSheathNearDL[39];
extern Gfx gLinkChildLeftHandHoldingMasterSwordDL[131];
extern Gfx gLinkChildRightHandAndOotNearDL[74];
extern Gfx gLinkChildRightHandHoldingFairyOcarinaNearDL[73];
extern Gfx gLinkChildRightHandHoldingSlingshotNearDL[60];
extern Gfx gLinkChildLeftHandUpNearDL[41];
extern Gfx gLinkChildGoronBraceletDL[45];
extern Gfx gLinkChildLeftHandFarDL[40];
extern Gfx gLinkChildLeftFistFarDL[36];
extern Gfx gLinkChildRightHandFarDL[40];
extern Gfx gLinkChildRightHandClosedFarDL[36];
extern Gfx gLinkChildRightFistAndDekuShieldFarDL[57];
extern Gfx gLinkChildLeftFistAndBoomerangFarDL[50];
extern Gfx gLinkChildHylianShieldSwordAndSheathFarDL[76];
extern Gfx gLinkChildHylianShieldAndSheathFarDL[62];
extern Gfx gLinkChildDekuShieldSwordAndSheathFarDL[77];
extern Gfx gLinkChildDekuShieldAndSheathFarDL[66];
extern Gfx gLinkChildSwordAndSheathFarDL[52];
extern Gfx gLinkChildSheathFarDL[38];
extern Gfx gLinkChildLeftFistAndKokiriSwordFarDL[78];
extern Gfx gLinkChildRightHandHoldingOOTFarDL[74];
extern Gfx gLinkChildRightHandHoldingFairyOcarinaFarDL[73];
extern Gfx gLinkChildRightHandHoldingSlingshotFarDL[57];
extern Gfx gLinkChildRightArmStretchedSlingshotDL[134];
extern Gfx gLinkChildBottleDL[33];
extern Gfx gLinkChildWaistFarDL[70];
extern Gfx gLinkChildWaistNearDL[73];
extern Gfx gLinkChildRightShoulderNearDL[58];
extern Gfx gLinkChildSlingshotStringDL[12];
extern Gfx gLinkChildDekuShieldDL[42];
extern Gfx gLinkChildDekuShieldWithMatrixDL[3];
extern Gfx gLinkChildSkullMaskDL[70];
extern Gfx gLinkChildSpookyMaskDL[30];
extern Gfx gLinkChildKeatonMaskDL[50];
extern Gfx gLinkChildMaskOfTruthDL[44];
extern Gfx gLinkChildGoronMaskDL[70];
extern Gfx gLinkChildZoraMaskDL[65];
extern Gfx gLinkChildGerudoMaskDL[84];
extern Gfx gLinkChildBunnyHoodDL[114];
extern FlexSkeletonHeader gLinkChildSkel;
#endif