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

Decompile a bunch of objects (#603)

Browse source 
* Mostly done but shifted

* still messed up

* Almost OK

* OBJECT_JYA_OBJ OK, OBJECT_GR OK

* Done

* Merge master and format

* Cleanup

* Cleanup 2

* Start object MB dont merge yet

* Object_MB OK

* Object_ydan_objects OK

* General 'ydan' actor cleanup

* Forgot some small things

* Object_EC OK

* add .gitkeep and run format

* Object_sd OK but no textures cause of a zap issue

* PR fixes

* Fix object_sd

* fix ydan

* delete .gitkeep files

* OBJECT_BOX as far as it can go with current ZAP

* Fix undefined_syms

* Start child link object

* Push progress, dont merge yet

* Object_mori_objects OK

* Fixed?

* Fix conflicts again

* Seems like i missed some textures

* Extract data for BgBombwall

* More field

* ZAP YEP 2.0

* Object_Box OK

* Object_SD ok.  Ready to merge

* remove ASM and merge master

* remove ASM

* remove files wrongfully added to docs/

* Almost done

* Change comment in z_player_lib.c

* forgot some DLists in player_lib.c

* Fix conflict, run format

* Same as before but this time with Tex and TLUT

* Last few things

* fix object_GR and add limbs to object_sd

* Nane -> Name

* gChildDekuShieldMtx is now a matrix and not a blob

* PR fixes (Fig)

* add a space for comment in z_player_lib.c

* re push and new lines

* PR fixes (AngheloAlf)

* PR fixes (Roman)

* Fix Heishi2

* PR fixes (Fig)

* Replace spacing in a file

* PR fixes (Roman)
This commit is contained in:
louist103 2021-05-26 18:59:21 -04:00 • committed by GitHub
parent 36fead60a0
commit 201c9ec1cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 1499 additions and 1128 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,20 @@
<Root>
<File Name="object_ydan_objects" Segment="6">
<Texture Name="gYdanDoor1Tex" OutName="door_tex1" Format="rgb5a1" Width="32" Height="64" Offset="0x2800"/>
<Texture Name="gYdanWebTex" OutName="web_tex" Format="ia16" Width="32" Height="64" Offset="0x1000"/>
<Texture Name="gYdanHasiFloatingBlockSideTex" OutName="floating_block_side" Format="rgb5a1" Width="32" Height="32" Offset="0x0"/>
<Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgb5a1" Width="32" Height="32" Offset="0x800"/>
<Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8"/>
<Texture Name="gYdanHasi2TLUT" OutName="palette_2" Format="rgb5a1" Width="16" Height="16" Offset="0x69C0"/>
<Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8"/>
<Texture Name="gYdanTLUT_38F0" OutName="palette_3" Format="rgb5a1" 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="gYdanHasiWaterTLUT" OutName="water_palette" Format="rgb5a1" Width="208" Height="1" Offset="0x57B0"/>
<Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgb5a1" Width="32" Height="32" Offset="0x2000"/>
<Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8"/>
<Texture Name="gYdanMaruta1TLUT" OutName="maruta_palette" Format="rgb5a1" Width="16" Height="16" Offset="0x77D0"/>
<DList Name="gDTUnknownWebDL" Offset="0x3850"/>
<DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
<DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>