mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

z_En_Ossan and dependencies (#824)

Browse source 
* fix colliderinit typo

* fix initchain

* reloc

* progress

* progress

* Pick off a few easy functions, reduce number of warnings

* more tough OKs

* Getting closer to all OK, fix en_girla header

* some hard OKs, 7 to go

* two funcs remaining

* func_80AC7094 OK!

* Fix warnings, begin documentation

* get most of object_ossan documented, document some of en_ossan

* improve en_girla function names

* more EnOssan documentation

* more documentation

* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements

* delete TIME ITSELF

* object_oF1d_map OK

* more names, fixed a poition typo

* Nearly all en_ossan functions named, all variables named

* format.sh

* forgot to delete data

* implement pr changes

* EnOssan OK! implement most of Roman's suggestions

* ugh

* implement figs suggestions

* implement roman's suggestion

* Can't tell my left from my other left

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
mzxrules 2021-07-04 11:23:18 -04:00 • committed by GitHub
parent 7446e5eb80
commit 3fd05c9147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3479 additions and 7998 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,9 @@
<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"/>
<Blob Name="object_ds2_Blob_0030D8" Size="0xC00" Offset="0x30D8"/>
<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"/>

35
assets/xml/objects/object_oF1d_map.xml Normal file
View file

@ -0,0 +1,35 @@
<Root>
<File Name="object_oF1d_map" Segment="6">
<!-- animations -->
<Animation Name="gGoronAnim_000750" Offset="0x750"/>
<Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
<Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
<Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
<Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
<Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
<Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
<Animation Name="gGoronAnim_003768" Offset="0x3768"/>
<Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
<Animation Name="gGoronAnim_004930" Offset="0x4930"/>
<Animation Name="gGoronAnim_010590" Offset="0x10590"/>
<DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
<DList Name="gGoronDL_00C140" Offset="0xC140"/>
<DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
<DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
<Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
<!-- Eye textures -->
<Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80"/>
<Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280"/>
<Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680"/>
<Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80"/>
<!-- Mouth textures -->
<Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80"/>
<Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680"/>
</File>
</Root>

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

@ -16,7 +16,8 @@
<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"/>
<Blob Name="object_os_Blob_0035D8" Size="0x800" Offset="0x35D8"/>
<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"/>

12
assets/xml/objects/object_ossan.xml Normal file
View file

@ -0,0 +1,12 @@
<Root>
<File Name="object_ossan" Segment="6">
<Animation Name="gObjectOssanAnim_000338" Offset="0x338"/>
<Texture Name="gOssanEyesTLUT" OutName="ossan_eyes_tlut" Format="rgb5a1" 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"/>
<DList Name="gObjectOssanEnSyatekiManDL_007E28" Offset="0x7E28"/>
<Skeleton Name="gObjectOssanSkel" Type="Flex" LimbType="Standard" Offset="0x9B38"/>
</File>
</Root>

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

@ -13,7 +13,9 @@
<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"/>
<Blob Name="object_rs_Blob_003968" Size="0xC00" Offset="0x3968"/>
<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_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"/>

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

@ -1,9 +1,10 @@
<Root>
<File Name="object_shop_dungen" Segment="6">
<DList Name="object_shop_dungen_DL_000B80" Offset="0xB80"/>
<Texture Name="object_shop_dungen_Tex_000DE0" OutName="tex_00000DE0" Format="rgb5a1" Width="4" Height="4" Offset="0xDE0"/>
<Blob Name="object_shop_dungen_Blob_000E00" Size="0x1008" Offset="0xE00"/>
<DList Name="object_shop_dungen_DL_0027E8" Offset="0x27E8"/>
<Texture Name="object_shop_dungen_Tex_002A20" OutName="tex_00002A20" Format="rgb5a1" Width="64" Height="32" Offset="0x2A20"/>
<DList Name="gShopDungenWoodenShelvesDL" Offset="0xB80"/>
<Texture Name="gShopDungenStoneTLUT" OutName="stone_tlut" Format="rgb5a1" Width="16" Height="1" Offset="0xDE0"/>
<Texture Name="gShopDungenStone1Tex" OutName="stone1_tex" Format="ci4" Width="64" Height="64" Offset="0xE08"/>
<Texture Name="gShopDungenStone2Tex" OutName="stone2_tex" Format="ci4" Width="64" Height="64" Offset="0x1608"/>
<DList Name="gShopDungenStoneShelvesDL" Offset="0x27E8"/>
<Texture Name="gShopDungenWoodPlankTex" OutName="wood_plank_tex" Format="rgb5a1" Width="64" Height="32" Offset="0x2A20"/>
</File>
</Root>