mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-08 15:30:14 +00:00
Decompile a bunch of objects (#603)
* 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:
parent
36fead60a0
commit
201c9ec1cd
72 changed files with 1499 additions and 1128 deletions
|
@ -3,8 +3,8 @@
|
|||
<Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgb5a1" Width="16" Height="16" Offset="0x0000"/>
|
||||
<Texture Name="gEnNySpikeTex" OutName="spike" Format="rgb5a1" Width="32" Height="32" Offset="0x0200"/>
|
||||
<Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgb5a1" Width="32" Height="32" Offset="0x0A00"/>
|
||||
<DList Name="gEnNyRockBodyDlist" Offset="0x1DD0"/>
|
||||
<DList Name="gEnNyMetalBodyDlist" Offset="0x1EA8"/>
|
||||
<DList Name="gEnNySpikeDlist" Offset="0x1FC8"/>
|
||||
<DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
|
||||
<DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
|
||||
<DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
|
||||
</File>
|
||||
</Root>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue