mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +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

24
assets/xml/objects/object_mori_objects.xml Normal file
View file

@ -0,0 +1,24 @@
<Root>
<File Name="object_mori_objects" Segment="6">
<Texture Name="gMoriHashiraTLUT" OutName="hashira_palette" Width="112" Height="1" Format="rgb5a1" Offset="0x0000"/>
<Texture Name="gMoriHashiraTex" OutName="hashira" Width="32" Height="32" Format="ci8" Offset="0x00E0"/>
<Texture Name="gMoriHashigoClaspTLUT" OutName="hashigo_clasp_palette" Width="112" Height="1" Format="rgb5a1" Offset="0x3810"/>
<Texture Name="gMoriHashigoClaspTex" OutName="hashigo_clasp" Width="32" Height="32" Format="ci8" Offset="0x38F0"/>
<Collision Name="gMoriBigstCol" Offset="0x221C"/>
<DList Name="gMoriBigstDL" Offset="0x1E50"/>
<Collision Name="gMoriElevatorCol" Offset="0x35F8"/>
<DList Name="gMoriElevatorDL" Offset="0x2AD0"/>
<Collision Name="gMoriHashigoCol" Offset="0x37D8"/>
<DList Name="gMoriHashigoLadderDL" Offset="0x36B0"/>
<DList Name="gMoriHashigoClaspDL" Offset="0x4770"/>
<Collision Name="gMoriHashira1Col" Offset="0x1AF8"/>
<Collision Name="gMoriHashira2Col" Offset="0x89E0"/>
<DList Name="gMoriHashiraPlatformsDL" Offset="0x1300"/>
<DList Name="gMoriHashiraGateDL" Offset="0x8840"/>
<DList Name="gMoriIdomizuWaterDL" Offset="0x49D0"/>
<Collision Name="gMoriKaitenkabeCol" Offset="0x63B8"/>
<DList Name="gMoriKaitenkabeDL" Offset="0x56B0"/>
<Collision Name="gMoriRakkatenjoCol" Offset="0x87AC"/>
<DList Name="gMoriRakkatenjoDL" Offset="0x7690"/>
</File>
</Root>