mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-03 01:53:58 -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_goron.xml
+60 -50
View File
@@ -1,8 +1,13 @@
<Root>
<File Name="object_link_goron" Segment="6">
<!-- <Blob Name="object_link_goron_Blob_000000" Size="0x2000" Offset="0x0" /> -->
<Texture Name="gLinkGoronEyesOpenTex" OutName="eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0" TlutOffset="0x2200" />
<Texture Name="gLinkGoronEyesHalfTex" OutName="eyes_half" Format="ci8" Width="64" Height="32" Offset="0x800" TlutOffset="0x2200" />
<Texture Name="gLinkGoronEyesClosedTex" OutName="eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x2200" />
<Texture Name="gLinkGoronEyesSurprisedTex" OutName="eyes_surprised" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x2200" />
<Texture Name="object_link_goron_TLUT_002000" OutName="tlut_002000" Format="rgba16" Width="16" Height="16" Offset="0x2000" />
<Texture Name="object_link_goron_Tex_002200" OutName="tex_002200" Format="rgba16" Width="16" Height="16" Offset="0x2200" />
<Texture Name="gLinkGoronSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2200" />
<Texture Name="object_link_goron_Tex_002400" OutName="tex_002400" Format="rgba16" Width="8" Height="32" Offset="0x2400" />
<Texture Name="object_link_goron_Tex_002600" OutName="tex_002600" Format="ci8" Width="16" Height="16" Offset="0x2600" />
<Texture Name="object_link_goron_Tex_002700" OutName="tex_002700" Format="rgba16" Width="8" Height="8" Offset="0x2700" />
@@ -17,26 +22,28 @@
<Texture Name="object_link_goron_Tex_003E40" OutName="tex_003E40" Format="ci8" Width="32" Height="32" Offset="0x3E40" />
<Texture Name="object_link_goron_Tex_004240" OutName="tex_004240" Format="ci8" Width="8" Height="32" Offset="0x4240" />
<Texture Name="object_link_goron_Tex_004340" OutName="tex_004340" Format="i8" Width="8" Height="8" Offset="0x4340" />
<DList Name="object_link_goron_DL_008140" Offset="0x8140" />
<DList Name="object_link_goron_DL_008230" Offset="0x8230" />
<DList Name="object_link_goron_DL_008500" Offset="0x8500" />
<DList Name="object_link_goron_DL_0086A0" Offset="0x86A0" />
<DList Name="object_link_goron_DL_008790" Offset="0x8790" />
<DList Name="object_link_goron_DL_008A60" Offset="0x8A60" />
<DList Name="object_link_goron_DL_008C00" Offset="0x8C00" />
<DList Name="object_link_goron_DL_008C98" Offset="0x8C98" />
<DList Name="object_link_goron_DL_008F18" Offset="0x8F18" />
<DList Name="object_link_goron_DL_0091F0" Offset="0x91F0" />
<DList Name="object_link_goron_DL_009898" Offset="0x9898" />
<DList Name="object_link_goron_DL_0099D8" Offset="0x99D8" />
<DList Name="object_link_goron_DL_009A98" Offset="0x9A98" />
<DList Name="object_link_goron_DL_009C18" Offset="0x9C18" />
<DList Name="object_link_goron_DL_009EF8" Offset="0x9EF8" />
<DList Name="object_link_goron_DL_00A0A0" Offset="0xA0A0" />
<DList Name="object_link_goron_DL_00A220" Offset="0xA220" />
<DList Name="object_link_goron_DL_00A500" Offset="0xA500" />
<DList Name="gLinkGoronRightThighDL" Offset="0x8140" />
<DList Name="gLinkGoronRightShinDL" Offset="0x8230" />
<DList Name="gLinkGoronRightFootDL" Offset="0x8500" />
<DList Name="gLinkGoronLeftThighDL" Offset="0x86A0" />
<DList Name="gLinkGoronLeftShinDL" Offset="0x8790" />
<DList Name="gLinkGoronLeftFootDL" Offset="0x8A60" />
<DList Name="gLinkGoronWaistDL" Offset="0x8C00" />
<DList Name="gLinkGoronCollarDL" Offset="0x8C98" />
<DList Name="gLinkGoronTorsoDL" Offset="0x8F18" />
<DList Name="gLinkGoronHeadDL" Offset="0x91F0" />
<DList Name="gLinkGoronHatDL" Offset="0x9898" />
<DList Name="gLinkGoronSheathDL" Offset="0x99D8" />
<DList Name="gLinkGoronRightShoulderDL" Offset="0x9A98" />
<DList Name="gLinkGoronRightForearmDL" Offset="0x9C18" />
<DList Name="gLinkGoronRightHandOpenDL" Offset="0x9EF8" />
<DList Name="gLinkGoronLeftShoulderDL" Offset="0xA0A0" />
<DList Name="gLinkGoronLeftForearmDL" Offset="0xA220" />
<DList Name="gLinkGoronLeftHandOpenDL" Offset="0xA500" />
<DList Name="gLinkGoronCurledDL" Offset="0xBDD8" />
<DList Name="object_link_goron_DL_00C540" Offset="0xC540" />
<Texture Name="object_link_goron_Tex_00C6B8" OutName="tex_00C6B8" Format="ci8" Width="32" Height="64" Offset="0xC6B8" />
<Texture Name="object_link_goron_Tex_00CEB8" OutName="tex_00CEB8" Format="rgba16" Width="8" Height="16" Offset="0xCEB8" />
<Texture Name="object_link_goron_Tex_00CFB8" OutName="tex_00CFB8" Format="ci8" Width="16" Height="16" Offset="0xCFB8" />
@@ -45,9 +52,9 @@
<Texture Name="object_link_goron_Tex_00D3B8" OutName="tex_00D3B8" Format="rgba16" Width="8" Height="16" Offset="0xD3B8" />
<Texture Name="object_link_goron_Tex_00D4B8" OutName="tex_00D4B8" Format="rgba16" Width="16" Height="32" Offset="0xD4B8" />
<Texture Name="object_link_goron_Tex_00D8B8" OutName="tex_00D8B8" Format="i8" Width="8" Height="8" Offset="0xD8B8" />
<DList Name="object_link_goron_DL_00DE68" Offset="0xDE68" />
<DList Name="gLinkGoronLeftHandClosedDL" Offset="0xDE68" />
<Texture Name="object_link_goron_Tex_00E078" OutName="tex_00E078" Format="rgba16" Width="16" Height="16" Offset="0xE078" />
<DList Name="object_link_goron_DL_00E7E8" Offset="0xE7E8" />
<DList Name="gLinkGoronRightHandClosedDL" Offset="0xE7E8" />
<DList Name="object_link_goron_DL_00FC18" Offset="0xFC18" />
<DList Name="object_link_goron_DL_00FCF0" Offset="0xFCF0" />
<DList Name="object_link_goron_DL_00FF18" Offset="0xFF18" />
@@ -59,7 +66,7 @@
<Texture Name="object_link_goron_Tex_010AB8" OutName="tex_010AB8" Format="ci8" Width="16" Height="8" Offset="0x10AB8" />
<Texture Name="object_link_goron_Tex_010B38" OutName="tex_010B38" Format="ci8" Width="16" Height="16" Offset="0x10B38" />
<Texture Name="object_link_goron_Tex_010C38" OutName="tex_010C38" Format="ci8" Width="32" Height="32" Offset="0x10C38" />
<DList Name="object_link_goron_DL_011468" Offset="0x11468" />
<DList Name="gLinkGoronLeftHandHoldBottleDL" Offset="0x11468" />
<Texture Name="object_link_goron_Tex_011628" OutName="tex_011628" Format="ci8" Width="16" Height="16" Offset="0x11628" />
<Texture Name="object_link_goron_Tex_011728" OutName="tex_011728" Format="rgba16" Width="8" Height="32" Offset="0x11728" />
<DList Name="gLinkGoronGoronPunchEffectDL" Offset="0x11AB8" />
@@ -76,33 +83,36 @@
<DList Name="object_link_goron_DL_016A88" Offset="0x16A88" />
<DList Name="object_link_goron_DL_017180" Offset="0x17180" />
<DList Name="object_link_goron_DL_017620" Offset="0x17620" />
<Limb Name="object_link_goron_Standardlimb_017778" Type="Standard" EnumName="OBJECT_LINK_GORON_1_LIMB_01" Offset="0x17778" />
<Limb Name="object_link_goron_Standardlimb_017784" Type="Standard" EnumName="OBJECT_LINK_GORON_1_LIMB_02" Offset="0x17784" />
<Limb Name="object_link_goron_Standardlimb_017790" Type="Standard" EnumName="OBJECT_LINK_GORON_1_LIMB_03" Offset="0x17790" />
<Limb Name="object_link_goron_Standardlimb_01779C" Type="Standard" EnumName="OBJECT_LINK_GORON_1_LIMB_04" Offset="0x1779C" />
<Skeleton Name="object_link_goron_Skel_0177B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_GORON_1_LIMB_NONE" LimbMax="OBJECT_LINK_GORON_1_LIMB_MAX" EnumName="ObjectLinkGoron1Limb" Offset="0x177B8" />
<Limb Name="gLinkGoronShieldingRootLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_ROOT" Offset="0x17778" />
<Limb Name="gLinkGoronShieldingBodyLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_BODY" Offset="0x17784" />
<Limb Name="gLinkGoronShieldingHeadLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_HEAD" Offset="0x17790" />
<Limb Name="gLinkGoronShieldingArmsAndLegsLimb" Type="Standard" EnumName="LINK_GORON_SHIELDING_LIMB_ARMS_AND_LEGS" Offset="0x1779C" />
<Skeleton Name="gLinkGoronShieldingSkel" Type="Flex" LimbType="Standard" LimbNone="LINK_GORON_SHIELDING_LIMB_NONE" LimbMax="LINK_GORON_SHIELDING_LIMB_MAX" EnumName="LinkGoronShieldingLimb" Offset="0x177B8" />
<!-- <Blob Name="object_link_goron_Blob_0178D0" Size="0x10" Offset="0x178D0" /> -->
<Limb Name="object_link_goron_Lodlimb_0178E0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_01" Offset="0x178E0" />
<Limb Name="object_link_goron_Lodlimb_0178F0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_02" Offset="0x178F0" />
<Limb Name="object_link_goron_Lodlimb_017900" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_03" Offset="0x17900" />
<Limb Name="object_link_goron_Lodlimb_017910" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_04" Offset="0x17910" />
<Limb Name="object_link_goron_Lodlimb_017920" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_05" Offset="0x17920" />
<Limb Name="object_link_goron_Lodlimb_017930" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_06" Offset="0x17930" />
<Limb Name="object_link_goron_Lodlimb_017940" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_07" Offset="0x17940" />
<Limb Name="object_link_goron_Lodlimb_017950" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_08" Offset="0x17950" />
<Limb Name="object_link_goron_Lodlimb_017960" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_09" Offset="0x17960" />
<Limb Name="object_link_goron_Lodlimb_017970" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_0A" Offset="0x17970" />
<Limb Name="object_link_goron_Lodlimb_017980" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_0B" Offset="0x17980" />
<Limb Name="object_link_goron_Lodlimb_017990" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_0C" Offset="0x17990" />
<Limb Name="object_link_goron_Lodlimb_0179A0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_0D" Offset="0x179A0" />
<Limb Name="object_link_goron_Lodlimb_0179B0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_0E" Offset="0x179B0" />
<Limb Name="object_link_goron_Lodlimb_0179C0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_0F" Offset="0x179C0" />
<Limb Name="object_link_goron_Lodlimb_0179D0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_10" Offset="0x179D0" />
<Limb Name="object_link_goron_Lodlimb_0179E0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_11" Offset="0x179E0" />
<Limb Name="object_link_goron_Lodlimb_0179F0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_12" Offset="0x179F0" />
<Limb Name="object_link_goron_Lodlimb_017A00" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_13" Offset="0x17A00" />
<Limb Name="object_link_goron_Lodlimb_017A10" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_14" Offset="0x17A10" />
<Limb Name="object_link_goron_Lodlimb_017A20" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_15" Offset="0x17A20" />
<Skeleton Name="object_link_goron_Skel_017A84" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_GORON_2_LIMB_NONE" LimbMax="OBJECT_LINK_GORON_2_LIMB_MAX" EnumName="ObjectLinkGoron2Limb" Offset="0x17A84" />
<Limb Name="gLinkGoronRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_ROOT" Offset="0x178E0" />
<Limb Name="gLinkGoronWaistLimb" Type="LOD" EnumName="LINK_GORON_LIMB_WAIST" Offset="0x178F0" />
<Limb Name="gLinkGoronLowerRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LOWER_ROOT" Offset="0x17900" />
<Limb Name="gLinkGoronRightThighLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_THIGH" Offset="0x17910" />
<Limb Name="gLinkGoronRightShinLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_SHIN" Offset="0x17920" />
<Limb Name="gLinkGoronRightFootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_FOOT" Offset="0x17930" />
<Limb Name="gLinkGoronLeftThighLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_THIGH" Offset="0x17940" />
<Limb Name="gLinkGoronLeftShinLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_SHIN" Offset="0x17950" />
<Limb Name="gLinkGoronLeftFootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_FOOT" Offset="0x17960" />
<Limb Name="gLinkGoronUpperRootLimb" Type="LOD" EnumName="LINK_GORON_LIMB_UPPER_ROOT" Offset="0x17970" />
<Limb Name="gLinkGoronHeadLimb" Type="LOD" EnumName="LINK_GORON_LIMB_HEAD" Offset="0x17980" />
<Limb Name="gLinkGoronHatLimb" Type="LOD" EnumName="LINK_GORON_LIMB_HAT" Offset="0x17990" />
<Limb Name="gLinkGoronCollarLimb" Type="LOD" EnumName="LINK_GORON_LIMB_COLLAR" Offset="0x179A0" />
<Limb Name="gLinkGoronLeftShoulderLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_SHOULDER" Offset="0x179B0" />
<Limb Name="gLinkGoronLeftForearmLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_FOREARM" Offset="0x179C0" />
<Limb Name="gLinkGoronLeftHandLimb" Type="LOD" EnumName="LINK_GORON_LIMB_LEFT_HAND" Offset="0x179D0" />
<Limb Name="gLinkGoronRightShoulderLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_SHOULDER" Offset="0x179E0" />
<Limb Name="gLinkGoronRightForearmLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_FOREARM" Offset="0x179F0" />
<Limb Name="gLinkGoronRightHandLimb" Type="LOD" EnumName="LINK_GORON_LIMB_RIGHT_HAND" Offset="0x17A00" />
<Limb Name="gLinkGoronSheathLimb" Type="LOD" EnumName="LINK_GORON_LIMB_SHEATH" Offset="0x17A10" />
<Limb Name="gLinkGoronTorsoLimb" Type="LOD" EnumName="LINK_GORON_LIMB_TORSO" Offset="0x17A20" />
<Skeleton Name="gLinkGoronSkel" Type="Flex" LimbType="Standard" LimbNone="LINK_GORON_LIMB_NONE" LimbMax="LINK_GORON_LIMB_MAX" EnumName="LinkGoronLimb" Offset="0x17A84" />
</File>
</Root>