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

Misc objects problems (#748)

Browse source 
* fix hidan door

Signed-off-by: angie <angheloalf95@gmail.com>

* doors and lens of truth in gameplaykeep

Signed-off-by: angie <angheloalf95@gmail.com>

* other minor fixes

Signed-off-by: angie <angheloalf95@gmail.com>

* Fix a typo

Signed-off-by: Angie <angheloalf95@gmail.com>
This commit is contained in:
Anghelo Carvajal 2021-04-02 20:30:26 -03:00 • committed by GitHub
parent fa5e785760
commit c94e595dc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
assets/xml/objects/gameplay_keep.xml
View file

@ -599,8 +599,9 @@
<PlayerAnimation Name="gPlayer573Anim"/>
<PlayerAnimation Name="gPlayer574Anim"/>
<PlayerAnimation Name="gPlayer575Anim"/>
<!-- TODO: this padding should be static -->
<Scalar Type="u64" Name="pad34F8"/>
<!-- Probably a file boundary here. -->
<DList Name="gDebugPyramidDL" Offset="0x35C0"/>
<Texture Name="gDebugCircleTex" OutName="debug_circle" Format="i8" Width="16" Height="16" Offset="0x35F0"/>
<Texture Name="gDebugBallTex" OutName="debug_ball" Format="i8" Width="16" Height="16" Offset="0x36F0"/>
@ -720,7 +721,7 @@
<Texture Name="gEffUnusedBubbles7Tex" OutName="eff_unused_bubbles_7" Format="ia8" Width="32" Height="32" Offset="0x1DAC0"/>
<Texture Name="gEffUnusedBubbles8Tex" OutName="eff_unused_bubbles_8" Format="ia8" Width="32" Height="32" Offset="0x1DEC0"/>
<DList Name="gEffUnusedBubblesDL" Offset="0x1E2C0"/>
<Texture Name="gUnknownCircle5Tex" OutName="unknown_circle_5" Format="i8" Width="64" Height="64" Offset="0x1E370"/>
<Texture Name="gLensOfTruthMaskTex" OutName="lens_of_truth_mask" Format="i8" Width="64" Height="64" Offset="0x1E370"/>
<Texture Name="gEffHitMark1Tex" OutName="eff_hit_mark_1" Format="i4" Width="32" Height="24" Offset="0x1F370"/>
<Texture Name="gEffHitMark2Tex" OutName="eff_hit_mark_2" Format="i4" Width="32" Height="24" Offset="0x1F4F0"/>
<Texture Name="gEffHitMark3Tex" OutName="eff_hit_mark_3" Format="i4" Width="32" Height="24" Offset="0x1F670"/>
@ -912,9 +913,9 @@
<Texture Name="gCircleShadowTex" OutName="circular_shadow" Format="ia16" Width="32" Height="32" Offset="0x49290"/>
<DList Name="gHorseShadowDL" Offset="0x49AD0"/>
<Texture Name="gHorseShadowTex" OutName="horse_shadow" Format="i8" Width="16" Height="64" Offset="0x49B20"/>
<DList Name="gDoorMetalBarsDL" Offset="0x49FE0"/>
<DList Name="gDungeonDoorDL" Offset="0x49FE0"/>
<Texture Name="gDoorMetalBarsTex" OutName="door_metal_bars" Format="ia8" Width="32" Height="128" Offset="0x4A090"/>
<DList Name="gDungeonDoorDL" Offset="0x4B0D0"/>
<DList Name="gDoorMetalBarsDL" Offset="0x4B0D0"/>
<Texture Name="gGenericDungeonDoorTex" OutName="generic_dungeon_door" Format="rgb5a1" Width="32" Height="64" Offset="0x4B160"/>
<Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="31" Offset="0x4C160"/>
<Texture Name="gSun2Tex" OutName="sun_2" Format="i4" Width="64" Height="16" Offset="0x4C540"/>
@ -922,7 +923,7 @@
<Texture Name="gSunEvening1Tex" OutName="sun_evening_1" Format="i4" Width="64" Height="31" Offset="0x4C960"/>
<Texture Name="gSunEvening2Tex" OutName="sun_evening_2" Format="i4" Width="64" Height="16" Offset="0x4CD40"/>
<Texture Name="gSunEvening3Tex" OutName="sun_evening_3" Format="i4" Width="64" Height="16" Offset="0x4CF40"/>
<DList Name="gKokiriDustMoteTextureLoadDL " Offset="0x4D160"/>
<DList Name="gKokiriDustMoteTextureLoadDL" Offset="0x4D160"/>
<DList Name="gKokiriDustMoteDL" Offset="0x4D1A8"/>
<DList Name="gSunDL" Offset="0x4D1C0"/>
<DList Name="gZTargetLockOnTriangleDL" Offset="0x4D450"/>

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

@ -78,11 +78,13 @@
<Collision Name="gFireTemplePillarInsertedInGroundCol" Offset="0xD188"/>
<DList Name="gFireTempleBombableDoorFrameDL" Offset="0xF890"/>
<DList Name="gFireTempleBombableDoorDL1" Offset="0xF938"/>
<DList Name="gFireTempleBombableDoorDL2" Offset="0xF998"/>
<DList Name="gFireTempleDoorWithHandleBackDL" Offset="0xF938"/>
<DList Name="gFireTempleDoorWithHandleFrontDL" Offset="0xF998"/>
<DList Name="gFireTempleDoorFrontDL" Offset="0x10CB0"/>
<DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
<Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgb5a1" Width="32" Height="64" Offset="0xE5A0"/>
<!-- I don't know what could this be -->
<Blob Name="gFireTempleBlob_00CCC0" Size="0x10E" Offset="0xCCC0"/>
</File>