mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-12 10:54:44 +00:00
Code Issues Projects Releases Wiki Activity

z_en_ko OK (#869)

Browse source 
* .data OK

* Progress

* push some old stuff

* Finish a chain

* Progress

* Progress

* Run mathfixer.py

* Progress

* match one more

* Up to date

* Match func_80A97610

* func_80A96FD0

* most of the way through the mega switch

* small formatting thing. still stuck on the switch

* start a big switch function

* a little closer

* done with matching for now starting objects

* func_80A97738 OK!

* func_80A995CC OK!

* func_80A99864 OK!

* en_ko OK!

* Code clean-up pass

* more EnKo cleanups, object_fa and object_kw1 textures documented

* complete object_km1, more EnKo documentation

* More documentation

* delete asm

* Clean-up rebase issues

* bleh

* Implement Dragorn's suggestions

* fix spec, implement fig's suggestions

* whoops (ill leave it for the docs tho lol)

* whoops again

* i made an ouchie

* smile

* last one for real

Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
mzxrules 2021-07-28 17:59:52 -04:00 • committed by GitHub
parent 6f7312a348
commit df5e1c63c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 1454 additions and 4168 deletions
Download patch file Download diff file Expand all files Collapse all files

21
assets/xml/objects/object_fa.xml
View file

@ -1,14 +1,15 @@
<Root>
<File Name="object_fa" Segment="6">
<Texture Name="object_fa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
<Texture Name="object_fa_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200"/>
<Texture Name="object_fa_Tex_000240" OutName="tex_00000240" Format="ci8" Width="32" Height="32" Offset="0x240"/>
<Texture Name="object_fa_Tex_000640" OutName="tex_00000640" Format="ci8" Width="32" Height="16" Offset="0x640"/>
<Texture Name="object_fa_Tex_000840" OutName="tex_00000840" Format="ci8" Width="8" Height="16" Offset="0x840"/>
<Texture Name="object_fa_Tex_0008C0" OutName="tex_000008C0" Format="ci8" Width="8" Height="8" Offset="0x8C0"/>
<Texture Name="object_fa_Tex_000900" OutName="tex_00000900" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
<Texture Name="object_fa_Tex_000D00" OutName="tex_00000D00" Format="ci8" Width="8" Height="8" Offset="0xD00"/>
<Blob Name="object_fa_Blob_000D40" Size="0x800" Offset="0xD40"/>
<DList Name="object_fa_DL_002940" Offset="0x2940"/>
<Texture Name="gFaTLUT" OutName="tlut" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
<Texture Name="gFaSkinTex" OutName="skin" Format="ci8" TlutOffset="0x0" Width="8" Height="8" Offset="0x200"/>
<Texture Name="gFaEyeOpenTex" OutName="eye_open" Format="ci8" TlutOffset="0x0" Width="32" Height="32" Offset="0x240"/>
<Texture Name="gFaMouthTex" OutName="mouth" Format="ci8" TlutOffset="0x0" Width="32" Height="16" Offset="0x640"/>
<Texture Name="gFaHair1Tex" OutName="hair1" Format="ci8" TlutOffset="0x0" Width="8" Height="16" Offset="0x840"/>
<Texture Name="gFaEarTex" OutName="ear" Format="ci8" TlutOffset="0x0" Width="8" Height="8" Offset="0x8C0"/>
<Texture Name="gFaHair2Tex" OutName="hair2" Format="rgba16" Width="32" Height="16" Offset="0x900"/>
<Texture Name="gFaHeadbandTex" OutName="headband" Format="ci8" TlutOffset="0x0" Width="8" Height="8" Offset="0xD00"/>
<Texture Name="gFaEyeHalfTex" OutName="eye_half" Format="ci8" TlutOffset="0x0" Width="32" Height="32" Offset="0xD40"/>
<Texture Name="gFaEyeClosedTex" OutName="eye_closed" Format="ci8" TlutOffset="0x0" Width="32" Height="32" Offset="0x1140"/>
<DList Name="gFaDL" Offset="0x2940"/>
</File>
</Root>

39
assets/xml/objects/object_km1.xml Normal file
View file

@ -0,0 +1,39 @@
<Root>
<File Name="object_km1" Segment="6">
<!-- The textures used by these limbs aren't 64-bit aligned -->
<Limb Name="gKm1SkelLimb_000000" LimbType="Standard" Offset="0x0" />
<Limb Name="gKm1SkelLimb_00000C" LimbType="Standard" Offset="0xC" />
<Limb Name="gKm1SkelLimb_000018" LimbType="Standard" Offset="0x18" />
<Limb Name="gKm1SkelLimb_000024" LimbType="Standard" Offset="0x24" />
<Limb Name="gKm1SkelLimb_000030" LimbType="Standard" Offset="0x30" />
<Limb Name="gKm1SkelLimb_00003C" LimbType="Standard" Offset="0x3C" />
<Limb Name="gKm1SkelLimb_000048" LimbType="Standard" Offset="0x48" />
<Limb Name="gKm1SkelLimb_000054" LimbType="Standard" Offset="0x54" />
<Limb Name="gKm1SkelLimb_000060" LimbType="Standard" Offset="0x60" />
<Limb Name="gKm1SkelLimb_00006C" LimbType="Standard" Offset="0x6C" />
<Limb Name="gKm1SkelLimb_000078" LimbType="Standard" Offset="0x78" />
<Limb Name="gKm1SkelLimb_000084" LimbType="Standard" Offset="0x84" />
<Limb Name="gKm1SkelLimb_000090" LimbType="Standard" Offset="0x90" />
<Limb Name="gKm1SkelLimb_00009C" LimbType="Standard" Offset="0x9C" />
<Limb Name="gKm1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8" />
<Skeleton Name="gKm1Skel" Type="Flex" LimbType="Standard" Offset="0xF0" />
<!-- 32-bit aligned textures. -->
<Texture Name="gKm1TLUT_0000FC" OutName="tlut_0000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC" />
<Texture Name="gKm1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x2FC" />
<Texture Name="gKm1BootWrinkleTex" OutName="boot_wrinkle" Format="i8" Width="8" Height="8" Offset="0x33C" />
<Texture Name="gKm1Skin1Tex" OutName="skin1" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x37C" />
<Texture Name="gKm1TunicFringeTex" OutName="tunic_fringe" Format="rgba16" Width="16" Height="16" Offset="0x3BC" />
<Texture Name="gKm1UnusedHairTex" OutName="unused_hair" Format="ci8" TlutOffset="0xFC" Width="16" Height="32" Offset="0x5BC" />
<Texture Name="gKm1Ear1Tex" OutName="ear1" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x7BC"/>
<Texture Name="gKm1HandTex" OutName="hand" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x7FC" />
<Texture Name="gKm1TLUT_00083C" OutName="tlut_00083C" Format="rgba16" Width="96" Height="1" Offset="0x83C" />
<Texture Name="gKm1Ear2Tex" OutName="ear2" Format="ci8" TlutOffset="0x83C" Width="8" Height="8" Offset="0x8FC"/>
<Texture Name="gKm1Skin2Tex" OutName="skin2" Format="ci8" TlutOffset="0x83C" Width="8" Height="8" Offset="0x93C" />
<Texture Name="gKm1HairTex" OutName="hair" Format="ci8" TlutOffset="0x83C" Width="16" Height="32" Offset="0x97C" />
<DList Name="gKm1DL" Offset="0x1890" />
</File>
</Root>

78
assets/xml/objects/object_kw1.xml
View file

@ -1,48 +1,49 @@
<Root>
<File Name="object_kw1" Segment="6">
<!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
<!--
<Limb Name="object_kw1_Limb_000000" LimbType="Standard" Offset="0x0" />
<Limb Name="object_kw1_Limb_00000C" LimbType="Standard" Offset="0xC" />
<Limb Name="object_kw1_Limb_000018" LimbType="Standard" Offset="0x18" />
<Limb Name="object_kw1_Limb_000024" LimbType="Standard" Offset="0x24" />
<Limb Name="object_kw1_Limb_000030" LimbType="Standard" Offset="0x30" />
<Limb Name="object_kw1_Limb_00003C" LimbType="Standard" Offset="0x3C" />
<Limb Name="object_kw1_Limb_000048" LimbType="Standard" Offset="0x48" />
<Limb Name="object_kw1_Limb_000054" LimbType="Standard" Offset="0x54" />
<Limb Name="object_kw1_Limb_000060" LimbType="Standard" Offset="0x60" />
<Limb Name="object_kw1_Limb_00006C" LimbType="Standard" Offset="0x6C" />
<Limb Name="object_kw1_Limb_000078" LimbType="Standard" Offset="0x78" />
<Limb Name="object_kw1_Limb_000084" LimbType="Standard" Offset="0x84" />
<Limb Name="object_kw1_Limb_000090" LimbType="Standard" Offset="0x90" />
<Limb Name="object_kw1_Limb_00009C" LimbType="Standard" Offset="0x9C" />
<Limb Name="object_kw1_Limb_0000A8" LimbType="Standard" Offset="0xA8" />
-->
<!-- The textures used by these limbs aren't 64-bit aligned -->
<Limb Name="gKw1SkelLimb_000000" LimbType="Standard" Offset="0x0" />
<Limb Name="gKw1SkelLimb_00000C" LimbType="Standard" Offset="0xC" />
<Limb Name="gKw1SkelLimb_000018" LimbType="Standard" Offset="0x18" />
<Limb Name="gKw1SkelLimb_000024" LimbType="Standard" Offset="0x24" />
<Limb Name="gKw1SkelLimb_000030" LimbType="Standard" Offset="0x30" />
<Limb Name="gKw1SkelLimb_00003C" LimbType="Standard" Offset="0x3C" />
<Limb Name="gKw1SkelLimb_000048" LimbType="Standard" Offset="0x48" />
<Limb Name="gKw1SkelLimb_000054" LimbType="Standard" Offset="0x54" />
<Limb Name="gKw1SkelLimb_000060" LimbType="Standard" Offset="0x60" />
<Limb Name="gKw1SkelLimb_00006C" LimbType="Standard" Offset="0x6C" />
<Limb Name="gKw1SkelLimb_000078" LimbType="Standard" Offset="0x78" />
<Limb Name="gKw1SkelLimb_000084" LimbType="Standard" Offset="0x84" />
<Limb Name="gKw1SkelLimb_000090" LimbType="Standard" Offset="0x90" />
<Limb Name="gKw1SkelLimb_00009C" LimbType="Standard" Offset="0x9C" />
<Limb Name="gKw1SkelLimb_0000A8" LimbType="Standard" Offset="0xA8" />
<!--
<Skeleton Name="object_kw1_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0" />
-->
<Skeleton Name="gKw1Skel" Type="Flex" LimbType="Standard" Offset="0xF0" />
<!-- 32-bit aligned textures. -->
<!--
<Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC" />
<Texture Name="object_kw1_Tex_0002FC" OutName="tex_000002FC" Format="i8" Width="16" Height="16" Offset="0x2FC" />
<Texture Name="object_kw1_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="8" Height="8" Offset="0x3FC" />
<Texture Name="object_kw1_Tex_00043C" OutName="tex_0000043C" Format="i8" Width="8" Height="8" Offset="0x43C" />
<Blob Name="object_kw1_Blob_00047C" Size="0x840" Offset="0x47C" />
<Texture Name="object_kw1_Tex_000CBC" OutName="tex_00000CBC" Format="ci8" Width="8" Height="8" Offset="0xCBC" />
<Texture Name="object_kw1_Tex_000CFC" OutName="tex_00000CFC" Format="ci8" Width="8" Height="8" Offset="0xCFC" />
<Texture Name="object_kw1_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="256" Height="1" Offset="0xFC" />
<Texture Name="gKw1BootsTex" OutName="boots" Format="i8" Width="16" Height="16" Offset="0x2FC" />
<!-- Arm/neck texture-->
<Texture Name="gKw1Skin1Tex" OutName="skin1" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x3FC" />
<Texture Name="gKw1TunicTex" OutName="tunic" Format="i8" Width="8" Height="8" Offset="0x43C" />
<!-- Possibly a skin gradient texture -->
<Texture Name="object_kw1_Tex_00047C" OutName="tex_00047C" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0x47C" />
<Texture Name="gKw1UnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x4BC"/>
<Texture Name="gKw1HandTex" OutName="hand" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0xCBC" />
<Texture Name="gKw1BeltBuckleTex" OutName="belt_buckle" Format="ci8" TlutOffset="0xFC" Width="8" Height="8" Offset="0xCFC" />
<Texture Name="object_kw1_TLUT_000D3C" OutName="tlut_00000D3C" Format="rgba16" Width="232" Height="1" Offset="0xD3C" />
<Blob Name="object_kw1_Blob_000F3C" Size="0x410" Offset="0xF3C" />
<!Texture Name="object_kw1_Tex_00134C" OutName="tex_0000134C" Format="ci8" Width="16" Height="32" Offset="0x134C" />
<Texture Name="object_kw1_Tex_00154C" OutName="tex_0000154C" Format="ci8" Width="8" Height="8" Offset="0x154C" />
<Texture Name="object_kw1_Tex_00158C" OutName="tex_0000158C" Format="ci8" Width="16" Height="8" Offset="0x158C" />
<Texture Name="object_kw1_Tex_00160C" OutName="tex_0000160C" Format="ci8" Width="32" Height="32" Offset="0x160C" />
-->
<Texture Name="gKw1EarTex" OutName="ear" Format="ci8" TlutOffset="0xD3C" Width="8" Height="8" Offset="0xF0C"/>
<Texture Name="gKw1EyeOpenTex" OutName="eye_open" Format="ci8" TlutOffset="0xD3C" Width="32" Height="32" Offset="0xF4C"/>
<Texture Name="gKw1EyeHalfTex" OutName="eye_half" Format="ci8" TlutOffset="0xD3C" Width="32" Height="32" Offset="0x1A0C"/>
<Texture Name="gKw1EyeClosedTex" OutName="eye_closed" Format="ci8" TlutOffset="0xD3C" Width="32" Height="32" Offset="0x1E0C"/>
<Texture Name="gKw1HairTex" OutName="hair" Format="ci8" TlutOffset="0xD3C" Width="16" Height="32" Offset="0x134C" />
<Texture Name="gKw1Skin2Tex" OutName="skin2" Format="ci8" TlutOffset="0xD3C" Width="8" Height="8" Offset="0x154C" />
<Texture Name="gKw1HairlineTex" OutName="hairline" Format="ci8" TlutOffset="0xD3C" Width="16" Height="8" Offset="0x158C" />
<Texture Name="gKw1MouthTex" OutName="mouth" Format="ci8" TlutOffset="0xD3C" Width="32" Height="32" Offset="0x160C" />
<Blob Name="object_kw1_Blob_001A0C" Size="0x804" Offset="0x1A0C" />
<!--
<DList Name="object_kw1_DL_002C10" Offset="0x2C10" />
<DList Name="object_kw1_DL_0053F8" Offset="0x53F8" />
<DList Name="object_kw1_DL_005668" Offset="0x5668" />
@ -58,6 +59,5 @@
<DList Name="object_kw1_DL_006478" Offset="0x6478" />
<DList Name="object_kw1_DL_006620" Offset="0x6620" />
<DList Name="object_kw1_DL_0067C0" Offset="0x67C0" />
-->
</File>
</Root>