mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00
Code Issues Projects Releases Wiki Activity

Even more objects (#913)

Browse source 
* malon adult limbs and enum

* malon adult animations

* Malon Adult textures

* Object_ma2 OK

* Cleanup undefined syms file

* more cleanup

* object_in OK

* change

* Object_TA limbs and Limb DLs ok

* Textures in DLs OK

* Object TA animations OK

* Object TA OK

* clean up the xml

* almost done with impa textures

* name impa draw funcs

* fix globalCtx2 in talon_init

* more progress in impa

* eye texture stuff

* impa OK

* remove files

* fix messed up merge

* Switch MA2 blink timer from hex

* Name a function

* Fix skelanime fixer

* Missing malon adult TLUT

* add some missing symbols in DemoEc

* Fix conflicts, part2

* Clean up TLUT related stuff and some minor things

* Remove unused externs from z_demo_ec

* Remove unused symbols from undefined_syms.txt

* PR fixes (Dragorn)

* Dragorn fixes

* Fix various texture-related issues in object_link_child

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix ingo and the rest of Dragorns fix

* impa fixes

* fix ingo again

* fix windmill man missing TLUT

* Fix impa in viewer

* Roman's fixes

* Add limb

* Missed an animation

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-11-24 13:37:36 -05:00 • committed by GitHub
parent 0f58b15b27
commit 665283432b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 1568 additions and 1452 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
assets/xml/objects/gameplay_field_keep.xml
View file

@ -24,8 +24,8 @@
<Skeleton Name="gButterflySkel" Type="Normal" LimbType="Standard" Offset="0x36F0"/>
<Animation Name="gButterflyAnim" Offset="0x2470"/>
<Texture Name="gBgBombwallTLUT" OutName="bombwall_palette" Format="rgba16" Width="4" Height="4" Offset="0x3700"/>
<Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720"/>
<Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20"/>
<Texture Name="gBgBombwallNormalTex" OutName="bombwall_normal" Format="ci4" Width="32" Height="64" Offset="0x3720" TlutOffset="0x3700"/>
<Texture Name="gBgBombWallBrokenTex" OutName="bombwall_broken" Format="ci4" Width="32" Height="64" Offset="0x3B20" TlutOffset="0x3700"/>
<DList Name="gFieldDoorDL_004720" Offset="0x4720"/>
<DList Name="gFieldDoor1DL" Offset="0x47A0"/>
<DList Name="gFieldDoor2DL" Offset="0x4978"/>
@ -51,8 +51,9 @@
<DList Name="gFieldBeehiveFragmentDL" Offset="0x9940"/>
<Texture Name="gFieldBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x8900"/>
<Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
<Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8"/>
<Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8" TlutOffset="0x99D0"/>
<Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_palette" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
<Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
<Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
<DList Name="gFieldSandstormDL" Offset="0xCA70"/>

16
assets/xml/objects/object_bba.xml
View file

@ -17,15 +17,15 @@
<Limb Name="object_bba_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
<Skeleton Name="object_bba_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
<Texture Name="object_bba_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
<Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308"/>
<Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348"/>
<Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388"/>
<Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488"/>
<Texture Name="object_bba_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
<Texture Name="object_bba_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
<Texture Name="object_bba_Tex_000388" OutName="tex_00000388" Format="ci8" Width="16" Height="16" Offset="0x388" TlutOffset="0x108"/>
<Texture Name="object_bba_Tex_000488" OutName="tex_00000488" Format="ci8" Width="8" Height="8" Offset="0x488" TlutOffset="0x108"/>
<Texture Name="object_bba_Tex_0004C8" OutName="tex_000004C8" Format="rgba16" Width="32" Height="32" Offset="0x4C8"/>
<Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8"/>
<Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8"/>
<Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08"/>
<Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08"/>
<Texture Name="object_bba_Tex_000CC8" OutName="tex_00000CC8" Format="ci8" Width="16" Height="16" Offset="0xCC8" TlutOffset="0x108"/>
<Texture Name="object_bba_Tex_000DC8" OutName="tex_00000DC8" Format="ci8" Width="8" Height="8" Offset="0xDC8" TlutOffset="0x108"/>
<Texture Name="object_bba_Tex_000E08" OutName="tex_00000E08" Format="ci8" Width="16" Height="16" Offset="0xE08" TlutOffset="0x108"/>
<Texture Name="object_bba_Tex_000F08" OutName="tex_00000F08" Format="ci8" Width="16" Height="16" Offset="0xF08" TlutOffset="0x108"/>
<DList Name="object_bba_DL_002948" Offset="0x2948"/>
<DList Name="object_bba_DL_003298" Offset="0x3298"/>
<DList Name="object_bba_DL_0033A8" Offset="0x33A8"/>

16
assets/xml/objects/object_bob.xml
View file

@ -17,15 +17,15 @@
<Limb Name="object_bob_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
<Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
<Texture Name="object_bob_TLUT_000108" OutName="tlut_00000108" Format="rgba16" Width="16" Height="16" Offset="0x108"/>
<Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308"/>
<Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348"/>
<Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388"/>
<Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788"/>
<Texture Name="object_bob_Tex_000308" OutName="tex_00000308" Format="ci8" Width="8" Height="8" Offset="0x308" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_000348" OutName="tex_00000348" Format="ci8" Width="8" Height="8" Offset="0x348" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_000388" OutName="tex_00000388" Format="ci8" Width="32" Height="32" Offset="0x388" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_000788" OutName="tex_00000788" Format="ci8" Width="8" Height="8" Offset="0x788" TlutOffset="0x108"/>
<Blob Name="object_bob_Blob_0007C8" Size="0x1800" Offset="0x7C8"/>
<Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8"/>
<Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8"/>
<Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8"/>
<Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208"/>
<Texture Name="object_bob_Tex_001FC8" OutName="tex_00001FC8" Format="ci8" Width="16" Height="16" Offset="0x1FC8" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_0020C8" OutName="tex_000020C8" Format="ci8" Width="16" Height="16" Offset="0x20C8" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_0021C8" OutName="tex_000021C8" Format="ci8" Width="8" Height="8" Offset="0x21C8" TlutOffset="0x108"/>
<Texture Name="object_bob_Tex_002208" OutName="tex_00002208" Format="ci8" Width="16" Height="16" Offset="0x2208" TlutOffset="0x108"/>
<DList Name="object_bob_DL_003B78" Offset="0x3B78"/>
<DList Name="object_bob_DL_003F68" Offset="0x3F68"/>
<DList Name="object_bob_DL_0040B0" Offset="0x40B0"/>

2
assets/xml/objects/object_bombiwa.xml
View file

@ -1,7 +1,7 @@
<Root>
<File Name="object_bombiwa" Segment="6">
<Texture Name="object_bombiwa_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="4" Height="4" Offset="0x0"/>
<Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20"/>
<Texture Name="object_bombiwa_Tex_000020" OutName="tex_00000020" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x0"/>
<DList Name="object_bombiwa_DL_0009E0" Offset="0x9E0"/>
</File>
</Root>

4
assets/xml/objects/object_bw.xml
View file

@ -9,8 +9,8 @@
<Texture Name="object_bw_Tex_001240" OutName="tex_00001240" Format="rgba16" Width="16" Height="16" Offset="0x1240"/>
<Texture Name="object_bw_Tex_001440" OutName="tex_00001440" Format="rgba16" Width="16" Height="16" Offset="0x1440"/>
<Texture Name="object_bw_TLUT_001640" OutName="tlut_00001640" Format="rgba16" Width="16" Height="16" Offset="0x1640"/>
<Texture Name="object_bw_Tex_001840" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840"/>
<Texture Name="object_bw_Tex_001C40" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40"/>
<Texture Name="object_bw_Tex_001840" OutName="tex_00001840" Format="ci8" Width="32" Height="32" Offset="0x1840" TlutOffset="0x1640"/>
<Texture Name="object_bw_Tex_001C40" OutName="tex_00001C40" Format="ci8" Width="32" Height="32" Offset="0x1C40" TlutOffset="0x1640"/>
<Limb Name="object_bw_Limb_002040" LimbType="Standard" Offset="0x2040"/>
<Limb Name="object_bw_Limb_00204C" LimbType="Standard" Offset="0x204C"/>
<Limb Name="object_bw_Limb_002058" LimbType="Standard" Offset="0x2058"/>

10
assets/xml/objects/object_cob.xml
View file

@ -1,11 +1,11 @@
<Root>
<File Name="object_cob" Segment="6">
<Texture Name="object_cob_TLUT_000000" OutName="tlut_00000000" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
<Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200"/>
<Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280"/>
<Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0"/>
<Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300"/>
<Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340"/>
<Texture Name="object_cob_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="16" Offset="0x200" TlutOffset="0x0"/>
<Texture Name="object_cob_Tex_000280" OutName="tex_00000280" Format="ci8" Width="8" Height="8" Offset="0x280" TlutOffset="0x0"/>
<Texture Name="object_cob_Tex_0002C0" OutName="tex_000002C0" Format="ci8" Width="8" Height="8" Offset="0x2C0" TlutOffset="0x0"/>
<Texture Name="object_cob_Tex_000300" OutName="tex_00000300" Format="ci8" Width="8" Height="8" Offset="0x300" TlutOffset="0x0"/>
<Texture Name="object_cob_Tex_000340" OutName="tex_00000340" Format="ci8" Width="8" Height="16" Offset="0x340" TlutOffset="0x0"/>
<DList Name="object_cob_DL_001300" Offset="0x1300"/>
<DList Name="object_cob_DL_001678" Offset="0x1678"/>
<DList Name="object_cob_DL_001780" Offset="0x1780"/>

22
assets/xml/objects/object_cs.xml
View file

@ -44,17 +44,17 @@
<Texture Name="gGraveyardKidEyesClosedTex" OutName="eyes_closed" Format="rgba16" Width="64" Height="16" Offset="0x3130"/>
<Texture Name="gGraveyardKidTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1970"/>
<Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70"/>
<Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70"/>
<Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0"/>
<Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0"/>
<Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0"/>
<Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0"/>
<Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0"/>
<Texture Name="gGraveyardKidGradientTex" OutName="gradient" Format="ci8" Width="8" Height="8" Offset="0x1B70" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidPantsTex' OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x3C70" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidBoot1Tex' OutName="boot1" Format="ci8" Width="8" Height="16" Offset="0x3BF0" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidBoot2Tex' OutName="boot2" Format="ci8" Width="8" Height="8" Offset="0x3BB0" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidHairTex' OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1BB0" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidEarTex' OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x1CB0" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidNoseTex' OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1CF0" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidMouthTex' OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1D30"/>
<Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30"/>
<Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30"/>
<Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930"/>
<Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70"/>
<Texture Name='gGraveyardKidShirt1Tex' OutName="shirt1" Format="ci8" Width="16" Height="16" Offset="0x3A30" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidShirt2Tex' OutName="shirt2" Format="ci8" Width="8" Height="8" Offset="0x3B30" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidFingersTex' OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x3930" TlutOffset="0x1970"/>
<Texture Name='gGraveyardKidStickTex' OutName="stick" Format="ci8" Width="8" Height="8" Offset="0x3B70" TlutOffset="0x1970"/>
</File>
</Root>

20
assets/xml/objects/object_daiku.xml
View file

@ -4,18 +4,18 @@
<Animation Name="object_daiku_Anim_000C44" Offset="0xC44"/>
<Animation Name="object_daiku_Anim_001AB0" Offset="0x1AB0"/>
<Texture Name="object_daiku_TLUT_001AC0" OutName="tlut_00001AC0" Format="rgba16" Width="16" Height="16" Offset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0"/>
<Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00"/>
<Texture Name="object_daiku_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="8" Height="8" Offset="0x1CC0" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001D00" OutName="tex_00001D00" Format="ci8" Width="16" Height="16" Offset="0x1D00" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001E00" OutName="tex_00001E00" Format="rgba16" Width="4" Height="4" Offset="0x1E00"/>
<Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20"/>
<Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0"/>
<Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0"/>
<Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0"/>
<Texture Name="object_daiku_Tex_001E20" OutName="tex_00001E20" Format="ci8" Width="8" Height="16" Offset="0x1E20" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001EA0" OutName="tex_00001EA0" Format="ci8" Width="8" Height="8" Offset="0x1EA0" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001EE0" OutName="tex_00001EE0" Format="ci8" Width="16" Height="16" Offset="0x1EE0" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_001FE0" OutName="tex_00001FE0" Format="ci8" Width="8" Height="8" Offset="0x1FE0" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_002020" OutName="tex_00002020" Format="rgba16" Width="32" Height="32" Offset="0x2020"/>
<Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820"/>
<Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920"/>
<Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960"/>
<Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0"/>
<Texture Name="object_daiku_Tex_002820" OutName="tex_00002820" Format="ci8" Width="16" Height="16" Offset="0x2820" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_002920" OutName="tex_00002920" Format="ci8" Width="8" Height="8" Offset="0x2920" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_002960" OutName="tex_00002960" Format="ci8" Width="8" Height="8" Offset="0x2960" TlutOffset="0x1AC0"/>
<Texture Name="object_daiku_Tex_0029A0" OutName="tex_000029A0" Format="ci8" Width="8" Height="8" Offset="0x29A0" TlutOffset="0x1AC0"/>
<DList Name="object_daiku_DL_005490" Offset="0x5490"/>
<DList Name="object_daiku_DL_005880" Offset="0x5880"/>
<DList Name="object_daiku_DL_005990" Offset="0x5990"/>

22
assets/xml/objects/object_ds2.xml
View file

@ -10,17 +10,17 @@
<DList Name="object_ds2_DL_002738" Offset="0x2738"/>
<DList Name="object_ds2_DL_002908" Offset="0x2908"/>
<Texture Name="object_ds2_TLUT_002A98" OutName="tlut_00002A98" Format="rgba16" Width="16" Height="16" Offset="0x2A98"/>
<Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98"/>
<Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98"/>
<Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8"/>
<Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8"/>
<Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8"/>
<Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8"/>
<Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8"/>
<Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8"/>
<Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8"/>
<Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8"/>
<Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8"/>
<Texture Name="object_ds2_Tex_002C98" OutName="tex_00002C98" Format="ci8" Width="16" Height="16" Offset="0x2C98" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_002D98" OutName="tex_00002D98" Format="ci8" Width="8" Height="8" Offset="0x2D98" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_002DD8" OutName="tex_00002DD8" Format="ci8" Width="16" Height="16" Offset="0x2DD8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_002ED8" OutName="tex_00002ED8" Format="ci8" Width="32" Height="16" Offset="0x2ED8" TlutOffset="0x2A98"/>
<Texture Name="gPotionShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x30D8" TlutOffset="0x2A98"/>
<Texture Name="gPotionShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x34D8" TlutOffset="0x2A98"/>
<Texture Name="gPotionShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x38D8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_003CD8" OutName="tex_00003CD8" Format="ci8" Width="16" Height="16" Offset="0x3CD8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="16" Offset="0x3ED8" TlutOffset="0x2A98"/>
<Texture Name="object_ds2_Tex_003FD8" OutName="tex_00003FD8" Format="ci8" Width="16" Height="32" Offset="0x3FD8" TlutOffset="0x2A98"/>
<Limb Name="object_ds2_Limb_0041D8" LimbType="Standard" Offset="0x41D8"/>
<Limb Name="object_ds2_Limb_0041E4" LimbType="Standard" Offset="0x41E4"/>
<Limb Name="object_ds2_Limb_0041F0" LimbType="Standard" Offset="0x41F0"/>

44
assets/xml/objects/object_du.xml
View file

@ -40,20 +40,20 @@
<!-- Darunia's eyes textures -->
<Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8080"/>
<Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8480"/>
<Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8880"/>
<Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xA540"/>
<Texture Name="gDaruniaEyeOpenTex" OutName="darunia_eye_open" Format="ci8" Width="32" Height="32" Offset="0x8080" TlutOffset="0x7AF8"/>
<Texture Name="gDaruniaEyeOpeningTex" OutName="darunia_eye_opening" Format="ci8" Width="32" Height="32" Offset="0x8480" TlutOffset="0x7AF8"/>
<Texture Name="gDaruniaEyeShutTex" OutName="darunia_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x8880" TlutOffset="0x7AF8"/>
<Texture Name="gDaruniaEyeClosingTex" OutName="darunia_eye_closing" Format="ci8" Width="32" Height="32" Offset="0xA540" TlutOffset="0x7AF8"/>
<!-- Darunia's mouth textures -->
<Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x8C80"/>
<Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0x9D40"/>
<Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xA940"/>
<Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB180"/>
<Texture Name="gDaruniaMouthSeriousTex" OutName="darunia_mouth_serious" Format="ci8" Width="64" Height="32" Offset="0x8C80" TlutOffset="0x7CC8"/>
<Texture Name="gDaruniaMouthGrinningTex" OutName="darunia_mouth_grinning" Format="ci8" Width="64" Height="32" Offset="0x9D40" TlutOffset="0x7CC8"/>
<Texture Name="gDaruniaMouthOpenTex" OutName="darunia_mouth_open" Format="ci8" Width="64" Height="32" Offset="0xA940" TlutOffset="0x7CC8"/>
<Texture Name="gDaruniaMouthHappyTex" OutName="darunia_mouth_happy" Format="ci8" Width="64" Height="32" Offset="0xB180" TlutOffset="0x7CC8"/>
<!-- Darunia's nose textures -->
<Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x7FC0"/>
<Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB140"/>
<Texture Name="gDaruniaNoseSeriousTex" OutName="darunia_nose_serious" Format="ci8" Width="8" Height="8" Offset="0x7FC0" TlutOffset="0x7980"/>
<Texture Name="gDaruniaNoseHappyTex" OutName="darunia_nose_happy" Format="ci8" Width="8" Height="8" Offset="0xB140" TlutOffset="0x7980"/>
<!-- Palettes -->
@ -63,19 +63,19 @@
<Texture Name="gDaruniaTLUT_7980" OutName="darunia_tlut_7980" Format="rgba16" Width="47" Height="4" Offset="0x7980"/>
<!-- Palette: gDaruniaPalette_6EC0 -->
<Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x70C0"/>
<Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x72C0"/>
<Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x73C0"/>
<Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7440"/>
<Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7480"/>
<Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7580"/>
<Texture Name="gDaruniaSkelTex_70C0" OutName="darunia_tex_70C0" Format="ci8" Width="32" Height="16" Offset="0x70C0" TlutOffset="0x6EC0"/>
<Texture Name="gDaruniaSkelTex_72C0" OutName="darunia_tex_72C0" Format="ci8" Width="16" Height="16" Offset="0x72C0" TlutOffset="0x6EC0"/>
<Texture Name="gDaruniaSkelTex_73C0" OutName="darunia_tex_73C0" Format="ci8" Width="8" Height="16" Offset="0x73C0" TlutOffset="0x6EC0"/>
<Texture Name="gDaruniaSkelTex_7440" OutName="darunia_tex_7440" Format="ci8" Width="8" Height="8" Offset="0x7440" TlutOffset="0x6EC0"/>
<Texture Name="gDaruniaSkelTex_7480" OutName="darunia_tex_7480" Format="ci8" Width="16" Height="16" Offset="0x7480" TlutOffset="0x6EC0"/>
<Texture Name="gDaruniaSkelTex_7580" OutName="darunia_tex_7580" Format="ci8" Width="32" Height="32" Offset="0x7580" TlutOffset="0x6EC0"/>
<!-- Palette: gDaruniaPalette_7980 -->
<Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x7EC0"/>
<Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x7F40"/>
<Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8000"/>
<Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9480"/>
<Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9500"/>
<Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0x9D00"/>
<Texture Name="gDaruniaSkelTex_7EC0" OutName="darunia_tex_7EC0" Format="ci8" Width="8" Height="16" Offset="0x7EC0" TlutOffset="0x7980"/>
<Texture Name="gDaruniaSkelTex_7F40" OutName="darunia_tex_7F40" Format="ci8" Width="8" Height="16" Offset="0x7F40" TlutOffset="0x7980"/>
<Texture Name="gDaruniaSkelTex_8000" OutName="darunia_tex_8000" Format="ci8" Width="8" Height="16" Offset="0x8000" TlutOffset="0x7980"/>
<Texture Name="gDaruniaSkelTex_9480" OutName="darunia_tex_9480" Format="ci8" Width="8" Height="16" Offset="0x9480" TlutOffset="0x7980"/>
<Texture Name="gDaruniaSkelTex_9500" OutName="darunia_tex_9500" Format="ci8" Width="32" Height="64" Offset="0x9500" TlutOffset="0x7980"/>
<Texture Name="gDaruniaSkelTex_9D00" OutName="darunia_tex_9D00" Format="ci8" Width="8" Height="8" Offset="0x9D00" TlutOffset="0x7980"/>
</File>
</Root>

28
assets/xml/objects/object_fish.xml
View file

@ -91,20 +91,20 @@
<DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
<Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
<Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90"/>
<Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0"/>
<Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0"/>
<Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0"/>
<Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10"/>
<Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210"/>
<Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250"/>
<Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650"/>
<Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50"/>
<Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50"/>
<Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650"/>
<Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690"/>
<Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790"/>
<Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810"/>
<Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerHairFullTex" OutName="fishing_owner_hair_full" Format="ci8" Width="16" Height="16" Offset="0x8BD0" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerHairPartialTex" OutName="fishing_owner_hair_partial" Format="ci8" Width="16" Height="16" Offset="0x8CD0" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerHearTex" OutName="fishing_owner_hear" Format="ci8" Width="8" Height="8" Offset="0x8DD0" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerMouthTex" OutName="fishing_owner_mouth" Format="ci8" Width="32" Height="32" Offset="0x8E10" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerNostrilTex" OutName="fishing_owner_nostril" Format="ci8" Width="8" Height="8" Offset="0x9210" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerEyeOpenTex" OutName="fishing_owner_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9250" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerEyeHalfTex" OutName="fishing_owner_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9650" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerEyeClosedTex" OutName="fishing_owner_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9A50" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerHatTex" OutName="fishing_owner_hat" Format="ci8" Width="64" Height="32" Offset="0x9E50" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerShirtTex" OutName="fishing_owner_shirt" Format="ci8" Width="8" Height="8" Offset="0xA650" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerFingersTex" OutName="fishing_owner_fingers" Format="ci8" Width="16" Height="16" Offset="0xA690" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerCollarTex" OutName="fishing_owner_collar" Format="ci8" Width="8" Height="16" Offset="0xA790" TlutOffset="0x8990"/>
<Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810" TlutOffset="0x8990"/>
<Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
<DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>

26
assets/xml/objects/object_fu.xml
View file

@ -19,22 +19,22 @@
<DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
<Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C60"/>
<Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x4E60"/>
<Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060"/>
<Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160"/>
<Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0"/>
<Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0"/>
<Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0"/>
<Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
<Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
<Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0"/>
<Texture Name="gWindmillManPantsTex" OutName="pants" Format="ci8" Width="16" Height="16" Offset="0x5060" TlutOffset="0x4C60"/>
<Texture Name="gWindmillManHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x5160" TlutOffset="0x4E60"/>
<Texture Name="gWindmillManMusicBoxTex" OutName="music_box" Format="ci8" Width="32" Height="32" Offset="0x51A0" TlutOffset="0x4C60"/>
<Texture Name="gWindmillManFingersAndToesTex" OutName="fingers_and_toes" Format="ci8" Width="16" Height="16" Offset="0x55A0" TlutOffset="0x4E60"/>
<Texture Name="gWindmillManEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x56A0" TlutOffset="0x4E60"/>
<Texture Name="gWindmillManUpperHornAndCrankTex" OutName="upper_horn_and_crank" Format="ci8" Width="32" Height="32" Offset="0x56E0" TlutOffset="0x4C60"/>
<Texture Name="gWindmillManShirtTex" OutName="shirt" Format="ci8" Width="32" Height="32" Offset="0x5AE0" TlutOffset="0x4C60"/>
<Texture Name="gWindmillManHornAndPipeTex" OutName="horn_and_pipe" Format="ci8" Width="8" Height="8" Offset="0x5EE0" TlutOffset="0x4C60"/>
<Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20"/>
<Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320"/>
<Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20" TlutOffset="0x4E60"/>
<Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320" TlutOffset="0x4E60"/>
<Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720"/>
<Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920"/>
<Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720" TlutOffset="0x4E60"/>
<Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920" TlutOffset="0x4E60"/>
<Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20"/>
<Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20" TlutOffset="0x4E60"/>
<Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
<Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
<Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>

18
assets/xml/objects/object_ganon.xml
View file

@ -24,18 +24,18 @@
<Texture Name="object_ganon_TLUT_007B10" OutName="tlut_00007B10" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
<Texture Name="object_ganon_TLUT_007D10" OutName="tlut_00007D10" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
<Texture Name="object_ganon_Tex_007F10" OutName="tex_00007F10" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
<Texture Name="object_ganon_Tex_007F90" OutName="tex_00007F90" Format="ci8" Width="16" Height="16" Offset="0x7F90"/>
<Texture Name="object_ganon_Tex_008090" OutName="tex_00008090" Format="ci8" Width="16" Height="16" Offset="0x8090"/>
<Texture Name="object_ganon_Tex_007F90" OutName="tex_00007F90" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
<Texture Name="object_ganon_Tex_008090" OutName="tex_00008090" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
<Texture Name="object_ganon_Tex_008190" OutName="tex_00008190" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
<Texture Name="object_ganon_Tex_0081D0" OutName="tex_000081D0" Format="ci8" Width="16" Height="16" Offset="0x81D0"/>
<Texture Name="object_ganon_Tex_0082D0" OutName="tex_000082D0" Format="ci8" Width="16" Height="16" Offset="0x82D0"/>
<Texture Name="object_ganon_Tex_0081D0" OutName="tex_000081D0" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
<Texture Name="object_ganon_Tex_0082D0" OutName="tex_000082D0" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
<Texture Name="object_ganon_Tex_0083D0" OutName="tex_000083D0" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
<Texture Name="object_ganon_Tex_0083F0" OutName="tex_000083F0" Format="ci8" Width="16" Height="8" Offset="0x83F0"/>
<Texture Name="object_ganon_Tex_008470" OutName="tex_00008470" Format="ci8" Width="16" Height="16" Offset="0x8470"/>
<Texture Name="object_ganon_Tex_0083F0" OutName="tex_000083F0" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
<Texture Name="object_ganon_Tex_008470" OutName="tex_00008470" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
<Texture Name="object_ganon_Tex_008570" OutName="tex_00008570" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
<Texture Name="object_ganon_Tex_0085F0" OutName="tex_000085F0" Format="ci8" Width="8" Height="8" Offset="0x85F0"/>
<Texture Name="object_ganon_Tex_0085F0" OutName="tex_000085F0" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
<Texture Name="object_ganon_Tex_008630" OutName="tex_00008630" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
<Texture Name="object_ganon_Tex_008730" OutName="tex_00008730" Format="ci8" Width="32" Height="16" Offset="0x8730"/>
<Texture Name="object_ganon_Tex_008730" OutName="tex_00008730" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
<Texture Name="object_ganon_Tex_008930" OutName="tex_00008930" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
<Texture Name="object_ganon_Tex_008B30" OutName="tex_00008B30" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
<Texture Name="object_ganon_Tex_008D30" OutName="tex_00008D30" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
@ -47,7 +47,7 @@
<Texture Name="object_ganon_Tex_009A20" OutName="tex_00009A20" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
<Texture Name="object_ganon_Tex_009E20" OutName="tex_00009E20" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
<Texture Name="object_ganon_Tex_00A020" OutName="tex_0000A020" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
<Texture Name="object_ganon_Tex_00A220" OutName="tex_0000A220" Format="ci8" Width="8" Height="8" Offset="0xA220"/>
<Texture Name="object_ganon_Tex_00A220" OutName="tex_0000A220" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
<Texture Name="object_ganon_Tex_00A260" OutName="tex_0000A260" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
<Texture Name="object_ganon_Tex_00A460" OutName="tex_0000A460" Format="ci8" Width="8" Height="8" Offset="0xA460"/>
<Texture Name="object_ganon_Tex_00A4A0" OutName="tex_0000A4A0" Format="ci8" Width="8" Height="8" Offset="0xA4A0"/>

25
assets/xml/objects/object_ganon2.xml
View file

@ -57,22 +57,23 @@
<Texture Name="object_ganon2_Tex_01C180" OutName="tex_0001C180" Format="rgba16" Width="8" Height="16" Offset="0x1C180"/>
<Texture Name="object_ganon2_Tex_01C280" OutName="tex_0001C280" Format="rgba16" Width="8" Height="16" Offset="0x1C280"/>
<Texture Name="object_ganon2_Tex_01C380" OutName="tex_0001C380" Format="rgba16" Width="8" Height="8" Offset="0x1C380"/>
<Texture Name="object_ganon2_Tex_01C400" OutName="tex_0001C400" Format="ci8" Width="32" Height="32" Offset="0x1C400"/>
<Texture Name="object_ganon2_Tex_01C400" OutName="tex_0001C400" Format="ci8" Width="32" Height="32" Offset="0x1C400" TlutOffset="0x1AF80"/>
<Texture Name="object_ganon2_Tex_01C800" OutName="tex_0001C800" Format="rgba16" Width="8" Height="16" Offset="0x1C800"/>
<Texture Name="object_ganon2_Tex_01C900" OutName="tex_0001C900" Format="rgba16" Width="8" Height="16" Offset="0x1C900"/>
<Texture Name="object_ganon2_Tex_01CA00" OutName="tex_0001CA00" Format="ci8" Width="32" Height="16" Offset="0x1CA00"/>
<Texture Name="object_ganon2_Tex_01CC00" OutName="tex_0001CC00" Format="ci8" Width="16" Height="16" Offset="0x1CC00"/>
<Texture Name="object_ganon2_Tex_01CA00" OutName="tex_0001CA00" Format="ci8" Width="32" Height="16" Offset="0x1CA00" TlutOffset="0x1B180"/>
<Texture Name="object_ganon2_Tex_01CC00" OutName="tex_0001CC00" Format="ci8" Width="16" Height="16" Offset="0x1CC00" TlutOffset="0x1B580"/>
<Texture Name="object_ganon2_Tex_01CD00" OutName="tex_0001CD00" Format="rgba16" Width="16" Height="16" Offset="0x1CD00"/>
<Texture Name="object_ganon2_Tex_01CF00" OutName="tex_0001CF00" Format="ci8" Width="16" Height="16" Offset="0x1CF00"/>
<Texture Name="object_ganon2_Tex_01D000" OutName="tex_0001D000" Format="ci8" Width="16" Height="16" Offset="0x1D000"/>
<Texture Name="object_ganon2_Tex_01D100" OutName="tex_0001D100" Format="ci8" Width="16" Height="16" Offset="0x1D100"/>
<Texture Name="object_ganon2_Tex_01D200" OutName="tex_0001D200" Format="ci8" Width="16" Height="16" Offset="0x1D200"/>
<Texture Name="object_ganon2_Tex_01D300" OutName="tex_0001D300" Format="ci8" Width="16" Height="16" Offset="0x1D300"/>
<Texture Name="object_ganon2_Tex_01D400" OutName="tex_0001D400" Format="ci8" Width="16" Height="16" Offset="0x1D400"/>
<Texture Name="object_ganon2_Tex_01CF00" OutName="tex_0001CF00" Format="ci8" Width="16" Height="16" Offset="0x1CF00" TlutOffset="0x1B780"/>
<Texture Name="object_ganon2_Tex_01D000" OutName="tex_0001D000" Format="ci8" Width="16" Height="16" Offset="0x1D000" TlutOffset="0x1B980"/>
<Texture Name="object_ganon2_Tex_01D100" OutName="tex_0001D100" Format="ci8" Width="16" Height="16" Offset="0x1D100" TlutOffset="0x1B780"/>
<Texture Name="object_ganon2_Tex_01D200" OutName="tex_0001D200" Format="ci8" Width="16" Height="16" Offset="0x1D200" TlutOffset="0x1B980"/>
<Texture Name="object_ganon2_Tex_01D300" OutName="tex_0001D300" Format="ci8" Width="16" Height="16" Offset="0x1D300" TlutOffset="0x1BB80"/>
<Texture Name="object_ganon2_Tex_01D400" OutName="tex_0001D400" Format="ci8" Width="16" Height="16" Offset="0x1D400" TlutOffset="0x1BD80"/>
<Texture Name="object_ganon2_Tex_01D500" OutName="tex_0001D500" Format="rgba16" Width="4" Height="16" Offset="0x1D500"/>
<Texture Name="object_ganon2_Tex_01D580" OutName="tex_0001D580" Format="ci8" Width="16" Height="32" Offset="0x1D580"/>
<Texture Name="object_ganon2_Tlut_01D780" OutName="tlut_0001D780" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/><!--Blob Name="object_ganon2_Blob_01D7A0" Size="0x168" Offset="0x1D7A0" /-->
<Texture Name="object_ganon2_Tex_01D908" OutName="tex_0001D908" Format="ci8" Width="32" Height="32" Offset="0x1D908"/>
<Texture Name="object_ganon2_Tex_01D580" OutName="tex_0001D580" Format="ci8" Width="16" Height="32" Offset="0x1D580" TlutOffset="0x1BF80"/>
<Texture Name="object_ganon2_TLUT_01D780" OutName="tlut_0001D780" Format="rgba16" Width="4" Height="4" Offset="0x1D780"/>
<Texture Name="object_ganon2_TLUT_01D7A8" OutName="tlut_0001D7A8" Format="rgba16" Width="16" Height="11" Offset="0x1D7A8"/>
<Texture Name="object_ganon2_Tex_01D908" OutName="tex_0001D908" Format="ci8" Width="32" Height="32" Offset="0x1D908" TlutOffset="0x1D7A8"/>
<Texture Name="object_ganon2_Tex_01DD08" OutName="tex_0001DD08" Format="rgba16" Width="16" Height="32" Offset="0x1DD08"/>
<Texture Name="object_ganon2_Tex_01E108" OutName="tex_0001E108" Format="rgba16" Width="8" Height="8" Offset="0x1E108"/>
<Texture Name="object_ganon2_Tex_01E188" Format="ci4" Width="16" Height="16" Offset="0x1E188" TlutOffset="0x1D780"/> <!-- eye open -->

24
assets/xml/objects/object_ge1.xml
View file

@ -43,17 +43,17 @@
<Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2808"/>
<!-- White-clothed Gerudo Displaylist textures -->
<Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548"/>
<Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588"/>
<Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688"/>
<Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08"/>
<Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308"/>
<Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388"/>
<Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488"/>
<Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588"/>
<Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688"/>
<Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8"/>
<Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748"/>
<Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748" TlutOffset="0x0348"/>
<Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgba16" Width="8" Height="8" Offset="0x2788"/>
<!-- White-clothed Gerudo Hairstyle DisplayLists -->
@ -62,7 +62,7 @@
<DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>
<!-- White-clothed Gerudo Hair textures -->
<Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08"/>
<Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08" TlutOffset="0x2808"/>
<!-- White-clothed Gerudo Eye Textures -->
<Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x0708"/>

8
assets/xml/objects/object_geldb.xml
View file

@ -17,12 +17,12 @@
<Animation Name="gGerudoRedStandAnim" Offset="0xB07C"/>
<!-- Red-clothed Gerudo eye textures -->
<Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8"/>
<Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8"/>
<Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28"/>
<Texture Name="gGerudoRedEyeOpenTex" OutName="gerudo_red_eye_open" Format="ci8" Width="32" Height="32" Offset="0x5FE8" TlutOffset="0x5D30"/>
<Texture Name="gGerudoRedEyeHalfTex" OutName="gerudo_red_eye_half" Format="ci8" Width="32" Height="32" Offset="0x65A8" TlutOffset="0x5D30"/>
<Texture Name="gGerudoRedEyeShutTex" OutName="gerudo_red_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x6D28" TlutOffset="0x5D30"/>
<!-- These hints are currently needed for ZAPD to extract the textures properly. -->
<Texture Name="sGerudoRedTexHint1" Format="rgba16" Width="18" Height="14" Offset="0x5D30"/>
<Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28"/>
<Texture Name="sGerudoRedTexHint2" Format="ci8" Width="8" Height="8" Offset="0x5F28" TlutOffset="0x5D30"/>
</File>
</Root>

24
assets/xml/objects/object_gla.xml
View file

@ -51,25 +51,25 @@
<Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgba16" Width="18" Height="12" Offset="0x4D08"/>
<!-- Purple-clothed Gerudo Displaylist textures -->
<Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988"/>
<Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08"/>
<Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08"/>
<Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8"/>
<Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8"/>
<Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8"/>
<Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988" TlutOffset="0x4788"/>
<Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08" TlutOffset="0x4788"/>
<Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08" TlutOffset="0x4788"/>
<Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8" TlutOffset="0x4D08"/>
<Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8" TlutOffset="0x4D08"/>
<Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8" TlutOffset="0x4788"/>
<Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
<Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
<Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
<Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8"/>
<Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538"/>
<Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8" TlutOffset="0x4D08"/>
<Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538" TlutOffset="0x4D08"/>
<Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
<Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8"/>
<Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8" TlutOffset="0x4D08"/>
<Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>
<!-- Purple-clothed Gerudo Eye Textures -->
<Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78"/>
<Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578"/>
<Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8"/>
<Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78" TlutOffset="0x4D08"/>
<Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578" TlutOffset="0x4D08"/>
<Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8" TlutOffset="0x4D08"/>
<!-- Purple-clothed Gerudo Animations -->
<Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>

8
assets/xml/objects/object_gnd.xml
View file

@ -66,9 +66,11 @@
<DList Name="gPhantomGanonFaceDL" Offset="0x4EC0"/>
<!-- Face textures-->
<Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0"/>
<Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0"/>
<Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0"/>
<Texture Name="gPhantomGanonEyeTLUT" OutName="phantom_ganon_eye_palette" Format="rgba16" Width="16" Height="5" Offset="0x3CC0"/>
<Texture Name="gPhantomGanonMouthTLUT" OutName="phantom_ganon_mouth_palette" Format="rgba16" Width="8" Height="5" Offset="0x3D60"/>
<Texture Name="gPhantomGanonEyeTex" OutName="phantom_ganon_eye_tex" Format="ci8" Width="32" Height="16" Offset="0x3DB0" TlutOffset="0x3CC0"/>
<Texture Name="gPhantomGanonSmileTex" OutName="phantom_ganon_smile_tex" Format="ci8" Width="16" Height="16" Offset="0x3FB0" TlutOffset="0x3D60"/>
<Texture Name="gPhantomGanonMouthTex" OutName="phantom_ganon_mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x40B0" TlutOffset="0x3D60"/>
<!-- Unused Animations, seem to be corrupt -->
<Animation Name="gPhantomGanonAnim_003854" Offset="0x3854"/>

6
assets/xml/objects/object_horse.xml
View file

@ -51,9 +51,9 @@
<!-- Eyes textures -->
<Texture Name="gEponaEyeTLUT" OutName="epona_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9D80" />
<Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80" />
<Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180" />
<Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380" />
<Texture Name="gEponaEyeOpenTex" OutName="epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x9F80" TlutOffset="0x9D80"/>
<Texture Name="gEponaEyeHalfTex" OutName="epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0xA180" TlutOffset="0x9D80"/>
<Texture Name="gEponaEyeClosedTex" OutName="epona_eye_closed" Format="ci8" Width="32" Height="16" Offset="0xA380" TlutOffset="0x9D80"/>
<DList Name="gEponaUnusedWhiteCubeDL" Offset="0x4C0"/>
<DList Name="gEponaUnusedWhiteRectangle1DL" Offset="0x580"/>

6
assets/xml/objects/object_horse_link_child.xml
View file

@ -14,8 +14,8 @@
<Animation Name="gChildEponaGallopingAnim" Offset="0x2F98"/>
<Texture Name="gChildEponaEyePal" OutName="child_epona_eye_pal" Format="rgba16" Width="16" Height="16" Offset="0x1728" />
<Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" />
<Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" />
<Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" />
<Texture Name="gChildEponaEyeOpenTex" OutName="child_epona_eye_open" Format="ci8" Width="32" Height="16" Offset="0x1D28" TlutOffset="0x1728"/>
<Texture Name="gChildEponaEyeHalfTex" OutName="child_epona_eye_half" Format="ci8" Width="32" Height="16" Offset="0x1928" TlutOffset="0x1728"/>
<Texture Name="gChildEponaEyeCloseTex" OutName="child_epona_eye_close" Format="ci8" Width="32" Height="16" Offset="0x1B28" TlutOffset="0x1728"/>
</File>
</Root>

18
assets/xml/objects/object_hs.xml
View file

@ -16,17 +16,17 @@
<DList Name="object_hs_DL_004CF0" Offset="0x4CF0"/>
<DList Name="object_hs_DL_004CF8" Offset="0x4CF8"/>
<Texture Name="object_hs_TLUT_004E50" OutName="tlut_00004E50" Format="rgba16" Width="16" Height="16" Offset="0x4E50"/>
<Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050"/>
<Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250"/>
<Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290"/>
<Texture Name="object_hs_Tex_005050" OutName="tex_00005050" Format="ci8" Width="16" Height="32" Offset="0x5050" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005250" OutName="tex_00005250" Format="ci8" Width="8" Height="8" Offset="0x5250" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005290" OutName="tex_00005290" Format="ci8" Width="32" Height="16" Offset="0x5290" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005490" OutName="tex_00005490" Format="rgba16" Width="32" Height="16" Offset="0x5490"/>
<Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890"/>
<Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990"/>
<Texture Name="object_hs_Tex_005890" OutName="tex_00005890" Format="ci8" Width="16" Height="16" Offset="0x5890" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005990" OutName="tex_00005990" Format="ci8" Width="16" Height="16" Offset="0x5990" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005A90" OutName="tex_00005A90" Format="rgba16" Width="4" Height="4" Offset="0x5A90"/>
<Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0"/>
<Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0"/>
<Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0"/>
<Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70"/>
<Texture Name="object_hs_Tex_005AB0" OutName="tex_00005AB0" Format="ci8" Width="8" Height="8" Offset="0x5AB0" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005AF0" OutName="tex_00005AF0" Format="ci8" Width="32" Height="32" Offset="0x5AF0" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005EF0" OutName="tex_00005EF0" Format="ci8" Width="8" Height="16" Offset="0x5EF0" TlutOffset="0x4E50"/>
<Texture Name="object_hs_Tex_005F70" OutName="tex_00005F70" Format="ci8" Width="16" Height="32" Offset="0x5F70" TlutOffset="0x4E50"/>
<Limb Name="object_hs_Limb_006170" LimbType="Standard" Offset="0x6170"/>
<Limb Name="object_hs_Limb_00617C" LimbType="Standard" Offset="0x617C"/>
<Limb Name="object_hs_Limb_006188" LimbType="Standard" Offset="0x6188"/>

139
assets/xml/objects/object_im.xml
View file

@ -1,76 +1,79 @@
<Root>
<File Name="object_im" Segment="6">
<Animation Name="object_im_Anim_000710" Offset="0x710"/>
<Animation Name="object_im_Anim_000AFC" Offset="0xAFC"/>
<Animation Name="object_im_Anim_0014E4" Offset="0x14E4"/>
<Animation Name="object_im_Anim_001868" Offset="0x1868"/>
<Animation Name="gImpaRaiseArmsAnim" Offset="0x710"/>
<Animation Name="gImpaPresentShadowMedallionAnim" Offset="0xAFC"/>
<Animation Name="gImpaThrowDekuNutAnim" Offset="0x14E4"/>
<Animation Name="gImpaIdleAnim" Offset="0x1868"/>
<Texture Name="object_im_TLUT_001880" OutName="tlut_00001880" Format="rgba16" Width="16" Height="16" Offset="0x1880"/>
<Texture Name="object_im_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="8" Height="8" Offset="0x1A80"/>
<Texture Name="object_im_Tex_001AC0" OutName="tex_00001AC0" Format="ci8" Width="16" Height="32" Offset="0x1AC0"/>
<Texture Name="object_im_Tex_001CC0" OutName="tex_00001CC0" Format="ci8" Width="16" Height="16" Offset="0x1CC0"/>
<Texture Name="object_im_Tex_001DC0" OutName="tex_00001DC0" Format="ci8" Width="8" Height="8" Offset="0x1DC0"/>
<Texture Name="object_im_Tex_001E00" OutName="tex_00001E00" Format="ci8" Width="8" Height="16" Offset="0x1E00"/>
<Texture Name="object_im_Tex_001E80" OutName="tex_00001E80" Format="ci8" Width="8" Height="16" Offset="0x1E80"/>
<Texture Name="object_im_Tex_001F00" OutName="tex_00001F00" Format="ci8" Width="16" Height="32" Offset="0x1F00"/>
<Texture Name="object_im_Tex_002100" OutName="tex_00002100" Format="ci8" Width="16" Height="32" Offset="0x2100"/>
<Texture Name="object_im_Tex_002300" OutName="tex_00002300" Format="ci8" Width="16" Height="16" Offset="0x2300"/>
<Texture Name="object_im_Tex_002400" OutName="tex_00002400" Format="ci8" Width="8" Height="16" Offset="0x2400"/>
<Texture Name="object_im_Tex_002480" OutName="tex_00002480" Format="ci8" Width="32" Height="32" Offset="0x2480"/>
<Texture Name="object_im_Tex_002880" OutName="tex_00002880" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
<Texture Name="object_im_Tex_002980" OutName="tex_00002980" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
<Texture Name="object_im_Tex_002D80" OutName="tex_00002D80" Format="ci8" Width="8" Height="8" Offset="0x2D80"/>
<DList Name="object_im_DL_005040" Offset="0x5040"/>
<DList Name="object_im_DL_005D60" Offset="0x5D60"/>
<DList Name="object_im_DL_006048" Offset="0x6048"/>
<DList Name="object_im_DL_006200" Offset="0x6200"/>
<DList Name="object_im_DL_0064E8" Offset="0x64E8"/>
<DList Name="object_im_DL_006720" Offset="0x6720"/>
<DList Name="object_im_DL_006880" Offset="0x6880"/>
<DList Name="object_im_DL_0069E8" Offset="0x69E8"/>
<DList Name="object_im_DL_006BB8" Offset="0x6BB8"/>
<DList Name="object_im_DL_006D70" Offset="0x6D70"/>
<Texture Name="object_im_Tex_006F40" OutName="tex_00006F40" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
<Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="8" Height="13" Offset="0x7140"/>
<Texture Name="object_im_Tex_007210" OutName="tex_00007210" Format="ci8" Width="32" Height="32" Offset="0x7210"/>
<Texture Name="object_im_Tex_007610" OutName="tex_00007610" Format="ci8" Width="16" Height="16" Offset="0x7610"/>
<Texture Name="object_im_Tex_007710" OutName="tex_00007710" Format="ci8" Width="8" Height="8" Offset="0x7710"/>
<Texture Name="gImpaBrownGradientTex" OutName="brown_gradient" Format="ci8" Width="8" Height="8" Offset="0x1A80" TlutOffset="0x1880"/>
<Texture Name="gImpaSkinAndArmGuardTex" OutName="skin_and_armguard" Format="ci8" Width="16" Height="32" Offset="0x1AC0" TlutOffset="0x1880"/>
<Texture Name="gImpaElbowTex" OutName="elbow" Format="ci8" Width="16" Height="16" Offset="0x1CC0" TlutOffset="0x1880"/>
<Texture Name="gImpaShoulderPadBottomEdgeTex" OutName="shoulder_pad_bottom_edge" Format="ci8" Width="8" Height="8" Offset="0x1DC0" TlutOffset="0x1880"/>
<Texture Name="gImpaShoulderSkinTex" OutName="shoulder_skin" Format="ci8" Width="8" Height="16" Offset="0x1E00" TlutOffset="0x1880"/>
<Texture Name="gImpaChestPlateTex" OutName="chest_plate" Format="ci8" Width="8" Height="16" Offset="0x1E80" TlutOffset="0x1880"/>
<Texture Name="gImpaEmblemTex" OutName="emblem" Format="ci8" Width="16" Height="32" Offset="0x1F00" TlutOffset="0x1880"/>
<Texture Name="gImpaSpearEmblemTex" OutName="spear_emblem" Format="ci8" Width="16" Height="32" Offset="0x2100" TlutOffset="0x1880"/>
<Texture Name="gImpaChestPlateStrapTex" OutName="chest_plate_strap" Format="ci8" Width="16" Height="16" Offset="0x2300" TlutOffset="0x1880"/>
<Texture Name="gImpaChestPlateEdgeTex" OutName="chest_plate_edge" Format="ci8" Width="8" Height="16" Offset="0x2400" TlutOffset="0x1880"/>
<Texture Name="gImpaNeckTex" OutName="neck" Format="ci8" Width="32" Height="32" Offset="0x2480" TlutOffset="0x1880"/>
<Texture Name="gImpaSwordHandleTex" OutName="sword_handle" Format="rgba16" Width="8" Height="16" Offset="0x2880"/>
<Texture Name="gImpaPantsAndSkinTex" OutName="pants_and_skin" Format="rgba16" Width="16" Height="32" Offset="0x2980"/>
<Texture Name="gImpaBlackTex" OutName="black_square" Format="ci8" Width="8" Height="8" Offset="0x2D80" TlutOffset="0x1880"/> <!-- Used on the bottom of the leg -->
<DList Name="gImpaChestDL" Offset="0x5040"/>
<DList Name="gImpaRightShoulderDL" Offset="0x5D60"/>
<DList Name="gImpaRightArmDL" Offset="0x6048"/>
<DList Name="gImpaLeftShoulderDL" Offset="0x6200"/>
<DList Name="gImpaLeftArmDL" Offset="0x64E8"/>
<DList Name="gImpaTorsoDL" Offset="0x6720"/>
<DList Name="gImpaRightThighDL" Offset="0x6880"/>
<DList Name="gImpaRightLegDL" Offset="0x69E8"/>
<DList Name="gImpaLeftThighDL" Offset="0x6BB8"/>
<DList Name="gImpaLeftLegDL" Offset="0x6D70"/>
<Texture Name="gImpaEyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6F40"/>
<Texture Name="object_im_TLUT_007140" OutName="tlut_00007140" Format="rgba16" Width="26" Height="4" Offset="0x7140"/>
<Texture Name="gImpaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7210" TlutOffset="0x6F40"/>
<Texture Name="gImpaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x7D50" TlutOffset="0x6F40"/>
<Texture Name="gImpaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x8150" TlutOffset="0x6F40"/>
<Texture Name="gImpaEarTex" OutName="ear" Format="ci8" Width="16" Height="16" Offset="0x7610" TlutOffset="0x7140"/> <!-- Also used in gImpaHandPointingDL DList -->
<DList Name="gImpaHeadUnmaskedDL" Offset="0xBDC0"/>
<Texture Name="gImpaHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x7710" TlutOffset="0x7140"/>
<Texture Name="object_im_Tex_007750" OutName="tex_00007750" Format="rgba16" Width="8" Height="8" Offset="0x7750"/>
<Texture Name="object_im_Tex_0077D0" OutName="tex_000077D0" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
<Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0"/>
<Texture Name="object_im_Tex_007A10" OutName="tex_00007A10" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
<Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10"/>
<Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50"/>
<Texture Name="object_im_Tex_007C50" OutName="tex_00007C50" Format="ci8" Width="16" Height="16" Offset="0x7C50"/>
<Blob Name="object_im_Blob_007D50" Size="0x800" Offset="0x7D50"/>
<DList Name="object_im_DL_00BDC0" Offset="0xBDC0"/>
<DList Name="object_im_DL_00D0D8" Offset="0xD0D8"/>
<DList Name="object_im_DL_00DDB8" Offset="0xDDB8"/>
<DList Name="object_im_DL_00E0F0" Offset="0xE0F0"/>
<DList Name="object_im_DL_00E5D0" Offset="0xE5D0"/>
<DList Name="object_im_DL_00E908" Offset="0xE908"/>
<DList Name="object_im_DL_00EDE8" Offset="0xEDE8"/>
<Limb Name="object_im_Limb_00F688" LimbType="Standard" Offset="0xF688"/>
<Limb Name="object_im_Limb_00F694" LimbType="Standard" Offset="0xF694"/>
<Limb Name="object_im_Limb_00F6A0" LimbType="Standard" Offset="0xF6A0"/>
<Limb Name="object_im_Limb_00F6AC" LimbType="Standard" Offset="0xF6AC"/>
<Limb Name="object_im_Limb_00F6B8" LimbType="Standard" Offset="0xF6B8"/>
<Limb Name="object_im_Limb_00F6C4" LimbType="Standard" Offset="0xF6C4"/>
<Limb Name="object_im_Limb_00F6D0" LimbType="Standard" Offset="0xF6D0"/>
<Limb Name="object_im_Limb_00F6DC" LimbType="Standard" Offset="0xF6DC"/>
<Limb Name="object_im_Limb_00F6E8" LimbType="Standard" Offset="0xF6E8"/>
<Limb Name="object_im_Limb_00F6F4" LimbType="Standard" Offset="0xF6F4"/>
<Limb Name="object_im_Limb_00F700" LimbType="Standard" Offset="0xF700"/>
<Limb Name="object_im_Limb_00F70C" LimbType="Standard" Offset="0xF70C"/>
<Limb Name="object_im_Limb_00F718" LimbType="Standard" Offset="0xF718"/>
<Limb Name="object_im_Limb_00F724" LimbType="Standard" Offset="0xF724"/>
<Limb Name="object_im_Limb_00F730" LimbType="Standard" Offset="0xF730"/>
<Limb Name="object_im_Limb_00F73C" LimbType="Standard" Offset="0xF73C"/>
<Skeleton Name="object_im_Skel_00F788" Type="Flex" LimbType="Standard" Offset="0xF788"/>
<Texture Name="gImpaHair2Tex" OutName="hair_2" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
<Texture Name="object_im_Tex_0079D0" OutName="tex_000079D0" Format="ci8" Width="8" Height="8" Offset="0x79D0" TlutOffset="0x7140"/>
<Texture Name="gImpaShoulderPadTopTex" OutName="shoulder_pad_top" Format="rgba16" Width="8" Height="16" Offset="0x7A10"/>
<Texture Name="object_im_Tex_007B10" OutName="tex_00007B10" Format="ci8" Width="8" Height="8" Offset="0x7B10" TlutOffset="0x7140"/>
<Texture Name="object_im_Tex_007B50" OutName="tex_00007B50" Format="ci8" Width="16" Height="16" Offset="0x7B50" TlutOffset="0x7140"/>
<Texture Name="gImpaFingers2Tex" OutName="fingers_2" Format="ci8" Width="16" Height="16" Offset="0x7C50" TlutOffset="0x7140"/> <!-- Used in the gImpaHandPointingDL DList -->
<DList Name="gImpaHeadMaskedDL" Offset="0xD0D8"/>
<DList Name="gImpaLeftFootDL" Offset="0xDDB8"/>
<DList Name="gImpaLeftHandDL" Offset="0xE0F0"/>
<DList Name="gImpaRightFootDL" Offset="0xE5D0"/>
<DList Name="gImpaRightHandDL" Offset="0xE908"/>
<DList Name="gImpaHandPointingDL" Offset="0xEDE8"/>
<Limb Name="gImpaRootLimb" LimbType="Standard" Offset="0xF688"/>
<Limb Name="gImpaTorsoLimb" LimbType="Standard" Offset="0xF694"/>
<Limb Name="gImpaLeftThighLimb" LimbType="Standard" Offset="0xF6A0"/>
<Limb Name="gImpaLeftLegLimb" LimbType="Standard" Offset="0xF6AC"/>
<Limb Name="gImpaLeftFootLimb" LimbType="Standard" Offset="0xF6B8"/>
<Limb Name="gImpaRightThighLimb" LimbType="Standard" Offset="0xF6C4"/>
<Limb Name="gImpaRightLegLimb" LimbType="Standard" Offset="0xF6D0"/>
<Limb Name="gImpaRightFootLimb" LimbType="Standard" Offset="0xF6DC"/>
<Limb Name="gImpaChestLimb" LimbType="Standard" Offset="0xF6E8"/>
<Limb Name="gImpaLeftShoulderLimb" LimbType="Standard" Offset="0xF6F4"/>
<Limb Name="gImpaLeftArmLimb" LimbType="Standard" Offset="0xF700"/>
<Limb Name="gImpaLeftHandLimb" LimbType="Standard" Offset="0xF70C"/>
<Limb Name="gImpaRightShoulderLimb" LimbType="Standard" Offset="0xF718"/>
<Limb Name="gImpaRightArmLimb" LimbType="Standard" Offset="0xF724"/>
<Limb Name="gImpaRightHandLimb" LimbType="Standard" Offset="0xF730"/>
<Limb Name="gImpaHeadLimb" LimbType="Standard" Offset="0xF73C"/>
<Skeleton Name="gImpaSkel" Type="Flex" LimbType="Standard" Offset="0xF788"/>
<Animation Name="object_im_Anim_00FB10" Offset="0xFB10"/>
<Animation Name="object_im_Anim_0101C8" Offset="0x101C8"/>
<Animation Name="object_im_Anim_010EE0" Offset="0x10EE0"/>
<Animation Name="object_im_Anim_01182C" Offset="0x1182C"/>
<Animation Name="object_im_Anim_011C08" Offset="0x11C08"/>
<Animation Name="object_im_Anim_012218" Offset="0x12218"/>
<Animation Name="gImpaStartWhistlingAnim" Offset="0x10EE0"/>
<Animation Name="gImpaWhistlingAnim" Offset="0x1182C"/>
<Animation Name="gImpaPrepareSealGanonAnim" Offset="0x11C08"/>
<Animation Name="gImpaSealGanonAnim" Offset="0x12218"/>
</File>
</Root>

230
assets/xml/objects/object_in.xml
View file

@ -4,114 +4,124 @@
<Animation Name="object_in_Anim_000CB0" Offset="0xCB0"/>
<Animation Name="object_in_Anim_001BE0" Offset="0x1BE0"/>
<Animation Name="object_in_Anim_001CC0" Offset="0x1CC0"/>
<Texture Name="object_in_TLUT_001CD0" OutName="tlut_00001CD0" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
<Texture Name="object_in_TLUT_001ED0" OutName="tlut_00001ED0" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
<Blob Name="object_in_Blob_0020D0" Size="0x880" Offset="0x20D0"/>
<Texture Name="object_in_Tex_002950" OutName="tex_00002950" Format="ci8" Width="8" Height="8" Offset="0x2950"/>
<Texture Name="object_in_Tex_002990" OutName="tex_00002990" Format="ci8" Width="16" Height="32" Offset="0x2990"/>
<Texture Name="object_in_Tex_002B90" OutName="tex_00002B90" Format="ci8" Width="16" Height="16" Offset="0x2B90"/>
<Texture Name="object_in_Tex_002C90" OutName="tex_00002C90" Format="ci8" Width="8" Height="8" Offset="0x2C90"/>
<Texture Name="object_in_Tex_002CD0" OutName="tex_00002CD0" Format="ci8" Width="32" Height="32" Offset="0x2CD0"/>
<Texture Name="object_in_Tex_0030D0" OutName="tex_000030D0" Format="ci8" Width="8" Height="8" Offset="0x30D0"/>
<Texture Name="object_in_Tex_003110" OutName="tex_00003110" Format="ci8" Width="8" Height="8" Offset="0x3110"/>
<Blob Name="object_in_Blob_003150" Size="0x80" Offset="0x3150"/>
<Texture Name="object_in_Tex_0031D0" OutName="tex_000031D0" Format="ci8" Width="8" Height="8" Offset="0x31D0"/>
<!-- <Blob Name="object_in_Blob_003210" Size="0x1F8" Offset="0x3210"/> -->
<Texture Name="object_in_TLUT_003408" OutName="tlut_00003408" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
<Texture Name="object_in_Tex_0034D0" OutName="tex_000034D0" Format="ci8" Width="8" Height="8" Offset="0x34D0"/>
<Texture Name="object_in_Tex_003590" OutName="tex_00003590" Format="ci8" Width="32" Height="32" Offset="0x3590"/>
<Texture Name="object_in_Tex_003990" OutName="tex_00003990" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
<Texture Name="object_in_Tex_003B90" OutName="tex_00003B90" Format="ci8" Width="16" Height="16" Offset="0x3B90"/>
<Texture Name="object_in_Tex_003C90" OutName="tex_00003C90" Format="ci8" Width="16" Height="16" Offset="0x3C90"/>
<Texture Name="object_in_Tex_003D90" OutName="tex_00003D90" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
<Texture Name="object_in_Tex_003DD0" OutName="tex_00003DD0" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
<Texture Name="object_in_Tex_003ED0" OutName="tex_00003ED0" Format="ci8" Width="16" Height="32" Offset="0x3ED0"/>
<Texture Name="object_in_Tex_0040D0" OutName="tex_000040D0" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
<Texture Name="object_in_Tex_0041D0" OutName="tex_000041D0" Format="ci8" Width="8" Height="16" Offset="0x41D0"/>
<Texture Name="object_in_Tex_004250" OutName="tex_00004250" Format="ci8" Width="16" Height="16" Offset="0x4250"/>
<Texture Name="object_in_Tex_004350" OutName="tex_00004350" Format="ci8" Width="8" Height="8" Offset="0x4350"/>
<Texture Name="object_in_Tex_004390" OutName="tex_00004390" Format="ci8" Width="32" Height="32" Offset="0x4390"/>
<Texture Name="object_in_Tex_004790" OutName="tex_00004790" Format="ci8" Width="8" Height="8" Offset="0x4790"/>
<Texture Name="object_in_Tex_0047D0" OutName="tex_000047D0" Format="ci8" Width="32" Height="32" Offset="0x47D0"/>
<Texture Name="object_in_Tex_004BD0" OutName="tex_00004BD0" Format="ci8" Width="32" Height="32" Offset="0x4BD0"/>
<DList Name="object_in_DL_006730" Offset="0x6730"/>
<DList Name="object_in_DL_007398" Offset="0x7398"/>
<DList Name="object_in_DL_0074C0" Offset="0x74C0"/>
<DList Name="object_in_DL_0075E8" Offset="0x75E8"/>
<DList Name="object_in_DL_0076E0" Offset="0x76E0"/>
<DList Name="object_in_DL_007880" Offset="0x7880"/>
<DList Name="object_in_DL_007A20" Offset="0x7A20"/>
<DList Name="object_in_DL_007BF8" Offset="0x7BF8"/>
<DList Name="object_in_DL_00A0D8" Offset="0xA0D8"/>
<DList Name="object_in_DL_00A408" Offset="0xA408"/>
<DList Name="object_in_DL_00A630" Offset="0xA630"/>
<DList Name="object_in_DL_00A8E0" Offset="0xA8E0"/>
<DList Name="object_in_DL_00ACA0" Offset="0xACA0"/>
<DList Name="object_in_DL_00AEC8" Offset="0xAEC8"/>
<DList Name="object_in_DL_00B178" Offset="0xB178"/>
<DList Name="object_in_DL_00B5B8" Offset="0xB5B8"/>
<DList Name="object_in_DL_00B7E0" Offset="0xB7E0"/>
<DList Name="object_in_DL_00BB28" Offset="0xBB28"/>
<DList Name="object_in_DL_00BD80" Offset="0xBD80"/>
<DList Name="object_in_DL_00C0C8" Offset="0xC0C8"/>
<Texture Name="object_in_TLUT_00C298" OutName="tlut_0000C298" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
<Texture Name="object_in_Tex_00C498" OutName="tex_0000C498" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
<Texture Name="object_in_Tex_00C698" OutName="tex_0000C698" Format="ci8" Width="8" Height="8" Offset="0xC698"/>
<Texture Name="object_in_Tex_00C6D8" OutName="tex_0000C6D8" Format="ci8" Width="8" Height="8" Offset="0xC6D8"/>
<Texture Name="object_in_Tex_00C718" OutName="tex_0000C718" Format="ci8" Width="8" Height="8" Offset="0xC718"/>
<Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758"/>
<Texture Name="object_in_Tex_00C958" OutName="tex_0000C958" Format="ci8" Width="16" Height="16" Offset="0xC958"/>
<Texture Name="object_in_Tex_00CA58" OutName="tex_0000CA58" Format="ci8" Width="16" Height="16" Offset="0xCA58"/>
<Texture Name="object_in_Tex_00CB58" OutName="tex_0000CB58" Format="ci8" Width="8" Height="8" Offset="0xCB58"/>
<Blob Name="object_in_Blob_00CB98" Size="0x800" Offset="0xCB98"/>
<Texture Name="object_in_Tex_00D398" OutName="tex_0000D398" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
<Blob Name="object_in_Blob_00DB98" Size="0x800" Offset="0xDB98"/>
<Texture Name="object_in_Tex_00E398" OutName="tex_0000E398" Format="ci8" Width="16" Height="16" Offset="0xE398"/>
<Texture Name="object_in_Tex_00E498" OutName="tex_0000E498" Format="ci8" Width="16" Height="32" Offset="0xE498"/>
<Texture Name="object_in_Tex_00E698" OutName="tex_0000E698" Format="ci8" Width="16" Height="16" Offset="0xE698"/>
<Texture Name="object_in_Tex_00E798" OutName="tex_0000E798" Format="ci8" Width="16" Height="16" Offset="0xE798"/>
<Texture Name="object_in_Tex_00E898" OutName="tex_0000E898" Format="ci8" Width="16" Height="16" Offset="0xE898"/>
<Texture Name="object_in_Tex_00E998" OutName="tex_0000E998" Format="ci8" Width="16" Height="16" Offset="0xE998"/>
<Texture Name="object_in_Tex_00EA98" OutName="tex_0000EA98" Format="ci8" Width="8" Height="8" Offset="0xEA98"/>
<Texture Name="object_in_Tex_00EAD8" OutName="tex_0000EAD8" Format="ci8" Width="8" Height="8" Offset="0xEAD8"/>
<DList Name="object_in_DL_011758" Offset="0x11758"/>
<DList Name="object_in_DL_011AD8" Offset="0x11AD8"/>
<DList Name="object_in_DL_012120" Offset="0x12120"/>
<DList Name="object_in_DL_012220" Offset="0x12220"/>
<DList Name="object_in_DL_012350" Offset="0x12350"/>
<DList Name="object_in_DL_012480" Offset="0x12480"/>
<DList Name="object_in_DL_0125B0" Offset="0x125B0"/>
<DList Name="object_in_DL_0126E0" Offset="0x126E0"/>
<DList Name="object_in_DL_012AC0" Offset="0x12AC0"/>
<DList Name="object_in_DL_012BF0" Offset="0x12BF0"/>
<DList Name="object_in_DL_012D20" Offset="0x12D20"/>
<DList Name="object_in_DL_013100" Offset="0x13100"/>
<DList Name="object_in_DL_0132B8" Offset="0x132B8"/>
<DList Name="object_in_DL_0133F0" Offset="0x133F0"/>
<DList Name="object_in_DL_013540" Offset="0x13540"/>
<DList Name="object_in_DL_013688" Offset="0x13688"/>
<DList Name="object_in_DL_0137C0" Offset="0x137C0"/>
<DList Name="object_in_DL_013910" Offset="0x13910"/>
<Limb Name="object_in_Limb_013A58" LimbType="Standard" Offset="0x13A58"/>
<Limb Name="object_in_Limb_013A64" LimbType="Standard" Offset="0x13A64"/>
<Limb Name="object_in_Limb_013A70" LimbType="Standard" Offset="0x13A70"/>
<Limb Name="object_in_Limb_013A7C" LimbType="Standard" Offset="0x13A7C"/>
<Limb Name="object_in_Limb_013A88" LimbType="Standard" Offset="0x13A88"/>
<Limb Name="object_in_Limb_013A94" LimbType="Standard" Offset="0x13A94"/>
<Limb Name="object_in_Limb_013AA0" LimbType="Standard" Offset="0x13AA0"/>
<Limb Name="object_in_Limb_013AAC" LimbType="Standard" Offset="0x13AAC"/>
<Limb Name="object_in_Limb_013AB8" LimbType="Standard" Offset="0x13AB8"/>
<Limb Name="object_in_Limb_013AC4" LimbType="Standard" Offset="0x13AC4"/>
<Limb Name="object_in_Limb_013AD0" LimbType="Standard" Offset="0x13AD0"/>
<Limb Name="object_in_Limb_013ADC" LimbType="Standard" Offset="0x13ADC"/>
<Limb Name="object_in_Limb_013AE8" LimbType="Standard" Offset="0x13AE8"/>
<Limb Name="object_in_Limb_013AF4" LimbType="Standard" Offset="0x13AF4"/>
<Limb Name="object_in_Limb_013B00" LimbType="Standard" Offset="0x13B00"/>
<Limb Name="object_in_Limb_013B0C" LimbType="Standard" Offset="0x13B0C"/>
<Limb Name="object_in_Limb_013B18" LimbType="Standard" Offset="0x13B18"/>
<Limb Name="object_in_Limb_013B24" LimbType="Standard" Offset="0x13B24"/>
<Limb Name="object_in_Limb_013B30" LimbType="Standard" Offset="0x13B30"/>
<Skeleton Name="object_in_Skel_013B88" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
<Texture Name="gIngoTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x1CD0"/>
<Texture Name="gIngoSkinGradientTLUT" OutName="skin_gradient_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1ED0"/>
<Texture Name="gIngoUnusedEyeTex" OutName="unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x2150"/>
<Texture Name="gIngoSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2950" TlutOffset="0x1ED0"/>
<Texture Name="gIngoArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0x2990" TlutOffset="0x1CD0"/>
<Texture Name="gIngoFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x2B90" TlutOffset="0x1CD0"/>
<Texture Name="gIngoShirtSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0x2C90" TlutOffset="0x1CD0"/>
<Texture Name="gIngoShirtButtonsTex" OutName="shirt_buttons" Format="ci8" Width="32" Height="32" Offset="0x2CD0" TlutOffset="0x1CD0"/>
<Texture Name="gIngoClothTex" OutName="cloth" Format="ci8" Width="8" Height="8" Offset="0x30D0" TlutOffset="0x1CD0"/>
<Texture Name="gIngoClothStainTex" OutName="cloth_stain" Format="ci8" Width="8" Height="8" Offset="0x3110" TlutOffset="0x1CD0"/>
<Texture Name="gIngoPocketTex" OutName="pocket" Format="ci8" Width="8" Height="8" Offset="0x31D0" TlutOffset="0x1CD0"/>
<Texture Name="gIngoHeadTLUT" OutName="head_tlut" Format="rgba16" Width="252" Height="1" Offset="0x3210"/>
<Texture Name="gIngoTLUT2" OutName="tlut2" Format="rgba16" Width="100" Height="1" Offset="0x3408"/>
<Texture Name="gIngoHeadGradient2Tex" OutName="head_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x34D0" TlutOffset="0x3210"/>
<Texture Name="gIngoEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3510" TlutOffset="0x3408"/>
<Texture Name="gIngoBrownTex" OutName="brown" Format="ci8" Width="8" Height="8" Offset="0x3550" TlutOffset="0x3408"/> <!-- Used in his mustache, eyebrows, pitchfork -->
<Texture Name="gIngoEyebrowEdgeTex" OutName="eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0x3990"/>
<Texture Name="gIngoHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x3B90" TlutOffset="0x3408"/>
<Texture Name="gIngoSideburnsTex" OutName="sideburns" Format="ci8" Width="16" Height="16" Offset="0x3C90" TlutOffset="0x3408"/>
<Texture Name="gIngoPitchforkTex" OutName="pitchfork" Format="i8" Width="8" Height="8" Offset="0x3D90"/>
<Texture Name="gIngoBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x3DD0"/>
<Texture Name="gIngoBeardTex" OutName="beard" Format="ci8" Width="16" Height="32" Offset="0x3ED0" TlutOffset="0x3408"/>
<Texture Name="gIngoBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x40D0"/>
<Texture Name="gIngoBootSideTex" OutName="boot_side" Format="ci8" Width="8" Height="16" Offset="0x41D0" TlutOffset="0x3408"/>
<Texture Name="gIngoBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x4250" TlutOffset="0x3408"/>
<Texture Name="gIngoHeadGradientTex" OutName="head_gradient" Format="ci8" Width="8" Height="8" Offset="0x4790" TlutOffset="0x3408"/>
<Texture Name="gIngoEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3590" TlutOffset="0x3210"/>
<Texture Name="gIngoRedTex" OutName="red" Format="ci8" Width="8" Height="8" TlutOffset="0x3210" Offset="0x4350"/>
<Texture Name="gIngoEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x47D0" TlutOffset="0x3210"/>
<Texture Name="gIngoEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4BD0" TlutOffset="0x3210"/>
<Texture Name="gIngoEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x4390" TlutOffset="0x3210"/>
<DList Name="gIngoChildEraHeadDL" Offset="0x6730"/>
<DList Name="gIngoChildEraRightEyebrowDL" Offset="0x7398"/>
<DList Name="gIngoChildEraLeftEyebrowDL" Offset="0x74C0"/>
<DList Name="gIngoChildEraMustacheDL" Offset="0x75E8"/>
<DList Name="gIngoChildEraLeftFootDL" Offset="0x76E0"/>
<DList Name="gIngoChildEraRightFootDL" Offset="0x7880"/>
<DList Name="gIngoChildEraBasketDL" Offset="0x7A20"/>
<DList Name="gIngoChildEraPitchForkDL" Offset="0x7BF8"/>
<DList Name="gIngoChildEraChestDL" Offset="0xA0D8"/>
<DList Name="gIngoChildEraRightShoulderDL" Offset="0xA408"/>
<DList Name="gIngoChildEraRightArmDL" Offset="0xA630"/>
<DList Name="gIngoChildEraRightHandDL" Offset="0xA8E0"/>
<DList Name="gIngoChildEraLeftShoulderDL" Offset="0xACA0"/>
<DList Name="gIngoChildEraLeftArmDL" Offset="0xAEC8"/>
<DList Name="gIngoChildEraLeftHandDL" Offset="0xB178"/>
<DList Name="gIngoChildEraTorsoDL" Offset="0xB5B8"/>
<DList Name="gIngoChildEraRightThighDL" Offset="0xB7E0"/>
<DList Name="gIngoChildEraRightLegDL" Offset="0xBB28"/>
<DList Name="gIngoChildEraLeftThighDL" Offset="0xBD80"/>
<DList Name="gIngoChildEraLeftLegDL" Offset="0xC0C8"/>
<Texture Name="gIngoAdultEraTLUT" OutName="adult_era_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC298"/>
<Texture Name="gIngoAdultEraEyebrowEdgeTex" OutName="adult_era_eyebrow_edge" Format="rgba16" Width="16" Height="16" Offset="0xC498"/>
<Texture Name="gIngoAdultEraFaceHairTex" OutName="adult_era_face_hair" Format="ci8" Width="8" Height="8" Offset="0xC698" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraGradientTex" OutName="adult_era_gradient" Format="ci8" Width="8" Height="8" Offset="0xC6D8" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraEarTex" OutName="adult_era_ear" Format="ci8" Width="8" Height="8" Offset="0xC718" TlutOffset="0xC298"/>
<Texture Name="object_in_Tex_00C758" OutName="tex_0000C758" Format="ci8" Width="16" Height="32" Offset="0xC758" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraHairTex" OutName="adult_era_hair" Format="ci8" Width="16" Height="16" Offset="0xC958" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraSideburnsTex" OutName="adult_era_sideburns" Format="ci8" Width="16" Height="16" Offset="0xCA58" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraGradient2Tex" OutName="adult_era_gradient_2" Format="ci8" Width="8" Height="8" Offset="0xCB58" TlutOffset="0xC298"/>
<Texture Name="gIngoUnusedEyeOpenTex" OutName="unused_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xCB98"/>
<Texture Name="gIngoUnusedEyeHalfTex" OutName="unused_eye_half" Format="rgba16" Width="32" Height="32" Offset="0xD398"/>
<Texture Name="gIngoUnusedEyeClosedTex" OutName="unused_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0xDB98"/>
<Texture Name="gIngoAdultEraFingersTex" OutName="adult_era_fingers" Format="ci8" Width="16" Height="16" Offset="0xE398" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraArmHairTex" OutName="adult_era_arm_har" Format="ci8" Width="16" Height="32" Offset="0xE498" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraSleeveTex" OutName="adult_era_sleeve" Format="ci8" Width="16" Height="16" Offset="0xE698" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraCollarTex" OutName="adult_era_collar" Format="ci8" Width="16" Height="16" Offset="0xE798" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraCollar2Tex" OutName="adult_era_collar_2" Format="ci8" Width="16" Height="16" Offset="0xE898" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraShirtTex" OutName="adult_era_shirt" Format="ci8" Width="16" Height="16" Offset="0xE998" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraShoesTex" OutName="adult_era_shoes" Format="ci8" Width="8" Height="8" Offset="0xEA98" TlutOffset="0xC298"/>
<Texture Name="gIngoAdultEraPantsTex" OutName="adult_era_pants" Format="ci8" Width="8" Height="8" Offset="0xEAD8" TlutOffset="0xC298"/>
<DList Name="gIngoAdultEraChestDL" Offset="0x11758"/>
<DList Name="gIngoAdultEraHeadDL" Offset="0x11AD8"/>
<DList Name="gIngoAdultEraMustacheDL" Offset="0x12120"/>
<DList Name="gIngoAdultEraRightEyebrowDL" Offset="0x12220"/>
<DList Name="gIngoAdultEraLeftEyebrowDL" Offset="0x12350"/>
<DList Name="gIngoAdultEraRightShoulderDL" Offset="0x12480"/>
<DList Name="gIngoAdultEraRightArmDL" Offset="0x125B0"/>
<DList Name="gIngoAdultEraRightHandDL" Offset="0x126E0"/>
<DList Name="gIngoAdultEraLeftShoulderDL" Offset="0x12AC0"/>
<DList Name="gIngoAdultEraLeftArmDL" Offset="0x12BF0"/>
<DList Name="gIngoAdultEraLeftHandDL" Offset="0x12D20"/>
<DList Name="gIngoAdultEraTorsoDL" Offset="0x13100"/>
<DList Name="gIngoAdultEraRightThighDL" Offset="0x132B8"/>
<DList Name="gIngoAdultEraRightLegDL" Offset="0x133F0"/>
<DList Name="gIngoAdultEraRightFootDL" Offset="0x13540"/>
<DList Name="gIngoAdultEraLeftThighDL" Offset="0x13688"/>
<DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
<DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
<Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
<Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
<Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
<Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
<Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
<Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
<Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
<Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
<Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
<Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
<Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
<Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
<Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
<Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
<Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
<Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
<Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
<Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
<Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
<Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
<Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
<Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
<Animation Name="object_in_Anim_01431C" Offset="0x1431C"/>
@ -124,5 +134,9 @@
<Animation Name="object_in_Anim_0175D0" Offset="0x175D0"/>
<Animation Name="object_in_Anim_017B58" Offset="0x17B58"/>
<Animation Name="object_in_Anim_018C38" Offset="0x18C38"/>
<!-- No idea what these are -->
<Blob Name="gIngoBlob_0020D0" Size="0x80" Offset="0x20D0"/>
<Blob Name="gIngoBlob_003150" Size="0x80" Offset="0x3150"/>
</File>
</Root>

27
assets/xml/objects/object_jya_obj.xml
View file

@ -56,23 +56,24 @@
<DList Name="gMegamiPiece12DL" Offset="0xA978"/>
<DList Name="gMegamiPiece13DL" Offset="0xAAC8"/>
<Texture Name="gMegami1TLUT" OutName="megami_palette_1" Format="rgba16" Width="4" Height="4" Offset="0x5C80"/>
<Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8"/>
<Texture Name="gMegami1Tex" OutName="megami_tex_1" Format="ci4" Width="64" Height="64" Offset="0x5CE8" TlutOffset="0x5C80"/>
<Texture Name="gMegami2TLUT" OutName="megami_palette_2" Format="rgba16" Width="4" Height="4" Offset="0xAC50"/>
<Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8"/>
<Texture Name="gMegami2Tex" OutName="megami_tex_2" Format="ci4" Width="64" Height="64" Offset="0xACB8" TlutOffset="0xAC50"/>
<Texture Name="gMegami3TLUT" OutName="megami_palette_3" Format="rgba16" Width="4" Height="64" Offset="0x6CE8"/>
<Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8"/>
<Texture Name="gMegami3Tex" OutName="megami_tex_3" Format="ci4" Width="64" Height="64" Offset="0x64E8" TlutOffset="0x5C80"/>
<Texture Name="gMegami4TLUT" OutName="megami_palette_4" Format="rgba16" Width="4" Height="4" Offset="0x5CA0"/>
<Texture Name="gMegami5TLUT" OutName="megami_palette_5" Format="rgba16" Width="4" Height="4" Offset="0xAC70"/>
<Texture Name="gMeagmiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00"/>
<Texture Name="gMeagmiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00"/>
<Texture Name="gMeagmiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500"/>
<Texture Name="gMeagmiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00"/>
<Texture Name="gMeagmiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00"/>
<Texture Name="gMeagmiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500"/>
<Texture Name="gMeagmiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500"/>
<Texture Name="gMeagmiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00"/>
<Texture Name="gMeagmiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500"/>
<Texture Name="gMeagmiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500"/>
<Texture Name="gMegamiCrumbleTLUT" OutName="megami_crumble_palette" Format="rgba16" Width="4" Height="4" Offset="0x4E0"/>
<Texture Name="gMegamiRightCrumble1Tex" OutName="megami_right_crumble_1" Format="ci4" Width="64" Height="64" Offset="0xD00" TlutOffset="0x4E0"/>
<Texture Name="gMegamiRightCrumble2Tex" OutName="megami_right_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x1D00" TlutOffset="0x4E0"/>
<Texture Name="gMegamiRightCrumble3Tex" OutName="megami_right_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x2500" TlutOffset="0x4E0"/>
<Texture Name="gMegamiRightCrumble4Tex" OutName="megami_right_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x2D00" TlutOffset="0x4E0"/>
<Texture Name="gMegamiRightCrumble5Tex" OutName="megami_right_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x4D00" TlutOffset="0x4E0"/>
<Texture Name="gMegamiLeftCrumble1Tex" OutName="megami_left_crumble_1" Format="ci4" Width="64" Height="64" Offset="0x1500" TlutOffset="0x4E0"/>
<Texture Name="gMegamiLeftCrumble2Tex" OutName="megami_left_crumble_2" Format="ci4" Width="64" Height="64" Offset="0x3500" TlutOffset="0x4E0"/>
<Texture Name="gMegamiLeftCrumble3Tex" OutName="megami_left_crumble_3" Format="ci4" Width="64" Height="64" Offset="0x3D00" TlutOffset="0x4E0"/>
<Texture Name="gMegamiLeftCrumble4Tex" OutName="megami_left_crumble_4" Format="ci4" Width="64" Height="64" Offset="0x4500" TlutOffset="0x4E0"/>
<Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
<DList Name="gZurerukabeDL" Offset="0x12340"/>
<Collision Name="gZurerukabeCol" Offset="0x12508" />
</File>

56
assets/xml/objects/object_link_child.xml
View file

@ -120,28 +120,28 @@
<DList Name="gLinkChildBunnyHoodDL" Offset="0x2CA38"/>
<!--Textures-->
<Texture Name="gLinkChildNoseTex" OutName="link_child_nose" Format="ci8" Width="16" Height="16" Offset="0x5000"/>
<Texture Name="gLinkChildUnusedHandTex" OutName="link_child_hand_unused" Format="ci8" Width="16" Height="16" Offset="0x5100"/>
<Texture Name="gLinkChildEarTex" OutName="link_child_ear" Format="ci8" Width="16" Height="16" Offset="0x5200"/>
<Texture Name="gLinkChildLowerBootTex" OutName="link_child_lower_boot" Format="ci8" Height="16" Width="16" Offset="0x5C00"/>
<Texture Name="gLinkChildUnusedBootTex" OutName="link_child_unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00"/><!--Unused so hard to verify-->
<Texture Name="gLinkChildBootTex" OutName="link_child_boot" Format="ci8" Width="32" Height="32" Offset="0x6000"/>
<Texture Name="gLinkChildNoseTex" OutName="link_child_nose" Format="ci8" Width="16" Height="16" Offset="0x5000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildUnusedHandTex" OutName="link_child_unused_hand" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEarTex" OutName="link_child_ear" Format="ci8" Width="16" Height="16" Offset="0x5200" TlutOffset="0x5500"/>
<Texture Name="gLinkChildLowerBootTex" OutName="link_child_lower_boot" Format="ci8" Height="16" Width="16" Offset="0x5C00" TlutOffset="0x5300"/>
<Texture Name="gLinkChildUnusedBootTex" OutName="link_child_unused_boot" Format="ci8" Height="32" Width="24" Offset="0x5D00" TlutOffset="0x5300"/><!--Unused so hard to verify-->
<Texture Name="gLinkChildBootTex" OutName="link_child_boot" Format="ci8" Width="32" Height="32" Offset="0x6000" TlutOffset="0x5300"/>
<Texture Name="gLinkChildWaistTex" OutName="link_child_waist" Format="i8" Width="32" Height="32" Offset="0x6400"/>
<Texture Name="gLinkChildBeltTex" OutName="link_child_belt" Format="ci8" Width="8" Height="16" Offset="0x6800"/>
<Texture Name="gLinkChildBeltClaspTex" OutName="link_child_belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880"/>
<Texture Name="gLinkChildBeltTex" OutName="link_child_belt" Format="ci8" Width="8" Height="16" Offset="0x6800" TlutOffset="0x5300"/>
<Texture Name="gLinkChildBeltClaspTex" OutName="link_child_belt_clasp" Format="ci8" Width="32" Height="16" Offset="0x6880" TlutOffset="0x5300"/>
<Texture Name="gLinkChildFairyOcarinaTex" OutName="link_child_fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x6E08"/>
<Texture Name="gLinkChildDekuShieldBackTex" OutName="link_child_deku_shield_back" Format="rgba16" Height="32" Width="32" Offset="0x7688"/>
<Texture Name="gLinkChildDekuShieldFrontTex" OutName="link_child_deku_shield_front" Format="rgba16" Height="32" Width="64" Offset="0x7E88"/>
<Texture Name="gLinkChildDekuShieldFrontTex" OutName="link_child_deku_shield_front" Format="rgba16" Width="32" Height="64" Offset="0x7E88"/>
<Texture Name="gLinkChildHylianShieldBackTex" OutName="link_child_hylian_shield_back" Format="rgba16" Height="32" Width="16" Offset="0x8E88"/>
<Texture Name="gLinkChildSlingshotTex" OutName="link_child_slingshot" Format="rgba16" Width="16" Height="32" Offset="0x9288"/>
<Texture Name="gLinkChildSlingshotSeedTex" OutName="link_child_slingshot_seed" Format="rgba16" Width="32" Height="32" Offset="0x9688"/>
<Texture Name="gLinkChildHandTex" OutName="link_child_hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0"/>
<Texture Name="gLinkChildKokiriSwordSheathTex" OutName="link_child_kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0"/>
<Texture Name="gLinkChildSwordJewelTex" OutName="link_child_sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0"/>
<Texture Name="gLinkChildMasterSwordPommelTex" OutName="link_child_master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0"/>
<Texture Name="gLinkChildMasterSwordGuardTex" OutName="link_child_master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0"/>
<Texture Name="gLinkChildMasterSwordEmblemTex" OutName="link_child_master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0"/>
<Texture Name="gLinkChildGoronBracletTex" OutName="link_child_goron_braclet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
<Texture Name="gLinkChildHandTex" OutName="link_child_hand" Format="ci8" Width="16" Height="16" Offset="0xA1F0" TlutOffset="0x9E88"/>
<Texture Name="gLinkChildKokiriSwordSheathTex" OutName="link_child_kokiri_sword_sheath" Format="ci8" Height="16" Width="16" Offset="0xA2F0" TlutOffset="0x9F10"/>
<Texture Name="gLinkChildSwordJewelTex" OutName="link_child_sword_jewel" Format="ci8" Width="32" Height="16" Offset="0xA3F0" TlutOffset="0xA118"/>
<Texture Name="gLinkChildMasterSwordPommelTex" OutName="link_child_master_sword_pommel" Format="ci8" Height="16" Width="16" Offset="0xA5F0" TlutOffset="0x9F10"/>
<Texture Name="gLinkChildMasterSwordGuardTex" OutName="link_child_master_sword_guard" Format="ci8" Height="32" Width="32" Offset="0xA6F0" TlutOffset="0x9F10"/>
<Texture Name="gLinkChildMasterSwordEmblemTex" OutName="link_child_master_sword_emblem" Format="ci8" Height="16" Width="16" Offset="0xAAF0" TlutOffset="0x9F10"/>
<Texture Name="gLinkChildGoronBraceletTex" OutName="link_child_goron_bracelet" Format="rgba16" Width="8" Height="8" Offset="0x7208"/>
<Texture Name="gLinkChildGoronSymbolTex" OutName="link_child_goron_symbol" Format="ia16" Width="16" Height="32" Offset="0x7288"/>
<Texture Name="gLinkChildSkullMaskTeethTex" OutName="link_child_skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x26BA0"/>
@ -182,20 +182,20 @@
<Texture Name="gLinkChildBeltTLUT" OutName="link_child_belt_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
<!--Eyes-->
<Texture Name="gLinkChildEyesOpenTex" OutName="link_child_eyes_open" Format="i8" Width="64" Height="32" Offset="0x0000"/>
<Texture Name="gLinkChildEyesHalfTex" OutName="link_child_eyes_half" Format="i8" Width="64" Height="32" Offset="0x0800"/>
<Texture Name="gLinkChildEyesClosedfTex" OutName="link_child_eyes_closed" Format="i8" Width="64" Height="32" Offset="0x1000"/>
<Texture Name="gLinkChildEyesRollLeftTex" OutName="link_child_eyes_roll_left" Format="i8" Width="64" Height="32" Offset="0x1800"/><!--Left from links perspective-->
<Texture Name="gLinkChildEyesRollRightTex" OutName="link_child_eyes_roll_right" Format="i8" Width="64" Height="32" Offset="0x2000"/><!--Right from links perspective-->
<Texture Name="gLinkChildEyesShockTex" OutName="link_child_eyes_shock" Format="i8" Width="64" Height="32" Offset="0x2800"/>
<Texture Name="gLinkChildEyesUnk1Tex" OutName="link_child_eyes_unk_1" Format="i8" Width="64" Height="32" Offset="0x3000"/>
<Texture Name="gLinkChildEyesUnk2Tex" OutName="link_child_eyes_unk_2" Format="i8" Width="64" Height="32" Offset="0x3800"/>
<Texture Name="gLinkChildEyesOpenTex" OutName="link_child_eyes_open" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesHalfTex" OutName="link_child_eyes_half" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesClosedfTex" OutName="link_child_eyes_closed" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesRollLeftTex" OutName="link_child_eyes_roll_left" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/><!--Left from links perspective-->
<Texture Name="gLinkChildEyesRollRightTex" OutName="link_child_eyes_roll_right" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/><!--Right from links perspective-->
<Texture Name="gLinkChildEyesShockTex" OutName="link_child_eyes_shock" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesUnk1Tex" OutName="link_child_eyes_unk_1" Format="ci8" Width="64" Height="32" Offset="0x3000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildEyesUnk2Tex" OutName="link_child_eyes_unk_2" Format="ci8" Width="64" Height="32" Offset="0x3800" TlutOffset="0x5500"/>
<!--Mouth-->
<Texture Name="gLinkChildMouth1Tex" OutName="link_mouth_1" Format="i8" Width="32" Height="32" Offset="0x4000"/>
<Texture Name="gLinkChildMouth2Tex" OutName="link_mouth_2" Format="i8" Width="32" Height="32" Offset="0x4400"/>
<Texture Name="gLinkChildMouth3Tex" OutName="link_mouth_3" Format="i8" Width="32" Height="32" Offset="0x4800"/>
<Texture Name="gLinkChildMouth4Tex" OutName="link_mouth_4" Format="i8" Width="32" Height="32" Offset="0x4C00"/>
<Texture Name="gLinkChildMouth1Tex" OutName="link_mouth_1" Format="ci8" Width="32" Height="32" Offset="0x4000" TlutOffset="0x5500"/>
<Texture Name="gLinkChildMouth2Tex" OutName="link_mouth_2" Format="ci8" Width="32" Height="32" Offset="0x4400" TlutOffset="0x5500"/>
<Texture Name="gLinkChildMouth3Tex" OutName="link_mouth_3" Format="ci8" Width="32" Height="32" Offset="0x4800" TlutOffset="0x5500"/>
<Texture Name="gLinkChildMouth4Tex" OutName="link_mouth_4" Format="ci8" Width="32" Height="32" Offset="0x4C00" TlutOffset="0x5500"/>
<!--Unused Vtx-->
<Array Name="gLinkChildVtx_019E08" Count="35" Offset="0x19E08">

14
assets/xml/objects/object_ma1.xml
View file

@ -26,25 +26,25 @@
<Animation Name="gMalonChildSingAnim" Offset="0x8D64"/>
<Texture Name="gMalonChildDressTLUT" OutName="dress_tlut" Format="rgba16" Width="16" Height="16" Offset="0x830"/>
<Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30"/>
<Texture Name="gMalonChildDressDesignTex" OutName="dress_design" Format="ci8" Width="8" Height="16" Offset="0xA30" TlutOffset="0x830"/>
<Texture Name="gMalonChildFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0xAB0"/>
<Texture Name="gMalonChildBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xCB0"/>
<Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0"/>
<Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0"/>
<Texture Name="gMalonChildScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0x10B0" TlutOffset="0x830"/>
<Texture Name="gMalonChildBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x10F0" TlutOffset="0x830"/>
<Texture Name="gMalonChildHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x14F0"/>
<Texture Name="gMalonChildSkinGradientTex" OutName="skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0x1718"/>
<Texture Name="gMalonChildBrownCircleTex" OutName="unk_circle" Format="rgba16" Width="8" Height="8" Offset="0x1798"/>
<Texture Name="gMalonChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x1818"/>
<Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18"/>
<Texture Name="gMalonChildHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1A18" TlutOffset="0x14F0"/>
<Texture Name="gMalonChildNeutralMouthTex" OutName="neutral_mouth" Format="rgba16" Width="32" Height="16" Offset="0x1F18"/>
<Texture Name="gMalonChildSmilingMouthTex" OutName="smiling_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2B18"/>
<Texture Name="gMalonChildTalkingMouthTex" OutName="talking_mouth" Format="rgba16" Width="32" Height="16" Offset="0x2F18"/>
<Texture Name="gMalonChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="15" Height="12" Offset="0x15B0"/>
<Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18"/>
<Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318"/>
<Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718"/>
<Texture Name="gMalonChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x1B18" TlutOffset="0x15B0"/>
<Texture Name="gMalonChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2318" TlutOffset="0x15B0"/>
<Texture Name="gMalonChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x2718" TlutOffset="0x15B0"/>
<DList Name="gMalonChildHeadDL" Offset="0x4148"/>
<DList Name="gMalonChildDressLowerDL" Offset="0x6C68"/>

135
assets/xml/objects/object_ma2.xml
View file

@ -1,68 +1,75 @@
<Root>
<File Name="object_ma2" Segment="6">
<Animation Name="object_ma2_Anim_0007D4" Offset="0x7D4"/>
<Texture Name="object_ma2_TLUT_0007F0" OutName="tlut_000007F0" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
<Texture Name="object_ma2_Tex_0009F0" OutName="tex_000009F0" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
<Texture Name="object_ma2_Tex_000BF0" OutName="tex_00000BF0" Format="ci8" Width="16" Height="16" Offset="0xBF0"/>
<Texture Name="object_ma2_Tex_000CF0" OutName="tex_00000CF0" Format="ci8" Width="8" Height="16" Offset="0xCF0"/>
<Texture Name="object_ma2_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="8" Height="8" Offset="0xD70"/>
<Texture Name="object_ma2_Tex_000DB0" OutName="tex_00000DB0" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
<Texture Name="object_ma2_Tex_0011B0" OutName="tex_000011B0" Format="ci8" Width="16" Height="16" Offset="0x11B0"/>
<Texture Name="object_ma2_Tex_0012B0" OutName="tex_000012B0" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
<Texture Name="object_ma2_Tex_0016B0" OutName="tex_000016B0" Format="ci8" Width="16" Height="32" Offset="0x16B0"/>
<Texture Name="object_ma2_Tex_0018B0" OutName="tex_000018B0" Format="ci8" Width="64" Height="16" Offset="0x18B0"/>
<Texture Name="object_ma2_Tex_001CB0" OutName="tex_00001CB0" Format="ci8" Width="32" Height="16" Offset="0x1CB0"/>
<Texture Name="object_ma2_TLUT_001EB0" OutName="tlut_00001EB0" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/><!--Blob Name="object_ma2_Blob_0020B0" Size="0xC0" Offset="0x20B0" /-->
<Texture Name="object_ma2_Tex_002170" OutName="tex_00002170" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
<Texture Name="object_ma2_Tex_0021F0" OutName="tex_000021F0" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
<Texture Name="object_ma2_Tex_002270" OutName="tex_00002270" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
<Texture Name="object_ma2_Tex_002470" OutName="tex_00002470" Format="ci8" Width="16" Height="16" Offset="0x2470"/>
<Texture Name="object_ma2_Tex_002570" OutName="tex_00002570" Format="ci8" Width="32" Height="32" Offset="0x2570"/>
<Blob Name="object_ma2_Blob_002970" Size="0x200" Offset="0x2970"/>
<Texture Name="object_ma2_Tex_002B70" OutName="tex_00002B70" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
<Texture Name="object_ma2_Tex_002C70" OutName="tex_00002C70" Format="ci8" Width="32" Height="32" Offset="0x2C70"/>
<Texture Name="object_ma2_Tex_003070" OutName="tex_00003070" Format="ci8" Width="32" Height="32" Offset="0x3070"/>
<Texture Name="object_ma2_Tex_003470" OutName="tex_00003470" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
<Blob Name="object_ma2_Blob_003570" Size="0x200" Offset="0x3570"/>
<Texture Name="object_ma2_Tex_003770" OutName="tex_00003770" Format="ci8" Width="32" Height="16" Offset="0x3770"/>
<DList Name="object_ma2_DL_004BE0" Offset="0x4BE0"/>
<DList Name="object_ma2_DL_005420" Offset="0x5420"/>
<DList Name="object_ma2_DL_007568" Offset="0x7568"/>
<DList Name="object_ma2_DL_007980" Offset="0x7980"/>
<DList Name="object_ma2_DL_007BB0" Offset="0x7BB0"/>
<DList Name="object_ma2_DL_007CA8" Offset="0x7CA8"/>
<DList Name="object_ma2_DL_007E40" Offset="0x7E40"/>
<DList Name="object_ma2_DL_008070" Offset="0x8070"/>
<DList Name="object_ma2_DL_008168" Offset="0x8168"/>
<DList Name="object_ma2_DL_008300" Offset="0x8300"/>
<DList Name="object_ma2_DL_008530" Offset="0x8530"/>
<DList Name="object_ma2_DL_0087A0" Offset="0x87A0"/>
<DList Name="object_ma2_DL_0087F8" Offset="0x87F8"/>
<DList Name="object_ma2_DL_0088E8" Offset="0x88E8"/>
<DList Name="object_ma2_DL_008A08" Offset="0x8A08"/>
<DList Name="object_ma2_DL_008A60" Offset="0x8A60"/>
<DList Name="object_ma2_DL_008B50" Offset="0x8B50"/>
<Limb Name="object_ma2_Limb_008C70" LimbType="Standard" Offset="0x8C70"/>
<Limb Name="object_ma2_Limb_008C7C" LimbType="Standard" Offset="0x8C7C"/>
<Limb Name="object_ma2_Limb_008C88" LimbType="Standard" Offset="0x8C88"/>
<Limb Name="object_ma2_Limb_008C94" LimbType="Standard" Offset="0x8C94"/>
<Limb Name="object_ma2_Limb_008CA0" LimbType="Standard" Offset="0x8CA0"/>
<Limb Name="object_ma2_Limb_008CAC" LimbType="Standard" Offset="0x8CAC"/>
<Limb Name="object_ma2_Limb_008CB8" LimbType="Standard" Offset="0x8CB8"/>
<Limb Name="object_ma2_Limb_008CC4" LimbType="Standard" Offset="0x8CC4"/>
<Limb Name="object_ma2_Limb_008CD0" LimbType="Standard" Offset="0x8CD0"/>
<Limb Name="object_ma2_Limb_008CDC" LimbType="Standard" Offset="0x8CDC"/>
<Limb Name="object_ma2_Limb_008CE8" LimbType="Standard" Offset="0x8CE8"/>
<Limb Name="object_ma2_Limb_008CF4" LimbType="Standard" Offset="0x8CF4"/>
<Limb Name="object_ma2_Limb_008D00" LimbType="Standard" Offset="0x8D00"/>
<Limb Name="object_ma2_Limb_008D0C" LimbType="Standard" Offset="0x8D0C"/>
<Limb Name="object_ma2_Limb_008D18" LimbType="Standard" Offset="0x8D18"/>
<Limb Name="object_ma2_Limb_008D24" LimbType="Standard" Offset="0x8D24"/>
<Limb Name="object_ma2_Limb_008D30" LimbType="Standard" Offset="0x8D30"/>
<Limb Name="object_ma2_Limb_008D3C" LimbType="Standard" Offset="0x8D3C"/>
<Skeleton Name="object_ma2_Skel_008D90" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
<Animation Name="object_ma2_Anim_0092F0" Offset="0x92F0"/>
<Animation Name="object_ma2_Anim_0093BC" Offset="0x93BC"/>
<Animation Name="object_ma2_Anim_009EE0" Offset="0x9EE0"/>
<Texture Name="gMalonAdultClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7F0"/>
<Texture Name="gMalonAdultFingersTex" OutName="fingers" Format="rgba16" Width="16" Height="16" Offset="0x9F0"/>
<Texture Name="gMalonAdultShirtTex" OutName="shirt" Format="ci8" Width="16" Height="16" Offset="0xBF0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultShirtCuffTex" OutName="shirt_cuff" Format="ci8" Width="8" Height="16" Offset="0xCF0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultScarfTex" OutName="scarf" Format="ci8" Width="8" Height="8" Offset="0xD70" TlutOffset="0x7F0"/>
<Texture Name="gMalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xDB0"/>
<Texture Name="gMalonAdultMiddleDressTex" OutName="middle_dress" Format="ci8" Width="16" Height="16" Offset="0x11B0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultFrontDressTex" OutName="front_dress" Format="rgba16" Width="16" Height="32" Offset="0x12B0"/>
<Texture Name="gMalonAdultDressPatternTex" OutName="dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x16B0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultBootTex" OutName="boot" Format="ci8" Width="64" Height="16" Offset="0x18B0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultBeltTex" OutName="belt" Format="ci8" Width="32" Height="16" Offset="0x1CB0" TlutOffset="0x7F0"/>
<Texture Name="gMalonAdultHairTLUT" OutName="hair_tlut" Format="rgba16" Width="96" Height="1" Offset="0x1EB0"/>
<Texture Name="gMalonAdultGradientTex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0x2170"/>
<Texture Name="gMalonAdultNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0x21F0"/>
<Texture Name="gMalonAdultEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0x2270"/>
<Texture Name="gMalonAdultHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x2470" TlutOffset="0x1EB0"/>
<Texture Name="gMalonAdultFaceTLUT" OutName="face_tlut" Format="rgba16" Width="16" Height="16" Offset="0x1F70"/>
<Texture Name="gMalonAdultEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2570" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x2C70" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3070" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultBasketTex" OutName="basket" Format="rgba16" Width="8" Height="16" Offset="0x2B70"/>
<Texture Name="gMalonAdultBasketInsideTex" OutName="basket_inside" Format="rgba16" Width="8" Height="16" Offset="0x3470"/>
<Texture Name="gMalonAdultMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="32" Height="16" Offset="0x2970" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultMouthSadTex" OutName="mouth_sad" Format="ci8" Width="32" Height="16" Offset="0x3570" TlutOffset="0x1F70"/>
<Texture Name="gMalonAdultMouthHappyTex" OutName="mouth_happy" Format="ci8" Width="32" Height="16" Offset="0x3770" TlutOffset="0x1F70"/>
<DList Name="gMalonAdultHeadDL" Offset="0x4BE0"/>
<DList Name="gMalonAdultBasketDL" Offset="0x5420"/>
<DList Name="gMalonAdultChestAndNeckDL" Offset="0x7568"/>
<DList Name="gMalonAdultRightShoulderDL" Offset="0x7980"/>
<DList Name="gMalonAdultRightArmDL" Offset="0x7BB0"/>
<DList Name="gMalonAdultRightHandDL" Offset="0x7CA8"/>
<DList Name="gMalonAdultLeftShoulderDL" Offset="0x7E40"/>
<DList Name="gMalonAdultLeftArmDL" Offset="0x8070"/>
<DList Name="gMalonAdultLeftHandDL" Offset="0x8168"/>
<DList Name="gMalonAdultDressDL" Offset="0x8300"/>
<DList Name="gMalonAdultTorsoDL" Offset="0x8530"/>
<DList Name="gMalonAdultRightThighDL" Offset="0x87A0"/>
<DList Name="gMalonAdultRightLegDL" Offset="0x87F8"/>
<DList Name="gMalonAdultRightFootDL" Offset="0x88E8"/>
<DList Name="gMalonAdultLeftThighDL" Offset="0x8A08"/>
<DList Name="gMalonAdultLeftLegDL" Offset="0x8A60"/>
<DList Name="gMalonAdultLeftFootDL" Offset="0x8B50"/>
<Skeleton Name="gMalonAdultSkel" Type="Flex" LimbType="Standard" Offset="0x8D90"/>
<Limb Name="gMalonAdultRootLimb" LimbType="Standard" Offset="0x8C70"/>
<Limb Name="gMalonAdultLowerControlLimb" LimbType="Standard" Offset="0x8C7C"/>
<Limb Name="gMalonAdultLeftThighLimb" LimbType="Standard" Offset="0x8C88"/>
<Limb Name="gMalonAdultLeftLegLimb" LimbType="Standard" Offset="0x8C94"/>
<Limb Name="gMalonAdultLeftFootLimb" LimbType="Standard" Offset="0x8CA0"/>
<Limb Name="gMalonAdultRightThighLimb" LimbType="Standard" Offset="0x8CAC"/>
<Limb Name="gMalonAdultRightLegLimb" LimbType="Standard" Offset="0x8CB8"/>
<Limb Name="gMalonAdultRightFootLimb" LimbType="Standard" Offset="0x8CC4"/>
<Limb Name="gMalonAdultTorsoLimb" LimbType="Standard" Offset="0x8CD0"/>
<Limb Name="gMalonAdultDressLimb" LimbType="Standard" Offset="0x8CDC"/>
<Limb Name="gMalonAdultChestAndNeckLimb" LimbType="Standard" Offset="0x8CE8"/>
<Limb Name="gMalonAdultLeftShoulderLimb" LimbType="Standard" Offset="0x8CF4"/>
<Limb Name="gMalonAdultLeftArmLimb" LimbType="Standard" Offset="0x8D00"/>
<Limb Name="gMalonAdultLeftHandLimb" LimbType="Standard" Offset="0x8D0C"/>
<Limb Name="gMalonAdultRightShoulderLimb" LimbType="Standard" Offset="0x8D18"/>
<Limb Name="gMalonAdultRightArmLimb" LimbType="Standard" Offset="0x8D24"/>
<Limb Name="gMalonAdultRightHandLimb" LimbType="Standard" Offset="0x8D30"/>
<Limb Name="gMalonAdultHeadLimb" LimbType="Standard" Offset="0x8D3C"/>
<Animation Name="gMalonAdultIdleAnim" Offset="0x7D4"/>
<Animation Name="gMalonAdultSingToIdleAnim" Offset="0x92F0"/> <!-- Unused -->
<Animation Name="gMalonAdultStandStillAnim" Offset="0x93BC"/>
<Animation Name="gMalonAdultSingAnim" Offset="0x9EE0"/>
</File>
</Root>

18
assets/xml/objects/object_mk.xml
View file

@ -17,16 +17,16 @@
<DList Name="object_mk_DL_004C60" Offset="0x4C60"/>
<DList Name="object_mk_DL_004DB0" Offset="0x4DB0"/>
<Texture Name="object_mk_TLUT_004F30" OutName="tlut_00004F30" Format="rgba16" Width="16" Height="16" Offset="0x4F30"/>
<Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130"/>
<Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170"/>
<Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270"/>
<Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0"/>
<Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0"/>
<Texture Name="object_mk_Tex_005130" OutName="tex_00005130" Format="ci8" Width="8" Height="8" Offset="0x5130" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005270" OutName="tex_00005270" Format="ci8" Width="8" Height="8" Offset="0x5270" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_0052B0" OutName="tex_000052B0" Format="ci8" Width="8" Height="8" Offset="0x52B0" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_0052F0" OutName="tex_000052F0" Format="ci8" Width="8" Height="16" Offset="0x52F0" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005370" OutName="tex_00005370" Format="rgba16" Width="32" Height="32" Offset="0x5370"/>
<Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70"/>
<Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0"/>
<Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0"/>
<Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30"/>
<Texture Name="object_mk_Tex_005B70" OutName="tex_00005B70" Format="ci8" Width="8" Height="8" Offset="0x5B70" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005BB0" OutName="tex_00005BB0" Format="ci8" Width="8" Height="8" Offset="0x5BB0" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005BF0" OutName="tex_00005BF0" Format="ci8" Width="8" Height="8" Offset="0x5BF0" TlutOffset="0x4F30"/>
<Texture Name="object_mk_Tex_005C30" OutName="tex_00005C30" Format="ci8" Width="16" Height="16" Offset="0x5C30" TlutOffset="0x4F30"/>
<Limb Name="object_mk_Limb_005D30" LimbType="Standard" Offset="0x5D30"/>
<Limb Name="object_mk_Limb_005D3C" LimbType="Standard" Offset="0x5D3C"/>
<Limb Name="object_mk_Limb_005D48" LimbType="Standard" Offset="0x5D48"/>

4
assets/xml/objects/object_mm.xml
View file

@ -10,7 +10,7 @@
<Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
<Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
<Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30"/>
<Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30"/>
<Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
<Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
</File>
</Root>

4
assets/xml/objects/object_mori_objects.xml
View file

@ -1,9 +1,9 @@
<Root>
<File Name="object_mori_objects" Segment="6">
<Texture Name="gMoriHashiraTLUT" OutName="hashira_palette" Width="112" Height="1" Format="rgba16" Offset="0x0000"/>
<Texture Name="gMoriHashiraTex" OutName="hashira" Width="32" Height="32" Format="ci8" Offset="0x00E0"/>
<Texture Name="gMoriHashiraTex" OutName="hashira" Width="32" Height="32" Format="ci8" Offset="0x00E0" TlutOffset="0x0000"/>
<Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_palette" Width="112" Height="1" Format="rgba16" Offset="0x3810"/>
<Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Width="32" Height="32" Format="ci8" Offset="0x38F0"/>
<Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Width="32" Height="32" Format="ci8" Offset="0x38F0" TlutOffset="0x3810"/>
<Collision Name="gMoriBigstCol" Offset="0x221C"/>
<DList Name="gMoriBigstDL" Offset="0x1E50"/>
<Collision Name="gMoriElevatorCol" Offset="0x35F8"/>

30
assets/xml/objects/object_mu.xml
View file

@ -6,12 +6,12 @@
<Texture Name="object_mu_Tex_000650" OutName="tex_00000650" Format="i8" Width="8" Height="8" Offset="0x650"/>
<Texture Name="object_mu_Tex_000690" OutName="tex_00000690" Format="i8" Width="8" Height="8" Offset="0x690"/>
<Texture Name="object_mu_Tex_0006D0" OutName="tex_000006D0" Format="i8" Width="8" Height="8" Offset="0x6D0"/>
<Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710"/>
<Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790"/>
<Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0"/>
<Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810"/>
<Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850"/>
<Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890"/>
<Texture Name="object_mu_Tex_000710" OutName="tex_00000710" Format="ci8" Width="8" Height="16" Offset="0x710" TlutOffset="0x410"/>
<Texture Name="object_mu_Tex_000790" OutName="tex_00000790" Format="ci8" Width="8" Height="8" Offset="0x790" TlutOffset="0x410"/>
<Texture Name="object_mu_Tex_0007D0" OutName="tex_000007D0" Format="ci8" Width="8" Height="8" Offset="0x7D0" TlutOffset="0x410"/>
<Texture Name="object_mu_Tex_000810" OutName="tex_00000810" Format="ci8" Width="8" Height="8" Offset="0x810" TlutOffset="0x410"/>
<Texture Name="object_mu_Tex_000850" OutName="tex_00000850" Format="ci8" Width="8" Height="8" Offset="0x850" TlutOffset="0x410"/>
<Texture Name="object_mu_Tex_000890" OutName="tex_00000890" Format="ci8" Width="8" Height="8" Offset="0x890" TlutOffset="0x410"/>
<DList Name="object_mu_DL_003110" Offset="0x3110"/>
<DList Name="object_mu_DL_0035E8" Offset="0x35E8"/>
<DList Name="object_mu_DL_0037B0" Offset="0x37B0"/>
@ -44,16 +44,16 @@
<Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
<Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
<Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
<Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350"/>
<Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350" TlutOffset="0x5050"/>
<Texture Name="object_mu_Tex_005450" OutName="tex_00005450" Format="i8" Width="8" Height="8" Offset="0x5450"/>
<Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490"/>
<Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0"/>
<Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0"/>
<Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610"/>
<Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810"/>
<Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10"/>
<Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50"/>
<Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0"/>
<Texture Name="object_mu_Tex_005490" OutName="tex_00005490" Format="ci8" Width="8" Height="8" Offset="0x5490" TlutOffset="0x5050"/>
<Texture Name="object_mu_Tex_0054D0" OutName="tex_000054D0" Format="ci8" Width="16" Height="16" Offset="0x54D0" TlutOffset="0x5050"/>
<Texture Name="object_mu_Tex_0055D0" OutName="tex_000055D0" Format="ci8" Width="8" Height="8" Offset="0x55D0" TlutOffset="0x5050"/>
<Texture Name="object_mu_Tex_005610" OutName="tex_00005610" Format="ci8" Width="32" Height="16" Offset="0x5610" TlutOffset="0x5050"/>
<Texture Name="object_mu_Tex_005810" OutName="tex_00005810" Format="ci8" Width="32" Height="32" Offset="0x5810" TlutOffset="0x5050"/>
<Texture Name="object_mu_Tex_005C10" OutName="tex_00005C10" Format="ci8" Width="8" Height="8" Offset="0x5C10" TlutOffset="0x5050"/>
<Texture Name="object_mu_Tex_005C50" OutName="tex_00005C50" Format="ci8" Width="8" Height="16" Offset="0x5C50" TlutOffset="0x5050"/>
<Texture Name="object_mu_Tex_005CD0" OutName="tex_00005CD0" Format="ci8" Width="32" Height="32" Offset="0x5CD0" TlutOffset="0x5050"/>
<DList Name="object_mu_DL_008FD0" Offset="0x8FD0"/>
<DList Name="object_mu_DL_009328" Offset="0x9328"/>
<DList Name="object_mu_DL_009828" Offset="0x9828"/>

56
assets/xml/objects/object_nb.xml
View file

@ -50,41 +50,41 @@
<Texture Name="gNabooru3TLUT" OutName="nabooru_3_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0B048"/>
<!-- Nabooru Displaylist Textures -->
<Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0"/>
<Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0"/>
<Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0"/>
<Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0"/>
<Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0"/>
<Texture Name="gNabooruClothesButtonsTex" OutName="nabooru_clothes_buttons" Format="ci8" Width="16" Height="16" Offset="0x098B0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruSkinGradient1Tex" OutName="nabooru_skin_gradient_1" Format="ci8" Width="8" Height="8" Offset="0x099B0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruNavelTex" OutName="nabooru_navel" Format="ci8" Width="16" Height="16" Offset="0x099F0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruPendantJewelTex" OutName="nabooru_pendant_jewel" Format="ci8" Width="32" Height="32" Offset="0x09AF0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruCleavageTex" OutName="nabooru_cleavage" Format="ci8" Width="8" Height="8" Offset="0x09EF0" TlutOffset="0x096B0"/>
<Texture Name="gNabooruTopFabricPatternTex" OutName="nabooru_top_fabric_pattern" Format="rgba16" Width="16" Height="16" Offset="0x09F30"/>
<Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130"/>
<Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230"/>
<Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270"/>
<Texture Name="gNabooruAnkleBraceletTex" OutName="nabooru_ankle_bracelet" Format="ci8" Width="16" Height="16" Offset="0x0A130" TlutOffset="0x096B0"/>
<Texture Name="gNabooruTrousersShadowTex" OutName="nabooru_trousers_shadow" Format="ci8" Width="8" Height="8" Offset="0x0A230" TlutOffset="0x096B0"/>
<Texture Name="gNabooruTrousersFabricTex" OutName="nabooru_trousers_fabric" Format="ci8" Width="16" Height="16" Offset="0x0A270" TlutOffset="0x096B0"/>
<Texture Name="gNabooruTrouserCuffPatternTex" OutName="nabooru_trouser_cuff_pattern" Format="rgba16" Width="16" Height="16" Offset="0x0A370"/>
<Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570"/>
<Texture Name="gNabooruBeltJewelTex" OutName="nabooru_belt_jewel" Format="ci8" Width="16" Height="16" Offset="0x0A570" TlutOffset="0x096B0"/>
<Texture Name="gNabooruBeltTex" OutName="nabooru_belt" Format="rgba16" Width="32" Height="32" Offset="0x0A670"/>
<Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248"/><!-- Looks like 0x099B0, but uses 2TLUT -->
<Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288"/>
<Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8"/>
<Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328"/>
<Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828"/>
<Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928"/><!-- Looks like 0x0A570, but uses 2TLUT -->
<Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28"/>
<Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8"/>
<Texture Name="gNabooruSkinGradient2Tex" OutName="nabooru_skin_gradient_2" Format="ci8" Width="8" Height="8" Offset="0x0B248" TlutOffset="0x0AE70"/><!-- Looks like 0x099B0, but uses 2TLUT -->
<Texture Name="gNabooruForeheadJewelSettingTopTex" OutName="nabooru_forehead_jewel_setting_top" Format="ci8" Width="8" Height="4" Offset="0x0B288" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruForeheadJewelSettingBottomTex" OutName="nabooru_forehead_jewel_setting_bottom" Format="ci8" Width="8" Height="16" Offset="0x0B2A8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruForeheadJewelSettingSideTex" OutName="nabooru_forehead_jewel_setting_side" Format="ci8" Width="16" Height="16" Offset="0x0B328" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruHairTex" OutName="nabooru_hair" Format="ci8" Width="16" Height="16" Offset="0x0B828" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruForeheadJewelTex" OutName="nabooru_forehead_jewel" Format="ci8" Width="16" Height="16" Offset="0x0B928" TlutOffset="0x0AE70"/><!-- Looks like 0x0A570, but uses 2TLUT -->
<Texture Name="gNabooruEarTex" OutName="nabooru_ear" Format="ci8" Width="8" Height="16" Offset="0x0BA28" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruFingersBackSideTex" OutName="nabooru_fingers_back_side" Format="ci8" Width="32" Height="32" Offset="0x0BAA8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruEarringsNecklaceArmletTex" OutName="nabooru_earrings_necklace_armlet" Format="rgba16" Width="32" Height="32" Offset="0x0BEA8"/>
<Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
<Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8"/><!-- Looks like 0x098B0, but uses 2TLUT -->
<Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8"/>
<Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8"/>
<Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28"/>
<Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68"/>
<Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8"/>
<Texture Name="gNabooruPonytailCuffJewelTex" OutName="nabooru_ponytail_cuff_jewel" Format="ci8" Width="32" Height="32" Offset="0x0C6A8" TlutOffset="0x0AE70"/><!-- Looks like 0x09AF0, but uses 2TLUT -->
<Texture Name="gNabooruGloveHandBackTex" OutName="nabooru_glove_hand_back" Format="ci8" Width="16" Height="16" Offset="0x0CAA8" TlutOffset="0x0AE70"/><!-- Looks like 0x098B0, but uses 2TLUT -->
<Texture Name="gNabooruGloveHandPalmTex" OutName="nabooru_glove_hand_palm" Format="ci8" Width="8" Height="8" Offset="0x0CBA8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruShoeUpperMouthTex" OutName="nabooru_shoe_upper_mouth" Format="ci8" Width="8" Height="8" Offset="0x0CBE8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruShoeSoleTex" OutName="nabooru_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x0CC28" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruTopOfFootTex" OutName="nabooru_top_of_foot" Format="ci8" Width="8" Height="16" Offset="0x0CC68" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruFingersPalmSideTex" OutName="nabooru_fingers_palm_side" Format="ci8" Width="32" Height="32" Offset="0x0CCE8" TlutOffset="0x0AE70"/>
<Texture Name="gNabooruLipsTex" OutName="nabooru_lips" Format="rgba16" Width="8" Height="8" Offset="0x0DCE8"/>
<!-- Nabooru Eye Textures -->
<Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428"/>
<Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8"/>
<Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8"/>
<Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8"/>
<Texture Name="gNabooruEyeOpenTex" OutName="nabooru_eye_open" Format="ci8" Width="32" Height="32" Offset="0x0B428" TlutOffset="0x0B048"/>
<Texture Name="gNabooruEyeHalfTex" OutName="nabooru_eye_half" Format="ci8" Width="32" Height="32" Offset="0x0D0E8" TlutOffset="0x0B048"/>
<Texture Name="gNabooruEyeClosedTex" OutName="nabooru_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x0D4E8" TlutOffset="0x0B048"/>
<Texture Name="gNabooruEyeWideTex" OutName="nabooru_eye_wide" Format="ci8" Width="32" Height="32" Offset="0x0D8E8" TlutOffset="0x0B048"/>
<!-- Nabooru Animations -->
<Animation Name="gNabooruPuttingHandsTogetherCastingMagicAnim" Offset="0x00410"/>

12
assets/xml/objects/object_oA1.xml
View file

@ -55,12 +55,12 @@
<DList Name="object_oA1_DL_00003508" Offset="0x3508"/>
<DList Name="object_oA1_DL_00003678" Offset="0x3678"/>
<Texture Name="object_oA1_TLUT_00003748" OutName="tlut_00003748" Format="rgba16" Width="16" Height="16" Offset="0x3748"/>
<Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948"/>
<Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48"/>
<Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48"/>
<Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88"/>
<Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88"/>
<Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088"/>
<Texture Name="object_oA1_Tex_00003948" OutName="tex_00003948" Format="ci8" Width="32" Height="32" Offset="0x3948" TlutOffset="0x3748"/>
<Texture Name="object_oA1_Tex_00003D48" OutName="tex_00003D48" Format="ci8" Width="16" Height="16" Offset="0x3D48" TlutOffset="0x3748"/>
<Texture Name="object_oA1_Tex_00003E48" OutName="tex_00003E48" Format="ci8" Width="8" Height="8" Offset="0x3E48" TlutOffset="0x3748"/>
<Texture Name="object_oA1_Tex_00003E88" OutName="tex_00003E88" Format="ci8" Width="16" Height="16" Offset="0x3E88" TlutOffset="0x3748"/>
<Texture Name="object_oA1_Tex_00003F88" OutName="tex_00003F88" Format="ci8" Width="16" Height="16" Offset="0x3F88" TlutOffset="0x3748"/>
<Texture Name="object_oA1_Tex_00004088" OutName="tex_00004088" Format="ci8" Width="16" Height="16" Offset="0x4088" TlutOffset="0x3748"/>
<Texture Name="object_oA1_Tex_00004188" OutName="tex_00004188" Format="i4" Width="16" Height="16" Offset="0x4188"/>
<Texture Name="object_oA1_Tex_00004208" OutName="tex_00004208" Format="i4" Width="16" Height="32" Offset="0x4208"/>
<Texture Name="object_oA1_Tex_00004308" OutName="tex_00004308" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>

8
assets/xml/objects/object_oE1.xml
View file

@ -55,12 +55,12 @@
<DList Name="object_oE1_DL_0045E8" Offset="0x45E8"/>
<DList Name="object_oE1_DL_004738" Offset="0x4738"/>
<Texture Name="object_oE1_TLUT_004808" OutName="tlut_00004808" Format="rgba16" Width="16" Height="16" Offset="0x4808"/>
<Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08"/>
<Texture Name="object_oE1_Tex_004A08" OutName="tex_00004A08" Format="ci8" Width="32" Height="32" Offset="0x4A08" TlutOffset="0x4808"/>
<Blob Name="object_oE1_Blob_004E08" Size="0x800" Offset="0x4E08"/>
<Texture Name="object_oE1_TLUT_005608" OutName="tlut_00005608" Format="rgba16" Width="16" Height="16" Offset="0x5608"/>
<Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808"/>
<Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848"/>
<Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948"/>
<Texture Name="object_oE1_Tex_005808" OutName="tex_00005808" Format="ci8" Width="8" Height="8" Offset="0x5808" TlutOffset="0x5608"/>
<Texture Name="object_oE1_Tex_005848" OutName="tex_00005848" Format="ci8" Width="16" Height="16" Offset="0x5848" TlutOffset="0x5608"/>
<Texture Name="object_oE1_Tex_005948" OutName="tex_00005948" Format="ci8" Width="16" Height="16" Offset="0x5948" TlutOffset="0x5608"/>
<Texture Name="object_oE1_Tex_005A48" OutName="tex_00005A48" Format="rgba16" Width="16" Height="32" Offset="0x5A48"/>
<Texture Name="object_oE1_Tex_005E48" OutName="tex_00005E48" Format="rgba16" Width="32" Height="32" Offset="0x5E48"/>
<Texture Name="object_oE1_Tex_006648" OutName="tex_00006648" Format="i4" Width="16" Height="8" Offset="0x6648"/>

8
assets/xml/objects/object_oE10.xml
View file

@ -2,11 +2,11 @@
<File Name="object_oE10" Segment="6">
<DList Name="object_oE10_DL_000720" Offset="0x720"/>
<Texture Name="object_oE10_TLUT_000C10" OutName="tlut_00000C10" Format="rgba16" Width="16" Height="16" Offset="0xC10"/>
<Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10"/>
<Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50"/>
<Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50"/>
<Texture Name="object_oE10_Tex_000E10" OutName="tex_00000E10" Format="ci8" Width="8" Height="8" Offset="0xE10" TlutOffset="0xC10"/>
<Texture Name="object_oE10_Tex_000E50" OutName="tex_00000E50" Format="ci8" Width="16" Height="16" Offset="0xE50" TlutOffset="0xC10"/>
<Texture Name="object_oE10_Tex_000F50" OutName="tex_00000F50" Format="ci8" Width="8" Height="8" Offset="0xF50" TlutOffset="0xC10"/>
<Texture Name="object_oE10_TLUT_000F90" OutName="tlut_00000F90" Format="rgba16" Width="16" Height="16" Offset="0xF90"/>
<Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190"/>
<Texture Name="object_oE10_Tex_001190" OutName="tex_00001190" Format="ci8" Width="32" Height="32" Offset="0x1190" TlutOffset="0xF90"/>
<Texture Name="object_oE10_Tex_001590" OutName="tex_00001590" Format="rgba16" Width="32" Height="32" Offset="0x1590"/>
<Texture Name="object_oE10_Tex_001D90" OutName="tex_00001D90" Format="i4" Width="16" Height="8" Offset="0x1D90"/>
<Texture Name="object_oE10_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="16" Height="32" Offset="0x1DD0"/>

6
assets/xml/objects/object_oE11.xml
View file

@ -2,11 +2,11 @@
<File Name="object_oE11" Segment="6">
<DList Name="object_oE11_DL_0009F0" Offset="0x9F0"/>
<Texture Name="object_oE11_TLUT_000F70" OutName="tlut_00000F70" Format="rgba16" Width="16" Height="16" Offset="0xF70"/>
<Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170"/>
<Texture Name="object_oE11_Tex_001170" OutName="tex_00001170" Format="ci8" Width="32" Height="32" Offset="0x1170" TlutOffset="0xF70"/>
<Blob Name="object_oE11_Blob_001570" Size="0x800" Offset="0x1570"/>
<Texture Name="object_oE11_TLUT_001D70" OutName="tlut_00001D70" Format="rgba16" Width="16" Height="16" Offset="0x1D70"/>
<Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70"/>
<Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0"/>
<Texture Name="object_oE11_Tex_001F70" OutName="tex_00001F70" Format="ci8" Width="8" Height="8" Offset="0x1F70" TlutOffset="0x1D70"/>
<Texture Name="object_oE11_Tex_001FB0" OutName="tex_00001FB0" Format="ci8" Width="16" Height="16" Offset="0x1FB0" TlutOffset="0x1D70"/>
<Texture Name="object_oE11_Tex_0020B0" OutName="tex_000020B0" Format="rgba16" Width="8" Height="16" Offset="0x20B0"/>
<Texture Name="object_oE11_Tex_0021B0" OutName="tex_000021B0" Format="rgba16" Width="32" Height="32" Offset="0x21B0"/>
<Texture Name="object_oE11_Tex_0029B0" OutName="tex_000029B0" Format="rgba16" Width="32" Height="32" Offset="0x29B0"/>

2
assets/xml/objects/object_oE12.xml
View file

@ -2,7 +2,7 @@
<File Name="object_oE12" Segment="6">
<DList Name="object_oE12_DL_001020" Offset="0x1020"/>
<Texture Name="object_oE12_TLUT_001600" OutName="tlut_00001600" Format="rgba16" Width="16" Height="16" Offset="0x1600"/>
<Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800"/>
<Texture Name="object_oE12_Tex_001800" OutName="tex_00001800" Format="ci8" Width="32" Height="32" Offset="0x1800" TlutOffset="0x1600"/>
<Blob Name="object_oE12_Blob_001C00" Size="0x800" Offset="0x1C00"/>
<Texture Name="object_oE12_Tex_002400" OutName="tex_00002400" Format="rgba16" Width="8" Height="8" Offset="0x2400"/>
<Texture Name="object_oE12_Tex_002480" OutName="tex_00002480" Format="rgba16" Width="32" Height="16" Offset="0x2480"/>

6
assets/xml/objects/object_oE1s.xml
View file

@ -21,15 +21,15 @@
<!--Blob Name="object_oE1s_Blob_00019C" Size="0x204" Offset="0x19C" /-->
<Texture Name="object_oE1s_TLUT_0003A0" OutName="tlut_000003A0" Format="rgba16" Width="108" Height="1" Offset="0x3A0" />
<!--Blob Name="object_oE1s_Blob_0005A0" Size="0x2D8" Offset="0x5A0" /-->
<Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" />
<Texture Name="object_oE1s_Tex_000878" OutName="tex_00000878" Format="ci8" Width="8" Height="8" Offset="0x878" TlutOffset="0x3A0"/>
<Texture Name="object_oE1s_Tex_0008B8" OutName="tex_000008B8" Format="rgba16" Width="16" Height="32" Offset="0x8B8" />
<Texture Name="object_oE1s_Tex_000CB8" OutName="tex_00000CB8" Format="rgba16" Width="32" Height="32" Offset="0xCB8" />
<Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" />
<Texture Name="object_oE1s_Tex_0014B8" OutName="tex_000014B8" Format="ci8" Width="16" Height="16" Offset="0x14B8" TlutOffset="0x3A0"/>
<Texture Name="object_oE1s_Tex_0015B8" OutName="tex_000015B8" Format="i4" Width="16" Height="8" Offset="0x15B8" />
<Blob Name="object_oE1s_Blob_0015F8" Size="0x400" Offset="0x15F8" />
<Texture Name="object_oE1s_Tex_0019F8" OutName="tex_000019F8" Format="i4" Width="16" Height="16" Offset="0x19F8" />
<Texture Name="object_oE1s_Tex_001A78" OutName="tex_00001A78" Format="rgba16" Width="16" Height="8" Offset="0x1A78" />
<Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" />
<Texture Name="object_oE1s_Tex_001B78" OutName="tex_00001B78" Format="ci8" Width="16" Height="16" Offset="0x1B78" TlutOffset="0x3A0"/>
<Blob Name="object_oE1s_Blob_001C78" Size="0x400" Offset="0x1C78" />
<DList Name="object_oE1s_DL_004D98" Offset="0x4D98" />
<DList Name="object_oE1s_DL_005010" Offset="0x5010" />

8
assets/xml/objects/object_oE2.xml
View file

@ -55,12 +55,12 @@
<DList Name="object_oE2_DL_003970" Offset="0x3970"/>
<DList Name="object_oE2_DL_003AB0" Offset="0x3AB0"/>
<Texture Name="object_oE2_TLUT_003C70" OutName="tlut_00003C70" Format="rgba16" Width="16" Height="16" Offset="0x3C70"/>
<Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70"/>
<Texture Name="object_oE2_Tex_003E70" OutName="tex_00003E70" Format="ci8" Width="32" Height="32" Offset="0x3E70" TlutOffset="0x3C70"/>
<Blob Name="object_oE2_Blob_004270" Size="0x800" Offset="0x4270"/>
<Texture Name="object_oE2_TLUT_004A70" OutName="tlut_00004A70" Format="rgba16" Width="16" Height="16" Offset="0x4A70"/>
<Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70"/>
<Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070"/>
<Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170"/>
<Texture Name="object_oE2_Tex_004C70" OutName="tex_00004C70" Format="ci8" Width="32" Height="32" Offset="0x4C70" TlutOffset="0x4A70"/>
<Texture Name="object_oE2_Tex_005070" OutName="tex_00005070" Format="ci8" Width="16" Height="16" Offset="0x5070" TlutOffset="0x4A70"/>
<Texture Name="object_oE2_Tex_005170" OutName="tex_00005170" Format="ci8" Width="16" Height="16" Offset="0x5170" TlutOffset="0x4A70"/>
<Texture Name="object_oE2_Tex_005270" OutName="tex_00005270" Format="rgba16" Width="16" Height="32" Offset="0x5270"/>
<Texture Name="object_oE2_Tex_005670" OutName="tex_00005670" Format="rgba16" Width="16" Height="16" Offset="0x5670"/>
<Texture Name="object_oE2_Tex_005870" OutName="tex_00005870" Format="rgba16" Width="16" Height="8" Offset="0x5870"/>

8
assets/xml/objects/object_oE3.xml
View file

@ -55,13 +55,13 @@
<DList Name="object_oE3_DL_004C30" Offset="0x4C30"/>
<DList Name="object_oE3_DL_004D70" Offset="0x4D70"/>
<Texture Name="object_oE3_TLUT_004F20" OutName="tlut_00004F20" Format="rgba16" Width="16" Height="16" Offset="0x4F20"/>
<Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120"/>
<Texture Name="object_oE3_Tex_005120" OutName="tex_00005120" Format="ci8" Width="32" Height="32" Offset="0x5120" TlutOffset="0x4F20"/>
<Blob Name="object_oE3_Blob_005520" Size="0x800" Offset="0x5520"/>
<Texture Name="object_oE3_TLUT_005D20" OutName="tlut_00005D20" Format="rgba16" Width="16" Height="16" Offset="0x5D20"/>
<Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20"/>
<Texture Name="object_oE3_Tex_005F20" OutName="tex_00005F20" Format="ci8" Width="8" Height="8" Offset="0x5F20" TlutOffset="0x5D20"/>
<Blob Name="object_oE3_Blob_005F60" Size="0x200" Offset="0x5F60"/>
<Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160"/>
<Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260"/>
<Texture Name="object_oE3_Tex_006160" OutName="tex_00006160" Format="ci8" Width="16" Height="16" Offset="0x6160" TlutOffset="0x5D20"/>
<Texture Name="object_oE3_Tex_006260" OutName="tex_00006260" Format="ci8" Width="16" Height="16" Offset="0x6260" TlutOffset="0x5D20"/>
<Blob Name="object_oE3_Blob_006360" Size="0x200" Offset="0x6360"/>
<Texture Name="object_oE3_Tex_006560" OutName="tex_00006560" Format="rgba16" Width="8" Height="16" Offset="0x6560"/>
<Texture Name="object_oE3_Tex_006660" OutName="tex_00006660" Format="rgba16" Width="32" Height="32" Offset="0x6660"/>

10
assets/xml/objects/object_oE4.xml
View file

@ -55,11 +55,11 @@
<DList Name="object_oE4_DL_003FE0" Offset="0x3FE0"/>
<DList Name="object_oE4_DL_004098" Offset="0x4098"/>
<Texture Name="object_oE4_TLUT_004188" OutName="tlut_00004188" Format="rgba16" Width="16" Height="16" Offset="0x4188"/>
<Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388"/>
<Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488"/>
<Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588"/>
<Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8"/>
<Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8"/>
<Texture Name="object_oE4_Tex_004388" OutName="tex_00004388" Format="ci8" Width="16" Height="16" Offset="0x4388" TlutOffset="0x4188"/>
<Texture Name="object_oE4_Tex_004488" OutName="tex_00004488" Format="ci8" Width="16" Height="16" Offset="0x4488" TlutOffset="0x4188"/>
<Texture Name="object_oE4_Tex_004588" OutName="tex_00004588" Format="ci8" Width="8" Height="8" Offset="0x4588" TlutOffset="0x4188"/>
<Texture Name="object_oE4_Tex_0045C8" OutName="tex_000045C8" Format="ci8" Width="16" Height="16" Offset="0x45C8" TlutOffset="0x4188"/>
<Texture Name="object_oE4_Tex_0046C8" OutName="tex_000046C8" Format="ci8" Width="16" Height="16" Offset="0x46C8" TlutOffset="0x4188"/>
<Texture Name="object_oE4_Tex_0047C8" OutName="tex_000047C8" Format="rgba16" Width="16" Height="32" Offset="0x47C8"/>
<Texture Name="object_oE4_Tex_004BC8" OutName="tex_00004BC8" Format="rgba16" Width="8" Height="16" Offset="0x4BC8"/>
<Texture Name="object_oE4_Tex_004CC8" OutName="tex_00004CC8" Format="i4" Width="16" Height="16" Offset="0x4CC8"/>

6
assets/xml/objects/object_oE4s.xml
View file

@ -19,13 +19,13 @@
<Limb Name="object_oE4s_Limb_000144" LimbType="Standard" Offset="0x144"/>
<Skeleton Name="object_oE4s_Skel_000190" Type="Flex" LimbType="Standard" Offset="0x190"/>
<Texture Name="object_oE4s_TLUT_0001A8" OutName="tlut_000001A8" Format="rgba16" Width="124" Height="1" Offset="0x1A8"/><!--Blob Name="object_oE4s_Blob_0003A8" Size="0xF8" Offset="0x3A8" /-->
<Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0"/>
<Texture Name="object_oE4s_Tex_0004A0" OutName="tex_000004A0" Format="ci8" Width="8" Height="8" Offset="0x4A0" TlutOffset="0x1A8"/>
<Texture Name="object_oE4s_Tex_0004E0" OutName="tex_000004E0" Format="rgba16" Width="16" Height="32" Offset="0x4E0"/>
<Texture Name="object_oE4s_Tex_0008E0" OutName="tex_000008E0" Format="rgba16" Width="8" Height="16" Offset="0x8E0"/>
<Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0"/>
<Texture Name="object_oE4s_Tex_0009E0" OutName="tex_000009E0" Format="ci8" Width="16" Height="16" Offset="0x9E0" TlutOffset="0x1A8"/>
<Texture Name="object_oE4s_Tex_000AE0" OutName="tex_00000AE0" Format="i4" Width="16" Height="16" Offset="0xAE0"/>
<Texture Name="object_oE4s_Tex_000B60" OutName="tex_00000B60" Format="i4" Width="16" Height="16" Offset="0xB60"/>
<Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0"/>
<Texture Name="object_oE4s_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="16" Height="16" Offset="0xBE0" TlutOffset="0x1A8"/>
<Texture Name="object_oE4s_Tex_000CE0" OutName="tex_00000CE0" Format="rgba16" Width="16" Height="16" Offset="0xCE0"/>
<DList Name="object_oE4s_DL_003970" Offset="0x3970"/>
<DList Name="object_oE4s_DL_003B28" Offset="0x3B28"/>

8
assets/xml/objects/object_oE5.xml
View file

@ -48,12 +48,12 @@
<DList Name="object_oE5_DL_003200" Offset="0x3200" />
<DList Name="object_oE5_DL_0032F0" Offset="0x32F0" />
<Texture Name="object_oE5_TLUT_003440" OutName="tlut_00003440" Format="rgba16" Width="16" Height="16" Offset="0x3440" />
<Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640" />
<Texture Name="object_oE5_Tex_003640" OutName="tex_00003640" Format="ci8" Width="32" Height="32" Offset="0x3640" TlutOffset="0x3440"/>
<Blob Name="object_oE5_Blob_003A40" Size="0x800" Offset="0x3A40" />
<Texture Name="object_oE5_TLUT_004240" OutName="tlut_00004240" Format="rgba16" Width="16" Height="16" Offset="0x4240" />
<Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440" />
<Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480" />
<Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580" />
<Texture Name="object_oE5_Tex_004440" OutName="tex_00004440" Format="ci8" Width="8" Height="8" Offset="0x4440" TlutOffset="0x4240"/>
<Texture Name="object_oE5_Tex_004480" OutName="tex_00004480" Format="ci8" Width="16" Height="16" Offset="0x4480" TlutOffset="0x4240"/>
<Texture Name="object_oE5_Tex_004580" OutName="tex_00004580" Format="ci8" Width="16" Height="16" Offset="0x4580" TlutOffset="0x4240"/>
<Texture Name="object_oE5_Tex_004680" OutName="tex_00004680" Format="rgba16" Width="32" Height="16" Offset="0x4680" />
<Texture Name="object_oE5_Tex_004A80" OutName="tex_00004A80" Format="rgba16" Width="8" Height="16" Offset="0x4A80" />
<Texture Name="object_oE5_Tex_004B80" OutName="tex_00004B80" Format="i4" Width="16" Height="8" Offset="0x4B80" />

6
assets/xml/objects/object_oE6.xml
View file

@ -2,11 +2,11 @@
<File Name="object_oE6" Segment="6">
<DList Name="object_oE6_DL_000AE0" Offset="0xAE0"/>
<Texture Name="object_oE6_TLUT_000FD0" OutName="tlut_00000FD0" Format="rgba16" Width="16" Height="16" Offset="0xFD0"/>
<Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0"/>
<Texture Name="object_oE6_Tex_0011D0" OutName="tex_000011D0" Format="ci8" Width="32" Height="32" Offset="0x11D0" TlutOffset="0xFD0"/>
<Blob Name="object_oE6_Blob_0015D0" Size="0x800" Offset="0x15D0"/>
<Texture Name="object_oE6_TLUT_001DD0" OutName="tlut_00001DD0" Format="rgba16" Width="16" Height="16" Offset="0x1DD0"/>
<Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0"/>
<Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010"/>
<Texture Name="object_oE6_Tex_001FD0" OutName="tex_00001FD0" Format="ci8" Width="8" Height="8" Offset="0x1FD0" TlutOffset="0x1DD0"/>
<Texture Name="object_oE6_Tex_002010" OutName="tex_00002010" Format="ci8" Width="16" Height="16" Offset="0x2010" TlutOffset="0x1DD0"/>
<Texture Name="object_oE6_Tex_002110" OutName="tex_00002110" Format="rgba16" Width="8" Height="16" Offset="0x2110"/>
<Texture Name="object_oE6_Tex_002210" OutName="tex_00002210" Format="rgba16" Width="32" Height="32" Offset="0x2210"/>
<Texture Name="object_oE6_Tex_002A10" OutName="tex_00002A10" Format="rgba16" Width="32" Height="16" Offset="0x2A10"/>

8
assets/xml/objects/object_oE7.xml
View file

@ -2,11 +2,11 @@
<File Name="object_oE7" Segment="6">
<DList Name="object_oE7_DL_0006B0" Offset="0x6B0"/>
<Texture Name="object_oE7_TLUT_000B18" OutName="tlut_00000B18" Format="rgba16" Width="16" Height="16" Offset="0xB18"/>
<Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18"/>
<Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118"/>
<Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158"/>
<Texture Name="object_oE7_Tex_000D18" OutName="tex_00000D18" Format="ci8" Width="32" Height="32" Offset="0xD18" TlutOffset="0xB18"/>
<Texture Name="object_oE7_Tex_001118" OutName="tex_00001118" Format="ci8" Width="8" Height="8" Offset="0x1118" TlutOffset="0xB18"/>
<Texture Name="object_oE7_Tex_001158" OutName="tex_00001158" Format="ci8" Width="16" Height="16" Offset="0x1158" TlutOffset="0xB18"/>
<Texture Name="object_oE7_TLUT_001258" OutName="tlut_00001258" Format="rgba16" Width="16" Height="16" Offset="0x1258"/>
<Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458"/>
<Texture Name="object_oE7_Tex_001458" OutName="tex_00001458" Format="ci8" Width="32" Height="32" Offset="0x1458" TlutOffset="0x1258"/>
<Blob Name="object_oE7_Blob_001858" Size="0x800" Offset="0x1858"/>
<Texture Name="object_oE7_Tex_002058" OutName="tex_00002058" Format="rgba16" Width="32" Height="32" Offset="0x2058"/>
<Texture Name="object_oE7_Tex_002858" OutName="tex_00002858" Format="rgba16" Width="16" Height="16" Offset="0x2858"/>

6
assets/xml/objects/object_oE8.xml
View file

@ -2,11 +2,11 @@
<File Name="object_oE8" Segment="6">
<DList Name="object_oE8_DL_000CA0" Offset="0xCA0"/>
<Texture Name="object_oE8_TLUT_001248" OutName="tlut_00001248" Format="rgba16" Width="16" Height="16" Offset="0x1248"/>
<Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448"/>
<Texture Name="object_oE8_Tex_001448" OutName="tex_00001448" Format="ci8" Width="32" Height="32" Offset="0x1448" TlutOffset="0x1248"/>
<Blob Name="object_oE8_Blob_001848" Size="0x800" Offset="0x1848"/>
<Texture Name="object_oE8_TLUT_002048" OutName="tlut_00002048" Format="rgba16" Width="16" Height="16" Offset="0x2048"/>
<Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248"/>
<Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288"/>
<Texture Name="object_oE8_Tex_002248" OutName="tex_00002248" Format="ci8" Width="8" Height="8" Offset="0x2248" TlutOffset="0x2048"/>
<Texture Name="object_oE8_Tex_002288" OutName="tex_00002288" Format="ci8" Width="16" Height="16" Offset="0x2288" TlutOffset="0x2048"/>
<Texture Name="object_oE8_Tex_002388" OutName="tex_00002388" Format="rgba16" Width="32" Height="16" Offset="0x2388"/>
<Texture Name="object_oE8_Tex_002788" OutName="tex_00002788" Format="rgba16" Width="16" Height="32" Offset="0x2788"/>
<Texture Name="object_oE8_Tex_002B88" OutName="tex_00002B88" Format="i4" Width="16" Height="8" Offset="0x2B88"/>

6
assets/xml/objects/object_oE9.xml
View file

@ -2,11 +2,11 @@
<File Name="object_oE9" Segment="6">
<DList Name="object_oE9_DL_000800" Offset="0x800"/>
<Texture Name="object_oE9_TLUT_000C90" OutName="tlut_00000C90" Format="rgba16" Width="16" Height="16" Offset="0xC90"/>
<Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90"/>
<Texture Name="object_oE9_Tex_000E90" OutName="tex_00000E90" Format="ci8" Width="32" Height="32" Offset="0xE90" TlutOffset="0xC90"/>
<Blob Name="object_oE9_Blob_001290" Size="0x800" Offset="0x1290"/>
<Texture Name="object_oE9_TLUT_001A90" OutName="tlut_00001A90" Format="rgba16" Width="16" Height="16" Offset="0x1A90"/>
<Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90"/>
<Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0"/>
<Texture Name="object_oE9_Tex_001C90" OutName="tex_00001C90" Format="ci8" Width="8" Height="8" Offset="0x1C90" TlutOffset="0x1A90"/>
<Texture Name="object_oE9_Tex_001CD0" OutName="tex_00001CD0" Format="ci8" Width="16" Height="16" Offset="0x1CD0" TlutOffset="0x1A90"/>
<Texture Name="object_oE9_Tex_001DD0" OutName="tex_00001DD0" Format="rgba16" Width="8" Height="16" Offset="0x1DD0"/>
<Texture Name="object_oE9_Tex_001ED0" OutName="tex_00001ED0" Format="rgba16" Width="32" Height="32" Offset="0x1ED0"/>
<Texture Name="object_oE9_Tex_0026D0" OutName="tex_000026D0" Format="rgba16" Width="32" Height="32" Offset="0x26D0"/>

24
assets/xml/objects/object_os.xml
View file

@ -11,18 +11,18 @@
<DList Name="object_os_DL_002C60" Offset="0x2C60"/>
<Texture Name="object_os_TLUT_002E18" OutName="tlut_00002E18" Format="rgba16" Width="16" Height="16" Offset="0x2E18"/>
<Texture Name="object_os_TLUT_003018" OutName="tlut_00003018" Format="rgba16" Width="16" Height="16" Offset="0x3018"/>
<Texture Name="object_os_Tex_003218" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218"/>
<Texture Name="object_os_Tex_003258" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258"/>
<Texture Name="object_os_Tex_003358" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358"/>
<Texture Name="object_os_Tex_003398" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398"/>
<Texture Name="object_os_Tex_0033D8" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8"/>
<Texture Name="gOsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8"/>
<Texture Name="gOsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8"/>
<Texture Name="object_os_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8"/>
<Texture Name="object_os_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8"/>
<Texture Name="object_os_Tex_0040D8" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8"/>
<Texture Name="object_os_Tex_0044D8" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8"/>
<Texture Name="object_os_Tex_004558" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558"/>
<Texture Name="object_os_Tex_003218" OutName="tex_00003218" Format="ci8" Width="8" Height="8" Offset="0x3218" TlutOffset="0x2E18"/>
<Texture Name="object_os_Tex_003258" OutName="tex_00003258" Format="ci8" Width="16" Height="16" Offset="0x3258" TlutOffset="0x2E18"/>
<Texture Name="object_os_Tex_003358" OutName="tex_00003358" Format="ci8" Width="8" Height="8" Offset="0x3358" TlutOffset="0x2E18"/>
<Texture Name="object_os_Tex_003398" OutName="tex_00003398" Format="ci8" Width="8" Height="8" Offset="0x3398" TlutOffset="0x2E18"/>
<Texture Name="object_os_Tex_0033D8" OutName="tex_000033D8" Format="ci8" Width="32" Height="16" Offset="0x33D8" TlutOffset="0x3018"/>
<Texture Name="gOsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x35D8" TlutOffset="0x3018"/>
<Texture Name="gOsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x39D8" TlutOffset="0x3018"/>
<Texture Name="object_os_Tex_003DD8" OutName="tex_00003DD8" Format="ci8" Width="16" Height="16" Offset="0x3DD8" TlutOffset="0x2E18"/>
<Texture Name="object_os_Tex_003ED8" OutName="tex_00003ED8" Format="ci8" Width="16" Height="32" Offset="0x3ED8" TlutOffset="0x2E18"/>
<Texture Name="object_os_Tex_0040D8" OutName="tex_000040D8" Format="ci8" Width="32" Height="32" Offset="0x40D8" TlutOffset="0x2E18"/>
<Texture Name="object_os_Tex_0044D8" OutName="tex_000044D8" Format="ci8" Width="8" Height="16" Offset="0x44D8" TlutOffset="0x2E18"/>
<Texture Name="object_os_Tex_004558" OutName="tex_00004558" Format="ci8" Width="8" Height="16" Offset="0x4558" TlutOffset="0x2E18"/>
<Limb Name="object_os_Limb_0045D8" LimbType="Standard" Offset="0x45D8"/>
<Limb Name="object_os_Limb_0045E4" LimbType="Standard" Offset="0x45E4"/>
<Limb Name="object_os_Limb_0045F0" LimbType="Standard" Offset="0x45F0"/>

11
assets/xml/objects/object_ossan.xml
View file

@ -1,11 +1,12 @@
<Root>
<File Name="object_ossan" Segment="6">
<Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
<Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
<Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878"/>
<Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78"/>
<Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8"/>
<Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8"/>
<Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_palette" Format="rgba16" Width="63" Height="4" Offset="0x4530"/>
<Texture Name="gOssanTLUT" OutName="ossan_palette" Format="rgba16" Width="168" Height="1" Offset="0x4728"/>
<Texture Name="gOssanEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x4878" TlutOffset="0x4530"/>
<Texture Name="gOssanBeardTex" OutName="beard" Format="ci8" Width="32" Height="32" Offset="0x4C78" TlutOffset="0x4728"/>
<Texture Name="gOssanEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x52B8" TlutOffset="0x4530"/>
<Texture Name="gOssanEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x56B8" TlutOffset="0x4530"/>
<DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
<Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
</File>

32
assets/xml/objects/object_rl.xml
View file

@ -13,26 +13,28 @@
<DList Name="object_rl_DL_003058" Offset="0x3058"/>
<Texture Name="object_rl_TLUT_0032A0" OutName="tlut_000032A0" Format="rgba16" Width="160" Height="1" Offset="0x32A0"/>
<!--Blob Name="object_rl_Blob_0034A0" Size="0x80" Offset="0x34A0" /-->
<Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520"/>
<Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620"/>
<Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820"/>
<Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920"/>
<Texture Name="object_rl_Tex_003520" OutName="tex_00003520" Format="ci8" Width="16" Height="16" Offset="0x3520" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003620" OutName="tex_00003620" Format="ci8" Width="32" Height="16" Offset="0x3620" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003820" OutName="tex_00003820" Format="ci8" Width="16" Height="16" Offset="0x3820" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003920" OutName="tex_00003920" Format="ci8" Width="8" Height="8" Offset="0x3920" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003960" OutName="tex_00003960" Format="ci8" Width="32" Height="16" Offset="0x3960"/>
<Texture Name="object_rl_Tex_003B60" OutName="tex_00003B60" Format="ci8" Width="32" Height="16" Offset="0x3B60"/>
<Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60"/>
<Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0"/>
<Texture Name="object_rl_Tex_003D60" OutName="tex_00003D60" Format="ci8" Width="8" Height="8" Offset="0x3D60" TlutOffset="0x32A0"/>
<Texture Name="object_rl_Tex_003DA0" OutName="tex_00003DA0" Format="ci8" Width="16" Height="16" Offset="0x3DA0" TlutOffset="0x32A0"/>
<DList Name="object_rl_DL_005220" Offset="0x5220"/>
<Texture Name="object_rl_TLUT_006318" OutName="tlut_00006318" Format="rgba16" Width="16" Height="16" Offset="0x6318"/>
<Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518"/>
<Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618"/>
<Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658"/>
<Texture Name="object_rl_Tex_006518" OutName="tex_00006518" Format="ci8" Width="16" Height="16" Offset="0x6518" TlutOffset="0x6318"/>
<Texture Name="object_rl_Tex_006618" OutName="tex_00006618" Format="ci8" Width="8" Height="8" Offset="0x6618" TlutOffset="0x6318"/>
<Texture Name="object_rl_Tex_006658" OutName="tex_00006658" Format="ci8" Width="16" Height="16" Offset="0x6658" TlutOffset="0x6318"/>
<Blob Name="object_rl_Blob_006758" Size="0x40" Offset="0x6758"/>
<Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798"/>
<Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98"/>
<Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98"/>
<Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198"/>
<Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598"/>
<Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998"/>
<Texture Name="object_rl_Tex_006798" OutName="tex_00006798" Format="ci8" Width="32" Height="32" Offset="0x6798" TlutOffset="0x6318"/>
<Texture Name="object_rl_Tex_006B98" OutName="tex_00006B98" Format="ci8" Width="32" Height="32" Offset="0x6B98" TlutOffset="0x6318"/>
<Texture Name="object_rl_Tex_006F98" OutName="tex_00006F98" Format="ci8" Width="16" Height="32" Offset="0x6F98" TlutOffset="0x6318"/>
<Texture Name="object_rl_Tex_007198" OutName="tex_00007198" Format="ci8" Width="32" Height="32" Offset="0x7198" TlutOffset="0x6318"/>
<Texture Name="object_rl_Tex_007598" OutName="tex_00007598" Format="ci8" Width="32" Height="32" Offset="0x7598" TlutOffset="0x6318"/>
<Texture Name="object_rl_Tex_007998" OutName="tex_00007998" Format="ci8" Width="16" Height="16" Offset="0x7998" TlutOffset="0x6318"/>
<Limb Name="object_rl_Limb_007A98" LimbType="Standard" Offset="0x7A98"/>
<Limb Name="object_rl_Limb_007AA4" LimbType="Standard" Offset="0x7AA4"/>
<Limb Name="object_rl_Limb_007AB0" LimbType="Standard" Offset="0x7AB0"/>

16
assets/xml/objects/object_rs.xml
View file

@ -10,15 +10,15 @@
<DList Name="object_rs_DL_002BA8" Offset="0x2BA8"/>
<DList Name="object_rs_DL_002CD8" Offset="0x2CD8"/>
<Texture Name="object_rs_TLUT_002EE8" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
<Texture Name="object_rs_Tex_0030E8" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8"/>
<Texture Name="object_rs_Tex_003128" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128"/>
<Texture Name="object_rs_Tex_003168" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168"/>
<Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968"/>
<Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68"/>
<Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168"/>
<Texture Name="object_rs_Tex_004568" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568"/>
<Texture Name="object_rs_Tex_0030E8" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
<Texture Name="object_rs_Tex_003128" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
<Texture Name="object_rs_Tex_003168" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
<Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
<Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
<Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
<Texture Name="object_rs_Tex_004568" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
<Texture Name="object_rs_Tex_004668" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/>
<Texture Name="object_rs_Tex_0046E8" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8"/>
<Texture Name="object_rs_Tex_0046E8" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
<Limb Name="object_rs_Limb_0047E8" LimbType="Standard" Offset="0x47E8"/>
<Limb Name="object_rs_Limb_0047F4" LimbType="Standard" Offset="0x47F4"/>
<Limb Name="object_rs_Limb_004800" LimbType="Standard" Offset="0x4800"/>

18
assets/xml/objects/object_ru1.xml
View file

@ -42,18 +42,18 @@
<Texture Name="gRutoChildEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xE038"/>
<Texture Name="gRutoChildMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="12" Offset="0xE238"/>
<Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8"/>
<Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238"/>
<Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638"/>
<Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38"/>
<Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238"/>
<Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38"/>
<Texture Name="gRutoChildEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xE3B8" TlutOffset="0xE038"/>
<Texture Name="gRutoChildEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xF238" TlutOffset="0xE038"/>
<Texture Name="gRutoChildEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF638" TlutOffset="0xE038"/>
<Texture Name="gRutoChildEyeRollLeftTex" OutName="eye_roll_left" Format="ci8" Width="32" Height="32" Offset="0xFE38" TlutOffset="0xE038"/>
<Texture Name="gRutoChildEyeHalf2Tex" OutName="eye_half_2" Format="ci8" Width="32" Height="32" Offset="0x10238" TlutOffset="0xE038"/>
<Texture Name="gRutoChildEyeHalfWithBlushTex" OutName="eye_half_with_blush" Format="ci8" Width="32" Height="32" Offset="0x10A38" TlutOffset="0xE038"/>
<Texture Name="gRutoChildBlueSkinGradientTex" OutName="blue_skin_gradient" Format="rgba16" Width="8" Height="8" Offset="0xE7B8"/>
<Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838"/>
<Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38"/>
<Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638"/>
<Texture Name="gRutoChildMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="32" Offset="0xE838" TlutOffset="0xE238"/>
<Texture Name="gRutoChildMouthFrownTex" OutName="mouth_frown" Format="ci8" Width="32" Height="32" Offset="0xFA38" TlutOffset="0xE238"/>
<Texture Name="gRutoChildMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="32" Offset="0x10638" TlutOffset="0xE238"/>
<Texture Name="gRutoChildEarTex" OutName="ear" Format="rgba16" Width="16" Height="16" Offset="0xEC38"/>
<Texture Name="gRutoChildBlueSkinPatchesTex" OutName="blue_skin_patches" Format="rgba16" Width="16" Height="16" Offset="0xEE38"/>

51
assets/xml/objects/object_sa.xml
View file

@ -67,34 +67,33 @@
<DList Name="gSariaLeftFootDL" Offset="0xAEE0"/>
<Texture Name="gSariaClothesTLUT" OutName="clothes_tlut" Format="rgba16" Width="18" Height="6" Offset="0x21F0"/>
<Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="18" Height="6" Offset="0x2CF8"/>
<Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="18" Height="6" Offset="0x2B00"/>
<Texture Name="gSariaMouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="29" Height="8" Offset="0x2CF8"/>
<Texture Name="gSariaEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x2B00"/>
<Texture Name="gSariaSkinTLUT" OutName="skin_tlut" Format="rgba16" Width="8" Height="9" Offset="0x2A70"/>
<Texture Name="gSariaUnkTLUT" OutName="unk_tlut" Format="rgba16" Width="16" Height="9" Offset="0x2BD8"/>
<Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0"/>
<Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0"/>
<Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570"/>
<Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670"/>
<Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770"/>
<Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870"/>
<Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0"/>
<Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0"/>
<Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8"/>
<Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48"/>
<Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348"/>
<Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548"/>
<Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588"/>
<Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788"/>
<Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8"/>
<Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808"/>
<Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848"/>
<Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48"/>
<Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
<Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/>
<Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
<Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
<Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
<Texture Name="gSariaUnkGreenTex" Format="ci8" Width="16" Height="8" Offset="0x2870" TlutOffset="0x21F0"/>
<Texture Name="gSariaUnusedHandTex" OutName="unused_hand" Format="ci8" Width="16" Height="16" Offset="0x28F0" TlutOffset="0x21F0"/>
<Texture Name="gSariaSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="16" Offset="0x29F0" TlutOffset="0x21F0"/>
<Texture Name="gSariaHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x2EC8" TlutOffset="0x2A70"/>
<Texture Name="gSariaEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x2F48" TlutOffset="0x2B00"/>
<Texture Name="gSariaMouthClosedTex" OutName="mouth_closed" Format="ci8" Width="32" Height="16" Offset="0x3348" TlutOffset="0x2CF8"/>
<Texture Name="gSariaSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x3548" TlutOffset="0x2A70"/>
<Texture Name="gSariaMouthClosed2Tex" OutName="mouth_closed2" Format="ci8" Width="32" Height="16" Offset="0x3588" TlutOffset="0x2CF8"/>
<Texture Name="gSariaEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3788" TlutOffset="0x2A70"/>
<Texture Name="gSariaCollarTex" OutName="collar" Format="ci8" Width="8" Height="8" Offset="0x37C8" TlutOffset="0x2A70"/>
<Texture Name="gSariaHandTex" OutName="hand" Format="ci8" Width="8" Height="8" Offset="0x3808" TlutOffset="0x2A70"/>
<Texture Name="gSariaEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x3848" TlutOffset="0x2B00"/>
<Texture Name="gSariaEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
<Texture Name="gSariaFairyOcarinaTex" OutName="fairy_ocarina" Format="rgba16" Width="32" Height="16" Offset="0x4048"/>
<Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448"/>
<Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648"/>
<Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848"/>
<Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48"/>
<Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48"/>
<Texture Name="gSariaMouthSmilingOpenTex" OutName="mouth_smiling_open" Format="ci8" Width="32" Height="16" Offset="0x4448" TlutOffset="0x2CF8"/>
<Texture Name="gSariaMouthFrowningTex" OutName="mouth_frowning" Format="ci8" Width="32" Height="16" Offset="0x4648" TlutOffset="0x2CF8"/>
<Texture Name="gSariaEyeSuprisedTex" OutName="eye_suprised" Format="ci8" Width="32" Height="32" Offset="0x4848" TlutOffset="0x2B00"/>
<Texture Name="gSariaMouthSuprisedTex" OutName="mouth_suprised" Format="ci8" Width="32" Height="16" Offset="0x4C48" TlutOffset="0x2CF8"/>
<Texture Name="gSariaEyeSadTex" OutName="eye_sad" Format="ci8" Width="32" Height="32" Offset="0x4E48" TlutOffset="0x2B00"/>
</File>
</Root>

32
assets/xml/objects/object_sd.xml
View file

@ -44,27 +44,27 @@
<!--King Guard Textures-->
<Texture Name="gEnHeishiKingGuardTLUT" OutName="king_guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
<Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200"/><!--Mouth?-->
<Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240"/><!--Eyes?-->
<Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280"/>
<Texture Name="gEnHeishiKingGuardSholderGuardTex" OutName="king_guard_sholder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0"/>
<Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340"/>
<Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40"/> <!--Leg Armor?-->
<Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40"/>
<Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80"/>
<Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
<Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
<Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardSholderGuardTex" OutName="king_guard_sholder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
<Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardPantsTex" OutName="king_guard_pants" Format="ci8" Width="16" Height="16" Offset="0x0C80" TlutOffset="0x0000"/>
<!--Normal Guard Textures-->
<Texture Name="gHeishiTLUT" OutName="guard_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C40"/>
<Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40"/>
<Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40"/>
<Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80"/>
<Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0"/>
<Texture Name="gEnHeishiMouthTex" OutName="mouth_tex" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiGradient1Tex" OutName="gradient1" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiGradient2Tex" OutName="gradient2" Format="ci8" Width="8" Height="8" Offset="0x5F80" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiArmorTex" OutName="armor" Format="ci8" Width="8" Height="8" Offset="0x5FC0" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiUniform1Tex" OutName="uniform1" Format="i4" Width="16" Height="16" Offset="0x6000"/>
<Texture Name="gEnHeishiUniform2Tex" OutName="uniform2" Format="i4" Width="16" Height="8" Offset="0x6080"/>
<Texture Name="gEnHeishiUniformGreyTriforceTex" OutName="uniform_grey_triforce" Format="i4" Width="32" Height="32" Offset="0x60C0"/>
<Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0"/>
<Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0"/>
<Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0"/>
<Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0"/>
<Texture Name="gEnHeishiUniformGoldTriforceTex" OutName="uniform_gold_triforce" Format="ci8" Width="32" Height="32" Offset="0x62C0" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiLegTex" OutName="leg" Format="ci8" Width="16" Height="16" Offset="0x66C0" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiTex_0067C0" Format="ci8" Width="32" Height="32" Offset="0x67C0" TlutOffset="0x5C40"/>
<Texture Name="gEnHeishiHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x6BC0" TlutOffset="0x5C40"/>
</File>
</Root>

4
assets/xml/objects/object_spot07_object.xml
View file

@ -3,12 +3,12 @@
<DList Name="object_spot07_object_DL_000460" Offset="0x460"/>
<DList Name="object_spot07_object_DL_000BE0" Offset="0xBE0"/>
<Texture Name="object_spot07_object_TLUT_000EC0" OutName="tlut_00000EC0" Format="rgba16" Width="4" Height="4" Offset="0xEC0"/>
<Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0"/>
<Texture Name="object_spot07_object_Tex_000EE0" OutName="tex_00000EE0" Format="ci4" Width="32" Height="128" Offset="0xEE0" TlutOffset="0xEC0"/>
<DList Name="object_spot07_object_DL_001CF0" Offset="0x1CF0"/>
<DList Name="object_spot07_object_DL_001F68" Offset="0x1F68"/>
<Collision Name="object_spot07_object_Col_002590" Offset="0x2590"/>
<Texture Name="object_spot07_object_TLUT_0025C0" OutName="tlut_000025C0" Format="rgba16" Width="4" Height="4" Offset="0x25C0"/>
<Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0"/>
<Texture Name="object_spot07_object_Tex_0025E0" OutName="tex_000025E0" Format="ci4" Width="32" Height="128" Offset="0x25E0" TlutOffset="0x25C0"/>
<DList Name="object_spot07_object_DL_003210" Offset="0x3210"/>
<DList Name="object_spot07_object_DL_0032D8" Offset="0x32D8"/>
<Collision Name="object_spot07_object_Col_0038FC" Offset="0x38FC"/>

2
assets/xml/objects/object_spot17_obj.xml
View file

@ -1,7 +1,7 @@
<Root>
<File Name="object_spot17_obj" Segment="6">
<Texture Name="gCraterRockPaletteTex" OutName="crater_rock_palette" Format="rgba16" Width="4" Height="4" Offset="0x00"/>
<Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20"/>
<Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20" TlutOffset="0x00"/>
<DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
<DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
<Collision Name="gCraterBombableWallCol" Offset="0xA38"/>

12
assets/xml/objects/object_ssh.xml
View file

@ -2,14 +2,14 @@
<File Name="object_ssh" Segment="6">
<Animation Name="object_ssh_Anim_000304" Offset="0x304"/>
<Texture Name="object_ssh_TLUT_000320" OutName="tlut_00000320" Format="rgba16" Width="16" Height="16" Offset="0x320"/>
<Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520"/>
<Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560"/>
<Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0"/>
<Texture Name="object_ssh_Tex_000520" OutName="tex_00000520" Format="ci8" Width="8" Height="8" Offset="0x520" TlutOffset="0x320"/>
<Texture Name="object_ssh_Tex_000560" OutName="tex_00000560" Format="ci8" Width="16" Height="8" Offset="0x560" TlutOffset="0x320"/>
<Texture Name="object_ssh_Tex_0005E0" OutName="tex_000005E0" Format="ci8" Width="8" Height="8" Offset="0x5E0" TlutOffset="0x320"/>
<Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
<Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720"/>
<Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0"/>
<Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
<Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
<Blob Name="object_ssh_Blob_0007E0" Size="0x400" Offset="0x7E0"/>
<Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0"/>
<Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
<Blob Name="object_ssh_Blob_000C60" Size="0x800" Offset="0xC60"/>
<DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
<DList Name="object_ssh_DL_004080" Offset="0x4080"/>

132
assets/xml/objects/object_ta.xml
View file

@ -1,70 +1,72 @@
<Root>
<File Name="object_ta" Segment="6">
<Animation Name="object_ta_Anim_0017E8" Offset="0x17E8"/>
<Animation Name="object_ta_Anim_001C94" Offset="0x1C94"/>
<DList Name="object_ta_DL_003F70" Offset="0x3F70"/>
<DList Name="object_ta_DL_004288" Offset="0x4288"/>
<DList Name="object_ta_DL_004918" Offset="0x4918"/>
<DList Name="object_ta_DL_004B40" Offset="0x4B40"/>
<DList Name="object_ta_DL_004DF0" Offset="0x4DF0"/>
<DList Name="object_ta_DL_005298" Offset="0x5298"/>
<DList Name="object_ta_DL_0054C0" Offset="0x54C0"/>
<DList Name="object_ta_DL_005770" Offset="0x5770"/>
<DList Name="object_ta_DL_005B98" Offset="0x5B98"/>
<DList Name="object_ta_DL_005FD8" Offset="0x5FD8"/>
<DList Name="object_ta_DL_006330" Offset="0x6330"/>
<DList Name="object_ta_DL_006770" Offset="0x6770"/>
<Texture Name="object_ta_TLUT_006AC0" OutName="tlut_00006AC0" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/><!--Blob Name="object_ta_Blob_006CC0" Size="0x100" Offset="0x6CC0" /-->
<Texture Name="object_ta_Tex_006DC0" OutName="tex_00006DC0" Format="ci8" Width="8" Height="8" Offset="0x6DC0"/>
<Texture Name="object_ta_Tex_006E00" OutName="tex_00006E00" Format="ci8" Width="8" Height="8" Offset="0x6E00"/>
<Texture Name="object_ta_Tex_006E40" OutName="tex_00006E40" Format="ci8" Width="8" Height="16" Offset="0x6E40"/>
<Texture Name="object_ta_Tex_006EC0" OutName="tex_00006EC0" Format="ci8" Width="32" Height="32" Offset="0x6EC0"/>
<Texture Name="object_ta_Tex_0072C0" OutName="tex_000072C0" Format="ci8" Width="32" Height="32" Offset="0x72C0"/>
<Texture Name="object_ta_Tex_0076C0" OutName="tex_000076C0" Format="ci8" Width="32" Height="32" Offset="0x76C0"/>
<Texture Name="object_ta_Tex_007AC0" OutName="tex_00007AC0" Format="ci8" Width="8" Height="8" Offset="0x7AC0"/>
<Texture Name="object_ta_Tex_007B00" OutName="tex_00007B00" Format="ci8" Width="16" Height="32" Offset="0x7B00"/>
<Texture Name="object_ta_Tex_007D00" OutName="tex_00007D00" Format="ci8" Width="16" Height="16" Offset="0x7D00"/>
<Texture Name="object_ta_Tex_007E00" OutName="tex_00007E00" Format="ci8" Width="16" Height="16" Offset="0x7E00"/>
<Texture Name="object_ta_Tex_007F00" OutName="tex_00007F00" Format="ci8" Width="8" Height="16" Offset="0x7F00"/>
<Texture Name="object_ta_Tex_007F80" OutName="tex_00007F80" Format="ci8" Width="32" Height="32" Offset="0x7F80"/>
<DList Name="object_ta_DL_0096D0" Offset="0x96D0"/>
<DList Name="object_ta_DL_00A2F8" Offset="0xA2F8"/>
<DList Name="object_ta_DL_00A498" Offset="0xA498"/>
<Texture Name="object_ta_TLUT_00A638" OutName="tlut_0000A638" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
<Blob Name="object_ta_Blob_00A838" Size="0x80" Offset="0xA838"/>
<Texture Name="object_ta_Tex_00A8B8" OutName="tex_0000A8B8" Format="ci8" Width="8" Height="8" Offset="0xA8B8"/>
<Texture Name="object_ta_Tex_00A8F8" OutName="tex_0000A8F8" Format="ci8" Width="16" Height="16" Offset="0xA8F8"/>
<Texture Name="object_ta_Tex_00A9F8" OutName="tex_0000A9F8" Format="ci8" Width="16" Height="32" Offset="0xA9F8"/>
<Texture Name="object_ta_Tex_00ABF8" OutName="tex_0000ABF8" Format="ci8" Width="8" Height="8" Offset="0xABF8"/>
<Texture Name="object_ta_Tex_00AC38" OutName="tex_0000AC38" Format="ci8" Width="8" Height="8" Offset="0xAC38"/>
<Texture Name="object_ta_Tex_00AC78" OutName="tex_0000AC78" Format="ci8" Width="8" Height="8" Offset="0xAC78"/>
<Texture Name="object_ta_Tex_00ACB8" OutName="tex_0000ACB8" Format="ci8" Width="16" Height="16" Offset="0xACB8"/>
<Texture Name="object_ta_Tex_00ADB8" OutName="tex_0000ADB8" Format="ci8" Width="16" Height="32" Offset="0xADB8"/>
<Texture Name="object_ta_Tex_00AFB8" OutName="tex_0000AFB8" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
<Texture Name="object_ta_Tex_00B3B8" OutName="tex_0000B3B8" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
<Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
<Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
<Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
<Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
<Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
<Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
<Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
<Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
<Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
<Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
<Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
<Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
<Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
<Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
<Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
<Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
<Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
<Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
<Animation Name="gTalonStandAnim" Offset="0x1C94"/>
<Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
<Animation Name="gTalonSitWakeUpAnim" Offset="0xC48C"/>
<Animation Name="gTalonRunAnim" Offset="0xC858"/>
<Animation Name="gTalonSleepAnim" Offset="0xCD50"/>
<Animation Name="gTalonRunTransitionAnim" Offset="0xCF28"/>
<Animation Name="gTalonWakeUpAnim" Offset="0xE3D8"/>
<DList Name="gTalonTorsoDL" Offset="0x3F70"/>
<DList Name="gTalonChestDL" Offset="0x4288"/>
<DList Name="gTalonRightShoulderDL" Offset="0x4918"/>
<DList Name="gTalonRightArmDL" Offset="0x4B40"/>
<DList Name="gTalonRightHandDL" Offset="0x4DF0"/>
<DList Name="gTalonLeftShoulderDL" Offset="0x5298"/>
<DList Name="gTalonLeftArmDL" Offset="0x54C0"/>
<DList Name="gTalonLeftHandDL" Offset="0x5770"/>
<DList Name="gTalonRightThighDL" Offset="0x5B98"/>
<DList Name="gTalonRightLegDL" Offset="0x5FD8"/>
<DList Name="gTalonLeftThighDL" Offset="0x6330"/>
<DList Name="gTalonLeftLegDL" Offset="0x6770"/>
<DList Name="gTalonHeadDL" Offset="0x96D0"/>
<DList Name="gTalonRightFootDL" Offset="0xA2F8"/>
<DList Name="gTalonLeftFootDL" Offset="0xA498"/>
<Texture Name="gTalon2TLUT" OutName="tlut_2" Format="rgba16" Width="132" Height="1" Offset="0x6AC0"/>
<Texture Name="gTalonEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="63" Height="4" Offset="0x6BC8"/>
<Texture Name="gTalonHeadSkinTex" OutName="head_skin" Format="ci8" Width="8" Height="8" Offset="0x6DC0" TlutOffset="0x6AC0"/>
<Texture Name="gTalonEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x6E00" TlutOffset="0x6AC0"/>
<Texture Name="gTalonFaceHairTex" OutName="face_hair" Format="ci8" Width="8" Height="16" Offset="0x6E40" TlutOffset="0x6AC0"/>
<Texture Name="gTalonRedTex" OutName="red" Format="ci8" Width="8" Height="8" TlutOffset="0x6AC0" Offset="0x7AC0"/>
<Texture Name="gTalonHeadHairTex" OutName="head_hair" Format="ci8" Width="16" Height="32" Offset="0x7B00" TlutOffset="0x6AC0"/> <!-- Not clear where this is used -->
<Texture Name="gTalonBootSideTex" OutName="boot_side" Format="ci8" Width="16" Height="16" Offset="0x7D00" TlutOffset="0x6AC0"/>
<Texture Name="gTalonBootTopTex" OutName="boot_top" Format="ci8" Width="16" Height="16" Offset="0x7E00" TlutOffset="0x6AC0"/>
<Texture Name="gTalonHeadHairTopTex" OutName="head_hair_top" Format="ci8" Width="8" Height="16" Offset="0x7F00" TlutOffset="0x6AC0"/>
<Texture Name="gTalonEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x7F80" TlutOffset="0x6BC8"/>
<Texture Name="gTalonEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x6EC0" TlutOffset="0x6BC8"/>
<Texture Name="gTalonEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x72C0" TlutOffset="0x6BC8"/>
<Texture Name="gTalonEyeClosed2Tex" OutName="eye_closed_2" Format="ci8" Width="32" Height="32" Offset="0x76C0" TlutOffset="0x6BC8"/>
<Texture Name="gTalonSkinAndClothesTLUT" OutName="skin_and_clothes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xA638"/>
<Texture Name="gTalonGradient2Tex" OutName="gradient" Format="rgba16" Width="8" Height="8" Offset="0xA838"/>
<Texture Name="gTalonSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0xA8B8" TlutOffset="0xA638"/>
<Texture Name="gTalonFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0xA8F8" TlutOffset="0xA638"/>
<Texture Name="gTalonArmHairTex" OutName="arm_hair" Format="ci8" Width="16" Height="32" Offset="0xA9F8" TlutOffset="0xA638"/>
<Texture Name="gTalonSleeveTex" OutName="sleeve" Format="ci8" Width="8" Height="8" Offset="0xABF8" TlutOffset="0xA638"/>
<Texture Name="gTalonBlueTex" OutName="blue_square" Format="ci8" Width="8" Height="8" Offset="0xAC38" TlutOffset="0xA638"/>
<Texture Name="gTalonBluePatternTex" OutName="blue_pattern" Format="ci8" Width="8" Height="8" Offset="0xAC78" TlutOffset="0xA638"/>
<Texture Name="gTalonBrownBlueOutlineTex" OutName="brown_blue_outline" Format="ci8" Width="16" Height="16" Offset="0xACB8" TlutOffset="0xA638"/>
<Texture Name="gTalonNecklaceStringUpperTex" OutName="necklace_string_upper" Format="ci8" Width="16" Height="32" Offset="0xADB8" TlutOffset="0xA638"/>
<Texture Name="gTalonBowserTex" OutName="bowser" Format="rgba16" Width="16" Height="32" Offset="0xAFB8"/>
<Texture Name="gTalonNecklaceLowerStringsTex" OutName="necklace_string_lower" Format="rgba16" Width="8" Height="16" Offset="0xB3B8"/>
<Blob Name="object_ta_Blob_00B4B8" Size="0x200" Offset="0xB4B8"/>
<Limb Name="object_ta_Limb_00B6B8" LimbType="Standard" Offset="0xB6B8"/>
<Limb Name="object_ta_Limb_00B6C4" LimbType="Standard" Offset="0xB6C4"/>
<Limb Name="object_ta_Limb_00B6D0" LimbType="Standard" Offset="0xB6D0"/>
<Limb Name="object_ta_Limb_00B6DC" LimbType="Standard" Offset="0xB6DC"/>
<Limb Name="object_ta_Limb_00B6E8" LimbType="Standard" Offset="0xB6E8"/>
<Limb Name="object_ta_Limb_00B6F4" LimbType="Standard" Offset="0xB6F4"/>
<Limb Name="object_ta_Limb_00B700" LimbType="Standard" Offset="0xB700"/>
<Limb Name="object_ta_Limb_00B70C" LimbType="Standard" Offset="0xB70C"/>
<Limb Name="object_ta_Limb_00B718" LimbType="Standard" Offset="0xB718"/>
<Limb Name="object_ta_Limb_00B724" LimbType="Standard" Offset="0xB724"/>
<Limb Name="object_ta_Limb_00B730" LimbType="Standard" Offset="0xB730"/>
<Limb Name="object_ta_Limb_00B73C" LimbType="Standard" Offset="0xB73C"/>
<Limb Name="object_ta_Limb_00B748" LimbType="Standard" Offset="0xB748"/>
<Limb Name="object_ta_Limb_00B754" LimbType="Standard" Offset="0xB754"/>
<Limb Name="object_ta_Limb_00B760" LimbType="Standard" Offset="0xB760"/>
<Limb Name="object_ta_Limb_00B76C" LimbType="Standard" Offset="0xB76C"/>
<Skeleton Name="object_ta_Skel_00B7B8" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
<Animation Name="object_ta_Anim_00BF38" Offset="0xBF38"/>
<Animation Name="object_ta_Anim_00C48C" Offset="0xC48C"/>
<Animation Name="object_ta_Anim_00C858" Offset="0xC858"/>
<Animation Name="object_ta_Anim_00CD50" Offset="0xCD50"/>
<Animation Name="object_ta_Anim_00CF28" Offset="0xCF28"/>
<Animation Name="object_ta_Anim_00E3D8" Offset="0xE3D8"/>
</File>
</Root>

26
assets/xml/objects/object_toryo.xml
View file

@ -2,20 +2,20 @@
<File Name="object_toryo" Segment="6">
<Animation Name="object_toryo_Anim_000E50" Offset="0xE50"/>
<Texture Name="object_toryo_TLUT_000E60" OutName="tlut_00000E60" Format="rgba16" Width="16" Height="16" Offset="0xE60"/>
<Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060"/>
<Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160"/>
<Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180"/>
<Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0"/>
<Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200"/>
<Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240"/>
<Texture Name="object_toryo_Tex_001060" OutName="tex_00001060" Format="ci8" Width="16" Height="16" Offset="0x1060" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001160" OutName="tex_00001160" Format="ci8" Width="8" Height="4" Offset="0x1160" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001180" OutName="tex_00001180" Format="ci8" Width="8" Height="8" Offset="0x1180" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0011C0" OutName="tex_000011C0" Format="ci8" Width="8" Height="8" Offset="0x11C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001200" OutName="tex_00001200" Format="ci8" Width="8" Height="8" Offset="0x1200" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001240" OutName="tex_00001240" Format="ci8" Width="8" Height="16" Offset="0x1240" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0012C0" OutName="tex_000012C0" Format="rgba16" Width="32" Height="16" Offset="0x12C0"/>
<Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0"/>
<Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0"/>
<Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0"/>
<Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0"/>
<Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00"/>
<Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80"/>
<Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80"/>
<Texture Name="object_toryo_Tex_0016C0" OutName="tex_000016C0" Format="ci8" Width="16" Height="16" Offset="0x16C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0017C0" OutName="tex_000017C0" Format="ci8" Width="16" Height="16" Offset="0x17C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0018C0" OutName="tex_000018C0" Format="ci8" Width="16" Height="16" Offset="0x18C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_0019C0" OutName="tex_000019C0" Format="ci8" Width="8" Height="8" Offset="0x19C0" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001A00" OutName="tex_00001A00" Format="ci8" Width="8" Height="16" Offset="0x1A00" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001A80" OutName="tex_00001A80" Format="ci8" Width="16" Height="16" Offset="0x1A80" TlutOffset="0xE60"/>
<Texture Name="object_toryo_Tex_001B80" OutName="tex_00001B80" Format="ci8" Width="16" Height="16" Offset="0x1B80" TlutOffset="0xE60"/>
<DList Name="object_toryo_DL_004B20" Offset="0x4B20"/>
<DList Name="object_toryo_DL_004F20" Offset="0x4F20"/>
<DList Name="object_toryo_DL_005438" Offset="0x5438"/>

14
assets/xml/objects/object_tr.xml
View file

@ -26,23 +26,23 @@
<DList Name="object_tr_DL_007600" Offset="0x7600"/>
<DList Name="object_tr_DL_007720" Offset="0x7720"/>
<DList Name="object_tr_DL_007728" Offset="0x7728"/>
<!-- <Blob Name="object_tr_Blob_007730" Size="0x1A8" Offset="0x7730"/> -->
<Texture Name="object_tr_TLUT_007730" OutName="tlut_00007730" Format="rgba16" Width="53" Height="4" Offset="0x7730"/>
<Texture Name="object_tr_Tex_0078D8" OutName="tex_000078D8" Format="rgba16" Width="32" Height="32" Offset="0x78D8"/>
<Texture Name="object_tr_Tex_0080D8" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
<Texture Name="object_tr_Tex_0082D8" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
<Texture Name="object_tr_Tex_0084D8" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
<Blob Name="object_tr_Blob_0086D8" Size="0x400" Offset="0x86D8"/>
<Texture Name="object_tr_Tex_008AD8" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8"/>
<Texture Name="object_tr_Tex_008B58" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58"/>
<Texture Name="object_tr_Tex_008AD8" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
<Texture Name="object_tr_Tex_008B58" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
<Texture Name="object_tr_Tex_008B98" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
<Texture Name="object_tr_Tex_008D98" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98"/>
<Texture Name="object_tr_Tex_008DD8" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8"/>
<Texture Name="object_tr_Tex_008D98" OutName="tex_00008D98" Format="ci8" Width="8" Height="8" Offset="0x8D98" TlutOffset="0x7730"/>
<Texture Name="object_tr_Tex_008DD8" OutName="tex_00008DD8" Format="ci8" Width="8" Height="16" Offset="0x8DD8" TlutOffset="0x7730"/>
<Texture Name="object_tr_Tex_008E58" OutName="tex_00008E58" Format="rgba16" Width="8" Height="8" Offset="0x8E58"/>
<Texture Name="object_tr_Tex_008ED8" OutName="tex_00008ED8" Format="rgba16" Width="16" Height="32" Offset="0x8ED8"/>
<Texture Name="object_tr_Tex_0092D8" OutName="tex_000092D8" Format="rgba16" Width="16" Height="8" Offset="0x92D8"/>
<Texture Name="object_tr_Tex_0093D8" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
<Texture Name="object_tr_Tex_009458" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458"/>
<Texture Name="object_tr_Tex_009498" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498"/>
<Texture Name="object_tr_Tex_009458" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
<Texture Name="object_tr_Tex_009498" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
<Blob Name="object_tr_Blob_0094D8" Size="0x800" Offset="0x94D8"/>
<DList Name="object_tr_DL_00AF38" Offset="0xAF38"/>
<DList Name="object_tr_DL_00B568" Offset="0xB568"/>

14
assets/xml/objects/object_ts.xml
View file

@ -2,14 +2,14 @@
<File Name="object_ts" Segment="6">
<Animation Name="object_ts_Anim_000498" Offset="0x498"/>
<Texture Name="object_ts_TLUT_0004B0" OutName="tlut_000004B0" Format="rgba16" Width="16" Height="16" Offset="0x4B0"/>
<Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0"/>
<Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0"/>
<Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0"/>
<Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830"/>
<Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930"/>
<Texture Name="object_ts_Tex_0006B0" OutName="tex_000006B0" Format="ci8" Width="8" Height="8" Offset="0x6B0" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_0006F0" OutName="tex_000006F0" Format="ci8" Width="16" Height="16" Offset="0x6F0" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
<Blob Name="object_ts_Blob_000970" Size="0x800" Offset="0x970"/>
<Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170"/>
<Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270"/>
<Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
<DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>
<DList Name="object_ts_DL_003ED8" Offset="0x3ED8"/>
<DList Name="object_ts_DL_004378" Offset="0x4378"/>

10
assets/xml/objects/object_ydan_objects.xml
View file

@ -5,15 +5,15 @@
<Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
<Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
<Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
<Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8"/>
<Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
<Texture Name="gYdanHasi2TLUT" OutName="palette_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
<Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8"/>
<Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
<Texture Name="gYdanTLUT_38F0" OutName="palette_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
<Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8"/>
<Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950"/>
<Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
<Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
<Texture Name="gYdanHasiWaterTLUT" OutName="water_palette" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
<Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
<Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8"/>
<Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
<Texture Name="gYdanMaruta1TLUT" OutName="maruta_palette" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
<DList Name="gDTUnknownWebDL" Offset="0x3850"/>
<DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>

8
assets/xml/objects/object_zf.xml
View file

@ -1,14 +1,14 @@
<Root>
<File Name="object_zf" Segment="6">
<Texture Name="gZfDinolfosTLUT" OutName="zf_dinolfos_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
<Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200"/>
<Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240"/>
<Texture Name="object_zf_Tex_000200" OutName="tex_00000200" Format="ci8" Width="8" Height="8" Offset="0x200" TlutOffset="0x0"/>
<Texture Name="object_zf_Tex_000240" OutName="tex_00000240" Format="ci8" Width="16" Height="16" Offset="0x240" TlutOffset="0x0"/>
<Texture Name="gZfDinolfosSpineTex" OutName="zf_dinolfos_spine" Format="rgba16" Width="8" Height="8" Offset="0x340"/>
<Texture Name="object_zf_Tex_0003C0" OutName="tex_000003C0" Format="rgba16" Width="8" Height="8" Offset="0x3C0"/>
<Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440"/>
<Texture Name="object_zf_Tex_000440" OutName="tex_00000440" Format="ci8" Width="16" Height="16" Offset="0x440" TlutOffset="0x0"/>
<Texture Name="object_zf_Tex_000540" OutName="tex_00000540" Format="i8" Width="8" Height="8" Offset="0x540"/>
<Texture Name="object_zf_Tex_000580" OutName="tex_00000580" Format="i8" Width="8" Height="16" Offset="0x580"/>
<Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600"/>
<Texture Name="object_zf_Tex_000600" OutName="tex_00000600" Format="ci8" Width="16" Height="16" Offset="0x600" TlutOffset="0x0"/>
<Texture Name="gZfDinolfosNormalEyeTex" OutName="zf_dinolfos_normal_eye" Format="rgba16" Width="16" Height="16" Offset="0x700"/>
<DList Name="gZfDinolfosRightThighDL" Offset="0x3510"/>
<DList Name="gZfDinolfosRightShinDL" Offset="0x3778"/>

24
assets/xml/objects/object_zl2.xml
View file

@ -5,23 +5,23 @@
<!-- Zelda 2 eyes textures -->
<Texture Name="gZelda2EyesTLUT" OutName="zelda_2_eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2B00"/>
<Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8"/>
<Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48"/>
<Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048"/>
<Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548"/>
<Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948"/>
<Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48"/>
<Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148"/> <!-- Scared (?) -->
<Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48"/> <!-- Sad (?) -->
<Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148"/> <!-- Sad2 (?) -->
<Texture Name="gZelda2EyeOpenTex" OutName="zelda_2_eye_open" Format="ci8" Width="32" Height="32" Offset="0x30C8" TlutOffset="0x2B00"/>
<Texture Name="gZelda2EyeHalfTex" OutName="zelda_2_eye_half" Format="ci8" Width="32" Height="32" Offset="0x3C48" TlutOffset="0x2B00"/>
<Texture Name="gZelda2EyeShutTex" OutName="zelda_2_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x4048" TlutOffset="0x2B00"/>
<Texture Name="gZelda2Eye03Tex" OutName="zelda_2_eye_03" Format="ci8" Width="32" Height="32" Offset="0x4548" TlutOffset="0x2B00"/>
<Texture Name="gZelda2Eye04Tex" OutName="zelda_2_eye_04" Format="ci8" Width="32" Height="32" Offset="0x4948" TlutOffset="0x2B00"/>
<Texture Name="gZelda2Eye05Tex" OutName="zelda_2_eye_05" Format="ci8" Width="32" Height="32" Offset="0x4D48" TlutOffset="0x2B00"/>
<Texture Name="gZelda2Eye06Tex" OutName="zelda_2_eye_06" Format="ci8" Width="32" Height="32" Offset="0x5148" TlutOffset="0x2B00"/> <!-- Scared (?) -->
<Texture Name="gZelda2Eye07Tex" OutName="zelda_2_eye_07" Format="ci8" Width="32" Height="32" Offset="0x5D48" TlutOffset="0x2B00"/> <!-- Sad (?) -->
<Texture Name="gZelda2Eye08Tex" OutName="zelda_2_eye_08" Format="ci8" Width="32" Height="32" Offset="0x6148" TlutOffset="0x2B00"/> <!-- Sad2 (?) -->
<Texture Name="gZelda2EyeUnusedTex" OutName="zelda_2_eye_unused" Format="rgba16" Width="32" Height="32" Offset="0x600"/>
<!-- Zelda 2 mouth textures -->
<Texture Name="gZelda2MouthTLUT" OutName="zelda_2_mouth_tlut" Format="rgba16" Width="16" Height="14" Offset="0x2D90"/>
<Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508"/>
<Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548"/>
<Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948"/>
<Texture Name="gZelda2MouthSeriousTex" OutName="zelda_2_mouth_serious" Format="ci8" Width="32" Height="32" Offset="0x3508" TlutOffset="0x2D90"/>
<Texture Name="gZelda2MouthHappyTex" OutName="zelda_2_mouth_happy" Format="ci8" Width="32" Height="32" Offset="0x5548" TlutOffset="0x2D90"/>
<Texture Name="gZelda2MouthOpenTex" OutName="zelda_2_mouth_open" Format="ci8" Width="32" Height="32" Offset="0x5948" TlutOffset="0x2D90"/>
<!-- Ocarina of time -->
<DList Name="gZelda2OcarinaDL" Offset="0xBAE8"/>

10
assets/xml/objects/object_zo.xml
View file

@ -65,11 +65,11 @@
<!-- Other body parts textures -->
<Texture Name="gZoraMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="32" Offset="0x5640"/>
<Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600"/>
<Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40"/>
<Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40"/>
<Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00"/>
<Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200"/>
<Texture Name="gZoraHeadTailTex" OutName="head_tail" Format="ci8" Width="32" Height="64" Offset="0x3600" TlutOffset="0x3000"/>
<Texture Name="gZoraHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x5E40" TlutOffset="0x3000"/>
<Texture Name="gZoraKneeTex" OutName="knee" Format="ci8" Width="8" Height="8" Offset="0x5F40" TlutOffset="0x3000"/>
<Texture Name="gZoraHeadTex" OutName="head" Format="ci8" Width="8" Height="8" Offset="0x3E00" TlutOffset="0x3000"/>
<Texture Name="gZoraFinTex" OutName="fin" Format="ci8" Width="32" Height="32" Offset="0x3200" TlutOffset="0x3000"/>
<!-- Palette / Tlut -->
<Texture Name="gZoraTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x3000"/>

8
src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
View file

@ -288,13 +288,13 @@ void BgJyaMegami_Update(Actor* thisx, GlobalContext* globalCtx) {
}
static void* sRightSideCrumbles[] = {
gMeagmiRightCrumble1Tex, gMeagmiRightCrumble2Tex, gMeagmiRightCrumble3Tex,
gMeagmiRightCrumble4Tex, gMeagmiRightCrumble5Tex,
gMegamiRightCrumble1Tex, gMegamiRightCrumble2Tex, gMegamiRightCrumble3Tex,
gMegamiRightCrumble4Tex, gMegamiRightCrumble5Tex,
};
static void* sLeftSideCrumbles[] = {
gMeagmiLeftCrumble1Tex, gMeagmiLeftCrumble2Tex, gMeagmiLeftCrumble3Tex,
gMeagmiLeftCrumble4Tex, gMeagmiLeftCrumble5Tex,
gMegamiLeftCrumble1Tex, gMegamiLeftCrumble2Tex, gMegamiLeftCrumble3Tex,
gMegamiLeftCrumble4Tex, gMegamiLeftCrumble5Tex,
};
void BgJyaMegami_DrawFace(BgJyaMegami* this, GlobalContext* globalCtx) {

27
src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View file

@ -8,7 +8,12 @@
#include "vt.h"
#include "objects/object_zo/object_zo.h"
#include "objects/object_ec/object_ec.h"
#include "objects/object_ma2/object_ma2.h"
#include "objects/object_in/object_in.h"
#include "objects/object_ge1/object_ge1.h"
#include "objects/object_fu/object_fu.h"
#include "objects/object_fish/object_fish.h"
#include "objects/object_ta/object_ta.h"
#include "objects/object_oF1d_map/object_oF1d_map.h"
#include "objects/object_ma2/object_ma2.h"
#include "objects/object_in/object_in.h"
@ -258,12 +263,12 @@ void DemoEc_DrawSkeleton(DemoEc* this, GlobalContext* globalCtx, void* eyeTextur
func_80093D18(gfxCtx);
if (eyeTexture != 0) {
if (eyeTexture != NULL) {
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture));
}
if (arg3 != 0) {
if (arg3 != NULL) {
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(arg3));
}
@ -353,7 +358,7 @@ void DemoEc_SetNpcActionPosRot(DemoEc* this, GlobalContext* globalCtx, s32 actio
void DemoEc_InitIngo(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_UseDrawObject(this, globalCtx);
DemoEc_InitSkelAnime(this, globalCtx, &object_in_Skel_013B88);
DemoEc_InitSkelAnime(this, globalCtx, &gIngoSkel);
DemoEc_UseAnimationObject(this, globalCtx);
DemoEc_ChangeAnimation(this, &gDemoEcIngoAnim, 0, 0.0f, false);
func_8096D64C(this, globalCtx);
@ -369,12 +374,12 @@ void DemoEc_UpdateIngo(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawIngo(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_DrawSkeleton(this, globalCtx, &object_in_Tex_004390, &object_in_Tex_004350, 0, 0);
DemoEc_DrawSkeleton(this, globalCtx, &gIngoEyeClosed2Tex, &gIngoRedTex, 0, 0);
}
void DemoEc_InitTalon(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_UseDrawObject(this, globalCtx);
DemoEc_InitSkelAnime(this, globalCtx, &object_ta_Skel_00B7B8);
DemoEc_InitSkelAnime(this, globalCtx, &gTalonSkel);
DemoEc_UseAnimationObject(this, globalCtx);
DemoEc_ChangeAnimation(this, &gDemoEcTalonAnim, 0, 0.0f, false);
func_8096D64C(this, globalCtx);
@ -390,7 +395,7 @@ void DemoEc_UpdateTalon(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawTalon(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_DrawSkeleton(this, globalCtx, &object_ta_Tex_0076C0, &object_ta_Tex_007AC0, NULL, NULL);
DemoEc_DrawSkeleton(this, globalCtx, &gTalonEyeClosed2Tex, &gTalonRedTex, NULL, NULL);
}
void DemoEc_InitWindmillMan(DemoEc* this, GlobalContext* globalCtx) {
@ -673,7 +678,7 @@ Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) {
return object_daiku_DL_005880;
default:
osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST);
return 0;
return NULL;
}
}
@ -1143,9 +1148,9 @@ void DemoEc_DrawGorons(DemoEc* this, GlobalContext* globalCtx) {
void DemoEc_InitMalon(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_UseDrawObject(this, globalCtx);
DemoEc_InitSkelAnime(this, globalCtx, &object_ma2_Skel_008D90);
DemoEc_InitSkelAnime(this, globalCtx, &gMalonAdultSkel);
DemoEc_UseAnimationObject(this, globalCtx);
DemoEc_ChangeAnimation(this, &object_ma2_Anim_009EE0, 0, 0.0f, false);
DemoEc_ChangeAnimation(this, &gMalonAdultSingAnim, 0, 0.0f, false);
func_8096D5D4(this, globalCtx);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
this->updateMode = EC_UPDATE_MALON;
@ -1160,11 +1165,11 @@ void DemoEc_UpdateMalon(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawMalon(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { object_ma2_Tex_002570, object_ma2_Tex_002C70, object_ma2_Tex_003070 };
static void* eyeTextures[] = { gMalonAdultEyeOpenTex, gMalonAdultEyeHalfTex, gMalonAdultEyeClosedTex };
s32 eyeTexIndex = this->eyeTexIndex;
void* eyeTexture = eyeTextures[eyeTexIndex];
DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &object_ma2_Tex_003770, NULL, NULL);
DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, gMalonAdultMouthHappyTex, NULL, NULL);
}
static DemoEcInitFunc sInitFuncs[] = {

8
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -191,7 +191,7 @@ void func_8097CCE0(DemoGo* this, GlobalContext* globalCtx) {
}
}
s32 DemoGo_FrameUpdateMatrix(DemoGo* this) {
s32 DemoGo_UpdateSkelAnime(DemoGo* this) {
return SkelAnime_Update(&this->skelAnime);
}
@ -278,7 +278,7 @@ void func_8097D088(DemoGo* this, GlobalContext* globalCtx) {
s32 something;
func_8097CA30(this, globalCtx);
something = DemoGo_FrameUpdateMatrix(this);
something = DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097CF20(this, globalCtx, something);
}
@ -287,7 +287,7 @@ void func_8097D0D0(DemoGo* this, GlobalContext* globalCtx) {
func_8097CCE0(this, globalCtx);
func_8097CCC0(this);
func_8097CA30(this, globalCtx);
DemoGo_FrameUpdateMatrix(this);
DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097C9DC(this);
func_8097CF9C(this);
@ -296,7 +296,7 @@ void func_8097D130(DemoGo* this, GlobalContext* globalCtx) {
func_8097CCE0(this, globalCtx);
func_8097CC08(this);
func_8097CA30(this, globalCtx);
DemoGo_FrameUpdateMatrix(this);
DemoGo_UpdateSkelAnime(this);
func_8097C930(this);
func_8097C9DC(this);
}

335
src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View file

@ -29,7 +29,7 @@ void func_80985830(DemoIm* this, GlobalContext* globalCtx);
void func_80985C10(DemoIm* this, GlobalContext* globalCtx);
void func_80985C40(DemoIm* this, GlobalContext* globalCtx);
void func_80985C94(DemoIm* this, GlobalContext* globalCtx);
void func_80985CE8(DemoIm* this, GlobalContext* globalCtx);
void DemoIm_DrawTranslucent(DemoIm* this, GlobalContext* globalCtx);
void func_809863BC(DemoIm* this, GlobalContext* globalCtx);
void func_809863DC(DemoIm* this, GlobalContext* globalCtx);
void func_80986430(DemoIm* this, GlobalContext* globalCtx);
@ -51,13 +51,13 @@ void func_80987288(DemoIm* this, GlobalContext* globalCtx);
void func_809872A8(DemoIm* this, GlobalContext* globalCtx);
void func_809872F0(DemoIm* this, GlobalContext* globalCtx);
void func_80987330(DemoIm* this, GlobalContext* globalCtx);
void func_8098764C(DemoIm* this, GlobalContext* globalCtx);
void func_80987658(DemoIm* this, GlobalContext* globalCtx);
void DemoIm_DrawNothing(DemoIm* this, GlobalContext* globalCtx);
void DemoIm_DrawSolid(DemoIm* this, GlobalContext* globalCtx);
static void* D_80987830[] = {
0x06007210,
0x06007D50,
0x06008150,
static void* sEyeTextures[] = {
gImpaEyeOpenTex,
gImpaEyeHalfTex,
gImpaEyeClosedTex,
};
static u32 D_8098783C = 0;
@ -87,9 +87,9 @@ static DemoImActionFunc sActionFuncs[] = {
static Vec3f D_809887D8 = { 0.0f, 10.0f, 0.0f };
static DemoImDrawFunc sDrawFuncs[] = {
func_8098764C,
func_80987658,
func_80985CE8,
DemoIm_DrawNothing,
DemoIm_DrawSolid,
DemoIm_DrawTranslucent,
};
const ActorInit Demo_Im_InitVars = {
@ -106,23 +106,23 @@ const ActorInit Demo_Im_InitVars = {
void func_80984BE0(DemoIm* this) {
s32 pad[3];
s16* unk_25E = &this->unk_25E;
s16* unk_25C = &this->unk_25C;
s16* blinkTimer = &this->blinkTimer;
s16* eyeIndex = &this->eyeIndex;
if (DECR(*unk_25E) == 0) {
*unk_25E = Rand_S16Offset(0x3C, 0x3C);
if (DECR(*blinkTimer) == 0) {
*blinkTimer = Rand_S16Offset(60, 60);
}
*unk_25C = *unk_25E;
if (*unk_25C >= 3) {
*unk_25C = 0;
*eyeIndex = *blinkTimer;
if (*eyeIndex >= 3) {
*eyeIndex = 0;
}
}
void func_80984C68(DemoIm* this) {
this->action = 7;
this->drawConfig = 0;
this->unk_26C = 0;
this->alpha = 0;
this->unk_270 = 0;
this->actor.shape.shadowAlpha = 0;
this->unk_268 = 0.0f;
@ -145,20 +145,20 @@ void func_80984C8C(DemoIm* this, GlobalContext* globalCtx) {
}
}
void func_80984D00(Actor* thisx, GlobalContext* globalCtx) {
void DemoIm_InitCollider(Actor* thisx, GlobalContext* globalCtx) {
DemoIm* this = THIS;
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit);
}
void func_80984D4C(Actor* thisx, GlobalContext* globalCtx) {
void DemoIm_DestroyCollider(Actor* thisx, GlobalContext* globalCtx) {
DemoIm* this = THIS;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
void func_80984D74(DemoIm* this, GlobalContext* globalCtx) {
void DemoIm_UpdateCollider(DemoIm* this, GlobalContext* globalCtx) {
s32 pad[5];
Collider_UpdateCylinder(&this->actor, &this->collider);
@ -207,55 +207,56 @@ void func_80984F94(DemoIm* this, GlobalContext* globalCtx) {
func_80034A14(&this->actor, &this->unk_2D4, kREG(17) + 0xC, 4);
}
void func_80985018(DemoIm* this, GlobalContext* globalCtx) {
void DemoIm_UpdateBgCheckInfo(DemoIm* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
s32 func_80985060(DemoIm* this) {
s32 DemoIm_UpdateSkelAnime(DemoIm* this) {
return SkelAnime_Update(&this->skelAnime);
}
s32 func_80985080(GlobalContext* globalCtx) {
s32 DemoIm_IsCsStateIdle(GlobalContext* globalCtx) {
if (globalCtx->csCtx.state == CS_STATE_IDLE) {
return 1;
return true;
} else {
return false;
}
return 0;
}
CsCmdActorAction* func_809850A0(GlobalContext* globalCtx, s32 actionIdx) {
CsCmdActorAction* DemoIm_GetNpcAction(GlobalContext* globalCtx, s32 actionIdx) {
s32 pad[2];
CsCmdActorAction* ret = NULL;
if (!func_80985080(globalCtx)) {
if (!DemoIm_IsCsStateIdle(globalCtx)) {
ret = globalCtx->csCtx.npcActions[actionIdx];
}
return ret;
}
s32 func_809850E8(DemoIm* this, GlobalContext* globalCtx, u16 action, s32 actionIdx) {
CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx);
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, actionIdx);
if (npcAction != NULL) {
if (npcAction->action == action) {
return 1;
return true;
}
}
return 0;
return false;
}
s32 func_80985134(DemoIm* this, GlobalContext* globalCtx, u16 action, s32 actionIdx) {
CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx);
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, actionIdx);
if (npcAction != NULL) {
if (npcAction->action != action) {
return 1;
return true;
}
}
return 0;
return false;
}
void func_80985180(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx);
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, actionIdx);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@ -266,7 +267,7 @@ void func_80985180(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
}
void func_80985200(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
CsCmdActorAction* npcAction = func_809850A0(globalCtx, actionIdx);
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, actionIdx);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@ -276,27 +277,28 @@ void func_80985200(DemoIm* this, GlobalContext* globalCtx, s32 actionIdx) {
}
}
void func_80985280(DemoIm* this, AnimationHeader* animHeaderSeg, u8 arg2, f32 transitionRate, s32 arg4) {
void DemoIm_ChangeAnim(DemoIm* this, AnimationHeader* animHeaderSeg, u8 animMode, f32 transitionRate,
s32 playBackwards) {
f32 frameCount = Animation_GetLastFrame(animHeaderSeg);
f32 playbackSpeed;
f32 unk0;
f32 fc;
f32 startFrame;
f32 endFrame;
if (arg4 == 0) {
unk0 = 0.0f;
fc = frameCount;
if (!playBackwards) {
startFrame = 0.0f;
endFrame = frameCount;
playbackSpeed = 1.0f;
} else {
fc = 0.0f;
unk0 = frameCount;
endFrame = 0.0f;
startFrame = frameCount;
playbackSpeed = -1.0f;
}
Animation_Change(&this->skelAnime, animHeaderSeg, playbackSpeed, unk0, fc, arg2, transitionRate);
Animation_Change(&this->skelAnime, animHeaderSeg, playbackSpeed, startFrame, endFrame, animMode, transitionRate);
}
void func_80985310(DemoIm* this, GlobalContext* globalCtx) {
func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->actor.shape.yOffset = -10000.0f;
}
@ -341,8 +343,8 @@ void func_8098544C(DemoIm* this, GlobalContext* globalCtx) {
void func_809854DC(DemoIm* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[5] != NULL) &&
(globalCtx->csCtx.npcActions[5]->action == 2)) {
Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f);
Animation_Change(&this->skelAnime, &gImpaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaIdleAnim),
ANIMMODE_LOOP, 0.0f);
this->action = 2;
this->drawConfig = 1;
func_80985358(this, globalCtx);
@ -359,16 +361,16 @@ void func_8098557C(DemoIm* this) {
void func_809855A8(DemoIm* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[5] != NULL) &&
(globalCtx->csCtx.npcActions[5]->action == 3)) {
Animation_Change(&this->skelAnime, &object_im_Anim_000710, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_000710), ANIMMODE_ONCE, 4.0f);
Animation_Change(&this->skelAnime, &gImpaRaiseArmsAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaRaiseArmsAnim),
ANIMMODE_ONCE, 4.0f);
this->action = 4;
}
}
void func_80985640(DemoIm* this, s32 arg1) {
if (arg1 != 0) {
Animation_Change(&this->skelAnime, &object_im_Anim_000AFC, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_000AFC), ANIMMODE_LOOP, 0.0f);
Animation_Change(&this->skelAnime, &gImpaPresentShadowMedallionAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gImpaPresentShadowMedallionAnim), ANIMMODE_LOOP, 0.0f);
this->action = 5;
}
}
@ -391,14 +393,14 @@ void func_80985718(DemoIm* this, GlobalContext* globalCtx) {
void func_80985738(DemoIm* this, GlobalContext* globalCtx) {
func_80985430(this, globalCtx);
func_80985060(this);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_8098557C(this);
}
void func_80985770(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809855A8(this, globalCtx);
}
@ -406,27 +408,27 @@ void func_80985770(DemoIm* this, GlobalContext* globalCtx) {
void func_809857B0(DemoIm* this, GlobalContext* globalCtx) {
s32 sp1C;
func_80985018(this, globalCtx);
sp1C = func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
sp1C = DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80985640(this, sp1C);
}
void func_809857F0(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809856AC(this, globalCtx);
}
void func_80985830(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
}
void func_80985860(DemoIm* this, GlobalContext* globalCtx) {
func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 7;
this->actor.shape.shadowAlpha = 0;
}
@ -435,18 +437,18 @@ void func_809858A8(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T);
}
void func_809858C8(DemoIm* this, GlobalContext* globalCtx) {
void DemoIm_SpawnLightBall(DemoIm* this, GlobalContext* globalCtx) {
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.world.pos.x,
(kREG(17) + 24.0f) + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 6);
}
void func_80985948(DemoIm* this, GlobalContext* globalCtx) {
if (func_809850E8(this, globalCtx, 4, 5)) {
Animation_Change(&this->skelAnime, &object_im_Anim_011C08, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_011C08), ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gImpaPrepareSealGanonAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gImpaPrepareSealGanonAnim), ANIMMODE_ONCE, 0.0f);
this->action = 8;
this->drawConfig = 2;
this->unk_26C = 0;
this->alpha = 0;
this->actor.shape.shadowAlpha = 0;
this->unk_268 = 0.0f;
func_809858A8();
@ -463,7 +465,7 @@ void func_809859E0(DemoIm* this, GlobalContext* globalCtx) {
this->action = 9;
this->drawConfig = 1;
*unk_268 = kREG(5) + 10.0f;
this->unk_26C = this->actor.shape.shadowAlpha = alpha;
this->alpha = this->actor.shape.shadowAlpha = alpha;
return;
}
} else {
@ -472,24 +474,24 @@ void func_809859E0(DemoIm* this, GlobalContext* globalCtx) {
this->action = 7;
this->drawConfig = 0;
*unk_268 = 0.0f;
this->unk_26C = 0;
this->alpha = 0;
this->actor.shape.shadowAlpha = 0;
return;
}
}
this->actor.shape.shadowAlpha = this->unk_26C = (*unk_268 / (kREG(5) + 10.0f)) * 255.0f;
this->actor.shape.shadowAlpha = this->alpha = (*unk_268 / (kREG(5) + 10.0f)) * 255.0f;
}
void func_80985B34(DemoIm* this, GlobalContext* globalCtx) {
if (func_80985134(this, globalCtx, 4, 5)) {
Animation_Change(&this->skelAnime, &object_im_Anim_012218, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_012218), ANIMMODE_ONCE, -8.0f);
Animation_Change(&this->skelAnime, &gImpaSealGanonAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaSealGanonAnim),
ANIMMODE_ONCE, -8.0f);
this->action = 8;
this->drawConfig = 2;
this->unk_268 = kREG(5) + 10.0f;
this->unk_26C = 255;
this->alpha = 255;
if (this->unk_270 == 0) {
func_809858C8(this, globalCtx);
DemoIm_SpawnLightBall(this, globalCtx);
this->unk_270 = 1;
}
this->actor.shape.shadowAlpha = 0xFF;
@ -502,34 +504,34 @@ void func_80985C10(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80985C40(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809859E0(this, globalCtx);
func_80984C8C(this, globalCtx);
}
void func_80985C94(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80985B34(this, globalCtx);
func_80984C8C(this, globalCtx);
}
void func_80985CE8(DemoIm* this, GlobalContext* globalCtx) {
void DemoIm_DrawTranslucent(DemoIm* this, GlobalContext* globalCtx) {
s32 pad[2];
s16 unk_25C = this->unk_25C;
void* sp68 = D_80987830[unk_25C];
s16 eyeIndex = this->eyeIndex;
void* eyeTex = sEyeTextures[eyeIndex];
SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_im_inKenjyanomaDemo02.c", 281);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp68));
gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp68));
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_26C);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTex));
gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTex));
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
gSPSegment(POLY_XLU_DISP++, 0x0C, &D_80116280[0]);
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
@ -539,7 +541,7 @@ void func_80985CE8(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80985E60(DemoIm* this, GlobalContext* globalCtx) {
func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 10;
this->unk_280 = 1;
}
@ -553,8 +555,8 @@ void func_80985EAC(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80985EF4(DemoIm* this) {
if (!Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&object_im_Anim_01182C) - 1.0f)) {
func_80985060(this);
if (!Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&gImpaWhistlingAnim) - 1.0f)) {
DemoIm_UpdateSkelAnime(this);
}
}
@ -564,8 +566,8 @@ void func_80985F54(DemoIm* this) {
}
void func_80985F64(DemoIm* this, GlobalContext* globalCtx) {
Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f);
Animation_Change(&this->skelAnime, &gImpaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaIdleAnim),
ANIMMODE_LOOP, 0.0f);
func_80985180(this, globalCtx, 5);
this->action = 11;
this->drawConfig = 1;
@ -573,15 +575,15 @@ void func_80985F64(DemoIm* this, GlobalContext* globalCtx) {
void func_80985FE8(DemoIm* this, s32 arg1) {
if (arg1 != 0) {
Animation_Change(&this->skelAnime, &object_im_Anim_01182C, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_01182C), ANIMMODE_LOOP, -8.0f);
Animation_Change(&this->skelAnime, &gImpaWhistlingAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaWhistlingAnim),
ANIMMODE_LOOP, -8.0f);
}
}
void func_8098604C(DemoIm* this) {
f32 frameCount = Animation_GetLastFrame(&object_im_Anim_010EE0);
f32 frameCount = Animation_GetLastFrame(&gImpaStartWhistlingAnim);
Animation_Change(&this->skelAnime, &object_im_Anim_010EE0, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, -8.0f);
Animation_Change(&this->skelAnime, &gImpaStartWhistlingAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, -8.0f);
this->action = 12;
this->drawConfig = 1;
this->unk_2D0 = 1;
@ -594,21 +596,21 @@ void func_809860C8(DemoIm* this) {
void func_809860DC(DemoIm* this, s32 arg1) {
if (arg1 != 0) {
Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, -8.0f);
Animation_Change(&this->skelAnime, &gImpaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaIdleAnim),
ANIMMODE_LOOP, -8.0f);
this->unk_2D0 = 0;
}
}
void func_80986148(DemoIm* this) {
Animation_Change(&this->skelAnime, &object_im_Anim_010EE0, -1.0f, Animation_GetLastFrame(&object_im_Anim_010EE0),
0.0f, ANIMMODE_ONCE, -8.0f);
Animation_Change(&this->skelAnime, &gImpaStartWhistlingAnim, -1.0f,
Animation_GetLastFrame(&gImpaStartWhistlingAnim), 0.0f, ANIMMODE_ONCE, -8.0f);
this->action = 14;
this->drawConfig = 1;
}
void func_809861C4(DemoIm* this, GlobalContext* globalCtx) {
CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5);
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@ -620,8 +622,8 @@ void func_809861C4(DemoIm* this, GlobalContext* globalCtx) {
func_80986148(this);
break;
case 7:
Animation_Change(&this->skelAnime, &object_im_Anim_01182C, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_01182C), ANIMMODE_LOOP, -8.0f);
Animation_Change(&this->skelAnime, &gImpaWhistlingAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gImpaWhistlingAnim), ANIMMODE_LOOP, -8.0f);
this->action = 12;
break;
default:
@ -633,7 +635,7 @@ void func_809861C4(DemoIm* this, GlobalContext* globalCtx) {
}
void func_8098629C(DemoIm* this, GlobalContext* globalCtx) {
if (func_80985080(globalCtx)) {
if (DemoIm_IsCsStateIdle(globalCtx)) {
this->action = 21;
this->drawConfig = 1;
this->unk_280 = 1;
@ -641,7 +643,7 @@ void func_8098629C(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809862E0(DemoIm* this, GlobalContext* globalCtx) {
CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5);
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@ -676,8 +678,8 @@ void func_809863BC(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809863DC(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80985EAC(this, globalCtx);
func_80984BE0(this);
func_809862E0(this, globalCtx);
@ -686,8 +688,8 @@ void func_809863DC(DemoIm* this, GlobalContext* globalCtx) {
void func_80986430(DemoIm* this, GlobalContext* globalCtx) {
s32 sp24;
func_80985018(this, globalCtx);
sp24 = func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
sp24 = DemoIm_UpdateSkelAnime(this);
func_80985EAC(this, globalCtx);
func_80984BE0(this);
func_80985FE8(this, sp24);
@ -695,7 +697,7 @@ void func_80986430(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986494(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
func_80985EF4(this);
func_80984BE0(this);
func_809861C4(this, globalCtx);
@ -704,15 +706,15 @@ void func_80986494(DemoIm* this, GlobalContext* globalCtx) {
void func_809864D4(DemoIm* this, GlobalContext* globalCtx) {
s32 sp24;
func_80985018(this, globalCtx);
sp24 = func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
sp24 = DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809860DC(this, sp24);
func_8098629C(this, globalCtx);
}
void func_8098652C(DemoIm* this, GlobalContext* globalCtx) {
func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 15;
}
@ -755,22 +757,22 @@ void func_80986700(DemoIm* this) {
}
void func_80986710(DemoIm* this, GlobalContext* globalCtx) {
Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f);
Animation_Change(&this->skelAnime, &gImpaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gImpaIdleAnim),
ANIMMODE_LOOP, 0.0f);
func_80985180(this, globalCtx, 5);
this->action = 16;
this->drawConfig = 1;
}
void func_80986794(DemoIm* this) {
Animation_Change(&this->skelAnime, &object_im_Anim_0014E4, 1.0f, 0.0f,
Animation_GetLastFrame(&object_im_Anim_0014E4), ANIMMODE_ONCE, -8.0f);
Animation_Change(&this->skelAnime, &gImpaThrowDekuNutAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gImpaThrowDekuNutAnim), ANIMMODE_ONCE, -8.0f);
this->action = 17;
this->drawConfig = 1;
}
void func_8098680C(DemoIm* this, GlobalContext* globalCtx) {
CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5);
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@ -803,8 +805,8 @@ void func_809868E8(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986908(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_8098680C(this, globalCtx);
}
@ -812,8 +814,8 @@ void func_80986908(DemoIm* this, GlobalContext* globalCtx) {
void func_80986948(DemoIm* this, GlobalContext* globalCtx) {
s32 sp24;
func_80985018(this, globalCtx);
sp24 = func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
sp24 = DemoIm_UpdateSkelAnime(this);
func_80986570(this, globalCtx);
func_80984BE0(this);
func_809865F8(this, globalCtx, sp24);
@ -821,7 +823,7 @@ void func_80986948(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809869B0(DemoIm* this, GlobalContext* globalCtx) {
func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 18;
this->actor.shape.shadowAlpha = 0;
}
@ -832,9 +834,10 @@ s32 func_809869F8(DemoIm* this, GlobalContext* globalCtx) {
f32 thisPosX = this->actor.world.pos.x;
if ((thisPosX - (kREG(16) + 30.0f) > playerPosX) && (!(this->actor.flags & 0x40))) {
return 1;
return true;
} else {
return false;
}
return 0;
}
s32 func_80986A5C(DemoIm* this, GlobalContext* globalCtx) {
@ -843,9 +846,10 @@ s32 func_80986A5C(DemoIm* this, GlobalContext* globalCtx) {
f32 thisPosX = this->actor.world.pos.x;
if ((thisPosX - (kREG(17) + 130.0f) < playerPosX) && (!Gameplay_InCsMode(globalCtx))) {
return 1;
return true;
} else {
return false;
}
return 0;
}
s32 func_80986AD0(DemoIm* this, GlobalContext* globalCtx) {
@ -854,9 +858,9 @@ s32 func_80986AD0(DemoIm* this, GlobalContext* globalCtx) {
this->actor.textId = 0x708E;
func_8002F2F4(&this->actor, globalCtx);
} else {
return 1;
return true;
}
return 0;
return false;
}
void func_80986B2C(GlobalContext* globalCtx) {
@ -934,8 +938,8 @@ void func_80986D40(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986DC8(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984E58(this, globalCtx);
this->actor.flags &= ~0x9;
@ -946,20 +950,20 @@ void func_80986E20(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986E40(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984E58(this, globalCtx);
func_80984D74(this, globalCtx);
DemoIm_UpdateCollider(this, globalCtx);
func_80986BE4(this, func_80986AD0(this, globalCtx));
}
void func_80986EAC(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984F94(this, globalCtx);
func_80984D74(this, globalCtx);
DemoIm_UpdateCollider(this, globalCtx);
func_80986B2C(globalCtx);
}
@ -968,11 +972,11 @@ void func_80986F08(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986F28(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984E58(this, globalCtx);
func_80984D74(this, globalCtx);
DemoIm_UpdateCollider(this, globalCtx);
func_80986C30(this, globalCtx);
}
@ -981,17 +985,17 @@ void func_80986F88(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80986FA8(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80984E58(this, globalCtx);
this->actor.flags &= ~0x9;
func_80984D74(this, globalCtx);
DemoIm_UpdateCollider(this, globalCtx);
func_80986CFC(this, globalCtx);
}
void func_80987018(DemoIm* this, GlobalContext* globalCtx) {
func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0);
DemoIm_ChangeAnim(this, &gImpaIdleAnim, ANIMMODE_LOOP, 0.0f, false);
this->action = 27;
this->drawConfig = 0;
this->actor.shape.shadowAlpha = 0;
@ -1006,9 +1010,9 @@ void func_80987064(DemoIm* this) {
temp = kREG(17) + 10.0f;
if (*unk_268 >= temp) {
this->actor.shape.shadowAlpha = this->unk_26C = alpha;
this->actor.shape.shadowAlpha = this->alpha = alpha;
} else {
this->actor.shape.shadowAlpha = this->unk_26C = (*unk_268 / temp) * 255.0f;
this->actor.shape.shadowAlpha = this->alpha = (*unk_268 / temp) * 255.0f;
}
}
@ -1026,18 +1030,18 @@ void func_80987128(DemoIm* this) {
}
void func_80987174(DemoIm* this) {
func_80985280(this, &object_im_Anim_0101C8, 2, -8.0f, 0);
DemoIm_ChangeAnim(this, &object_im_Anim_0101C8, ANIMMODE_ONCE, -8.0f, false);
this->action = 30;
}
void func_809871B4(DemoIm* this, s32 arg1) {
if (arg1 != 0) {
func_80985280(this, &object_im_Anim_00FB10, 0, 0.0f, 0);
DemoIm_ChangeAnim(this, &object_im_Anim_00FB10, ANIMMODE_LOOP, 0.0f, false);
}
}
void func_809871E8(DemoIm* this, GlobalContext* globalCtx) {
CsCmdActorAction* npcAction = func_809850A0(globalCtx, 5);
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(globalCtx, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@ -1064,16 +1068,16 @@ void func_80987288(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809872A8(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_80987064(this);
func_80987128(this);
}
void func_809872F0(DemoIm* this, GlobalContext* globalCtx) {
func_80985018(this, globalCtx);
func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809871E8(this, globalCtx);
}
@ -1081,8 +1085,8 @@ void func_809872F0(DemoIm* this, GlobalContext* globalCtx) {
void func_80987330(DemoIm* this, GlobalContext* globalCtx) {
s32 sp1C;
func_80985018(this, globalCtx);
sp1C = func_80985060(this);
DemoIm_UpdateBgCheckInfo(this, globalCtx);
sp1C = DemoIm_UpdateSkelAnime(this);
func_80984BE0(this);
func_809871B4(this, sp1C);
}
@ -1101,9 +1105,8 @@ void DemoIm_Init(Actor* thisx, GlobalContext* globalCtx) {
DemoIm* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
func_80984D00(thisx, globalCtx);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_im_Skel_00F788, NULL, this->jointTable, this->morphTable,
17);
DemoIm_InitCollider(thisx, globalCtx);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gImpaSkel, NULL, this->jointTable, this->morphTable, 17);
thisx->flags &= ~1;
switch (this->actor.params) {
@ -1128,7 +1131,7 @@ void DemoIm_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void DemoIm_Destroy(Actor* thisx, GlobalContext* globalCtx) {
func_80984D4C(thisx, globalCtx);
DemoIm_DestroyCollider(thisx, globalCtx);
}
s32 DemoIm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
@ -1140,19 +1143,19 @@ s32 DemoIm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
Vec3s* unk_2D4_unk_08 = &this->unk_2D4.unk_08;
switch (limbIndex) {
case 9:
case IMPA_LIMB_CHEST:
rot->x += unk_2D4_unk_0E->y;
rot->y -= unk_2D4_unk_0E->x;
break;
case 16:
case IMPA_LIMB_HEAD:
rot->x += unk_2D4_unk_08->y;
rot->z += unk_2D4_unk_08->x;
break;
}
}
if ((*unk_2D0 != 0) && (limbIndex == 15)) {
*dList = object_im_DL_00EDE8;
if ((*unk_2D0 != 0) && (limbIndex == IMPA_LIMB_RIGHT_HAND)) {
*dList = gImpaHandPointingDL;
}
return false;
@ -1161,7 +1164,7 @@ s32 DemoIm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
void DemoIm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
DemoIm* this = THIS;
if (limbIndex == 16) {
if (limbIndex == IMPA_LIMB_HEAD) {
Vec3f sp28 = D_809887D8;
Vec3f dest;
@ -1175,21 +1178,21 @@ void DemoIm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
}
}
void func_8098764C(DemoIm* this, GlobalContext* globalCtx) {
void DemoIm_DrawNothing(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80987658(DemoIm* this, GlobalContext* globalCtx) {
void DemoIm_DrawSolid(DemoIm* this, GlobalContext* globalCtx) {
s32 pad[2];
s16 unk_25C = this->unk_25C;
void* sp68 = D_80987830[unk_25C];
s16 eyeIndex = this->eyeIndex;
void* eyeTexture = sEyeTextures[eyeIndex];
SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_im.c", 904);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sp68));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sp68));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture));
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]);

31
src/overlays/actors/ovl_Demo_Im/z_demo_im.h
View file

@ -9,17 +9,38 @@ struct DemoIm;
typedef void (*DemoImActionFunc)(struct DemoIm*, GlobalContext*);
typedef void (*DemoImDrawFunc)(struct DemoIm*, GlobalContext*);
typedef enum {
/* 0x00 */ IMPA_LIMB_NONE,
/* 0x01 */ IMPA_LIMB_ROOT,
/* 0x02 */ IMPA_LIMB_TORSO,
/* 0x03 */ IMPA_LIMB_LEFT_THIGH,
/* 0x04 */ IMPA_LIMB_LEFT_LEG,
/* 0x05 */ IMPA_LIMB_LEFT_FOOT,
/* 0x06 */ IMPA_LIMB_RIGHT_THIGH,
/* 0x07 */ IMPA_LIMB_RIGHT_LEG,
/* 0x08 */ IMPA_LIMB_RIGHT_FOOT,
/* 0x09 */ IMPA_LIMB_CHEST,
/* 0x0A */ IMPA_LIMB_LEFT_SHOULDER,
/* 0x0B */ IMPA_LIMB_LEFT_ARM,
/* 0x0C */ IMPA_LIMB_LEFT_HAND,
/* 0x0D */ IMPA_LIMB_RIGHT_SHOULDER,
/* 0x0E */ IMPA_LIMB_RIGHT_ARM,
/* 0x0F */ IMPA_LIMB_RIGHT_HAND,
/* 0x10 */ IMPA_LIMB_HEAD,
/* 0x11 */ IMPA_LIMB_MAX
} ImpaLimb;
typedef struct DemoIm {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s jointTable[17];
/* 0x01F6 */ Vec3s morphTable[17];
/* 0x025C */ s16 unk_25C;
/* 0x025E */ s16 unk_25E;
/* 0x0190 */ Vec3s jointTable[IMPA_LIMB_MAX];
/* 0x01F6 */ Vec3s morphTable[IMPA_LIMB_MAX];
/* 0x025C */ s16 eyeIndex;
/* 0x025E */ s16 blinkTimer;
/* 0x0260 */ s32 action;
/* 0x0264 */ s32 drawConfig;
/* 0x0268 */ f32 unk_268;
/* 0x026C */ s32 unk_26C;
/* 0x026C */ s32 alpha;
/* 0x0270 */ s32 unk_270;
/* 0x0274 */ s32 unk_274;
/* 0x0278 */ f32 unk_278;

34
src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
View file

@ -156,7 +156,7 @@ void func_8098E5C8(DemoSa* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
s32 DemoSa_FrameUpdateMatrix(DemoSa* this) {
s32 DemoSa_UpdateSkelAnime(DemoSa* this) {
return SkelAnime_Update(&this->skelAnime);
}
@ -325,30 +325,30 @@ void func_8098EBD8(DemoSa* this, GlobalContext* globalCtx) {
void func_8098EBF8(DemoSa* this, GlobalContext* globalCtx) {
func_8098E944(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098EA3C(this);
}
void func_8098EC28(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098EA68(this, globalCtx);
}
void func_8098EC60(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
func_8098EB00(this, DemoSa_FrameUpdateMatrix(this));
func_8098EB00(this, DemoSa_UpdateSkelAnime(this));
}
void func_8098EC94(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098EB6C(this, globalCtx);
}
void func_8098ECCC(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
}
void func_8098ECF4(DemoSa* this, GlobalContext* globalCtx) {
@ -442,7 +442,7 @@ void func_8098F0E8(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F118(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098EEFC(this, globalCtx);
func_8098E554(this, globalCtx);
@ -450,7 +450,7 @@ void func_8098F118(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F16C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098EDB0(this);
func_8098F050(this, globalCtx);
func_8098E554(this, globalCtx);
@ -489,7 +489,7 @@ void func_8098F390(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F3F0(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
}
@ -578,7 +578,7 @@ void func_8098F714(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F734(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F480(this);
func_8098F544(this);
@ -586,14 +586,14 @@ void func_8098F734(DemoSa* this, GlobalContext* globalCtx) {
void func_8098F77C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F654(this, globalCtx);
}
void func_8098F7BC(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F654(this, globalCtx);
}
@ -602,7 +602,7 @@ void func_8098F7FC(DemoSa* this, GlobalContext* globalCtx) {
s32 sp1C;
func_8098E5C8(this, globalCtx);
sp1C = DemoSa_FrameUpdateMatrix(this);
sp1C = DemoSa_UpdateSkelAnime(this);
func_8098E480(this);
func_8098F610(this, sp1C);
}
@ -726,26 +726,26 @@ void func_8098FC44(DemoSa* this, GlobalContext* globalCtx) {
void func_8098FC64(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098F8F8(this);
func_8098FA2C(this);
}
void func_8098FC9C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098FB68(this, globalCtx);
}
void func_8098FCD4(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
DemoSa_FrameUpdateMatrix(this);
DemoSa_UpdateSkelAnime(this);
func_8098FB68(this, globalCtx);
}
void func_8098FD0C(DemoSa* this, GlobalContext* globalCtx) {
func_8098E5C8(this, globalCtx);
func_8098FB34(this, DemoSa_FrameUpdateMatrix(this));
func_8098FB34(this, DemoSa_UpdateSkelAnime(this));
func_8098FB68(this, globalCtx);
}

7
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -457,9 +457,10 @@ u16 EnGo2_GetTextIdGoronCityLowestFloor(GlobalContext* globalCtx, EnGo2* this) {
} else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
return 0x3027;
} else {
return CUR_UPG_VALUE(UPG_STRENGTH) != 0
? 0x302C
: !Flags_GetSwitch(globalCtx, 0x1B) ? 0x3017 : gSaveContext.infTable[15] & 0x100 ? 0x3019 : 0x3018;
return CUR_UPG_VALUE(UPG_STRENGTH) != 0 ? 0x302C
: !Flags_GetSwitch(globalCtx, 0x1B) ? 0x3017
: gSaveContext.infTable[15] & 0x100 ? 0x3019
: 0x3018;
}
}

106
src/overlays/actors/ovl_En_In/z_en_in.c
View file

@ -75,27 +75,27 @@ static AnimationHeader* D_80A7B918[] = {
&object_in_Anim_01646C, &object_in_Anim_0175D0, &object_in_Anim_017B58, &object_in_Anim_018C38,
};
static Gfx* sAlternateOutfitDLs[] = {
static Gfx* sAdultEraDLs[] = {
NULL,
NULL,
object_in_DL_013688,
object_in_DL_0137C0,
object_in_DL_013910,
object_in_DL_0132B8,
object_in_DL_0133F0,
object_in_DL_013540,
object_in_DL_013100,
object_in_DL_011758,
object_in_DL_012AC0,
object_in_DL_012BF0,
object_in_DL_012D20,
object_in_DL_012480,
object_in_DL_0125B0,
object_in_DL_0126E0,
object_in_DL_011AD8,
object_in_DL_012350,
object_in_DL_012220,
object_in_DL_012120,
gIngoAdultEraLeftThighDL,
gIngoAdultEraLeftLegDL,
gIngoAdultEraLeftFootDL,
gIngoAdultEraRightThighDL,
gIngoAdultEraRightLegDL,
gIngoAdultEraRightFootDL,
gIngoAdultEraTorsoDL,
gIngoAdultEraChestDL,
gIngoAdultEraLeftShoulderDL,
gIngoAdultEraLeftArmDL,
gIngoAdultEraLeftHandDL,
gIngoAdultEraRightShoulderDL,
gIngoAdultEraRightArmDL,
gIngoAdultEraRightHandDL,
gIngoAdultEraHeadDL,
gIngoAdultEraLeftEyebrowDL,
gIngoAdultEraRightEyebrowDL,
gIngoAdultEraMustacheDL,
};
u16 func_80A78FB0(GlobalContext* globalCtx) {
@ -180,20 +180,21 @@ u16 func_80A79168(GlobalContext* globalCtx, Actor* thisx) {
}
s16 func_80A791CC(GlobalContext* globalCtx, Actor* thisx) {
s32 temp_var = 0;
s32 ret = 0;
switch (thisx->textId) {
case 0x2045:
gSaveContext.infTable[9] |= 0x80;
break;
case 0x203E:
temp_var = 2;
ret = 2;
break;
case 0x203F:
gSaveContext.eventChkInf[1] |= 2;
gSaveContext.infTable[9] |= 0x10;
break;
}
return temp_var;
return ret;
}
s16 func_80A7924C(GlobalContext* globalCtx, Actor* thisx) {
@ -259,6 +260,7 @@ s16 func_80A7924C(GlobalContext* globalCtx, Actor* thisx) {
s16 func_80A7949C(GlobalContext* globalCtx, Actor* thisx) {
s32 phi_v1 = 1;
if (thisx->textId == 0x2035) {
Rupees_ChangeBy(-10);
thisx->textId = 0x205C;
@ -385,20 +387,13 @@ s32 func_80A79830(EnIn* this, GlobalContext* globalCtx) {
return 0;
}
void func_80A79A2C(EnIn* this) {
s16 phi_v1;
if (this->unk_1EE != 3) {
if (this->unk_1EA == 0) {
phi_v1 = 0;
} else {
phi_v1 = --this->unk_1EA;
}
if (phi_v1 == 0) {
this->unk_1EE++;
if (this->unk_1EE >= 3) {
this->unk_1EA = Rand_S16Offset(30, 30);
this->unk_1EE = 0;
void EnIn_UpdateEyes(EnIn* this) {
if (this->eyeIndex != 3) {
if (DECR(this->blinkTimer) == 0) {
this->eyeIndex++;
if (this->eyeIndex >= 3) {
this->blinkTimer = Rand_S16Offset(30, 30);
this->eyeIndex = 0;
}
}
}
@ -503,8 +498,7 @@ void func_80A79FB0(EnIn* this, GlobalContext* globalCtx) {
if (Object_IsLoaded(&globalCtx->objectCtx, this->ingoObjBankIndex) || this->actor.params <= 0) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_in_Skel_013B88, NULL, this->jointTable,
this->morphTable, 20);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gIngoSkel, NULL, this->jointTable, this->morphTable, 20);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
@ -531,7 +525,7 @@ void func_80A79FB0(EnIn* this, GlobalContext* globalCtx) {
break;
case 4:
func_80A796EC(this, 8);
this->unk_1EE = 3;
this->eyeIndex = 3;
this->actionFunc = func_80A7A4BC;
break;
case 0:
@ -915,7 +909,7 @@ void EnIn_Update(Actor* thisx, GlobalContext* globalCtx) {
}
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
}
func_80A79A2C(this);
EnIn_UpdateEyes(this);
this->actionFunc(this, globalCtx);
if (this->actionFunc != func_80A7A304) {
func_80A79AB4(this, globalCtx);
@ -938,24 +932,24 @@ s32 EnIn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
EnIn* this = THIS;
Vec3s sp2C;
if (this->actor.params > 0 && limbIndex != 16) {
if (sAlternateOutfitDLs[limbIndex] != NULL) {
*dList = sAlternateOutfitDLs[limbIndex];
if (this->actor.params > 0 && limbIndex != INGO_HEAD_LIMB) {
if (sAdultEraDLs[limbIndex] != NULL) {
*dList = sAdultEraDLs[limbIndex];
}
}
if (limbIndex == 16) {
if (limbIndex == INGO_HEAD_LIMB) {
Matrix_Translate(1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
sp2C = this->unk_308.unk_08;
Matrix_RotateZ(BINANG_TO_RAD(sp2C.x), MTXMODE_APPLY);
Matrix_RotateX(BINANG_TO_RAD(sp2C.y), MTXMODE_APPLY);
Matrix_Translate(-1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
}
if (limbIndex == 9) {
if (limbIndex == INGO_CHEST_LIMB) {
sp2C = this->unk_308.unk_0E;
Matrix_RotateX(BINANG_TO_RAD(sp2C.x), MTXMODE_APPLY);
Matrix_RotateY(BINANG_TO_RAD(sp2C.y), MTXMODE_APPLY);
}
if (limbIndex == 9 || limbIndex == 10 || limbIndex == 13) {
if (limbIndex == INGO_CHEST_LIMB || limbIndex == INGO_LEFT_SHOULDER_LIMB || limbIndex == INGO_RIGHT_SHOULDER_LIMB) {
rot->y += Math_SinS(this->unk_330[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->unk_330[limbIndex].z) * 200.0f;
}
@ -967,29 +961,31 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
Vec3f D_80A7B9A8 = { 1600.0, 0.0f, 0.0f };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2335);
if (limbIndex == 16) {
if (limbIndex == INGO_HEAD_LIMB) {
Matrix_MultVec3f(&D_80A7B9A8, &this->actor.focus.pos);
this->actor.focus.rot = this->actor.world.rot;
}
if (limbIndex == 12 && this->skelAnime.animation == &object_in_Anim_014CA8) {
gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007A20);
if (limbIndex == INGO_LEFT_HAND_LIMB && this->skelAnime.animation == &object_in_Anim_014CA8) {
gSPDisplayList(POLY_OPA_DISP++, gIngoChildEraBasketDL);
}
if (limbIndex == 15 && this->skelAnime.animation == &object_in_Anim_014CA8) {
gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007BF8);
if (limbIndex == INGO_RIGHT_HAND_LIMB && this->skelAnime.animation == &object_in_Anim_014CA8) {
gSPDisplayList(POLY_OPA_DISP++, gIngoChildEraPitchForkDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2365);
}
void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* D_80A7B9B4[] = { object_in_Tex_003590, object_in_Tex_0047D0, object_in_Tex_004BD0,
object_in_Tex_004390 };
static void* eyeTextures[] = { gIngoEyeOpenTex, gIngoEyeHalfTex, gIngoEyeClosedTex, gIngoEyeClosed2Tex };
EnIn* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2384);
if (this->actionFunc != func_80A79FB0) {
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80A7B9B4[this->unk_1EE]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_in_Tex_0034D0));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gIngoHeadGradient2Tex));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, EnIn_OverrideLimbDraw, EnIn_PostLimbDraw, &this->actor);
}

34
src/overlays/actors/ovl_En_In/z_en_in.h
View file

@ -8,6 +8,30 @@ struct EnIn;
typedef void (*EnInActionFunc)(struct EnIn*, GlobalContext*);
typedef enum {
/* 0x00 */ INGO_LIMB_NONE,
/* 0x01 */ INGO_LIMB_ROOT,
/* 0x02 */ INGO_LEFT_THIGH_LIMB,
/* 0x03 */ INGO_LEFT_LEG_LIMB,
/* 0x04 */ INGO_LEFT_FOOT_LIMB,
/* 0x05 */ INGO_RIGHT_THIGH_LIMB,
/* 0x06 */ INGO_RIGHT_LEG_LIMB,
/* 0x07 */ INGO_RIGHT_FOOT_LIMB,
/* 0x08 */ INGO_TORSO_LIMB,
/* 0x09 */ INGO_CHEST_LIMB,
/* 0x0A */ INGO_LEFT_SHOULDER_LIMB,
/* 0x0B */ INGO_LEFT_ARM_LIMB,
/* 0x0C */ INGO_LEFT_HAND_LIMB,
/* 0x0D */ INGO_RIGHT_SHOULDER_LIMB,
/* 0x0E */ INGO_RIGHT_ARM_LIMB,
/* 0x0F */ INGO_RIGHT_HAND_LIMB,
/* 0x10 */ INGO_HEAD_LIMB,
/* 0x11 */ INGO_LEFT_EYEBROW_LIMB,
/* 0x12 */ INGO_RIGHTEYEBROW_LIMB,
/* 0x13 */ INGO_MUSTACHE_LIMB,
/* 0x14 */ INGO_LIMB_MAX
} IngoLimb;
typedef struct EnIn {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
@ -17,17 +41,17 @@ typedef struct EnIn {
/* 0x01E4 */ s8 ingoObjBankIndex;
/* 0x01E6 */ s16 animationIdx;
/* 0x01E8 */ s16 unk_1E8;
/* 0x01EA */ s16 unk_1EA;
/* 0x01EA */ s16 blinkTimer;
/* 0x01EC */ s16 unk_1EC;
/* 0x01EE */ s16 unk_1EE;
/* 0x01EE */ s16 eyeIndex;
/* 0x01F0 */ s16 camId;
/* 0x01F2 */ s16 activeCamId;
/* 0x01F4 */ char unk_1F4[0x4];
/* 0x01F8 */ s16 unk_1F8;
/* 0x01FA */ s16 unk_1FA;
/* 0x01FC */ s16 unk_1FC;
/* 0x01FE */ Vec3s jointTable[20];
/* 0x0276 */ Vec3s morphTable[20];
/* 0x01FE */ Vec3s jointTable[INGO_LIMB_MAX];
/* 0x0276 */ Vec3s morphTable[INGO_LIMB_MAX];
/* 0x02F0 */ f32 unk_2F0;
/* 0x02F4 */ f32 unk_2F4;
/* 0x02F8 */ f32 unk_2F8;
@ -35,7 +59,7 @@ typedef struct EnIn {
/* 0x0300 */ f32 unk_300;
/* 0x0304 */ f32 unk_304;
/* 0x0308 */ struct_80034A14_arg1 unk_308;
/* 0x0330 */ Vec3s unk_330[20];
/* 0x0330 */ Vec3s unk_330[INGO_LIMB_MAX];
} EnIn; // size = 0x03A8
#endif

86
src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
View file

@ -15,7 +15,7 @@ s16 func_80AA1A38(GlobalContext* globalCtx, Actor* this);
void func_80AA1AE4(EnMa2* this, GlobalContext* globalCtx);
s32 func_80AA1C68(EnMa2* this);
void func_80AA1CC0(EnMa2* this);
void EnMa2_UpdateEyes(EnMa2* this);
void func_80AA1DB4(EnMa2* this, GlobalContext* globalCtx);
void func_80AA2018(EnMa2* this, GlobalContext* globalCtx);
void func_80AA204C(EnMa2* this, GlobalContext* globalCtx);
@ -56,10 +56,10 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static struct_D_80AA1678 D_80AA2858[] = {
{ 0x060007D4, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060007D4, 1.0f, ANIMMODE_LOOP, -10.0f },
{ 0x060093BC, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06009EE0, 1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f },
static struct_D_80AA1678 sAnimationInfo[] = {
{ &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &gMalonAdultStandStillAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
};
u16 func_80AA19A0(GlobalContext* globalCtx, Actor* thisx) {
@ -118,7 +118,7 @@ void func_80AA1AE4(EnMa2* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 phi_a3;
if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &object_ma2_Anim_009EE0)) {
if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &gMalonAdultSingAnim)) {
phi_a3 = 1;
} else {
phi_a3 = 0;
@ -155,39 +155,39 @@ u16 func_80AA1B58(EnMa2* this, GlobalContext* globalCtx) {
}
s32 func_80AA1C68(EnMa2* this) {
if (this->skelAnime.animation != &object_ma2_Anim_009EE0) {
if (this->skelAnime.animation != &gMalonAdultSingAnim) {
return 0;
}
if (this->unk_1E0.unk_00 != 0) {
return 0;
}
this->unk_20C = 0;
if (this->unk_20E != 2) {
this->blinkTimer = 0;
if (this->eyeIndex != 2) {
return 0;
}
this->unk_210 = 2;
this->mouthIndex = 2;
return 1;
}
void func_80AA1CC0(EnMa2* this) {
if ((!func_80AA1C68(this)) && (DECR(this->unk_20C) == 0)) {
this->unk_20E += 1;
if (this->unk_20E >= 3) {
this->unk_20C = Rand_S16Offset(0x1E, 0x1E);
this->unk_20E = 0;
void EnMa2_UpdateEyes(EnMa2* this) {
if ((!func_80AA1C68(this)) && (DECR(this->blinkTimer) == 0)) {
this->eyeIndex += 1;
if (this->eyeIndex >= 3) {
this->blinkTimer = Rand_S16Offset(30, 30);
this->eyeIndex = 0;
}
}
}
void func_80AA1D44(EnMa2* this, s32 idx) {
f32 frameCount = Animation_GetLastFrame(D_80AA2858[idx].animation);
void EnMa2_ChangeAnim(EnMa2* this, s32 idx) {
f32 frameCount = Animation_GetLastFrame(sAnimationInfo[idx].animation);
Animation_Change(&this->skelAnime, D_80AA2858[idx].animation, 1.0f, 0.0f, frameCount, D_80AA2858[idx].mode,
D_80AA2858[idx].transitionRate);
Animation_Change(&this->skelAnime, sAnimationInfo[idx].animation, 1.0f, 0.0f, frameCount, sAnimationInfo[idx].mode,
sAnimationInfo[idx].transitionRate);
}
void func_80AA1DB4(EnMa2* this, GlobalContext* globalCtx) {
if (this->skelAnime.animation == &object_ma2_Anim_009EE0) {
if (this->skelAnime.animation == &gMalonAdultSingAnim) {
if (this->unk_1E0.unk_00 == 0) {
if (this->unk_20A != 0) {
func_800F6584(0);
@ -207,25 +207,25 @@ void EnMa2_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_008D90, NULL, NULL, NULL, 0);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gMalonAdultSkel, NULL, NULL, NULL, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(22), &sColChkInfoInit);
switch (func_80AA1B58(this, globalCtx)) {
case 1:
func_80AA1D44(this, 2);
EnMa2_ChangeAnim(this, 2);
this->actionFunc = func_80AA2018;
break;
case 2:
func_80AA1D44(this, 3);
EnMa2_ChangeAnim(this, 3);
this->actionFunc = func_80AA204C;
break;
case 3:
if (gSaveContext.infTable[8] & 0x2000) {
func_80AA1D44(this, 0);
EnMa2_ChangeAnim(this, 0);
} else {
func_80AA1D44(this, 3);
EnMa2_ChangeAnim(this, 3);
}
this->actionFunc = func_80AA2018;
break;
@ -307,7 +307,7 @@ void EnMa2_Update(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
SkelAnime_Update(&this->skelAnime);
func_80AA1CC0(this);
EnMa2_UpdateEyes(this);
this->actionFunc(this, globalCtx);
func_80AA1DB4(this, globalCtx);
func_80AA1AE4(this, globalCtx);
@ -321,22 +321,23 @@ s32 EnMa2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
EnMa2* this = THIS;
Vec3s vec;
if ((limbIndex == 3) || (limbIndex == 6)) {
if ((limbIndex == MALON_ADULT_LEFT_THIGH_LIMB) || (limbIndex == MALON_ADULT_RIGHT_THIGH_LIMB)) {
*dList = NULL;
}
if (limbIndex == 18) {
if (limbIndex == MALON_ADULT_HEAD_LIMB) {
Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
vec = this->unk_1E0.unk_08;
Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
}
if (limbIndex == 11) {
if (limbIndex == MALON_ADULT_CHEST_AND_NECK_LIMB) {
vec = this->unk_1E0.unk_0E;
Matrix_RotateY((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
}
if ((limbIndex == 11) || (limbIndex == 12) || (limbIndex == 15)) {
if ((limbIndex == MALON_ADULT_CHEST_AND_NECK_LIMB) || (limbIndex == MALON_ADULT_LEFT_SHOULDER_LIMB) ||
(limbIndex == MALON_ADULT_RIGHT_SHOULDER_LIMB)) {
rot->y += Math_SinS(this->unk_212[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->unk_212[limbIndex].z) * 200.0f;
}
@ -349,27 +350,20 @@ void EnMa2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ma2.c", 904);
if (limbIndex == 18) {
if (limbIndex == MALON_ADULT_HEAD_LIMB) {
Matrix_MultVec3f(&vec, &this->actor.focus.pos);
}
if ((limbIndex == 14) && (this->skelAnime.animation == &object_ma2_Anim_0093BC)) {
gSPDisplayList(POLY_OPA_DISP++, object_ma2_DL_005420);
if ((limbIndex == MALON_ADULT_LEFT_HAND_LIMB) && (this->skelAnime.animation == &gMalonAdultStandStillAnim)) {
gSPDisplayList(POLY_OPA_DISP++, gMalonAdultBasketDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma2.c", 927);
}
void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* D_80AA28B4[] = {
0x06002970,
0x06003570,
0x06003770,
};
static void* D_80AA28C0[] = {
0x06002570,
0x06002C70,
0x06003070,
};
static void* sMouthTextures[] = { gMalonAdultMouthNeutralTex, gMalonAdultMouthSadTex, gMalonAdultMouthHappyTex };
static void* sEyeTextures[] = { gMalonAdultEyeOpenTex, gMalonAdultEyeHalfTex, gMalonAdultEyeClosedTex };
EnMa2* this = THIS;
Camera* camera;
f32 someFloat;
@ -382,8 +376,8 @@ void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800F6268(someFloat, NA_BGM_LONLON);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA28B4[this->unk_210]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA28C0[this->unk_20E]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnMa2_OverrideLimbDraw, EnMa2_PostLimbDraw, this);

31
src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
View file

@ -8,6 +8,29 @@ struct EnMa2;
typedef void (*EnMa2ActionFunc)(struct EnMa2*, GlobalContext*);
typedef enum {
/* 0x00 */ MALON_ADULT_LIMB_NONE,
/* 0x01 */ MALON_ADULT_ROOT_LIMB,
/* 0x02 */ MALON_ADULT_LOWER_CONTROL_LIMB,
/* 0x03 */ MALON_ADULT_LEFT_THIGH_LIMB,
/* 0x04 */ MALON_ADULT_LEFT_LEG_LIMB,
/* 0x05 */ MALON_ADULT_LEFT_FOOT_LIMB,
/* 0x06 */ MALON_ADULT_RIGHT_THIGH_LIMB,
/* 0x07 */ MALON_ADULT_RIGHT_LEG_LIMB,
/* 0x08 */ MALON_ADULT_RIGHT_FOOT_LIMB,
/* 0x09 */ MALON_ADULT_TORSO_LIMB,
/* 0x0A */ MALON_ADULT_DRESS_LIMB,
/* 0x0B */ MALON_ADULT_CHEST_AND_NECK_LIMB,
/* 0x0C */ MALON_ADULT_LEFT_SHOULDER_LIMB,
/* 0x0D */ MALON_ADULT_LEFT_ARM_LIMB,
/* 0x0E */ MALON_ADULT_LEFT_HAND_LIMB,
/* 0x0F */ MALON_ADULT_RIGHT_SHOULDER_LIMB,
/* 0x10 */ MALON_ADULT_RIGHT_ARM_LIMB,
/* 0x11 */ MALON_ADULT_RIGHT_HAND_LIMB,
/* 0x12 */ MALON_ADULT_HEAD_LIMB,
/* 0x13 */ MALON_ADULT_LIMB_MAX
} AdultMalonLimb;
typedef struct EnMa2 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
@ -16,10 +39,10 @@ typedef struct EnMa2 {
/* 0x01E0 */ struct_80034A14_arg1 unk_1E0;
/* 0x0208 */ s16 unk_208;
/* 0x020A */ s16 unk_20A;
/* 0x020C */ s16 unk_20C;
/* 0x020E */ s16 unk_20E;
/* 0x0210 */ s16 unk_210;
/* 0x0212 */ Vec3s unk_212[0x13];
/* 0x020C */ s16 blinkTimer;
/* 0x020E */ s16 eyeIndex;
/* 0x0210 */ s16 mouthIndex;
/* 0x0212 */ Vec3s unk_212[MALON_ADULT_LIMB_MAX];
} EnMa2; // size = 0x0284
#endif

82
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -22,8 +22,8 @@ s16 func_80AA2BD4(GlobalContext* globalCtx, Actor* this);
void func_80AA2E54(EnMa3* this, GlobalContext* globalCtx);
s32 func_80AA2EC8(EnMa3* this, GlobalContext* globalCtx);
s32 func_80AA2F28(EnMa3* this);
void func_80AA2F80(EnMa3* this);
void func_80AA3004(EnMa3* this, s32 arg1);
void EnMa3_UpdateEyes(EnMa3* this);
void EnMa3_ChangeAnim(EnMa3* this, s32 arg1);
void func_80AA3200(EnMa3* this, GlobalContext* globalCtx);
const ActorInit En_Ma3_InitVars = {
@ -60,10 +60,10 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static struct_D_80AA1678 D_80AA3848[] = {
{ 0x060007D4, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060007D4, 1.0f, ANIMMODE_LOOP, -10.0f },
{ 0x060093BC, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06009EE0, 1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f },
static struct_D_80AA1678 sAnimationInfo[] = {
{ &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &gMalonAdultStandStillAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
};
u16 func_80AA2AA0(GlobalContext* globalCtx, Actor* thisx) {
@ -177,7 +177,7 @@ void func_80AA2E54(EnMa3* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
s16 phi_a3;
if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &object_ma2_Anim_009EE0)) {
if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &gMalonAdultSingAnim)) {
phi_a3 = 1;
} else {
phi_a3 = 0;
@ -202,35 +202,35 @@ s32 func_80AA2EC8(EnMa3* this, GlobalContext* globalCtx) {
}
s32 func_80AA2F28(EnMa3* this) {
if (this->skelAnime.animation != &object_ma2_Anim_009EE0) {
if (this->skelAnime.animation != &gMalonAdultSingAnim) {
return 0;
}
if (this->unk_1E0.unk_00 != 0) {
return 0;
}
this->unk_20C = 0;
if (this->unk_20E != 2) {
this->blinkTimer = 0;
if (this->eyeIndex != 2) {
return 0;
}
this->unk_210 = 2;
this->mouthIndex = 2;
return 1;
}
void func_80AA2F80(EnMa3* this) {
if ((!func_80AA2F28(this)) && (DECR(this->unk_20C) == 0)) {
this->unk_20E += 1;
if (this->unk_20E >= 3) {
this->unk_20C = Rand_S16Offset(0x1E, 0x1E);
this->unk_20E = 0;
void EnMa3_UpdateEyes(EnMa3* this) {
if ((!func_80AA2F28(this)) && (DECR(this->blinkTimer) == 0)) {
this->eyeIndex += 1;
if (this->eyeIndex >= 3) {
this->blinkTimer = Rand_S16Offset(30, 30);
this->eyeIndex = 0;
}
}
}
void func_80AA3004(EnMa3* this, s32 idx) {
f32 frameCount = Animation_GetLastFrame(D_80AA3848[idx].animation);
void EnMa3_ChangeAnim(EnMa3* this, s32 idx) {
f32 frameCount = Animation_GetLastFrame(sAnimationInfo[idx].animation);
Animation_Change(&this->skelAnime, D_80AA3848[idx].animation, 1.0f, 0.0f, frameCount, D_80AA3848[idx].mode,
D_80AA3848[idx].transitionRate);
Animation_Change(&this->skelAnime, sAnimationInfo[idx].animation, 1.0f, 0.0f, frameCount, sAnimationInfo[idx].mode,
sAnimationInfo[idx].transitionRate);
}
void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) {
@ -238,18 +238,18 @@ void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_008D90, NULL, NULL, NULL, 0);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gMalonAdultSkel, NULL, NULL, NULL, 0);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(22), &sColChkInfoInit);
switch (func_80AA2EC8(this, globalCtx)) {
case 0:
func_80AA3004(this, 0);
EnMa3_ChangeAnim(this, 0);
this->actionFunc = func_80AA3200;
break;
case 1:
func_80AA3004(this, 0);
EnMa3_ChangeAnim(this, 0);
this->actionFunc = func_80AA3200;
break;
case 2:
@ -283,7 +283,7 @@ void EnMa3_Update(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
SkelAnime_Update(&this->skelAnime);
func_80AA2F80(this);
EnMa3_UpdateEyes(this);
this->actionFunc(this, globalCtx);
func_80AA2E54(this, globalCtx);
func_800343CC(globalCtx, &this->actor, &this->unk_1E0.unk_00, (f32)this->collider.dim.radius + 150.0f,
@ -303,22 +303,23 @@ s32 EnMa3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
EnMa3* this = THIS;
Vec3s vec;
if ((limbIndex == 3) || (limbIndex == 6)) {
if ((limbIndex == MALON_ADULT_LIMB_LEFT_THIGH) || (limbIndex == MALON_ADULT_LIMB_RIGHT_THIGH)) {
*dList = NULL;
}
if (limbIndex == 18) {
if (limbIndex == MALON_ADULT_LIMB_HEAD) {
Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
vec = this->unk_1E0.unk_08;
Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
}
if (limbIndex == 11) {
if (limbIndex == MALON_ADULT_LIMB_CHEST_AND_NECK) {
vec = this->unk_1E0.unk_0E;
Matrix_RotateY((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY);
Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
}
if ((limbIndex == 11) || (limbIndex == 12) || (limbIndex == 15)) {
if ((limbIndex == MALON_ADULT_LIMB_CHEST_AND_NECK) || (limbIndex == MALON_ADULT_LIMB_LEFT_SHOULDER) ||
(limbIndex == MALON_ADULT_LIMB_RIGHT_SHOULDER)) {
rot->y += Math_SinS(this->unk_212[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->unk_212[limbIndex].z) * 200.0f;
}
@ -331,27 +332,20 @@ void EnMa3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ma3.c", 927);
if (limbIndex == 18) {
if (limbIndex == MALON_ADULT_LIMB_HEAD) {
Matrix_MultVec3f(&vec, &this->actor.focus.pos);
}
if ((limbIndex == 14) && (this->skelAnime.animation == &object_ma2_Anim_0093BC)) {
gSPDisplayList(POLY_OPA_DISP++, &object_ma2_DL_005420);
if ((limbIndex == MALON_ADULT_LIMB_LEFT_HAND) && (this->skelAnime.animation == &gMalonAdultStandStillAnim)) {
gSPDisplayList(POLY_OPA_DISP++, gMalonAdultBasketDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma3.c", 950);
}
void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* D_80AA38A4[] = {
0x06002970,
0x06003570,
0x06003770,
};
static void* D_80AA38B0[] = {
0x06002570,
0x06002C70,
0x06003070,
};
static void* sMouthTextures[] = { gMalonAdultMouthNeutralTex, gMalonAdultMouthSadTex, gMalonAdultMouthHappyTex };
static void* sEyeTextures[] = { gMalonAdultEyeOpenTex, gMalonAdultEyeHalfTex, gMalonAdultEyeClosedTex };
EnMa3* this = THIS;
Camera* camera;
f32 someFloat;
@ -364,8 +358,8 @@ void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800F6268(someFloat, NA_BGM_LONLON);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA38A4[this->unk_210]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80AA38B0[this->unk_20E]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnMa3_OverrideLimbDraw, EnMa3_PostLimbDraw, this);

31
src/overlays/actors/ovl_En_Ma3/z_en_ma3.h
View file

@ -8,6 +8,29 @@ struct EnMa3;
typedef void (*EnMa3ActionFunc)(struct EnMa3*, GlobalContext*);
typedef enum {
/* 0x00 */ MALON_ADULT_LIMB_NONE,
/* 0x01 */ MALON_ADULT_LIMB_ROOT,
/* 0x02 */ MALON_ADULT_LIMB_LOWER_CONTROL,
/* 0x03 */ MALON_ADULT_LIMB_LEFT_THIGH,
/* 0x04 */ MALON_ADULT_LIMB_LEFT_LEG,
/* 0x05 */ MALON_ADULT_LIMB_LEFT_FOOT,
/* 0x06 */ MALON_ADULT_LIMB_RIGHT_THIGH,
/* 0x07 */ MALON_ADULT_LIMB_RIGHT_LEG,
/* 0x08 */ MALON_ADULT_LIMB_RIGHT_FOOT,
/* 0x09 */ MALON_ADULT_LIMB_TORSO,
/* 0x0A */ MALON_ADULT_LIMB_DRESS,
/* 0x0B */ MALON_ADULT_LIMB_CHEST_AND_NECK,
/* 0x0C */ MALON_ADULT_LIMB_LEFT_SHOULDER,
/* 0x0D */ MALON_ADULT_LIMB_LEFT_ARM,
/* 0x0E */ MALON_ADULT_LIMB_LEFT_HAND,
/* 0x0F */ MALON_ADULT_LIMB_RIGHT_SHOULDER,
/* 0x10 */ MALON_ADULT_LIMB_RIGHT_ARM,
/* 0x11 */ MALON_ADULT_LIMB_RIGHT_HAND,
/* 0x12 */ MALON_ADULT_LIMB_HEAD,
/* 0x13 */ MALON_ADULT_LIMB_MAX
} AdultMalonLimb;
typedef struct EnMa3 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
@ -16,10 +39,10 @@ typedef struct EnMa3 {
/* 0x01E0 */ struct_80034A14_arg1 unk_1E0;
/* 0x0208 */ s16 unk_208;
/* 0x020A */ s16 unk_20A;
/* 0x020C */ s16 unk_20C;
/* 0x020E */ s16 unk_20E;
/* 0x0210 */ s16 unk_210;
/* 0x0212 */ Vec3s unk_212[0x13];
/* 0x020C */ s16 blinkTimer;
/* 0x020E */ s16 eyeIndex;
/* 0x0210 */ s16 mouthIndex;
/* 0x0212 */ Vec3s unk_212[MALON_ADULT_LIMB_MAX];
} EnMa3; // size = 0x0284
#endif

48
src/overlays/actors/ovl_En_Nb/z_en_nb.c
View file

@ -226,7 +226,7 @@ void func_80AB1284(EnNb* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4);
}
s32 EnNb_FrameUpdateMatrix(EnNb* this) {
s32 EnNb_UpdateSkelAnime(EnNb* this) {
return SkelAnime_Update(&this->skelAnime);
}
@ -414,14 +414,14 @@ void EnNb_SetupChamberWarp(EnNb* this, GlobalContext* globalCtx) {
void EnNb_ComeUp(EnNb* this, GlobalContext* globalCtx) {
EnNb_ComeUpImpl(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupDefaultChamberIdle(this);
}
void func_80AB193C(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupArmRaise(this, globalCtx);
}
@ -430,21 +430,21 @@ void EnNb_RaiseArm(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
func_80AB1284(this, globalCtx);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupRaisedArmTransition(this, animFinished);
}
void func_80AB19BC(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupMedallion(this, globalCtx);
}
void func_80AB19FC(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
}
@ -528,7 +528,7 @@ void EnNb_Hide(EnNb* this, GlobalContext* globalCtx) {
void EnNb_Fade(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckToFade(this, globalCtx);
func_80AB1210(this, globalCtx);
@ -536,7 +536,7 @@ void EnNb_Fade(EnNb* this, GlobalContext* globalCtx) {
void EnNb_CreateLightOrb(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupLightOrb(this, globalCtx);
func_80AB1210(this, globalCtx);
@ -676,7 +676,7 @@ void EnNb_MovingInPortal(EnNb* this, GlobalContext* globalCtx) {
EnNb_PlayCrySFX(this, globalCtx);
EnNb_PlayAgonySFX(this, globalCtx);
EnNb_UpdateEyes(this);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_CheckKidnapCsMode(this, globalCtx);
}
@ -684,7 +684,7 @@ void EnNb_SuckedInByPortal(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
EnNb_UpdateEyes(this);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_SetRaisedArmCaptureAnim(this, animFinished);
EnNb_SetPosInPortal(this, globalCtx);
EnNb_CheckKidnapCsMode(this, globalCtx);
@ -900,7 +900,7 @@ void EnNb_Kneel(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
EnNb_UpdateEyes(this);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_CheckIfKneeling(this, animFinished);
EnNb_PlayKneelingOnGroundSFX(this);
func_80AB2688(this, globalCtx);
@ -912,7 +912,7 @@ void EnNb_LookRight(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
EnNb_UpdateEyes(this);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_CheckIfLookingRight(this, animFinished);
EnNb_PlayLookRightSFX(this);
func_80AB2688(this, globalCtx);
@ -924,7 +924,7 @@ void EnNb_LookLeft(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
EnNb_UpdateEyes(this);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_CheckIfLookLeft(this, animFinished);
func_80AB2688(this, globalCtx);
func_80AB1284(this, globalCtx);
@ -936,7 +936,7 @@ void EnNb_Run(EnNb* this, GlobalContext* globalCtx) {
EnNb_PlayKnuckleDefeatSFX(this, globalCtx);
EnNb_UpdateEyes(this);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_PlayLookLeftSFX(this);
func_80AB2688(this, globalCtx);
func_80AB1284(this, globalCtx);
@ -1078,7 +1078,7 @@ void EnNb_CheckCreditsCsMode(EnNb* this, GlobalContext* globalCtx) {
void EnNb_CreditsFade(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetAlphaInCredits(this);
EnNb_SetupCreditsSit(this);
@ -1086,7 +1086,7 @@ void EnNb_CreditsFade(EnNb* this, GlobalContext* globalCtx) {
void func_80AB3428(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckCreditsCsModeImpl(this, globalCtx);
}
@ -1095,7 +1095,7 @@ void EnNb_LookUp(EnNb* this, GlobalContext* globalCtx) {
s32 animFinished;
func_80AB1284(this, globalCtx);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckIfLookingUp(this, animFinished);
}
@ -1311,7 +1311,7 @@ void func_80AB3B7C(EnNb* this, GlobalContext* globalCtx) {
void EnNb_WaitForNotice(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckNoticed(this, globalCtx);
}
@ -1321,7 +1321,7 @@ void EnNb_StandUpAfterNotice(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupIdleCrawlspace(this, animFinished);
}
@ -1330,7 +1330,7 @@ void EnNb_BlockCrawlspace(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
func_80AB0FBC(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
func_80AB3838(this, globalCtx);
}
@ -1339,7 +1339,7 @@ void EnNb_InitCrawlspaceDialogue(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
func_80AB0FBC(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetTextIdAsChild(this, globalCtx);
}
@ -1352,7 +1352,7 @@ void EnNb_FollowPath(EnNb* this, GlobalContext* globalCtx) {
EnNb_UpdateCollider(this, globalCtx);
func_80AB36DC(this, globalCtx);
func_80AB10C4(this);
animFinished = EnNb_FrameUpdateMatrix(this);
animFinished = EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
func_80AB3A7C(this, globalCtx, animFinished);
}
@ -1361,7 +1361,7 @@ void func_80AB3DB0(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
func_80AB0FBC(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
func_80AB3B04(this, globalCtx);
}
@ -1370,7 +1370,7 @@ void func_80AB3E10(EnNb* this, GlobalContext* globalCtx) {
func_80AB1284(this, globalCtx);
EnNb_UpdateCollider(this, globalCtx);
func_80AB1040(this, globalCtx);
EnNb_FrameUpdateMatrix(this);
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
func_80AB3B7C(this, globalCtx);
}

72
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -379,7 +379,7 @@ void func_80AEB264(EnRu1* this, AnimationHeader* animation, u8 arg2, f32 transit
Animation_Change(&this->skelAnime, animHeader, playbackSpeed, unk0, fc, arg2, transitionRate);
}
s32 EnRu1_FrameUpdateMatrix(EnRu1* this) {
s32 EnRu1_UpdateSkelAnime(EnRu1* this) {
// why?
if (this->action != 32) {
return SkelAnime_Update(&this->skelAnime);
@ -696,7 +696,7 @@ void func_80AEC070(EnRu1* this, GlobalContext* globalCtx, UNK_TYPE arg2) {
void func_80AEC0B4(EnRu1* this, GlobalContext* globalCtx) {
func_80AEB89C(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AEBC84(this, globalCtx);
func_80AEBC30(globalCtx);
func_80AEBD1C(this, globalCtx);
@ -708,7 +708,7 @@ void func_80AEC100(EnRu1* this, GlobalContext* globalCtx) {
}
void func_80AEC130(EnRu1* this, GlobalContext* globalCtx) {
s32 something = EnRu1_FrameUpdateMatrix(this);
s32 something = EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
func_80AEBB3C(this);
@ -718,7 +718,7 @@ void func_80AEC130(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEC17C(EnRu1* this, GlobalContext* globalCtx) {
func_80AEB974(this, globalCtx);
func_80AEAECC(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AEB50C(this, globalCtx);
func_80AEBEC8(this, globalCtx);
}
@ -726,7 +726,7 @@ void func_80AEC17C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEC1D4(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
something = EnRu1_FrameUpdateMatrix(this);
something = EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
EnRu1_UpdateEyes(this);
func_80AEB50C(this, globalCtx);
@ -738,7 +738,7 @@ void func_80AEC1D4(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEC244(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
something = EnRu1_FrameUpdateMatrix(this);
something = EnRu1_UpdateSkelAnime(this);
func_80AEBA2C(this, globalCtx);
func_80AEAECC(this, globalCtx);
EnRu1_UpdateEyes(this);
@ -751,7 +751,7 @@ void func_80AEC244(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEC2C0(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
something = EnRu1_FrameUpdateMatrix(this);
something = EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
EnRu1_UpdateEyes(this);
func_80AEB50C(this, globalCtx);
@ -933,7 +933,7 @@ void func_80AECAB4(EnRu1* this, GlobalContext* globalCtx) {
}
void func_80AECAD4(EnRu1* this, GlobalContext* globalCtx) {
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC8B8(this, globalCtx);
@ -942,7 +942,7 @@ void func_80AECAD4(EnRu1* this, GlobalContext* globalCtx) {
void func_80AECB18(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
something = EnRu1_FrameUpdateMatrix(this);
something = EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC93C(this, something);
@ -950,7 +950,7 @@ void func_80AECB18(EnRu1* this, GlobalContext* globalCtx) {
void func_80AECB60(EnRu1* this, GlobalContext* globalCtx) {
func_80AEC40C(this);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC650(this);
@ -960,7 +960,7 @@ void func_80AECB60(EnRu1* this, GlobalContext* globalCtx) {
void func_80AECBB8(EnRu1* this, GlobalContext* globalCtx) {
func_80AEC4CC(this);
func_80AEC6E4(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC650(this);
@ -970,7 +970,7 @@ void func_80AECBB8(EnRu1* this, GlobalContext* globalCtx) {
void func_80AECC1C(EnRu1* this, GlobalContext* globalCtx) {
func_80AEC4F4(this);
func_80AEC6E4(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEC650(this);
@ -1142,29 +1142,29 @@ void func_80AED324(EnRu1* this, GlobalContext* globalCtx) {
void func_80AED344(EnRu1* this, GlobalContext* globalCtx) {
func_80AECE04(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AED110(this);
}
void func_80AED374(EnRu1* this, GlobalContext* globalCtx) {
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AED154(this, globalCtx);
}
void func_80AED3A4(EnRu1* this, GlobalContext* globalCtx) {
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AED19C(this, func_80AECF6C(this, globalCtx));
}
void func_80AED3E0(EnRu1* this, GlobalContext* globalCtx) {
func_80AEAECC(this, globalCtx);
func_80AED218(this, EnRu1_FrameUpdateMatrix(this));
func_80AED218(this, EnRu1_UpdateSkelAnime(this));
}
void func_80AED414(EnRu1* this, GlobalContext* globalCtx) {
func_80AECE20(this, globalCtx);
func_80AEAECC(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
}
void func_80AED44C(EnRu1* this, GlobalContext* globalCtx) {
@ -1696,7 +1696,7 @@ void func_80AEEBD4(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAC54(this, globalCtx);
func_80AEAECC(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEEBB4(this, globalCtx);
func_80AEE488(this, globalCtx);
@ -1710,7 +1710,7 @@ void func_80AEEC5C(EnRu1* this, GlobalContext* globalCtx) {
func_80AEAECC(this, globalCtx);
func_80AEE2F8(this, globalCtx);
func_80AEDFF4(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEE568(this, globalCtx);
func_80AED624(this, globalCtx);
@ -1721,7 +1721,7 @@ void func_80AEECF0(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
func_80AEE050(this);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEEB24(this, globalCtx);
func_80AED624(this, globalCtx);
@ -1731,7 +1731,7 @@ void func_80AEED58(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
Actor_MoveForward(&this->actor);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEEAC8(this, globalCtx);
func_80AED624(this, globalCtx);
@ -1740,7 +1740,7 @@ void func_80AEED58(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEEDCC(EnRu1* this, GlobalContext* globalCtx) {
func_80AED8DC(this);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
func_80AEE2F8(this, globalCtx);
EnRu1_UpdateEyes(this);
@ -1750,7 +1750,7 @@ void func_80AEEDCC(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEEE34(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
func_80AEE2F8(this, globalCtx);
EnRu1_UpdateEyes(this);
@ -1762,7 +1762,7 @@ void func_80AEEE9C(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
func_80AEDFF4(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AED738(this, globalCtx);
func_80AED624(this, globalCtx);
@ -1770,7 +1770,7 @@ void func_80AEEE9C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEEF08(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AEAECC(this, globalCtx);
EnRu1_UpdateEyes(this);
func_80AEE628(this, globalCtx);
@ -1861,7 +1861,7 @@ void func_80AEF2D0(EnRu1* this, GlobalContext* globalCtx) {
s32 cond;
func_80AEEF68(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAC10(this, globalCtx);
func_80AEAECC(this, globalCtx);
@ -1872,7 +1872,7 @@ void func_80AEF2D0(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEF354(EnRu1* this, GlobalContext* globalCtx) {
func_80AEEFEC(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEF188(this, globalCtx);
@ -1882,7 +1882,7 @@ void func_80AEF3A8(EnRu1* this, GlobalContext* globalCtx) {
s32 something;
func_80AED83C(this);
something = EnRu1_FrameUpdateMatrix(this);
something = EnRu1_UpdateSkelAnime(this);
func_80AEF080(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
@ -2029,7 +2029,7 @@ void func_80AEF99C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEF9D8(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEF624(this, globalCtx);
func_80AEB220(this, globalCtx);
@ -2041,7 +2041,7 @@ void func_80AEFA2C(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEB364(this, globalCtx);
func_80AEAECC(this, globalCtx);
something = EnRu1_FrameUpdateMatrix(this);
something = EnRu1_UpdateSkelAnime(this);
func_80AEF4E0(this);
func_80AEF5B8(this);
func_80AEF40C(this);
@ -2052,7 +2052,7 @@ void func_80AEFA2C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFAAC(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
func_80AEF79C(this, globalCtx);
func_80AEB220(this, globalCtx);
}
@ -2062,7 +2062,7 @@ void func_80AEFB04(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
something = EnRu1_FrameUpdateMatrix(this);
something = EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEF820(this, something);
func_80AEB220(this, globalCtx);
@ -2071,7 +2071,7 @@ void func_80AEFB04(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFB68(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEF890(this, globalCtx);
func_80AEB220(this, globalCtx);
@ -2080,7 +2080,7 @@ void func_80AEFB68(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFBC8(EnRu1* this, GlobalContext* globalCtx) {
func_80AED83C(this);
func_80AEAECC(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEF540(this);
func_80AEF930(this, globalCtx);
@ -2158,7 +2158,7 @@ void func_80AEFE9C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFECC(EnRu1* this, GlobalContext* globalCtx) {
func_80AEEF68(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAC10(this, globalCtx);
func_80AEAECC(this, globalCtx);
@ -2167,7 +2167,7 @@ void func_80AEFECC(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEFF40(EnRu1* this, GlobalContext* globalCtx) {
func_80AEEFEC(this, globalCtx);
EnRu1_FrameUpdateMatrix(this);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEAECC(this, globalCtx);
func_80AEFE9C(this, globalCtx);

32
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -170,7 +170,7 @@ void func_80AF2744(EnRu2* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4);
}
s32 EnRu2_FrameUpdateMatrix(EnRu2* this) {
s32 EnRu2_UpdateSkelAnime(EnRu2* this) {
return SkelAnime_Update(&this->skelAnime);
}
@ -342,14 +342,14 @@ void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2978(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2B94(this);
}
void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2BC0(this, globalCtx);
}
@ -358,21 +358,21 @@ void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx) {
UNK_TYPE something;
func_80AF2744(this, globalCtx);
something = EnRu2_FrameUpdateMatrix(this);
something = EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2C54(this, something);
}
void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2C68(this, globalCtx);
}
void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
}
@ -453,7 +453,7 @@ void func_80AF3144(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF2F58(this, globalCtx);
func_80AF26D0(this, globalCtx);
@ -461,7 +461,7 @@ void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF30AC(this, globalCtx);
func_80AF26D0(this, globalCtx);
@ -569,7 +569,7 @@ void func_80AF3604(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF33E0(this);
func_80AF34A4(this);
@ -577,7 +577,7 @@ void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF366C(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF3564(this, globalCtx);
}
@ -586,7 +586,7 @@ void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx) {
UNK_TYPE something;
func_80AF2744(this, globalCtx);
something = EnRu2_FrameUpdateMatrix(this);
something = EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
func_80AF3530(this, something);
}
@ -716,7 +716,7 @@ void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
func_80AF259C(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF38D0(this, globalCtx);
@ -724,7 +724,7 @@ void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF390C(this, globalCtx);
@ -732,7 +732,7 @@ void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF39DC(this, globalCtx);
@ -740,7 +740,7 @@ void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) {
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF3ADC(this, globalCtx);
@ -749,7 +749,7 @@ void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) {
func_80AF37CC(this);
func_80AF2744(this, globalCtx);
EnRu2_FrameUpdateMatrix(this);
EnRu2_UpdateSkelAnime(this);
func_80AF2608(this);
Actor_SetFocus(&this->actor, 50.0f);
func_80AF3B74(this, globalCtx);

275
src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -65,20 +65,8 @@ static ColliderCylinderInit sCylinderInit = {
{ 30, 40, 0, { 0, 0, 0 } },
};
static Vec3f D_80B16E7C = {
1100.0f,
1000.0f,
0.0f,
};
static void* D_80B16E88[] = {
object_ta_Tex_007F80,
object_ta_Tex_006EC0,
object_ta_Tex_0072C0,
};
void func_80B13AA0(EnTa* this, EnTaActionFunc arg1, EnTaUnkFunc arg2) {
this->unk_25C = arg1;
this->actionFunc = arg1;
this->unk_260 = arg2;
}
@ -116,8 +104,8 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ta_Skel_00B7B8, &object_ta_Anim_001C94, this->jointTable,
this->morphTable, 17);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gTalonSkel, &gTalonStandAnim, this->jointTable, this->morphTable,
17);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@ -125,7 +113,7 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
this->unk_2E0 = 0;
this->unk_2CE = 0;
this->unk_2E2 = 0;
this->unk_2B6 = 20;
this->blinkTimer = 20;
this->unk_2B0 = func_80B166CC;
Actor_SetScale(&this->actor, 0.01f);
this->actor.targetMode = 6;
@ -142,14 +130,14 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
Actor_Kill(&this->actor);
} else if (gSaveContext.eventChkInf[6] & 0x400) {
func_80B13AA0(this, func_80B14CAC, func_80B167C0);
this->unk_2B4 = 0;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94);
this->unk_2E4 = &object_ta_Anim_001C94;
this->eyeIndex = 0;
Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
this->currentAnimation = &gTalonStandAnim;
} else {
func_80B13AA0(this, func_80B14754, func_80B167FC);
this->unk_2B4 = 2;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50);
this->unk_2E4 = &object_ta_Anim_00CD50;
this->eyeIndex = 2;
Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
this->currentAnimation = &gTalonSleepAnim;
this->actor.shape.shadowScale = 54.0f;
}
break;
@ -164,9 +152,9 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
osSyncPrintf(VT_FGCOL(CYAN) " 夜はいない \n" VT_RST);
} else {
func_80B13AA0(this, func_80B14D98, func_80B167C0);
this->unk_2B4 = 0;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94);
this->unk_2E4 = &object_ta_Anim_001C94;
this->eyeIndex = 0;
Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
this->currentAnimation = &gTalonStandAnim;
}
break;
default:
@ -176,14 +164,14 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
Actor_Kill(&this->actor);
} else if (gSaveContext.eventChkInf[1] & 0x8) {
func_80B13AA0(this, func_80B14C18, func_80B167C0);
this->unk_2B4 = 0;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94);
this->unk_2E4 = &object_ta_Anim_001C94;
this->eyeIndex = 0;
Animation_PlayOnce(&this->skelAnime, &gTalonStandAnim);
this->currentAnimation = &gTalonStandAnim;
} else {
func_80B13AA0(this, func_80B14634, func_80B167FC);
this->unk_2B4 = 2;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50);
this->unk_2E4 = &object_ta_Anim_00CD50;
this->eyeIndex = 2;
Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
this->currentAnimation = &gTalonSleepAnim;
this->actor.shape.shadowScale = 54.0f;
}
} else if (globalCtx->sceneNum == SCENE_SOUKO) {
@ -196,42 +184,42 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
if (IS_DAY) {
this->actor.flags |= 0x10;
this->unk_2C4[0] = this->unk_2C4[1] = this->unk_2C4[2] = 7;
this->unk_2B8[0] = (EnNiw*)Actor_Spawn(
this->superCuccos[0] = (EnNiw*)Actor_Spawn(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_NIW, this->actor.world.pos.x + 5.0f,
this->actor.world.pos.y + 3.0f, this->actor.world.pos.z + 26.0f, 0, 0, 0, 0xD);
this->unk_2B8[1] = (EnNiw*)Actor_Spawn(
this->superCuccos[1] = (EnNiw*)Actor_Spawn(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_NIW, this->actor.world.pos.x - 20.0f,
this->actor.world.pos.y + 40.0f, this->actor.world.pos.z - 30.0f, 0, 0, 0, 0xD);
this->unk_2B8[2] = (EnNiw*)Actor_Spawn(
this->superCuccos[2] = (EnNiw*)Actor_Spawn(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_NIW, this->actor.world.pos.x + 20.0f,
this->actor.world.pos.y + 40.0f, this->actor.world.pos.z - 30.0f, 0, 0, 0, 0xD);
func_80B13AAC(this, globalCtx);
if (gSaveContext.eventInf[0] & 0x400) {
func_80B13AA0(this, func_80B16608, func_80B16938);
Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f,
Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f,
Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 0.0f);
gSaveContext.eventInf[0] &= ~0x400;
} else {
func_80B13AA0(this, func_80B16504, func_80B16854);
this->unk_2B4 = 0;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_0017E8);
this->unk_2E4 = &object_ta_Anim_0017E8;
this->eyeIndex = 0;
Animation_PlayOnce(&this->skelAnime, &gTalonSitSleepingAnim);
this->currentAnimation = &gTalonSitSleepingAnim;
}
} else {
func_80B13AA0(this, func_80B146F8, func_80B167FC);
this->unk_2B4 = 2;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50);
this->unk_2E4 = &object_ta_Anim_00CD50;
this->eyeIndex = 2;
Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
this->currentAnimation = &gTalonSleepAnim;
this->actor.shape.shadowScale = 54.0f;
}
}
} else {
func_80B13AA0(this, func_80B14634, func_80B167FC);
this->unk_2B4 = 2;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50);
this->unk_2E4 = &object_ta_Anim_00CD50;
this->eyeIndex = 2;
Animation_PlayOnce(&this->skelAnime, &gTalonSleepAnim);
this->currentAnimation = &gTalonSleepAnim;
this->actor.shape.shadowScale = 54.0f;
}
break;
@ -306,11 +294,12 @@ void func_80B1448C(EnTa* this, GlobalContext* globalCtx) {
void func_80B144D8(EnTa* this, GlobalContext* globalCtx) {
if (Actor_TextboxIsClosing(&this->actor, globalCtx)) {
func_80B14410(this);
this->unk_2B6 = 1;
this->blinkTimer = 1;
this->unk_2B0 = func_80B16700;
}
if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_DONE) {
this->unk_2B4 = 1;
this->eyeIndex = 1;
func_80B13AA0(this, func_80B1448C, func_80B167C0);
}
func_80B14248(this);
@ -324,8 +313,8 @@ void func_80B14570(EnTa* this, GlobalContext* globalCtx) {
func_80B13AA0(this, func_80B144D8, func_80B167C0);
this->unk_2CE = 3;
this->unk_2CC = 60;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00E3D8);
this->unk_2E4 = &object_ta_Anim_001C94;
Animation_PlayOnce(&this->skelAnime, &gTalonWakeUpAnim);
this->currentAnimation = &gTalonStandAnim;
Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE);
}
}
@ -476,8 +465,8 @@ void func_80B14B6C(EnTa* this, GlobalContext* globalCtx) {
func_80B13AA0(this, func_80B14AF4, func_80B167C0);
this->unk_2CC = 5;
gSaveContext.eventChkInf[1] |= 0x10;
Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CF28);
this->unk_2E4 = &object_ta_Anim_00C858;
Animation_PlayOnce(&this->skelAnime, &gTalonRunTransitionAnim);
this->currentAnimation = &gTalonRunAnim;
}
this->unk_2E0 |= 1;
}
@ -558,19 +547,19 @@ void func_80B14EDC(EnTa* this, GlobalContext* globalCtx) {
void func_80B14F20(EnTa* this, EnTaActionFunc arg1) {
func_80B13AA0(this, arg1, func_80B16854);
this->unk_2B4 = 2;
Animation_Change(&this->skelAnime, &object_ta_Anim_0017E8, 1.0f, 0.0f,
Animation_GetLastFrame(&object_ta_Anim_0017E8), ANIMMODE_ONCE, -5.0f);
this->eyeIndex = 2;
Animation_Change(&this->skelAnime, &gTalonSitSleepingAnim, 1.0f, 0.0f,
Animation_GetLastFrame(&gTalonSitSleepingAnim), ANIMMODE_ONCE, -5.0f);
this->unk_2E2 = 0;
this->unk_2E4 = &object_ta_Anim_0017E8;
this->currentAnimation = &gTalonSitSleepingAnim;
}
void func_80B14FAC(EnTa* this, EnTaActionFunc arg1) {
this->unk_2B4 = 1;
this->eyeIndex = 1;
func_80B13AA0(this, arg1, func_80B16938);
this->unk_2E0 &= ~0x10;
Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f, 0.0f,
Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, -5.0f);
Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gTalonSitWakeUpAnim),
ANIMMODE_ONCE, -5.0f);
}
void func_80B15034(EnTa* this, GlobalContext* globalCtx) {
@ -589,7 +578,7 @@ s32 func_80B150AC(EnTa* this, GlobalContext* globalCtx, s32 idx) {
if (player->stateFlags1 & 0x800) {
interactRangeActor = player->interactRangeActor;
if (interactRangeActor != NULL && interactRangeActor->id == ACTOR_EN_NIW &&
interactRangeActor == &this->unk_2B8[idx]->actor) {
interactRangeActor == &this->superCuccos[idx]->actor) {
return true;
}
}
@ -602,33 +591,33 @@ void func_80B15100(EnTa* this, GlobalContext* globalCtx) {
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
s32 unk_2CA;
Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f,
Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f,
Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 10.0f);
Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 10.0f);
this->unk_2E0 &= ~0x10;
Message_CloseTextbox(globalCtx);
unk_2CA = this->unk_2CA;
this->unk_25C = func_80B154FC;
this->unk_2B8[unk_2CA]->actor.gravity = 0.1f;
this->unk_2B8[unk_2CA]->actor.velocity.y = 0.0f;
this->unk_2B8[unk_2CA]->actor.speedXZ = 0.0f;
this->unk_2B8[unk_2CA]->actor.parent = NULL;
this->actionFunc = func_80B154FC;
this->superCuccos[unk_2CA]->actor.gravity = 0.1f;
this->superCuccos[unk_2CA]->actor.velocity.y = 0.0f;
this->superCuccos[unk_2CA]->actor.speedXZ = 0.0f;
this->superCuccos[unk_2CA]->actor.parent = NULL;
if (player->interactRangeActor == &this->unk_2B8[unk_2CA]->actor) {
if (player->interactRangeActor == &this->superCuccos[unk_2CA]->actor) {
player->interactRangeActor = NULL;
}
if (player->heldActor == &this->unk_2B8[unk_2CA]->actor) {
if (player->heldActor == &this->superCuccos[unk_2CA]->actor) {
player->heldActor = NULL;
}
player->stateFlags1 &= ~0x800;
this->unk_2B8[unk_2CA] = NULL;
this->superCuccos[unk_2CA] = NULL;
}
this->unk_2E0 |= 1;
}
void func_80B15260(EnTa* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->actor, globalCtx)) {
this->unk_25C = func_80B15100;
this->actionFunc = func_80B15100;
this->actor.flags &= ~0x10000;
} else {
func_8002F2CC(&this->actor, globalCtx, 1000.0f);
@ -636,25 +625,25 @@ void func_80B15260(EnTa* this, GlobalContext* globalCtx) {
this->unk_2E0 |= 1;
}
s32 func_80B152D0(EnTa* this, GlobalContext* globalCtx) {
s32 ct;
s32 EnTa_GetSuperCuccosCount(EnTa* this, GlobalContext* globalCtx) {
s32 count;
s32 i;
for (ct = 0, i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) {
if (this->unk_2B8[i] != NULL) {
ct++;
for (count = 0, i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
if (this->superCuccos[i] != NULL) {
count++;
}
}
return ct;
return count;
}
void func_80B15308(EnTa* this) {
if (this->unk_2E0 & 0x10) {
if (this->unk_2E0 & 0x100) {
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 17.0f, 22.0f, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 17.0f, 22.0f, ANIMMODE_ONCE, 0.0f);
this->unk_2E0 &= ~0x100;
} else {
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, -1.0f, 21.0f, 16.0f, ANIMMODE_ONCE, 3.0f);
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, -1.0f, 21.0f, 16.0f, ANIMMODE_ONCE, 3.0f);
this->unk_2E0 |= 0x100;
}
this->unk_2E0 &= ~0x10;
@ -688,7 +677,7 @@ void func_80B15424(EnTa* this, GlobalContext* globalCtx) {
globalCtx->sceneLoadFlag = 0x14;
gSaveContext.eventInf[0] |= 0x400;
this->unk_25C = func_80B153D4;
this->actionFunc = func_80B153D4;
this->unk_2CC = 22;
}
}
@ -696,10 +685,10 @@ void func_80B15424(EnTa* this, GlobalContext* globalCtx) {
void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
s32 i;
for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) {
if (this->unk_2B8[i] != NULL) {
if (this->unk_2B8[i]->actor.gravity > -2.0f) {
this->unk_2B8[i]->actor.gravity -= 0.03f;
for (i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
if (this->superCuccos[i] != NULL) {
if (this->superCuccos[i]->actor.gravity > -2.0f) {
this->superCuccos[i]->actor.gravity -= 0.03f;
}
if (func_80B150AC(this, globalCtx, i)) {
@ -707,17 +696,17 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
this->unk_2C4[i]--;
} else {
this->unk_2CA = i;
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE,
-10.0f);
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
this->unk_2E0 &= ~0x10;
switch (func_80B152D0(this, globalCtx)) {
switch (EnTa_GetSuperCuccosCount(this, globalCtx)) {
case 1:
gSaveContext.timer1State = 0;
func_8002DF54(globalCtx, &this->actor, 1);
Message_StartTextbox(globalCtx, 0x2084, &this->actor);
this->unk_25C = func_80B15424;
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE,
this->actionFunc = func_80B15424;
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE,
-10.0f);
this->unk_2E0 &= ~0x10;
this->unk_2E0 &= ~0x100;
@ -735,7 +724,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE);
break;
}
this->unk_25C = func_80B15260;
this->actionFunc = func_80B15260;
this->actor.flags |= 0x10000;
func_8002F2CC(&this->actor, globalCtx, 1000.0f);
return;
@ -757,11 +746,11 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
gSaveContext.timer1State = 0;
func_8002DF54(globalCtx, &this->actor, 1);
Message_StartTextbox(globalCtx, 0x2081, &this->actor);
this->unk_25C = func_80B15424;
this->actionFunc = func_80B15424;
func_80B14E28(this, globalCtx);
gSaveContext.eventInf[0] &= ~0x100;
this->unk_2E0 |= 0x80;
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
this->unk_2E0 &= ~0x10;
this->unk_2E0 &= ~0x100;
}
@ -773,28 +762,28 @@ void func_80B1585C(EnTa* this, GlobalContext* globalCtx) {
s32 i;
if (this->unk_2CC > 35) {
for (i = 1; i < ARRAY_COUNT(this->unk_2B8); i++) {
if (this->unk_2B8[i] != NULL) {
Math_SmoothStepToS(&this->unk_2B8[i]->actor.world.rot.y, i * -10000 - 3000, 2, 0x800, 0x100);
this->unk_2B8[i]->actor.shape.rot.y = this->unk_2B8[i]->actor.world.rot.y;
for (i = 1; i < ARRAY_COUNT(this->superCuccos); i++) {
if (this->superCuccos[i] != NULL) {
Math_SmoothStepToS(&this->superCuccos[i]->actor.world.rot.y, i * -10000 - 3000, 2, 0x800, 0x100);
this->superCuccos[i]->actor.shape.rot.y = this->superCuccos[i]->actor.world.rot.y;
}
}
} else if (this->unk_2CC == 35) {
for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) {
for (i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
this->unk_2C4[i] = (s32)(Rand_CenteredFloat(6.0f) + 10.0f);
if (this->unk_2B8[i] != NULL) {
EnNiw* niw = this->unk_2B8[i];
if (this->superCuccos[i] != NULL) {
EnNiw* niw = this->superCuccos[i];
niw->unk_308 = 1;
niw->actor.gravity = 0.0f;
}
}
} else {
for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) {
for (i = 0; i < ARRAY_COUNT(this->superCuccos); i++) {
if (this->unk_2CC < 35 - this->unk_2C4[i]) {
if (this->unk_2B8[i] != NULL) {
if (this->unk_2B8[i]->actor.gravity > -2.0f) {
this->unk_2B8[i]->actor.gravity -= 0.03f;
if (this->superCuccos[i] != NULL) {
if (this->superCuccos[i]->actor.gravity > -2.0f) {
this->superCuccos[i]->actor.gravity -= 0.03f;
}
}
}
@ -804,9 +793,9 @@ void func_80B1585C(EnTa* this, GlobalContext* globalCtx) {
if (this->unk_2CC == 0) {
func_80B13AA0(this, func_80B154FC, func_80B16938);
this->unk_2E0 &= ~0x10;
Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f,
Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f,
Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 10.0f);
Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 10.0f);
func_8002DF54(globalCtx, &this->actor, 7);
}
}
@ -815,8 +804,8 @@ void func_80B15AD4(EnTa* this, GlobalContext* globalCtx) {
if (this->unk_2CC == 0 && this->unk_2E0 & 0x20) {
func_80B13AA0(this, func_80B1585C, func_80B16938);
this->unk_2E0 &= ~0x10;
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 1.0f,
Animation_GetLastFrame(&object_ta_Anim_00BF38), ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 1.0f,
Animation_GetLastFrame(&gTalonSitHandsUpAnim), ANIMMODE_ONCE, 0.0f);
this->unk_2CC = 50;
func_80088B34(0x1E);
func_800F5ACC(NA_BGM_MINI_GAME_2);
@ -836,7 +825,7 @@ void func_80B15BF8(EnTa* this, GlobalContext* globalCtx) {
if (this->unk_2E0 & 0x10) {
func_80B13AA0(this, func_80B15AD4, func_80B16938);
this->unk_2E0 &= ~0x10;
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 0.0f, 1.0f, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 0.0f, 1.0f, ANIMMODE_ONCE, 0.0f);
this->unk_2CC = 5;
}
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
@ -849,7 +838,7 @@ void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) {
if (this->unk_2E0 & 0x10) {
func_80B13AA0(this, func_80B15BF8, func_80B16938);
this->unk_2E0 &= ~0x10;
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, -1.0f, 29.0f, 0.0f, ANIMMODE_ONCE, 10.0f);
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, -1.0f, 29.0f, 0.0f, ANIMMODE_ONCE, 10.0f);
}
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
this->unk_2E0 |= 0x20;
@ -860,7 +849,7 @@ void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) {
void func_80B15D90(EnTa* this, GlobalContext* globalCtx) {
func_80B13AA0(this, func_80B15CC8, func_80B16938);
this->unk_2E0 &= ~0x10;
Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
Message_ContinueTextbox(globalCtx, 0x2080);
this->unk_2E0 &= ~0x20;
}
@ -876,7 +865,7 @@ void func_80B15E28(EnTa* this, GlobalContext* globalCtx) {
void func_80B15E80(EnTa* this, GlobalContext* globalCtx) {
if (Actor_HasParent(&this->actor, globalCtx)) {
this->actor.parent = NULL;
this->unk_25C = func_80B15E28;
this->actionFunc = func_80B15E28;
if (!(this->unk_2E0 & 0x2)) {
gSaveContext.itemGetInf[0] |= 4;
}
@ -1048,13 +1037,13 @@ void func_80B16608(EnTa* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->actor, globalCtx)) {
switch (this->actor.textId) {
case 0x2085:
this->unk_25C = func_80B161C0;
this->actionFunc = func_80B161C0;
break;
case 0x2086:
this->unk_25C = func_80B162E8;
this->actionFunc = func_80B162E8;
break;
case 0x2088:
this->unk_25C = func_80B1642C;
this->actionFunc = func_80B1642C;
break;
}
this->actor.flags &= ~0x10000;
@ -1066,50 +1055,50 @@ void func_80B16608(EnTa* this, GlobalContext* globalCtx) {
}
void func_80B166CC(EnTa* this) {
s16 temp_v0 = this->unk_2B6 - 1;
s16 temp_v0 = this->blinkTimer - 1;
if (temp_v0 != 0) {
this->unk_2B6 = temp_v0;
this->blinkTimer = temp_v0;
} else {
this->unk_2B0 = func_80B16700;
}
}
void func_80B16700(EnTa* this) {
s16 temp2B6 = this->unk_2B6 - 1;
s16 blinkTimer = this->blinkTimer - 1;
if (temp2B6 != 0) {
this->unk_2B6 = temp2B6;
if (blinkTimer != 0) {
this->blinkTimer = blinkTimer;
} else {
s16 temp2B4 = this->unk_2B4 + 1;
s16 temp2B6 = 3;
s16 nextEyeIndex = this->eyeIndex + 1;
s16 blinkTimer = 3;
if (temp2B4 >= temp2B6) {
this->unk_2B4 = 0;
if (nextEyeIndex >= blinkTimer) {
this->eyeIndex = 0;
if (this->unk_2CE > 0) {
this->unk_2CE--;
temp2B6 = 1;
blinkTimer = 1;
} else {
temp2B6 = (s32)(Rand_ZeroOne() * 60.0f) + 20;
blinkTimer = (s32)(Rand_ZeroOne() * 60.0f) + 20;
}
this->unk_2B6 = temp2B6;
this->blinkTimer = blinkTimer;
this->unk_2B0 = func_80B166CC;
} else {
this->unk_2B4 = temp2B4;
this->unk_2B6 = 1;
this->eyeIndex = nextEyeIndex;
this->blinkTimer = 1;
}
}
}
void func_80B167C0(EnTa* this) {
if (SkelAnime_Update(&this->skelAnime)) {
Animation_PlayOnce(&this->skelAnime, this->unk_2E4);
Animation_PlayOnce(&this->skelAnime, this->currentAnimation);
}
}
void func_80B167FC(EnTa* this) {
if (SkelAnime_Update(&this->skelAnime)) {
Animation_PlayOnce(&this->skelAnime, this->unk_2E4);
Animation_PlayOnce(&this->skelAnime, this->currentAnimation);
Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SLEEP);
}
this->unk_2E0 |= 0xC;
@ -1120,14 +1109,14 @@ void func_80B16854(EnTa* this) {
this->unk_2E2--;
} else {
if (SkelAnime_Update(&this->skelAnime)) {
Animation_PlayOnce(&this->skelAnime, this->unk_2E4);
Animation_PlayOnce(&this->skelAnime, this->currentAnimation);
this->unk_2E2 = Rand_ZeroFloat(100.0f) + 100.0f;
}
if (this->skelAnime.curFrame < 96.0f && this->skelAnime.curFrame >= 53.0f) {
this->unk_2B4 = 1;
this->eyeIndex = 1;
} else {
this->unk_2B4 = 2;
this->eyeIndex = 2;
}
this->unk_2E0 |= 8;
}
@ -1152,7 +1141,7 @@ void EnTa_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_MoveForward(&this->actor);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
this->unk_260(this);
this->unk_25C(this, globalCtx);
this->actionFunc(this, globalCtx);
if (!(this->unk_2E0 & 4)) {
this->unk_2B0(this);
@ -1200,6 +1189,11 @@ s32 EnTa_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
void EnTa_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
static Vec3f D_80B16E7C = {
1100.0f,
1000.0f,
0.0f,
};
EnTa* this = THIS;
if (limbIndex == 15) {
@ -1208,6 +1202,11 @@ void EnTa_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
}
void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* eyeTextures[] = {
gTalonEyeOpenTex,
gTalonEyeHalfTex,
gTalonEyeClosedTex,
};
EnTa* this = THIS;
s32 pad;
@ -1215,8 +1214,8 @@ void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800943C8(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(D_80B16E88[this->unk_2B4]));
gSPSegment(POLY_OPA_DISP++, 0x9, SEGMENTED_TO_VIRTUAL(&object_ta_Tex_006DC0));
gSPSegment(POLY_OPA_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex]));
gSPSegment(POLY_OPA_DISP++, 0x9, SEGMENTED_TO_VIRTUAL(&gTalonHeadSkinTex));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnTa_OverrideLimbDraw, EnTa_PostLimbDraw, this);

10
src/overlays/actors/ovl_En_Ta/z_en_ta.h
View file

@ -16,13 +16,13 @@ typedef struct EnTa {
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s jointTable[17];
/* 0x01F6 */ Vec3s morphTable[17];
/* 0x025C */ EnTaActionFunc unk_25C;
/* 0x025C */ EnTaActionFunc actionFunc;
/* 0x0260 */ EnTaUnkFunc unk_260;
/* 0x0264 */ ColliderCylinder collider;
/* 0x02B0 */ EnTaUnkFunc unk_2B0;
/* 0x02B4 */ s16 unk_2B4;
/* 0x02B6 */ s16 unk_2B6;
/* 0x02B8 */ EnNiw* unk_2B8[3];
/* 0x02B4 */ s16 eyeIndex;
/* 0x02B6 */ s16 blinkTimer;
/* 0x02B8 */ EnNiw* superCuccos[3];
/* 0x02C4 */ s16 unk_2C4[3];
/* 0x02CA */ u8 unk_2CA;
/* 0x02CC */ s16 unk_2CC;
@ -33,7 +33,7 @@ typedef struct EnTa {
/* 0x02DA */ Vec3s unk_2DA;
/* 0x02E0 */ u16 unk_2E0;
/* 0x02E2 */ s16 unk_2E2;
/* 0x02E4 */ AnimationHeader* unk_2E4;
/* 0x02E4 */ AnimationHeader* currentAnimation;
} EnTa; // size = 0x02E8
#endif

8
src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
View file

@ -53,7 +53,7 @@ static EnViewerInitData sInitData[] = {
{ OBJECT_HORSE_ZELDA, OBJECT_HORSE_ZELDA, 1, 0, ENVIEWER_SHADOW_HORSE, 20, ENVIEWER_DRAW_HORSE, &gHorseZeldaSkel,
&gHorseZeldaGallopingAnim },
/* ENVIEWER_TYPE_1_IMPA */
{ OBJECT_IM, OBJECT_OPENING_DEMO1, 1, 0, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_IMPA, &object_im_Skel_00F788,
{ OBJECT_IM, OBJECT_OPENING_DEMO1, 1, 0, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_IMPA, &gImpaSkel,
&object_opening_demo1_Anim_0029CC },
/* ENVIEWER_TYPE_2_ZELDA */
{ OBJECT_ZL4, OBJECT_OPENING_DEMO1, 1, 0, ENVIEWER_SHADOW_NONE, 10, ENVIEWER_DRAW_ZELDA, &gChildZeldaSkel,
@ -669,15 +669,15 @@ void EnViewer_DrawZelda(EnViewer* this, GlobalContext* globalCtx) {
s32 EnViewer_ImpaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
void* thisx) {
if (limbIndex == 16) {
*dList = object_im_DL_00D0D8;
*dList = gImpaHeadMaskedDL;
}
return false;
}
void EnViewer_DrawImpa(EnViewer* this, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1717);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_im_Tex_007210));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_im_Tex_007210));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&gImpaEyeOpenTex));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&gImpaEyeOpenTex));
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]);
SkelAnime_DrawFlexOpa(globalCtx, this->skin.skelAnime.skeleton, this->skin.skelAnime.jointTable,

62
src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
View file

@ -208,7 +208,7 @@ void func_80B4ED2C(EnZl2* this, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
s32 EnZl2_FrameUpdateMatrix(EnZl2* this) {
s32 EnZl2_UpdateSkelAnime(EnZl2* this) {
return SkelAnime_Update(&this->skelAnime);
}
@ -987,7 +987,7 @@ void func_80B50BEC(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -996,7 +996,7 @@ void func_80B50C40(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FDD4(this);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B500E0(this, globalCtx);
func_80B503DC(this, globalCtx);
}
@ -1005,7 +1005,7 @@ void func_80B50CA8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1013,13 +1013,13 @@ void func_80B50CFC(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B4EA40(this);
func_80B50488(this, EnZl2_FrameUpdateMatrix(this));
func_80B50488(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B50D50(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1027,14 +1027,14 @@ void func_80B50D94(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B4EAF4(this);
func_80B5053C(this, EnZl2_FrameUpdateMatrix(this));
func_80B5053C(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B50DE8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1042,14 +1042,14 @@ void func_80B50E3C(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
func_80B505D4(this, EnZl2_FrameUpdateMatrix(this));
func_80B505D4(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B50E90(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1057,7 +1057,7 @@ void func_80B50EE4(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1065,7 +1065,7 @@ void func_80B50F38(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1074,7 +1074,7 @@ void func_80B50F8C(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1082,14 +1082,14 @@ void func_80B50FE8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B5073C(this, EnZl2_FrameUpdateMatrix(this));
func_80B5073C(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B51034(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1097,14 +1097,14 @@ void func_80B51080(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B507E8(this, EnZl2_FrameUpdateMatrix(this));
func_80B507E8(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B510CC(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1112,14 +1112,14 @@ void func_80B51118(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B50880(this, EnZl2_FrameUpdateMatrix(this));
func_80B50880(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B51164(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B50A04(this, globalCtx);
}
@ -1127,13 +1127,13 @@ void func_80B511B0(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE10(globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B50928(this, EnZl2_FrameUpdateMatrix(this));
func_80B50928(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B511FC(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B5008C(this);
func_80B50A04(this, globalCtx);
}
@ -1142,7 +1142,7 @@ void func_80B51250(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4FE48(this);
func_80B4ED2C(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B500E0(this, globalCtx);
func_80B5008C(this);
func_80B50A04(this, globalCtx);
@ -1151,7 +1151,7 @@ void func_80B51250(EnZl2* this, GlobalContext* globalCtx) {
void func_80B512B8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B501E8(this, globalCtx);
func_80B509A0(this, globalCtx);
}
@ -1377,7 +1377,7 @@ void func_80B51A8C(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B51418(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B51948(this, globalCtx);
}
@ -1385,7 +1385,7 @@ void func_80B51AE4(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
func_80B51644(this, EnZl2_FrameUpdateMatrix(this));
func_80B51644(this, EnZl2_UpdateSkelAnime(this));
func_80B51948(this, globalCtx);
}
@ -1393,7 +1393,7 @@ void func_80B51B44(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B5149C(this, globalCtx);
func_80B516D0(this, EnZl2_FrameUpdateMatrix(this));
func_80B516D0(this, EnZl2_UpdateSkelAnime(this));
func_80B51948(this, globalCtx);
}
@ -1401,7 +1401,7 @@ void func_80B51BA8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B514F8(this, globalCtx);
func_80B5175C(this, EnZl2_FrameUpdateMatrix(this));
func_80B5175C(this, EnZl2_UpdateSkelAnime(this));
func_80B51948(this, globalCtx);
}
@ -1409,13 +1409,13 @@ void func_80B51C0C(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B5146C(this, globalCtx);
func_80B517E0(this, EnZl2_FrameUpdateMatrix(this));
func_80B517E0(this, EnZl2_UpdateSkelAnime(this));
}
void func_80B51C64(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B51948(this, globalCtx);
}
@ -1423,7 +1423,7 @@ void func_80B51CA8(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
func_80B5154C(this, globalCtx);
func_80B5187C(this, EnZl2_FrameUpdateMatrix(this));
func_80B5187C(this, EnZl2_UpdateSkelAnime(this));
func_80B51948(this, globalCtx);
}
@ -1542,7 +1542,7 @@ void func_80B52098(EnZl2* this, GlobalContext* globalCtx) {
func_80B4FCCC(this, globalCtx);
func_80B4ED2C(this, globalCtx);
EnZl2_UpdateEyes(this);
EnZl2_FrameUpdateMatrix(this);
EnZl2_UpdateSkelAnime(this);
func_80B51D24(this, globalCtx);
func_80B51F38(this, globalCtx);
func_80B51DA4(this, globalCtx);

78
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -199,7 +199,7 @@ void func_80B538B0(EnZl3* this) {
}
}
s32 EnZl3_FrameUpdateMatrix(EnZl3* this) {
s32 EnZl3_UpdateSkelAnime(EnZl3* this) {
return SkelAnime_Update(&this->skelAnime);
}
@ -956,7 +956,7 @@ void func_80B55444(EnZl3* this, GlobalContext* globalCtx) {
void func_80B55550(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B550F0(this);
func_80B55444(this, globalCtx);
}
@ -974,7 +974,7 @@ void func_80B55604(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
func_80B55144(this);
func_80B552A8(this, EnZl3_FrameUpdateMatrix(this));
func_80B552A8(this, EnZl3_UpdateSkelAnime(this));
func_80B55054(this);
func_80B55444(this, globalCtx);
}
@ -983,7 +983,7 @@ void func_80B5566C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B55334(this, EnZl3_FrameUpdateMatrix(this));
func_80B55334(this, EnZl3_UpdateSkelAnime(this));
func_80B55444(this, globalCtx);
}
@ -991,7 +991,7 @@ void func_80B556CC(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B553B4(this, EnZl3_FrameUpdateMatrix(this));
func_80B553B4(this, EnZl3_UpdateSkelAnime(this));
func_80B55444(this, globalCtx);
}
@ -999,7 +999,7 @@ void func_80B5572C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B55444(this, globalCtx);
}
@ -1372,7 +1372,7 @@ void func_80B56658(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B564A8(this, globalCtx);
}
@ -1380,7 +1380,7 @@ void func_80B566AC(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B55B04(this, EnZl3_FrameUpdateMatrix(this));
func_80B55B04(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@ -1388,7 +1388,7 @@ void func_80B5670C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B55B78(this, EnZl3_FrameUpdateMatrix(this));
func_80B55B78(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@ -1398,7 +1398,7 @@ void func_80B5676C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
something = EnZl3_FrameUpdateMatrix(this);
something = EnZl3_UpdateSkelAnime(this);
func_80B559C4(this);
func_80B55C4C(this, something);
}
@ -1408,7 +1408,7 @@ void func_80B567CC(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B564A8(this, globalCtx);
}
@ -1418,7 +1418,7 @@ void func_80B5682C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B55CCC(this, EnZl3_FrameUpdateMatrix(this));
func_80B55CCC(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
func_80B55D00(this, globalCtx);
}
@ -1429,7 +1429,7 @@ void func_80B568B4(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B55DB0(this, globalCtx);
}
@ -1437,7 +1437,7 @@ void func_80B5691C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B55E48(this, EnZl3_FrameUpdateMatrix(this));
func_80B55E48(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@ -1445,7 +1445,7 @@ void func_80B5697C(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B55EBC(this, EnZl3_FrameUpdateMatrix(this));
func_80B55EBC(this, EnZl3_UpdateSkelAnime(this));
func_80B5585C(this);
func_80B564A8(this, globalCtx);
}
@ -1456,7 +1456,7 @@ void func_80B569E4(EnZl3* this, GlobalContext* globalCtx) {
func_80B537E8(this);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B55F38(this, EnZl3_FrameUpdateMatrix(this));
func_80B55F38(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
func_80B55F6C(this, globalCtx);
}
@ -1469,7 +1469,7 @@ void func_80B56A68(EnZl3* this, GlobalContext* globalCtx) {
func_80B537E8(this);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
something = EnZl3_FrameUpdateMatrix(this);
something = EnZl3_UpdateSkelAnime(this);
func_80B564A8(this, globalCtx);
func_80B56090(this, something);
}
@ -1480,7 +1480,7 @@ void func_80B56AE0(EnZl3* this, GlobalContext* globalCtx) {
func_80B537E8(this);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B55F38(this, EnZl3_FrameUpdateMatrix(this));
func_80B55F38(this, EnZl3_UpdateSkelAnime(this));
func_80B56108(this, globalCtx);
}
@ -1488,7 +1488,7 @@ void func_80B56B54(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B564A8(this, globalCtx);
}
@ -1497,7 +1497,7 @@ void func_80B56BA8(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B561E0(this, EnZl3_FrameUpdateMatrix(this));
func_80B561E0(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
func_80B56214(this, globalCtx);
}
@ -1507,7 +1507,7 @@ void func_80B56C24(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B562F4(this, globalCtx);
}
@ -1515,7 +1515,7 @@ void func_80B56C84(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B5638C(this, EnZl3_FrameUpdateMatrix(this));
func_80B5638C(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@ -1523,7 +1523,7 @@ void func_80B56CE4(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B56400(this, EnZl3_FrameUpdateMatrix(this));
func_80B56400(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@ -1531,7 +1531,7 @@ void func_80B56D44(EnZl3* this, GlobalContext* globalCtx) {
func_80B54DE0(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B56474(this, EnZl3_FrameUpdateMatrix(this));
func_80B56474(this, EnZl3_UpdateSkelAnime(this));
func_80B564A8(this, globalCtx);
}
@ -2283,7 +2283,7 @@ void func_80B58D50(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B57EAC(this, globalCtx);
}
@ -2292,7 +2292,7 @@ void func_80B58DB0(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B57EEC(this, globalCtx);
}
@ -2302,7 +2302,7 @@ void func_80B58E10(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B57F1C(this, globalCtx);
}
@ -2312,7 +2312,7 @@ void func_80B58E7C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B58014(this, globalCtx);
func_80B536B4(this);
}
@ -2324,7 +2324,7 @@ void func_80B58EF4(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B58214(this, globalCtx);
}
@ -2335,7 +2335,7 @@ void func_80B58F6C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B58268(this, globalCtx);
}
@ -2346,7 +2346,7 @@ void func_80B58FDC(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B582C8(this, globalCtx);
}
@ -2357,7 +2357,7 @@ void func_80B5904C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B584B4(this, globalCtx);
}
@ -2368,7 +2368,7 @@ void func_80B590BC(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B58624(this, globalCtx);
}
@ -2379,7 +2379,7 @@ void func_80B5912C(EnZl3* this, GlobalContext* globalCtx) {
func_80B5366C(this, globalCtx);
func_80B56E38(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B57CB4(this, globalCtx);
func_80B57D60(this, globalCtx);
func_80B58A1C(this, globalCtx);
@ -2392,7 +2392,7 @@ void func_80B591BC(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B58A50(this, globalCtx);
}
@ -2404,7 +2404,7 @@ void func_80B5922C(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B58AAC(this, globalCtx);
}
@ -2416,7 +2416,7 @@ void func_80B592A8(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B57AAC(this, EnZl3_FrameUpdateMatrix(this), &gZelda2Anime2Anim_003D20);
func_80B57AAC(this, EnZl3_UpdateSkelAnime(this), &gZelda2Anime2Anim_003D20);
func_80B56DEC(this);
func_80B58AAC(this, globalCtx);
}
@ -2429,7 +2429,7 @@ void func_80B59340(EnZl3* this, GlobalContext* globalCtx) {
func_80B533FC(this, globalCtx);
func_80B5366C(this, globalCtx);
EnZl3_UpdateEyes(this);
func_80B57AAC(this, EnZl3_FrameUpdateMatrix(this), &gZelda2Anime2Anim_009FBC);
func_80B57AAC(this, EnZl3_UpdateSkelAnime(this), &gZelda2Anime2Anim_009FBC);
func_80B58AAC(this, globalCtx);
}
@ -2441,7 +2441,7 @@ void func_80B593D0(EnZl3* this, GlobalContext* globalCtx) {
func_80B56E38(this, globalCtx);
Actor_SetFocus(&this->actor, 60.0f);
EnZl3_UpdateEyes(this);
EnZl3_FrameUpdateMatrix(this);
EnZl3_UpdateSkelAnime(this);
func_80B58C08(this, globalCtx);
}