mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-03 16:26:17 +00:00
0f644b7545
* . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com>
55 lines
3.9 KiB
XML
55 lines
3.9 KiB
XML
<Root>
|
|
<File Name="object_js" Segment="6">
|
|
<!-- Carpet Merchant Skeleton -->
|
|
<Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
|
|
|
|
<!-- Carpet Merchant Limbs -->
|
|
<Limb Name="gCarpetMerchantRootLimb" Type="Standard" Offset="0x5DE0"/>
|
|
<Limb Name="gCarpetMerchantTopRootLimb" Type="Standard" Offset="0x5DEC"/>
|
|
<Limb Name="gCarpetMerchantLowerHairLimb" Type="Standard" Offset="0x5DF8"/>
|
|
<Limb Name="gCarpetMerchantUpperHairLimb" Type="Standard" Offset="0x5E04"/>
|
|
<Limb Name="gCarpetMerchantTorsoLimb" Type="Standard" Offset="0x5E10"/>
|
|
<Limb Name="gCarpetMerchantUpperArmLeftLimb" Type="Standard" Offset="0x5E1C"/>
|
|
<Limb Name="gCarpetMerchantForearmLeftLimb" Type="Standard" Offset="0x5E28"/>
|
|
<Limb Name="gCarpetMerchantLeftHandLimb" Type="Standard" Offset="0x5E34"/>
|
|
<Limb Name="gCarpetMerchantUpperArmRightLimb" Type="Standard" Offset="0x5E40"/>
|
|
<Limb Name="gCarpetMerchantForearmRightLimb" Type="Standard" Offset="0x5E4C"/>
|
|
<Limb Name="gCarpetMerchantRightHandLimb" Type="Standard" Offset="0x5E58"/>
|
|
<Limb Name="gCarpetMerchantHeadLimb" Type="Standard" Offset="0x5E64"/>
|
|
|
|
<!-- Carpet Merchant Limb DisplayLists -->
|
|
<DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
|
|
<DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
|
|
<DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
|
|
<DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
|
|
<DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
|
|
<DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
|
|
<DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
|
|
<DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
|
|
<DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
|
|
<DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
|
|
<DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
|
|
|
|
<!-- Carpet Merchant Palettes -->
|
|
<Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
|
|
|
|
<!-- Carpet Merchant DisplayList Textures -->
|
|
<Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
|
|
<Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
|
|
|
|
<!-- Carpet Merchant Animations -->
|
|
<Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
|
|
<Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
|
|
|
|
<!-- Carpet Merchant Collision -->
|
|
<Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
|
|
</File>
|
|
</Root>
|