mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +00:00
Code Issues Projects Releases Wiki Activity

Decompile ovl_Door_Warp1 (#949)

Browse source 
* Initial progress on Door_Warp1

* Fix merge

* More work on Door_Warp1

* Decompile most of Door_Warp1

* 2 more functions OK

* All decompiled, 3 nonmatching

* Tiny improvements, fix several warnings

* Remove commented GLOBAL_ASM lines

* Fix

* Fix merge

* Two more matches

* Some docs

* More docs

* Use generated reloc under NON_MATCHING

* Fix accesses in ru1

* Add break and add limbs and dlists for the skeleton to the object xml

* Comment values for enums

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* boolean returns for flag checking functions

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* Named more loop variables i and named DoorWarp1_FloatPlayer

* Last function matched thanks to Roman

* Some further suggestions

* Fix

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
This commit is contained in:
Tharo 2021-09-12 16:10:10 +01:00 • committed by GitHub
parent e31e35658d
commit eccfd2efbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 1139 additions and 4711 deletions
Download patch file Download diff file Expand all files Collapse all files

47
assets/xml/objects/object_warp1.xml
View file

@ -1,16 +1,39 @@
<Root>
<File Name="object_warp1" Segment="6">
<Skeleton Name="gBlueWarpSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
<Animation Name="gBlueWarpAnim" Offset="0x1374"/>
<DList Name="gBlueWarpLightBeamDL" Offset="0x01A0"/>
<DList Name="gBlueWarpDiamondDL" Offset="0x1750"/>
<DList Name="gBlueWarpTriangle1DL" Offset="0x1828"/>
<DList Name="gBlueWarpTriangle2DL" Offset="0x18B0"/>
<DList Name="gBlueWarpTriangle3DL" Offset="0x1938"/>
<DList Name="gBlueWarpTriangle4DL" Offset="0x19C0"/>
<DList Name="gBlueWarpTriangle5DL" Offset="0x1A48"/>
<DList Name="gBlueWarpTriangle6DL" Offset="0x1AD0"/>
<Texture Name="gBlueWarpLightBeamTex" OutName="light_beam" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
<Texture Name="gBlueWarpDiamondAndTriangleTex" OutName="diamond_and_triangle" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
<!-- Portal -->
<DList Name="gWarpPortalDL" Offset="0x01A0"/>
<Texture Name="gWarpPortalTex" OutName="warp_portal_tex" Format="i8" Width="64" Height="64" Offset="0x02C0"/>
<!-- Crystal -->
<Animation Name="gWarpCrystalAnim" Offset="0x1374"/>
<DList Name="gWarp1DL_001750" Offset="0x1750"/>
<DList Name="gWarp1DL_001828" Offset="0x1828"/>
<DList Name="gWarp1DL_0018B0" Offset="0x18B0"/>
<DList Name="gWarp1DL_001938" Offset="0x1938"/>
<DList Name="gWarp1DL_0019C0" Offset="0x19C0"/>
<DList Name="gWarp1DL_001A48" Offset="0x1A48"/>
<DList Name="gWarp1DL_001AD0" Offset="0x1AD0"/>
<Texture Name="gWarpCrystalTex" OutName="warp_crystal_tex" Format="i8" Width="64" Height="64" Offset="0x1B58"/>
<Limb Name="gWarpCrystalLimb_002B58" Type="Standard" Offset="0x2B58"/>
<Limb Name="gWarpCrystalLimb_002B64" Type="Standard" Offset="0x2B64"/>
<Limb Name="gWarpCrystalLimb_002B70" Type="Standard" Offset="0x2B70"/>
<Limb Name="gWarpCrystalLimb_002B7C" Type="Standard" Offset="0x2B7C"/>
<Limb Name="gWarpCrystalLimb_002B88" Type="Standard" Offset="0x2B88"/>
<Limb Name="gWarpCrystalLimb_002B94" Type="Standard" Offset="0x2B94"/>
<Limb Name="gWarpCrystalLimb_002BA0" Type="Standard" Offset="0x2BA0"/>
<Limb Name="gWarpCrystalLimb_002BAC" Type="Standard" Offset="0x2BAC"/>
<Limb Name="gWarpCrystalLimb_002BB8" Type="Standard" Offset="0x2BB8"/>
<Limb Name="gWarpCrystalLimb_002BC4" Type="Standard" Offset="0x2BC4"/>
<Limb Name="gWarpCrystalLimb_002BD0" Type="Standard" Offset="0x2BD0"/>
<Limb Name="gWarpCrystalLimb_002BDC" Type="Standard" Offset="0x2BDC"/>
<Limb Name="gWarpCrystalLimb_002BE8" Type="Standard" Offset="0x2BE8"/>
<Limb Name="gWarpCrystalLimb_002BF4" Type="Standard" Offset="0x2BF4"/>
<Limb Name="gWarpCrystalLimb_002C00" Type="Standard" Offset="0x2C00"/>
<Limb Name="gWarpCrystalLimb_002C0C" Type="Standard" Offset="0x2C0C"/>
<Limb Name="gWarpCrystalLimb_002C18" Type="Standard" Offset="0x2C18"/>
<Limb Name="gWarpCrystalLimb_002C24" Type="Standard" Offset="0x2C24"/>
<Limb Name="gWarpCrystalLimb_002C30" Type="Standard" Offset="0x2C30"/>
<Limb Name="gWarpCrystalLimb_002C3C" Type="Standard" Offset="0x2C3C"/>
<Limb Name="gWarpCrystalLimb_002C48" Type="Standard" Offset="0x2C48"/>
<Skeleton Name="gWarpCrystalSkel" Type="Normal" LimbType="Standard" Offset="0x2CA8"/>
</File>
</Root>