falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finalize and commit object_link_boy

This commit is contained in:
Dragorn421 2025-05-19 15:06:05 +02:00
parent 1e556e3a3d
commit 80fa2eab5c
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
8 changed files with 1695 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1279
assets/objects/object_link_boy/object_link_boy.c Normal file
View File

File diff suppressed because it is too large Load Diff

89
assets/objects/object_link_boy/object_link_boy.h Normal file
View File

@ -0,0 +1,89 @@
#ifndef OBJECT_LINK_BOY_H
#define OBJECT_LINK_BOY_H
#include "ultra64.h"
#include "z64animation.h"
extern u64 gLinkAdultEyesOpenTex[];
extern u64 gLinkAdultEyesHalfTex[];
extern u64 gLinkAdultEyesClosedfTex[];
extern u64 gLinkAdultEyesLeftTex[];
extern u64 gLinkAdultEyesRightTex[];
extern u64 gLinkAdultEyesWideTex[];
extern u64 gLinkAdultEyesDownTex[];
extern u64 gLinkAdultEyesWincingTex[];
extern u64 gLinkAdultMouthClosedTex[];
extern u64 gLinkAdultMouthHalfTex[];
extern u64 gLinkAdultMouthOpenTex[];
extern u64 gLinkAdultMouthSmileTex[];
extern Gfx gLinkAdultHylianShieldSwordAndSheathNearDL[];
extern Gfx gLinkAdultHylianShieldAndSheathNearDL[];
extern Gfx gLinkAdultMirrorShieldSwordAndSheathNearDL[];
extern Gfx gLinkAdultMirrorShieldAndSheathNearDL[];
extern Gfx gLinkAdultLeftHandNearDL[];
extern Gfx gLinkAdultLeftHandClosedNearDL[];
extern Gfx gLinkAdultLeftHandHoldingMasterSwordNearDL[];
extern Gfx gLinkAdultRightHandNearDL[];
extern Gfx gLinkAdultRightHandClosedNearDL[];
extern Gfx gLinkAdultRightHandHoldingHylianShieldNearDL[];
extern Gfx gLinkAdultRightHandHoldingBowNearDL[];
extern Gfx gLinkAdultMasterSwordAndSheathNearDL[];
extern Gfx gLinkAdultLeftHandHoldingHammerNearDL[];
extern Gfx gLinkAdultLeftHandHoldingBgsNearDL[];
extern Gfx gLinkAdultHandHoldingBrokenGiantsKnifeDL[];
extern Gfx gLinkAdultRightHandHoldingMirrorShieldNearDL[];
extern Gfx gLinkAdultRightHandHoldingOotNearDL[];
extern Gfx gLinkAdultSheathNearDL[];
extern Gfx gLinkAdultLeftHandOutNearDL[];
extern Gfx gLinkAdultRightHandHoldingHookshotNearDL[];
extern Gfx gLinkAdultLeftGauntletPlate1DL[];
extern Gfx gLinkAdultLeftGauntletPlate2DL[];
extern Gfx gLinkAdultLeftGauntletPlate3DL[];
extern Gfx gLinkAdultRightGauntletPlate1DL[];
extern Gfx gLinkAdultRightGauntletPlate2DL[];
extern Gfx gLinkAdultRightGauntletPlate3DL[];
extern Gfx gLinkAdultLeftIronBootDL[];
extern Gfx gLinkAdultRightIronBootDL[];
extern Gfx gLinkAdultLeftHoverBootDL[];
extern Gfx gLinkAdultRightHoverBootDL[];
extern Gfx gLinkAdultHylianShieldSwordAndSheathFarDL[];
extern Gfx gLinkAdultHylianShieldAndSheathFarDL[];
extern Gfx gLinkAdultMirrorShieldSwordAndSheathFarDL[];
extern Gfx gLinkAdultMirrorShieldAndSheathFarDL[];
extern Gfx gLinkAdultLeftHandFarDL[];
extern Gfx gLinkAdultLeftHandClosedFarDL[];
extern Gfx gLinkAdultLeftHandHoldingMasterSwordFarDL[];
extern Gfx gLinkAdultRightHandFarDL[];
extern Gfx gLinkAdultRightHandClosedFarDL[];
extern Gfx gLinkAdultRightHandHoldingHylianShieldFarDL[];
extern Gfx gLinkAdultRightHandHoldingBowFarDL[];
extern Gfx gLinkAdultMasterSwordAndSheathFarDL[];
extern Gfx gLinkAdultSheathFarDL[];
extern Gfx gLinkAdultLeftHandHoldingHammerFarDL[];
extern Gfx gLinkAdultLeftHandHoldingBgsFarDL[];
extern Gfx gLinkAdultRightHandHoldingMirrorShieldFarDL[];
extern Gfx gLinkAdultRightHandHoldingOotFarDL[];
extern Gfx gLinkAdultHandHoldingBrokenGiantsKnifeFarDL[];
extern Gfx gLinkAdultHandHoldingBottleDL[];
extern Gfx gLinkAdultRightArmOutNearDL[];
extern Gfx gLinkAdultRightHandOutNearDL[];
extern Gfx gLinkAdultLeftArmOutNearDL[];
extern Gfx gLinkAdultRightHandHoldingBowFirstPersonDL[];
extern Gfx gLinkAdultRightHandHoldingHookshotFarDL[];
extern Gfx gLinkAdultBottleDL[];
extern Gfx gLinkAdultHookshotChainDL[];
extern Gfx gLinkAdultBowStringDL[];
extern Gfx gLinkAdultHookshotTipDL[];
extern Gfx gLinkAdultBrokenGiantsKnifeBladeDL[];
extern Gfx gLinkAdultHookshotReticleDL[];
extern Gfx gLinkAdultWaistFarDL[];
extern Gfx gLinkAdultWaistNearDL[];
extern Gfx gLinkAdultRightShoulderNearDL[];
extern FlexSkeletonHeader gLinkAdultSkel;
#endif

