mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-15 20:40:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_player_lib: Part 2 (#938)

Browse Source 
* preparations

* import data

* PLAYER_STATE1

* PLAYER_STATE2

* PLAYER_STATE3

* import bss

* format stuff

* bss cleanup

* more cleaning and some naming

* face

* cleaning up link human object a bit

* Remove PHYSICAL_TO_VIRTUAL2

* Update src/code/z_player_lib.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* format

* /* CAT */

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* naming some stuff on objects

* format

* invert flags endian

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* format

* drawmask

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* naming

* another round of human object naming

* enum renames

* sActionModelGroups and use enum as types

* PlayerAnimType

* PLAYER_MODELTYPE_

* determined ranges of PlayerModelType

* name PLAYER_MODELGROUP_DEFAULT

* format

* sheath

* dlist groups placeholder namse

* PLAYER_MODELGROUP_BOTTLE

* Some fierce deity naming

* Right hands

* zora skel dlists

* deku limb dlists

* left hands

* name most modelgroups

* more hand naming

* regs as dec

* fix in horse

* Use BUTTON_ITEM_EQUIP macro

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* reformat D_801AED58

* Sword sheaths

* swords and shields

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* playerForm on Player_DrawImpl

* fomat

* Update src/code/z_player_lib.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update assets/xml/objects/gameplay_keep.xml

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex))

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* singular limb enum names

* fix bss

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* name goron shielding limbs

* name limb

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* bss

* bss

* format

* namefixer

* bss

* bss

* bss

* bss

* format

