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

Decompile some more objects (#848)

Browse source 
* Object_FU limbs and skel OK

* limbs OK

* Object_FU textures OK

* Object_FU face textures OK

* Symbols in en_fu.c

* en_fu.c limb enum

* Remove Object_fu from undefined_syms, move textures to draw, and small cleanup

* Object_bird OK

* Object_Bird OK, added cutscene for shot sun, and song of storms

* Rainbow Bridge CS

* Great fairy CS

* Cutscene -> Cs

* remove '&' from Cutscenes

* Cleanup object_bird

* Update z_en_fu.c

* Update z_en_fu.h

* Update z_en_fu.c

* Update z_en_fu.h

* Update z_en_fu.h

* DC intro CS

* Zeldas lullaby CS

* Nabooru Knuckle CS

* Owl Lake Hylia CS

* Sun song CS

* Undefined sym in Boss Dodongo

* Missed a few more

* DC tex name

* Windmill man limbs
This commit is contained in:
louist103 2021-06-29 13:22:36 -04:00 • committed by GitHub
parent a6bd227137
commit 7446e5eb80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 179 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

49
assets/xml/objects/object_bird.xml
View file

@ -1,27 +1,30 @@
<Root>
<File Name="object_bird" Segment="6">
<Animation Name="object_bird_Anim_00006C" Offset="0x6C"/>
<DList Name="object_bird_DL_000080" Offset="0x80"/>
<DList Name="object_bird_DL_000120" Offset="0x120"/>
<DList Name="object_bird_DL_000130" Offset="0x130"/>
<DList Name="object_bird_DL_000180" Offset="0x180"/>
<DList Name="object_bird_DL_000220" Offset="0x220"/>
<DList Name="object_bird_DL_000230" Offset="0x230"/>
<DList Name="object_bird_DL_000280" Offset="0x280"/>
<DList Name="object_bird_DL_0003D0" Offset="0x3D0"/>
<DList Name="object_bird_DL_0003E0" Offset="0x3E0"/>
<Texture Name="object_bird_Tex_000500" OutName="tex_00000500" Format="rgb5a1" Width="32" Height="32" Offset="0x500"/>
<Texture Name="object_bird_Tex_000D00" OutName="tex_00000D00" Format="rgb5a1" Width="16" Height="32" Offset="0xD00"/>
<Texture Name="object_bird_Tex_001100" OutName="tex_00001100" Format="rgb5a1" Width="64" Height="32" Offset="0x1100"/>
<Limb Name="object_bird_Limb_002100" LimbType="Standard" Offset="0x2100"/>
<Limb Name="object_bird_Limb_00210C" LimbType="Standard" Offset="0x210C"/>
<Limb Name="object_bird_Limb_002118" LimbType="Standard" Offset="0x2118"/>
<Limb Name="object_bird_Limb_002124" LimbType="Standard" Offset="0x2124"/>
<Limb Name="object_bird_Limb_002130" LimbType="Standard" Offset="0x2130"/>
<Limb Name="object_bird_Limb_00213C" LimbType="Standard" Offset="0x213C"/>
<Limb Name="object_bird_Limb_002148" LimbType="Standard" Offset="0x2148"/>
<Limb Name="object_bird_Limb_002154" LimbType="Standard" Offset="0x2154"/>
<Limb Name="object_bird_Limb_002160" LimbType="Standard" Offset="0x2160"/>
<Skeleton Name="object_bird_Skel_002190" Type="Normal" LimbType="Standard" Offset="0x2190"/>
<Animation Name="gBirdFlyAnim" Offset="0x6C"/>
<DList Name="gBirdLeftWingDL" Offset="0x80"/>
<DList Name="gBirdLeftWingWrapper1DL" Offset="0x120"/>
<DList Name="gBirdLeftWingWrapper2DL" Offset="0x130"/>
<DList Name="gBirdRightWingDL" Offset="0x180"/>
<DList Name="gBirdRightWingWrapper1DL" Offset="0x220"/>
<DList Name="gBirdRightWingWrapper2DL" Offset="0x230"/>
<DList Name="gBirdBodyDL" Offset="0x280"/>
<DList Name="gBirdBodyWrapper1DL" Offset="0x3D0"/>
<DList Name="gBirdBodyWrapper2DL" Offset="0x3E0"/>
<Texture Name="gBirdFaceTex" OutName="face" Format="rgb5a1" Width="32" Height="32" Offset="0x500"/>
<Texture Name="gBirdTailTex" OutName="tail" Format="rgb5a1" Width="16" Height="32" Offset="0xD00"/>
<Texture Name="gBirdWingTex" OutName="wing" Format="rgb5a1" Width="64" Height="32" Offset="0x1100"/>
<Limb Name="gBirdLimb_002100" LimbType="Standard" Offset="0x2100"/>
<Limb Name="gBirdLimb_00210C" LimbType="Standard" Offset="0x210C"/>
<Limb Name="gBirdLimb_002118" LimbType="Standard" Offset="0x2118"/>
<Limb Name="gBirdLimb_002124" LimbType="Standard" Offset="0x2124"/>
<Limb Name="gBirdLeftWingLimb" LimbType="Standard" Offset="0x2130"/>
<Limb Name="gBirdLimb_00213C" LimbType="Standard" Offset="0x213C"/>
<Limb Name="gBirdLimb_002148" LimbType="Standard" Offset="0x2148"/>
<Limb Name="gBirdRightWingLimb" LimbType="Standard" Offset="0x2154"/>
<Limb Name="gBirdBodyLimb" LimbType="Standard" Offset="0x2160"/>
<Skeleton Name="gBirdSkel" Type="Normal" LimbType="Standard" Offset="0x2190"/>
</File>
</Root>

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

@ -1,49 +1,55 @@
<Root>
<File Name="object_fu" Segment="6">
<Animation Name="object_fu_Anim_00057C" Offset="0x57C"/>
<Animation Name="object_fu_Anim_000B04" Offset="0xB04"/>
<DList Name="object_fu_DL_003130" Offset="0x3130"/>
<DList Name="object_fu_DL_003320" Offset="0x3320"/>
<DList Name="object_fu_DL_0036A0" Offset="0x36A0"/>
<DList Name="object_fu_DL_003BD8" Offset="0x3BD8"/>
<DList Name="object_fu_DL_003D08" Offset="0x3D08"/>
<DList Name="object_fu_DL_003E38" Offset="0x3E38"/>
<DList Name="object_fu_DL_0040E0" Offset="0x40E0"/>
<DList Name="object_fu_DL_004390" Offset="0x4390"/>
<DList Name="object_fu_DL_004460" Offset="0x4460"/>
<DList Name="object_fu_DL_004570" Offset="0x4570"/>
<DList Name="object_fu_DL_004690" Offset="0x4690"/>
<DList Name="object_fu_DL_0047E0" Offset="0x47E0"/>
<DList Name="object_fu_DL_0048E8" Offset="0x48E8"/>
<DList Name="object_fu_DL_004A08" Offset="0x4A08"/>
<DList Name="object_fu_DL_004B58" Offset="0x4B58"/>
<Texture Name="object_fu_TLUT_004C60" OutName="tlut_00004C60" Format="rgb5a1" Width="16" Height="16" Offset="0x4C60"/>
<Texture Name="object_fu_TLUT_004E60" OutName="tlut_00004E60" Format="rgb5a1" Width="16" Height="16" Offset="0x4E60"/>
<Texture Name="object_fu_Tex_005060" OutName="tex_00005060" Format="ci8" Width="16" Height="16" Offset="0x5060"/>
<Texture Name="object_fu_Tex_005160" OutName="tex_00005160" Format="ci8" Width="8" Height="8" Offset="0x5160"/>
<Texture Name="object_fu_Tex_0051A0" OutName="tex_000051A0" Format="ci8" Width="32" Height="32" Offset="0x51A0"/>
<Texture Name="object_fu_Tex_0055A0" OutName="tex_000055A0" Format="ci8" Width="16" Height="16" Offset="0x55A0"/>
<Texture Name="object_fu_Tex_0056A0" OutName="tex_000056A0" Format="ci8" Width="8" Height="8" Offset="0x56A0"/>
<Texture Name="object_fu_Tex_0056E0" OutName="tex_000056E0" Format="ci8" Width="32" Height="32" Offset="0x56E0"/>
<Texture Name="object_fu_Tex_005AE0" OutName="tex_00005AE0" Format="ci8" Width="32" Height="32" Offset="0x5AE0"/>
<Texture Name="object_fu_Tex_005EE0" OutName="tex_00005EE0" Format="ci8" Width="8" Height="8" Offset="0x5EE0"/>
<Blob Name="object_fu_Blob_005F20" Size="0xC00" Offset="0x5F20"/>
<Texture Name="object_fu_Tex_006B20" OutName="tex_00006B20" Format="ci8" Width="8" Height="16" Offset="0x6B20"/>
<Limb Name="object_fu_Limb_006BA0" LimbType="Standard" Offset="0x6BA0"/>
<Limb Name="object_fu_Limb_006BAC" LimbType="Standard" Offset="0x6BAC"/>
<Limb Name="object_fu_Limb_006BB8" LimbType="Standard" Offset="0x6BB8"/>
<Limb Name="object_fu_Limb_006BC4" LimbType="Standard" Offset="0x6BC4"/>
<Limb Name="object_fu_Limb_006BD0" LimbType="Standard" Offset="0x6BD0"/>
<Limb Name="object_fu_Limb_006BDC" LimbType="Standard" Offset="0x6BDC"/>
<Limb Name="object_fu_Limb_006BE8" LimbType="Standard" Offset="0x6BE8"/>
<Limb Name="object_fu_Limb_006BF4" LimbType="Standard" Offset="0x6BF4"/>
<Limb Name="object_fu_Limb_006C00" LimbType="Standard" Offset="0x6C00"/>
<Limb Name="object_fu_Limb_006C0C" LimbType="Standard" Offset="0x6C0C"/>
<Limb Name="object_fu_Limb_006C18" LimbType="Standard" Offset="0x6C18"/>
<Limb Name="object_fu_Limb_006C24" LimbType="Standard" Offset="0x6C24"/>
<Limb Name="object_fu_Limb_006C30" LimbType="Standard" Offset="0x6C30"/>
<Limb Name="object_fu_Limb_006C3C" LimbType="Standard" Offset="0x6C3C"/>
<Limb Name="object_fu_Limb_006C48" LimbType="Standard" Offset="0x6C48"/>
<Skeleton Name="object_fu_Skel_006C90" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
<Animation Name="gWindmillManPlayAndMoveHeadAnim" Offset="0x57C"/>
<Animation Name="gWindmillManPlayStillAnim" Offset="0xB04"/>
<DList Name="gWindmillManHornDL" Offset="0x3130"/>
<DList Name="gWindmillManChestAndMusicBoxPipeDL" Offset="0x3320"/>
<DList Name="gWindmillManHeadDL" Offset="0x36A0"/>
<DList Name="gWindmillManRightShoulderDL" Offset="0x3BD8"/>
<DList Name="gWindmillManRightArmDL" Offset="0x3D08"/>
<DList Name="gWindmillManRightHandAndCrankDL" Offset="0x3E38"/>
<DList Name="gWindmillManLeftArmAndMusicBoxDL" Offset="0x40E0"/>
<DList Name="gWindmillManBlueTriangleDL" Offset="0x4390"/>
<DList Name="gWindmillManTorsoDL" Offset="0x4460"/>
<DList Name="gWindmillManRightThighDL" Offset="0x4570"/>
<DList Name="gWindmillManRightLegDL" Offset="0x4690"/>
<DList Name="gWindmillManRightFootDL" Offset="0x47E0"/>
<DList Name="gWindmillManLeftThighDL" Offset="0x48E8"/>
<DList Name="gWindmillManLeftLegDL" Offset="0x4A08"/>
<DList Name="gWindmillManLeftFootDL" Offset="0x4B58"/>
<Texture Name="gWindmillManClothesTLUT" OutName="clothes_tlut" Format="rgb5a1" Width="16" Height="16" Offset="0x4C60"/>
<Texture Name="gWindmillManSkinTLUT" OutName="skin_tlut" Format="rgb5a1" 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="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="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="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20"/>
<Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>
<Limb Name="gWindmillManTorsoLimb" LimbType="Standard" Offset="0x6BA0"/>
<Limb Name="gWindmillManLeftThighLimb" LimbType="Standard" Offset="0x6BAC"/>
<Limb Name="gWindmillManLeftLegLimb" LimbType="Standard" Offset="0x6BB8"/>
<Limb Name="gWindmillManLeftFootLimb" LimbType="Standard" Offset="0x6BC4"/>
<Limb Name="gWindmillManRightThighLimb" LimbType="Standard" Offset="0x6BD0"/>
<Limb Name="gWindmillManRightLegLimb" LimbType="Standard" Offset="0x6BDC"/>
<Limb Name="gWindmillManRightFootLimb" LimbType="Standard" Offset="0x6BE8"/>
<Limb Name="gWindmillManChestAndMusicBoxPipeLimb" LimbType="Standard" Offset="0x6BF4"/>
<Limb Name="gWindmillManLeftArmAndMusicBoxLimb" LimbType="Standard" Offset="0x6C00"/>
<Limb Name="gWindmillManLimb_006C0C" LimbType="Standard" Offset="0x6C0C"/> <!--A random triangle near the right side of the music box-->
<Limb Name="gWindmillManRightShoulderLimb" LimbType="Standard" Offset="0x6C18"/>
<Limb Name="gWindmillManRightArmLimb" LimbType="Standard" Offset="0x6C24"/>
<Limb Name="gWindmillManRightHandAndCrankLimb" LimbType="Standard" Offset="0x6C30"/>
<Limb Name="gWindmillManHeadLimb" LimbType="Standard" Offset="0x6C3C"/>
<Limb Name="gWindmillManHornLimb" LimbType="Standard" Offset="0x6C48"/>
</File>
</Root>

3
assets/xml/scenes/dungeons/ddan.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="ddan_scene" Segment="2">
<Scene Name="ddan_scene"/>
<Scene Name="ddan_scene" Offset="0x0"/>
<Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
</File>
<File Name="ddan_room_0" Segment="3">
<Room Name="ddan_room_0" Offset="0x0"/>

1
assets/xml/scenes/dungeons/ddan_boss.xml
View file

@ -6,6 +6,7 @@
<Room Name="ddan_boss_room_0" Offset="0x0"/>
</File>
<File Name="ddan_boss_room_1" Segment="3">
<Texture Name="gDodongosCavernBossLavaFloorTex" OutName="lava_floor" Format="rgb5a1" Width="64" Height="32" Offset="0x21D8"/>
<Room Name="ddan_boss_room_1" Offset="0x0"/>
</File>
</Root>

3
assets/xml/scenes/dungeons/ganon_tou.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="ganon_tou_scene" Segment="2">
<Scene Name="ganon_tou_scene"/>
<Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
<Scene Name="ganon_tou_scene" Offset="0x0"/>
</File>
<File Name="ganon_tou_room_0" Segment="3">
<Room Name="ganon_tou_room_0" Offset="0x0"/>

3
assets/xml/scenes/dungeons/jyasinboss.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="jyasinboss_scene" Segment="2">
<Scene Name="jyasinboss_scene"/>
<Cutscene Name="gNabooruKnuckleDefeatCs" Offset="0x3F80"/>
<Scene Name="jyasinboss_scene" Offset="0x0"/>
</File>
<File Name="jyasinboss_room_0" Segment="3">
<Room Name="jyasinboss_room_0" Offset="0x0"/>

5
assets/xml/scenes/indoors/daiyousei_izumi.xml
View file

@ -1,6 +1,9 @@
<Root>
<File Name="daiyousei_izumi_scene" Segment="2">
<Scene Name="daiyousei_izumi_scene"/>
<Cutscene Name="gGreatFairyMagicCs" Offset="0x0130"/>
<Cutscene Name="gGreatFairyDoubleMagicCs" Offset="0x13E0"/>
<Cutscene Name="gGreatFairyDoubleDefenceCs" Offset="0x25D0"/>
<Scene Name="daiyousei_izumi_scene" Offset="0x0"/>
</File>
<File Name="daiyousei_izumi_room_0" Segment="3">
<Room Name="daiyousei_izumi_room_0" Offset="0x0"/>

3
assets/xml/scenes/indoors/hakasitarelay.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="hakasitarelay_scene" Segment="2">
<Scene Name="hakasitarelay_scene"/>
<Scene Name="hakasitarelay_scene" Offset="0x0"/>
<Cutscene Name="gSongOfStormsCs" Offset="0xE080"/>
</File>
<File Name="hakasitarelay_room_0" Segment="3">
<Room Name="hakasitarelay_room_0" Offset="0x0"/>

1
assets/xml/scenes/indoors/nakaniwa.xml
View file

@ -3,6 +3,7 @@
<Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
<Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
<Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
<Cutscene Name="gZeldasCourtyardLullabyCs" Offset="0x2524"/>
<Scene Name="nakaniwa_scene" Offset="0x0"/>
</File>

5
assets/xml/scenes/indoors/yousei_izumi_yoko.xml
View file

@ -1,6 +1,9 @@
<Root>
<File Name="yousei_izumi_yoko_scene" Segment="2">
<Scene Name="yousei_izumi_yoko_scene"/>
<Cutscene Name="gGreatFairyFaroresWindCs" Offset="0x0160"/>
<Cutscene Name="gGreatFairyDinsFireCs" Offset="0x1020"/>
<Cutscene Name="gGreatFairyNayrusLoveCs" Offset="0x1F40"/>
<Scene Name="yousei_izumi_yoko_scene" Offset="0x0"/>
</File>
<File Name="yousei_izumi_yoko_room_0" Segment="3">
<Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>

3
assets/xml/scenes/misc/hakaana_ouke.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="hakaana_ouke_scene" Segment="2">
<Scene Name="hakaana_ouke_scene"/>
<Cutscene Name="gSunSongTeachCs" Offset="0x24A0"/>
<Scene Name="hakaana_ouke_scene" Offset="0x0"/>
</File>
<File Name="hakaana_ouke_room_0" Segment="3">
<Room Name="hakaana_ouke_room_0" Offset="0x0"/>

2
assets/xml/scenes/overworld/spot05.xml
View file

@ -1,7 +1,7 @@
<Root>
<File Name="spot05_scene" Segment="2">
<Cutscene Name="gMinuetCs" Offset="0x3F80"/>
<Path Name="gSpot05Path_0069D8" Offset="0x69D8"/>
<Path Name="gSpot05Path_0069E0" Offset="0x69E0"/>
<Path Name="gSpot05Path_0069E8" Offset="0x69E8"/>
<Path Name="gSpot05Path_0069F0" Offset="0x69F0"/>

6
assets/xml/scenes/overworld/spot06.xml
View file

@ -1,10 +1,8 @@
<Root>
<File Name="spot06_scene" Segment="2">
<Cutscene Name="gSpot06Cs_007020" Offset="0x7020"/>
<Cutscene Name="gSpot06Cs_01B0C0" Offset="0x1B0C0"/>
<Cutscene Name="gFireArrowsCS" Offset="0x7020"/>
<Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
<Path Name="gSpot06Path_00776C" Offset="0x776C"/>
<Scene Name="spot06_scene" Offset="0x0"/>
</File>
<File Name="spot06_room_0" Segment="3">

1
assets/xml/scenes/overworld/spot16.xml
View file

@ -1,5 +1,6 @@
<Root>
<File Name="spot16_scene" Segment="2">
<Cutscene Name="gDmtOwlCs" Offset="0x1E6A0"/>
<Scene Name="spot16_scene" Offset="0x0"/>
</File>
<File Name="spot16_room_0" Segment="3">