338
assets/xml/objects/object_link_boy.xml
View File

@ -1,137 +1,350 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_link_boy" Segment="6">
<Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>
<Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" LimbNone="PLAYER_LIMB_NONE" LimbMax="Player_LIMB_MAX" EnumName="PlayerLimb" Offset="0x377F4"/>
<LimbTable Name="gLinkAdultLimbs" LimbType="LOD" Count="21" Offset="0x377A0"/>
<!-- Far Limb DLists-->
<Array Name="gLinkAdultWaistFarVtx" Count="32" Offset="0x2D650">
<Vtx/>
</Array>
<DList Name="gLinkAdultWaistFarDL" Offset="0x2F530"/>
<Array Name="gLinkAdultRightThighFarVtx" Count="34" Offset="0x2CEE0">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightThighFarDL" Offset="0x2F7A0"/>
<Array Name="gLinkAdultRightLegFarVtx" Count="30" Offset="0x2CD00">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightLegFarDL" Offset="0x2F9B8"/>
<Array Name="gLinkAdultRightFootFarVtx" Count="21" Offset="0x2CBB0">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightFootFarDL" Offset="0x2FB80"/>
<Array Name="gLinkAdultLeftThighFarVtx" Count="34" Offset="0x2D430">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftThighFarDL" Offset="0x2FCA0"/>
<Array Name="gLinkAdultLeftLegFarVtx" Count="30" Offset="0x2D250">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftLegFarDL" Offset="0x2FEC0"/>
<Array Name="gLinkAdultLeftFootFarVtx" Count="21" Offset="0x2D100">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftFootFarDL" Offset="0x30088"/>
<Array Name="gLinkAdultCollarFarVtx" Count="8" Offset="0x2F4B0">
<Vtx/>
</Array>
<DList Name="gLinkAdultCollarFarDL" Offset="0x301A8"/>
<Array Name="gLinkAdultTorsoFarVtx" Count="24" Offset="0x2F330">
<Vtx/>
</Array>
<DList Name="gLinkAdultTorsoFarDL" Offset="0x30250"/>
<Array Name="gLinkAdultHeadFarVtx" Count="120" Offset="0x2D9A0">
<Vtx/>
</Array>
<DList Name="gLinkAdultHeadFarDL" Offset="0x30400"/>
<Array Name="gLinkAdultHatFarVtx" Count="21" Offset="0x2D850">
<Vtx/>
</Array>
<DList Name="gLinkAdultHatFarDL" Offset="0x309B0"/>
<Array Name="gLinkAdultRightShoulderFarVtx" Count="31" Offset="0x2F140">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightShoulderFarDL" Offset="0x30AA0"/>
<Array Name="gLinkAdultRightArmFarVtx" Count="36" Offset="0x2EF00">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightArmFarDL" Offset="0x30C48"/>
<Array Name="gLinkAdultRightHandFarVtx" Count="27" Offset="0x19AC8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandFarDL" Offset="0x274F8"/>
<Array Name="gLinkAdultLeftShoulderFarVtx" Count="35" Offset="0x2E5B0">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftShoulderFarDL" Offset="0x30EF8"/>
<Array Name="gLinkAdultLeftArmFarVtx" Count="35" Offset="0x2E380">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftArmFarDL" Offset="0x310A0"/>
<Array Name="gLinkAdultLeftHandFarVtx" Count="18" Offset="0x19058">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandFarDL" Offset="0x26C58"/>
<!-- Near Limb DLists-->
<Array Name="gLinkAdultWaistNearVtx" Count="48" Offset="0x324F0">
<Vtx/>
</Array>
<DList Name="gLinkAdultWaistNearDL" Offset="0x35330"/>
<Array Name="gLinkAdultRightThighNearVtx" Count="43" Offset="0x31960">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightThighNearDL" Offset="0x35678"/>
<Array Name="gLinkAdultRightLegNearVtx" Count="56" Offset="0x315E0">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightLegNearDL" Offset="0x358B0"/>
<Array Name="gLinkAdultRightFootNearVtx" Count="41" Offset="0x31350">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightFootNearDL" Offset="0x35B60"/>
<Array Name="gLinkAdultLeftThighNearVtx" Count="44" Offset="0x32230">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftThighNearDL" Offset="0x35CB8"/>
<Array Name="gLinkAdultLeftLegNearVtx" Count="57" Offset="0x31EA0">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftLegNearDL" Offset="0x35EF0"/>
<Array Name="gLinkAdultLeftFootNearVtx" Count="41" Offset="0x31C10">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftFootNearDL" Offset="0x361A0"/>
<Array Name="gLinkAdultCollarNearVtx" Count="14" Offset="0x35250">
<Vtx/>
</Array>
<DList Name="gLinkAdultCollarNearDL" Offset="0x362F8"/>
<Array Name="gLinkAdultTorsoNearVtx" Count="43" Offset="0x34FA0">
<Vtx/>
</Array>
<DList Name="gLinkAdultTorsoNearDL" Offset="0x363B8"/>
<Array Name="gLinkAdultHeadNearVtx" Count="212" Offset="0x32A20">
<Vtx/>
</Array>
<DList Name="gLinkAdultHeadNearDL" Offset="0x365E8"/>
<Array Name="gLinkAdultHatNearVtx" Count="35" Offset="0x327F0">
<Vtx/>
</Array>
<DList Name="gLinkAdultHatNearDL" Offset="0x36D30"/>
<Array Name="gLinkAdultRightShoulderNearVtx" Count="47" Offset="0x34CB0">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightShoulderNearDL" Offset="0x36E58"/>
<Array Name="gLinkAdultRightArmNearVtx" Count="47" Offset="0x349C0">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightArmNearDL" Offset="0x37018"/>
<Array Name="gLinkAdultRightHandNearVtx" Count="67" Offset="0x11A88">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandNearDL" Offset="0x22498"/>
<Array Name="gLinkAdultLeftShoulderNearVtx" Count="47" Offset="0x33DB0">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftShoulderNearDL" Offset="0x37210"/>
<Array Name="gLinkAdultLeftArmNearVtx" Count="47" Offset="0x33AC0">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftArmNearDL" Offset="0x373D8"/>
<Array Name="gLinkAdultLeftHandNearVtx" Count="63" Offset="0x107D8">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandNearDL" Offset="0x21AA8"/>
<Array Name="gLinkAdultBottleVtx" Count="28" Offset="0x206D8">
<Vtx/>
</Array>
<DList Name="gLinkAdultBottleDL" Offset="0x2AD58"/>
<Array Name="gLinkAdultHandHoldingBottleVtx" Count="76" Offset="0x1C468">
<Vtx/>
</Array>
<DList Name="gLinkAdultHandHoldingBottleDL" Offset="0x29600"/>
<!-- Bodypart DLs not directly used in the skeleton -->
<!-- TODO check left vs right-->
<Array Name="gLinkAdultRightHandClosedNearVtx" Count="50" Offset="0x11EB8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandClosedNearDL" Offset="0x226E0"/>
<Array Name="gLinkAdultRightHandClosedFarVtx" Count="39" Offset="0x19C78">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandClosedFarDL" Offset="0x27690"/>
<Array Name="gLinkAdultLeftHandHoldingMasterSwordNearVtx" Count="186" Offset="0x10EE8">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandHoldingMasterSwordNearDL" Offset="0x21F78"/>
<Array Name="gLinkAdultLeftHandHoldingMasterSwordFarVtx" Count="113" Offset="0x193B8">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandHoldingMasterSwordFarDL" Offset="0x27078"/>
<Array Name="gLinkAdultLeftHandClosedNearVtx" Count="50" Offset="0x10BC8">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandClosedNearDL" Offset="0x21CE8"/>
<Array Name="gLinkAdultLeftHandClosedFarVtx" Count="36" Offset="0x19178">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandClosedFarDL" Offset="0x26DF0"/>
<!-- Left hand, left arm, and right arm are used with the Bow. Not sure what right hand is for -->
<Array Name="gLinkAdultRightArmOutNearVtx" Count="123" Offset="0x1C928">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightArmOutNearDL" Offset="0x29918"/>
<Array Name="gLinkAdultRightHandOutNearVtx" Count="218" Offset="0x1D0D8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandOutNearDL" Offset="0x29C20"/>
<Array Name="gLinkAdultLeftArmOutNearVtx" Count="110" Offset="0x1DE78">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftArmOutNearDL" Offset="0x29FA0"/>
<Array Name="gLinkAdultLeftHandOutNearVtx" Count="41" Offset="0x15E78">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandOutNearDL" Offset="0x24B58"/>
<!-- Limbs-->
<Limb Name="gLinkAdultRootLimb" LimbType="LOD" Offset="0x37650"/>
<Limb Name="gLinkAdultWaistLimb" LimbType="LOD" Offset="0x37660"/>
<Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" Offset="0x37670"/>
<Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" Offset="0x37680"/>
<Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" Offset="0x37690"/>
<Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" Offset="0x376A0"/>
<Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" Offset="0x376B0"/>
<Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" Offset="0x376C0"/>
<Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" Offset="0x376D0"/>
<Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" Offset="0x376E0"/>
<Limb Name="gLinkAdultHeadLimb" LimbType="LOD" Offset="0x376F0"/>
<Limb Name="gLinkAdultHatLimb" LimbType="LOD" Offset="0x37700"/>
<Limb Name="gLinkAdultCollarLimb" LimbType="LOD" Offset="0x37710"/>
<Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" Offset="0x37720"/>
<Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" Offset="0x37730"/>
<Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" Offset="0x37740"/>
<Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" Offset="0x37750"/>
<Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" Offset="0x37760"/>
<Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" Offset="0x37770"/>
<Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" Offset="0x37780"/>
<Limb Name="gLinkTorsoLimb" LimbType="LOD" Offset="0x37790"/>
<Limb Name="gLinkAdultRootLimb" LimbType="LOD" EnumName="PLAYER_LIMB_ROOT" Offset="0x37650"/>
<Limb Name="gLinkAdultWaistLimb" LimbType="LOD" EnumName="PLAYER_LIMB_WAIST" Offset="0x37660"/>
<Limb Name="gLinkAdultLowerControlLimb" LimbType="LOD" EnumName="PLAYER_LIMB_LOWER" Offset="0x37670"/>
<Limb Name="gLinkAdultRightThighLimb" LimbType="LOD" EnumName="PLAYER_LIMB_R_THIGH" Offset="0x37680"/>
<Limb Name="gLinkAdultRightLegLimb" LimbType="LOD" EnumName="PLAYER_LIMB_R_SHIN" Offset="0x37690"/>
<Limb Name="gLinkAdultRightFootLimb" LimbType="LOD" EnumName="PLAYER_LIMB_R_FOOT" Offset="0x376A0"/>
<Limb Name="gLinkAdultLeftThighLimb" LimbType="LOD" EnumName="PLAYER_LIMB_L_THIGH" Offset="0x376B0"/>
<Limb Name="gLinkAdultLeftLegLimb" LimbType="LOD" EnumName="PLAYER_LIMB_L_SHIN" Offset="0x376C0"/>
<Limb Name="gLinkAdultLeftFootLimb" LimbType="LOD" EnumName="PLAYER_LIMB_L_FOOT" Offset="0x376D0"/>
<Limb Name="gLinkAdultUpperControlLimb" LimbType="LOD" EnumName="PLAYER_LIMB_UPPER" Offset="0x376E0"/>
<Limb Name="gLinkAdultHeadLimb" LimbType="LOD" EnumName="PLAYER_LIMB_HEAD" Offset="0x376F0"/>
<Limb Name="gLinkAdultHatLimb" LimbType="LOD" EnumName="PLAYER_LIMB_HAT" Offset="0x37700"/>
<Limb Name="gLinkAdultCollarLimb" LimbType="LOD" EnumName="PLAYER_LIMB_COLLAR" Offset="0x37710"/>
<Limb Name="gLinkAdultLeftShoulderLimb" LimbType="LOD" EnumName="PLAYER_LIMB_L_SHOULDER" Offset="0x37720"/>
<Limb Name="gLinkAdultLeftArmLimb" LimbType="LOD" EnumName="PLAYER_LIMB_L_FOREARM" Offset="0x37730"/>
<Limb Name="gLinkAdultLeftHandLimb" LimbType="LOD" EnumName="PLAYER_LIMB_L_HAND" Offset="0x37740"/>
<Limb Name="gLinkAdultRightShoulderLimb" LimbType="LOD" EnumName="PLAYER_LIMB_R_SHOULDER" Offset="0x37750"/>
<Limb Name="gLinkAdultRightArmLimb" LimbType="LOD" EnumName="PLAYER_LIMB_R_FOREARM" Offset="0x37760"/>
<Limb Name="gLinkAdultRightHandLimb" LimbType="LOD" EnumName="PLAYER_LIMB_R_HAND" Offset="0x37770"/>
<Limb Name="gLinkAdultSwordAndSheathLimb" LimbType="LOD" EnumName="PLAYER_LIMB_SHEATH" Offset="0x37780"/>
<Limb Name="gLinkTorsoLimb" LimbType="LOD" EnumName="PLAYER_LIMB_TORSO" Offset="0x37790"/>
<!-- Swords and shields -->
<Array Name="gLinkAdultMasterSwordAndSheathNearVtx" Count="97" Offset="0x12E68">
<Vtx/>
</Array>
<DList Name="gLinkAdultMasterSwordAndSheathNearDL" Offset="0x23160"/>
<Array Name="gLinkAdultMasterSwordAndSheathFarVtx" Count="48" Offset="0x1A638">
<Vtx/>
</Array>
<DList Name="gLinkAdultMasterSwordAndSheathFarDL" Offset="0x27F00"/>
<Array Name="gLinkAdultHylianShieldSwordAndSheathNearVtx" Count="125" Offset="0xEFB8">
<Vtx/>
</Array>
<DList Name="gLinkAdultHylianShieldSwordAndSheathNearDL" Offset="0x20A78"/>
<Array Name="gLinkAdultHylianShieldSwordAndSheathFarVtx" Count="55" Offset="0x18358">
<Vtx/>
</Array>
<DList Name="gLinkAdultHylianShieldSwordAndSheathFarDL" Offset="0x25FB8"/>
<Array Name="gLinkAdultHylianShieldAndSheathNearVtx" Count="54" Offset="0xF788">
<Vtx/>
</Array>
<DList Name="gLinkAdultHylianShieldAndSheathNearDL" Offset="0x20E70"/>
<Array Name="gLinkAdultHylianShieldAndSheathFarVtx" Count="31" Offset="0x186C8">
<Vtx/>
</Array>
<DList Name="gLinkAdultHylianShieldAndSheathFarDL" Offset="0x262B8"/>
<!-- TODO distinguish those two Vtx[] Vtx1 and Vtx2 (also elsewhere) -->
<Array Name="gLinkAdultMirrorShieldAndSheathNearVtx1" Count="68" Offset="0x10398">
<Vtx/>
</Array>
<Array Name="gLinkAdultMirrorShieldAndSheathNearVtx2" Count="10" Offset="0x20598">
<Vtx/>
</Array>
<DList Name="gLinkAdultMirrorShieldAndSheathNearDL" Offset="0x216B0"/>
<Array Name="gLinkAdultMirrorShieldAndSheathFarVtx1" Count="46" Offset="0x18D78">
<Vtx/>
</Array>
<Array Name="gLinkAdultMirrorShieldAndSheathFarVtx2" Count="10" Offset="0x20938">
<Vtx/>
</Array>
<DList Name="gLinkAdultMirrorShieldAndSheathFarDL" Offset="0x26910"/>
<Array Name="gLinkAdultMirrorShieldSwordAndSheathNearVtx1" Count="139" Offset="0xFAE8">
<Vtx/>
</Array>
<Array Name="gLinkAdultMirrorShieldSwordAndSheathNearVtx2" Count="10" Offset="0x204F8">
<Vtx/>
</Array>
<DList Name="gLinkAdultMirrorShieldSwordAndSheathNearDL" Offset="0x211B8"/>
<Array Name="gLinkAdultMirrorShieldSwordAndSheathFarVtx1" Count="76" Offset="0x188B8">
<Vtx/>
</Array>
<Array Name="gLinkAdultMirrorShieldSwordAndSheathFarVtx2" Count="10" Offset="0x20898">
<Vtx/>
</Array>
<DList Name="gLinkAdultMirrorShieldSwordAndSheathFarDL" Offset="0x264F0"/>
<Array Name="gLinkAdultLeftHandHoldingBgsNearVtx" Count="118" Offset="0x14448">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandHoldingBgsNearDL" Offset="0x238C8"/>
<Array Name="gLinkAdultLeftHandHoldingBgsFarVtx" Count="110" Offset="0x1B0C8">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandHoldingBgsFarDL" Offset="0x286B8"/>
<Array Name="gLinkAdultHandHoldingBrokenGiantsKnifeVtx" Count="93" Offset="0x14BA8">
<Vtx/>
</Array>
<DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeDL" Offset="0x23D50"/>
<Array Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarVtx" Count="86" Offset="0x1BF08">
<Vtx/>
</Array>
<DList Name="gLinkAdultHandHoldingBrokenGiantsKnifeFarDL" Offset="0x291E8"/>
<Array Name="gLinkAdultSheathNearVtx" Count="26" Offset="0x15CD8">
<Vtx/>
</Array>
<DList Name="gLinkAdultSheathNearDL" Offset="0x249D8"/>
<Array Name="gLinkAdultSheathFarVtx" Count="14" Offset="0x1A938">
<Vtx/>
</Array>
<DList Name="gLinkAdultSheathFarDL" Offset="0x28150"/>
<Array Name="gLinkAdultRightHandHoldingHylianShieldNearVtx" Count="78" Offset="0x121D8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingHylianShieldNearDL" Offset="0x22970"/>
<Array Name="gLinkAdultRightHandHoldingHylianShieldFarVtx" Count="28" Offset="0x19EE8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingHylianShieldFarDL" Offset="0x27918"/>
<Array Name="gLinkAdultBrokenGiantsKnifeBladeVtx" Count="48" Offset="0x2B738">
<Vtx/>
</Array>
<DList Name="gLinkAdultBrokenGiantsKnifeBladeDL" Offset="0x2BA38"/> <!-- Used for when Giants Knife shatters -->
<Texture Name="gLinkAdultTLUT1" Format="rgba16" Width="16" Height="16" Offset="0x5400"/>
<Texture Name="gLinkAdultTLUT2" Format="rgba16" Width="16" Height="16" Offset="0x5800"/>
<Texture Name="gLinkAdultTLUT3" Format="rgba16" Width="8" Height="11" Offset="0x5A00"/>
<Blob Name="gLinkAdult_5AB0_Blob" Size="0x150" Offset="0x5AB0" />
<Texture Name="gLinkAdultTLUT4" Format="rgba16" Width="16" Height="16" Offset="0xCB40"/>
<Blob Name="gLinkAdult_CD40_Blob" Size="8" Offset="0xCD40" />
<Texture Name="gLinkAdultTLUT5" Format="rgba16" Width="16" Height="16" Offset="0xCD48"/>
<Blob Name="gLinkAdult_CF48_Blob" Size="8" Offset="0xCF48" />
<Texture Name="gLinkAdultTLUT6" Format="rgba16" Width="12" Height="12" Offset="0xCF50"/>
<Blob Name="gLinkAdult_D070_Blob" Size="8" Offset="0xD070" />
<Texture Name="gLinkAdultTLUT7" Format="rgba16" Width="8" Height="4" Offset="0xD078"/>
<Texture Name="gLinkAdultShieldHandleTex" OutName="shield_handle" Format="ci8" Width="8" Height="16" Offset="0xD4B8" TlutOffset="0xCD48"/>
@ -162,25 +375,73 @@
<Texture Name="gLinkAdultEarringTex" OutName="earring" Format="ia16" Width="32" Height="32" Offset="0x7180"/>
<!-- Bow -->
<Array Name="gLinkAdultRightHandHoldingBowNearVtx" Count="123" Offset="0x126B8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingBowNearDL" Offset="0x22DA8"/>
<Array Name="gLinkAdultRightHandHoldingBowFarVtx" Count="89" Offset="0x1A0A8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingBowFarDL" Offset="0x27B88"/>
<Array Name="gLinkAdultRightHandHoldingBowFirstPersonVtx" Count="212" Offset="0x1E558">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingBowFirstPersonDL" Offset="0x2A248"/>
<Array Name="gLinkAdultBowStringVtx" Count="6" Offset="0x2B0A8">
<Vtx/>
</Array>
<DList Name="gLinkAdultBowStringDL" Offset="0x2B108"/>
<Array Name="gLinkAdultLeftHandHoldingHammerNearVtx" Count="253" Offset="0x13478">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandHoldingHammerNearDL" Offset="0x233E0"/>
<Array Name="gLinkAdultLeftHandHoldingHammerFarVtx" Count="107" Offset="0x1AA18">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHandHoldingHammerFarDL" Offset="0x28288"/>
<Array Name="gLinkAdultRightHandHoldingMirrorShieldNearVtx1" Count="92" Offset="0x15178">
<Vtx/>
</Array>
<Array Name="gLinkAdultRightHandHoldingMirrorShieldNearVtx2" Count="10" Offset="0x20638">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingMirrorShieldNearDL" Offset="0x241C0"/>
<Array Name="gLinkAdultRightHandHoldingMirrorShieldFarVtx1" Count="68" Offset="0x1B7A8">
<Vtx/>
</Array>
<Array Name="gLinkAdultRightHandHoldingMirrorShieldFarVtx2" Count="10" Offset="0x209D8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingMirrorShieldFarDL" Offset="0x28B40"/>
<!-- Ocarina -->
<Array Name="gLinkAdultRightHandHoldingOotNearVtx" Count="90" Offset="0x15738">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingOotNearDL" Offset="0x24698"/>
<Array Name="gLinkAdultRightHandHoldingOotFarVtx" Count="50" Offset="0x1BBE8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingOotFarDL" Offset="0x28F58"/>
<!-- Hookshot -->
<Array Name="gLinkAdultRightHandHoldingHookshotNearVtx" Count="108" Offset="0x16108">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingHookshotNearDL" Offset="0x24D70"/>
<Array Name="gLinkAdultRightHandHoldingHookshotFarVtx" Count="294" Offset="0x1F298">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHandHoldingHookshotFarDL" Offset="0x2A738"/>
<Array Name="gLinkAdultHookshotChainVtx" Count="24" Offset="0x2AE70">
<Vtx/>
</Array>
<DList Name="gLinkAdultHookshotChainDL" Offset="0x2AFF0"/>
<Array Name="gLinkAdultHookshotTipVtx" Count="18" Offset="0x2B168">
<Vtx/>
</Array>
<DList Name="gLinkAdultHookshotTipDL" Offset="0x2B288"/>
<Texture Name="gLinkAdultHookshotMetalTex" OutName="hookshot_metal" Format="rgba16" Width="8" Height="8" Offset="0xCA80"/>
<Texture Name="gLinkAdultHookshotHandleTex" OutName="hookshot_handle" Format="ci8" Width="16" Height="8" Offset="0xEB38" TlutOffset="0xCD48"/>
@ -200,25 +461,58 @@
<Texture Name="gLinkAdultNose2Tex" OutName="nose2" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5C00"/>
<!-- Gauntlets -->
<Array Name="gLinkAdultLeftGauntletPlate1Vtx" Count="24" Offset="0x167C8">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftGauntletPlate1DL" Offset="0x25218"/>
<Array Name="gLinkAdultLeftGauntletPlate2Vtx" Count="38" Offset="0x16948">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftGauntletPlate2DL" Offset="0x252D8"/>
<Array Name="gLinkAdultLeftGauntletPlate3Vtx" Count="38" Offset="0x16BA8">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftGauntletPlate3DL" Offset="0x25438"/>
<Array Name="gLinkAdultRightGauntletPlate1Vtx" Count="24" Offset="0x16E08">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightGauntletPlate1DL" Offset="0x25598"/>
<Array Name="gLinkAdultRightGauntletPlate2Vtx" Count="38" Offset="0x16F88">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightGauntletPlate2DL" Offset="0x25658"/>
<Array Name="gLinkAdultRightGauntletPlate3Vtx" Count="38" Offset="0x171E8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightGauntletPlate3DL" Offset="0x257B8"/>
<Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
<Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
<Array Name="gLinkAdultHookshotReticleVtx" Count="3" Offset="0x2CB18">
<Vtx/>
</Array>
<DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
<!-- Boots -->
<Array Name="gLinkAdultLeftIronBootVtx" Count="43" Offset="0x17448">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftIronBootDL" Offset="0x25918"/> <!-- TODO verify the positions-->
<Array Name="gLinkAdultRightIronBootVtx" Count="44" Offset="0x176F8">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightIronBootDL" Offset="0x25A60"/>
<Texture Name="gLinkAdultIronBootTex" OutName="iron_boot" Format="ci8" Width="16" Height="16" Offset="0xD1B8" TlutOffset="0xCB40"/>
<Array Name="gLinkAdultLeftHoverBootVtx" Count="77" Offset="0x179B8">
<Vtx/>
</Array>
<DList Name="gLinkAdultLeftHoverBootDL" Offset="0x25BA8"/>
<Array Name="gLinkAdultRightHoverBootVtx" Count="77" Offset="0x17E88">
<Vtx/>
</Array>
<DList Name="gLinkAdultRightHoverBootDL" Offset="0x25DB0"/>
<Texture Name="gLinkAdultHoverBootsHeelTex" OutName="hover_boots_heel" Format="rgba16" Width="16" Height="8" Offset="0xA580"/>
<Texture Name="gLinkAdultHoverBootsJetTex" OutName="hover_boots_jet" Format="rgba16" Width="32" Height="32" Offset="0xA680"/>

2
src/code/z_kankyo.c
View File

@ -238,7 +238,7 @@ s16 sLightningFlashAlpha;
s16 sSunDepthTestX;
s16 sSunDepthTestY;
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:192 pal-1.1:192"
LightNode* sNGameOverLightNode;

2
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View File

@ -27,7 +27,7 @@
#include "assets/objects/object_tw/object_tw.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128"
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \

4
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View File

@ -22,8 +22,8 @@
#include "assets/objects/object_efc_star_field/object_efc_star_field.h"
#include "assets/objects/object_toki_objects/object_toki_objects.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:128" \
"ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

4
src/overlays/actors/ovl_Fishing/z_fishing.c
View File

@ -37,8 +37,8 @@
#include "cic6105.h"
#endif
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:0" \
"ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:128" \
"ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

10
src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -362,21 +362,21 @@ void Player_Action_CsAction(Player* this, PlayState* play);
// .bss part 1
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:0 ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
static s32 D_80858AA0;
// TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving
// data around. It would be easier if we had more options for controlling BSS ordering in debug.
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
"ique-cn:192 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:224 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
static s32 sSavedCurrentMask;
static Vec3f sInteractWallCheckResult;
static Input* sControlInput;
#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
"ique-cn:192 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
// .data