* bss

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* fix bss

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Anghelo Carvajal
2022-10-15 19:12:01 -03:00
committed by GitHub
parent 638f5062cb
commit bd373940ac
139 changed files with 2323 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_link_nuts.xml
+42 -40
View File
@@ -1,23 +1,24 @@
<Root>
<File Name="object_link_nuts" Segment="6">
<DList Name="object_link_nuts_DL_0025D0" Offset="0x25D0" />
<DList Name="object_link_nuts_DL_0026D8" Offset="0x26D8" />
<DList Name="object_link_nuts_DL_0027E0" Offset="0x27E0" />
<DList Name="object_link_nuts_DL_0028F8" Offset="0x28F8" />
<DList Name="object_link_nuts_DL_002A00" Offset="0x2A00" />
<DList Name="object_link_nuts_DL_002B08" Offset="0x2B08" />
<DList Name="object_link_nuts_DL_002C20" Offset="0x2C20" />
<DList Name="object_link_nuts_DL_002DD8" Offset="0x2DD8" />
<DList Name="object_link_nuts_DL_002E98" Offset="0x2E98" />
<DList Name="object_link_nuts_DL_002FD0" Offset="0x2FD0" />
<DList Name="object_link_nuts_DL_003488" Offset="0x3488" />
<DList Name="object_link_nuts_DL_0035F0" Offset="0x35F0" />
<DList Name="object_link_nuts_DL_0036B0" Offset="0x36B0" />
<DList Name="object_link_nuts_DL_0037B8" Offset="0x37B8" />
<DList Name="object_link_nuts_DL_0038C0" Offset="0x38C0" />
<DList Name="object_link_nuts_DL_0039B0" Offset="0x39B0" />
<DList Name="object_link_nuts_DL_003AB8" Offset="0x3AB8" />
<DList Name="object_link_nuts_DL_003BC0" Offset="0x3BC0" />
<DList Name="gLinkDekuRightThighDL" Offset="0x25D0" />
<DList Name="gLinkDekuRightShinDL" Offset="0x26D8" />
<DList Name="gLinkDekuRightFootDL" Offset="0x27E0" />
<DList Name="gLinkDekuLeftThighDL" Offset="0x28F8" />
<DList Name="gLinkDekuLeftShinDL" Offset="0x2A00" />
<DList Name="gLinkDekuLeftFootDL" Offset="0x2B08" />
<DList Name="gLinkDekuWaistDL" Offset="0x2C20" />
<DList Name="gLinkDekuCollarDL" Offset="0x2DD8" />
<DList Name="gLinkDekuTorsoDL" Offset="0x2E98" />
<DList Name="gLinkDekuHeadDL" Offset="0x2FD0" />
<DList Name="gLinkDekuHatDL" Offset="0x3488" />
<DList Name="gLinkDekuSheathDL" Offset="0x35F0" />
<DList Name="gLinkDekuRightShoulderDL" Offset="0x36B0" />
<DList Name="gLinkDekuRightForearmDL" Offset="0x37B8" />
<DList Name="gLinkDekuRightHandDL" Offset="0x38C0" />
<DList Name="gLinkDekuLeftShoulderDL" Offset="0x39B0" />
<DList Name="gLinkDekuLeftForearmDL" Offset="0x3AB8" />
<DList Name="gLinkDekuLeftHandDL" Offset="0x3BC0" />
<Texture Name="object_link_nuts_TLUT_003CB0" OutName="tlut_003CB0" Format="rgba16" Width="16" Height="16" Offset="0x3CB0" />
<Texture Name="object_link_nuts_TLUT_003EB0" OutName="tlut_003EB0" Format="rgba16" Width="16" Height="16" Offset="0x3EB0" />
<Texture Name="object_link_nuts_Tex_0040B0" OutName="tex_0040B0" Format="ci8" Width="16" Height="16" Offset="0x40B0" />
@@ -53,27 +54,28 @@
<Texture Name="object_link_nuts_Tex_00A4E0" OutName="tex_00A4E0" Format="rgba16" Width="32" Height="64" Offset="0xA4E0" />
<DList Name="object_link_nuts_DL_00B690" Offset="0xB690" />
<Texture Name="object_link_nuts_Tex_00B780" OutName="tex_00B780" Format="ci8" Width="16" Height="16" Offset="0xB780" />
<Limb Name="object_link_nuts_Lodlimb_00B880" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_01" Offset="0xB880" />
<Limb Name="object_link_nuts_Lodlimb_00B890" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_02" Offset="0xB890" />
<Limb Name="object_link_nuts_Lodlimb_00B8A0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_03" Offset="0xB8A0" />
<Limb Name="object_link_nuts_Lodlimb_00B8B0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_04" Offset="0xB8B0" />
<Limb Name="object_link_nuts_Lodlimb_00B8C0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_05" Offset="0xB8C0" />
<Limb Name="object_link_nuts_Lodlimb_00B8D0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_06" Offset="0xB8D0" />
<Limb Name="object_link_nuts_Lodlimb_00B8E0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_07" Offset="0xB8E0" />
<Limb Name="object_link_nuts_Lodlimb_00B8F0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_08" Offset="0xB8F0" />
<Limb Name="object_link_nuts_Lodlimb_00B900" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_09" Offset="0xB900" />
<Limb Name="object_link_nuts_Lodlimb_00B910" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_0A" Offset="0xB910" />
<Limb Name="object_link_nuts_Lodlimb_00B920" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_0B" Offset="0xB920" />
<Limb Name="object_link_nuts_Lodlimb_00B930" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_0C" Offset="0xB930" />
<Limb Name="object_link_nuts_Lodlimb_00B940" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_0D" Offset="0xB940" />
<Limb Name="object_link_nuts_Lodlimb_00B950" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_0E" Offset="0xB950" />
<Limb Name="object_link_nuts_Lodlimb_00B960" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_0F" Offset="0xB960" />
<Limb Name="object_link_nuts_Lodlimb_00B970" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_10" Offset="0xB970" />
<Limb Name="object_link_nuts_Lodlimb_00B980" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_11" Offset="0xB980" />
<Limb Name="object_link_nuts_Lodlimb_00B990" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_12" Offset="0xB990" />
<Limb Name="object_link_nuts_Lodlimb_00B9A0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_13" Offset="0xB9A0" />
<Limb Name="object_link_nuts_Lodlimb_00B9B0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_14" Offset="0xB9B0" />
<Limb Name="object_link_nuts_Lodlimb_00B9C0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_15" Offset="0xB9C0" />
<Skeleton Name="object_link_nuts_Skel_00BA24" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_NUTS_LIMB_NONE" LimbMax="OBJECT_LINK_NUTS_LIMB_MAX" EnumName="ObjectLinkNutsLimb" Offset="0xBA24" />
<Limb Name="gLinkDekuRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_ROOT" Offset="0xB880" />
<Limb Name="gLinkDekuWaistLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_WAIST" Offset="0xB890" />
<Limb Name="gLinkDekuLowerRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LOWER_ROOT" Offset="0xB8A0" />
<Limb Name="gLinkDekuRightThighLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_THIGH" Offset="0xB8B0" />
<Limb Name="gLinkDekuRightShinLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_SHIN" Offset="0xB8C0" />
<Limb Name="gLinkDekuRightFootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_FOOT" Offset="0xB8D0" />
<Limb Name="gLinkDekuLeftThighLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_THIGH" Offset="0xB8E0" />
<Limb Name="gLinkDekuLeftShinLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_SHIN" Offset="0xB8F0" />
<Limb Name="gLinkDekuLeftFootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_FOOT" Offset="0xB900" />
<Limb Name="gLinkDekuUpperRootLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_UPPER_ROOT" Offset="0xB910" />
<Limb Name="gLinkDekuHeadLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_HEAD" Offset="0xB920" />
<Limb Name="gLinkDekuHatLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_HAT" Offset="0xB930" />
<Limb Name="gLinkDekuCollarLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_COLLAR" Offset="0xB940" />
<Limb Name="gLinkDekuLeftShoulderLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_SHOULDER" Offset="0xB950" />
<Limb Name="gLinkDekuLeftForearmLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_FOREARM" Offset="0xB960" />
<Limb Name="gLinkDekuLeftHandLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_LEFT_HAND" Offset="0xB970" />
<Limb Name="gLinkDekuRightShoulderLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_SHOULDER" Offset="0xB980" />
<Limb Name="gLinkDekuRightForearmLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_FOREARM" Offset="0xB990" />
<Limb Name="gLinkDekuRightHandLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_RIGHT_HAND" Offset="0xB9A0" />
<Limb Name="gLinkDekuSheathLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_SHEATH" Offset="0xB9B0" />
<Limb Name="gLinkDekuTorsoLimb" Type="LOD" EnumName="LINK_DEKU_LIMB_TORSO" Offset="0xB9C0" />
<Skeleton Name="gLinkDekuSkel" Type="Flex" LimbType="LOD" LimbNone="LINK_DEKU_LIMB_NONE" LimbMax="LINK_DEKU_LIMB_MAX" EnumName="LinkDekuLimb" Offset="0xBA24" />
</File>
</Root>