mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-07 02:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_En_Kaizoku OK (#945)

Browse Source 
* ovl_En_Kaizoku OK

* format.sh

* Review changes

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* Fix building

* first pass

* picto

* format

* object

* sfx

* morecleanup

* and more naming

* boyo

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

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

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

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

* review

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

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

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

* Review

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

* review

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

* floats

* steal some docs from OoT

* review

* format

* sort

* parens

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Synray
2022-11-03 17:42:27 -07:00
committed by GitHub
parent 38c9ffe445
commit baaa79b979
9 changed files with 2211 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_ge1.xml
+1 -1
View File
@@ -38,7 +38,7 @@
<Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2EB8" TlutOffset="0x2CB8" />
<Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x2EF8" TlutOffset="0x2CB8" />
<Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x2FF8" TlutOffset="0x2CB8" />
<!-- White-clothed Gerudo Eye Textures -->
<Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3078"/>
<Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x3878"/>
assets/xml/objects/object_kz.xml
+33 -27
View File
@@ -12,6 +12,7 @@
<Animation Name="object_kz_Anim_004860" Offset="0x4860" />
<Animation Name="object_kz_Anim_005644" Offset="0x5644" />
<Animation Name="object_kz_Anim_0058B8" Offset="0x58B8" />
<Texture Name="object_kz_TLUT_0058D0" OutName="tlut_0058D0" Format="rgba16" Width="16" Height="16" Offset="0x58D0" />
<Texture Name="object_kz_Tex_005AD0" OutName="tex_005AD0" Format="ci8" Width="8" Height="8" Offset="0x5AD0" />
<Texture Name="object_kz_Tex_005B10" OutName="tex_005B10" Format="ci8" Width="8" Height="8" Offset="0x5B10" />
@@ -20,6 +21,7 @@
<Texture Name="object_kz_Tex_005D50" OutName="tex_005D50" Format="ci8" Width="16" Height="16" Offset="0x5D50" />
<Texture Name="object_kz_Tex_005E50" OutName="tex_005E50" Format="i8" Width="16" Height="16" Offset="0x5E50" />
<Texture Name="object_kz_Tex_005F50" OutName="tex_005F50" Format="i8" Width="8" Height="16" Offset="0x5F50" />
<DList Name="object_kz_DL_007CB0" Offset="0x7CB0" />
<DList Name="object_kz_DL_008130" Offset="0x8130" />
<DList Name="object_kz_DL_008268" Offset="0x8268" />
@@ -30,19 +32,21 @@
<DList Name="object_kz_DL_008B10" Offset="0x8B10" />
<DList Name="object_kz_DL_008D80" Offset="0x8D80" />
<DList Name="object_kz_DL_008E80" Offset="0x8E80" />
<!-- <Texture Name="object_kz_TLUT_009100" OutName="tlut_009100" Format="rgba16" Width="16" Height="16" Offset="0x9100" /> -->
<!-- <Blob Name="object_kz_Blob_009300" Size="0x38" Offset="0x9300" /> -->
<Texture Name="object_kz_Tex_009338" OutName="tex_009338" Format="ci8" Width="8" Height="16" Offset="0x9338" />
<!-- <Blob Name="object_kz_Blob_0093B8" Size="0x400" Offset="0x93B8" /> -->
<Texture Name="gKaizokuEyeOpenTex" OutName="kaizoku_eye_open" Format="ci8" Width="32" Height="32" Offset="0x93B8" TlutOffset="0x9100" />
<Texture Name="object_kz_Tex_0097B8" OutName="tex_0097B8" Format="i8" Width="16" Height="16" Offset="0x97B8" />
<Texture Name="object_kz_Tex_0098B8" OutName="tex_0098B8" Format="ci8" Width="8" Height="16" Offset="0x98B8" />
<Texture Name="object_kz_Tex_009938" OutName="tex_009938" Format="ci8" Width="8" Height="8" Offset="0x9938" />
<!-- <Blob Name="object_kz_Blob_009978" Size="0x400" Offset="0x9978" /> -->
<Texture Name="gKaizokuEyeHalfTex" OutName="kaizoku_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9978" TlutOffset="0x9100" />
<Texture Name="object_kz_Tex_009D78" OutName="tex_009D78" Format="i8" Width="8" Height="16" Offset="0x9D78" />
<Texture Name="object_kz_Tex_009DF8" OutName="tex_009DF8" Format="ci8" Width="16" Height="16" Offset="0x9DF8" />
<Texture Name="object_kz_Tex_009EF8" OutName="tex_009EF8" Format="ci8" Width="16" Height="16" Offset="0x9EF8" />
<Texture Name="object_kz_Tex_009FF8" OutName="tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" />
<!-- <Blob Name="object_kz_Blob_00A0F8" Size="0x400" Offset="0xA0F8" /> -->
<Texture Name="gKaizokuEyeClosedTex" OutName="kaizoku_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9100" />
<DList Name="object_kz_DL_00C318" Offset="0xC318" />
<DList Name="object_kz_DL_00C4D8" Offset="0xC4D8" />
<DList Name="object_kz_DL_00C698" Offset="0xC698" />
@@ -52,30 +56,32 @@
<DList Name="object_kz_DL_00CD78" Offset="0xCD78" />
<DList Name="object_kz_DL_00CE30" Offset="0xCE30" />
<DList Name="object_kz_DL_00CF20" Offset="0xCF20" />
<Limb Name="object_kz_Standardlimb_00D6B8" Type="Standard" EnumName="OBJECT_KZ_LIMB_01" Offset="0xD6B8" />
<Limb Name="object_kz_Standardlimb_00D6C4" Type="Standard" EnumName="OBJECT_KZ_LIMB_02" Offset="0xD6C4" />
<Limb Name="object_kz_Standardlimb_00D6D0" Type="Standard" EnumName="OBJECT_KZ_LIMB_03" Offset="0xD6D0" />
<Limb Name="object_kz_Standardlimb_00D6DC" Type="Standard" EnumName="OBJECT_KZ_LIMB_04" Offset="0xD6DC" />
<Limb Name="object_kz_Standardlimb_00D6E8" Type="Standard" EnumName="OBJECT_KZ_LIMB_05" Offset="0xD6E8" />
<Limb Name="object_kz_Standardlimb_00D6F4" Type="Standard" EnumName="OBJECT_KZ_LIMB_06" Offset="0xD6F4" />
<Limb Name="object_kz_Standardlimb_00D700" Type="Standard" EnumName="OBJECT_KZ_LIMB_07" Offset="0xD700" />
<Limb Name="object_kz_Standardlimb_00D70C" Type="Standard" EnumName="OBJECT_KZ_LIMB_08" Offset="0xD70C" />
<Limb Name="object_kz_Standardlimb_00D718" Type="Standard" EnumName="OBJECT_KZ_LIMB_09" Offset="0xD718" />
<Limb Name="object_kz_Standardlimb_00D724" Type="Standard" EnumName="OBJECT_KZ_LIMB_0A" Offset="0xD724" />
<Limb Name="object_kz_Standardlimb_00D730" Type="Standard" EnumName="OBJECT_KZ_LIMB_0B" Offset="0xD730" />
<Limb Name="object_kz_Standardlimb_00D73C" Type="Standard" EnumName="OBJECT_KZ_LIMB_0C" Offset="0xD73C" />
<Limb Name="object_kz_Standardlimb_00D748" Type="Standard" EnumName="OBJECT_KZ_LIMB_0D" Offset="0xD748" />
<Limb Name="object_kz_Standardlimb_00D754" Type="Standard" EnumName="OBJECT_KZ_LIMB_0E" Offset="0xD754" />
<Limb Name="object_kz_Standardlimb_00D760" Type="Standard" EnumName="OBJECT_KZ_LIMB_0F" Offset="0xD760" />
<Limb Name="object_kz_Standardlimb_00D76C" Type="Standard" EnumName="OBJECT_KZ_LIMB_10" Offset="0xD76C" />
<Limb Name="object_kz_Standardlimb_00D778" Type="Standard" EnumName="OBJECT_KZ_LIMB_11" Offset="0xD778" />
<Limb Name="object_kz_Standardlimb_00D784" Type="Standard" EnumName="OBJECT_KZ_LIMB_12" Offset="0xD784" />
<Limb Name="object_kz_Standardlimb_00D790" Type="Standard" EnumName="OBJECT_KZ_LIMB_13" Offset="0xD790" />
<Limb Name="object_kz_Standardlimb_00D79C" Type="Standard" EnumName="OBJECT_KZ_LIMB_14" Offset="0xD79C" />
<Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="OBJECT_KZ_LIMB_15" Offset="0xD7A8" />
<Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="OBJECT_KZ_LIMB_16" Offset="0xD7B4" />
<Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="OBJECT_KZ_LIMB_17" Offset="0xD7C0" />
<Skeleton Name="object_kz_Skel_00D828" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KZ_LIMB_NONE" LimbMax="OBJECT_KZ_LIMB_MAX" EnumName="ObjectKzLimb" Offset="0xD828" />
<Limb Name="object_kz_Standardlimb_00D6B8" Type="Standard" EnumName="KAIZOKU_LIMB_01" Offset="0xD6B8" />
<Limb Name="object_kz_Standardlimb_00D6C4" Type="Standard" EnumName="KAIZOKU_LIMB_02" Offset="0xD6C4" />
<Limb Name="object_kz_Standardlimb_00D6D0" Type="Standard" EnumName="KAIZOKU_LIMB_03" Offset="0xD6D0" />
<Limb Name="object_kz_Standardlimb_00D6DC" Type="Standard" EnumName="KAIZOKU_LIMB_04" Offset="0xD6DC" />
<Limb Name="object_kz_Standardlimb_00D6E8" Type="Standard" EnumName="KAIZOKU_LIMB_05" Offset="0xD6E8" />
<Limb Name="object_kz_Standardlimb_00D6F4" Type="Standard" EnumName="KAIZOKU_LIMB_06" Offset="0xD6F4" />
<Limb Name="object_kz_Standardlimb_00D700" Type="Standard" EnumName="KAIZOKU_LIMB_07" Offset="0xD700" />
<Limb Name="object_kz_Standardlimb_00D70C" Type="Standard" EnumName="KAIZOKU_LIMB_08" Offset="0xD70C" />
<Limb Name="object_kz_Standardlimb_00D718" Type="Standard" EnumName="KAIZOKU_LIMB_09" Offset="0xD718" />
<Limb Name="object_kz_Standardlimb_00D724" Type="Standard" EnumName="KAIZOKU_LIMB_0A" Offset="0xD724" />
<Limb Name="object_kz_Standardlimb_00D730" Type="Standard" EnumName="KAIZOKU_LIMB_R_SWORD" Offset="0xD730" />
<Limb Name="object_kz_Standardlimb_00D73C" Type="Standard" EnumName="KAIZOKU_LIMB_0C" Offset="0xD73C" />
<Limb Name="object_kz_Standardlimb_00D748" Type="Standard" EnumName="KAIZOKU_LIMB_0D" Offset="0xD748" />
<Limb Name="object_kz_Standardlimb_00D754" Type="Standard" EnumName="KAIZOKU_LIMB_0E" Offset="0xD754" />
<Limb Name="object_kz_Standardlimb_00D760" Type="Standard" EnumName="KAIZOKU_LIMB_0F" Offset="0xD760" />
<Limb Name="object_kz_Standardlimb_00D76C" Type="Standard" EnumName="KAIZOKU_LIMB_10" Offset="0xD76C" />
<Limb Name="object_kz_Standardlimb_00D778" Type="Standard" EnumName="KAIZOKU_LIMB_11" Offset="0xD778" />
<Limb Name="object_kz_Standardlimb_00D784" Type="Standard" EnumName="KAIZOKU_LIMB_12" Offset="0xD784" />
<Limb Name="object_kz_Standardlimb_00D790" Type="Standard" EnumName="KAIZOKU_LIMB_L_FOOT" Offset="0xD790" />
<Limb Name="object_kz_Standardlimb_00D79C" Type="Standard" EnumName="KAIZOKU_LIMB_14" Offset="0xD79C" />
<Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="KAIZOKU_LIMB_15" Offset="0xD7A8" />
<Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="KAIZOKU_LIMB_R_FOOT" Offset="0xD7B4" />
<Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="KAIZOKU_LIMB_17" Offset="0xD7C0" />
<Skeleton Name="gKaizokuSkel" Type="Flex" LimbType="Standard" LimbNone="KAIZOKU_LIMB_NONE" LimbMax="KAIZOKU_LIMB_MAX" EnumName="KaizokuLimb" Offset="0xD828" />
<Animation Name="object_kz_Anim_00DBE4" Offset="0xDBE4" />
<Animation Name="object_kz_Anim_00E1C8" Offset="0xE1C8" />
<Animation Name="object_kz_Anim_00E8BC" Offset="0xE8BC" />