mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-18 04:29:51 +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
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

27
spec
View file

@ -3453,7 +3453,8 @@ endseg
beginseg
name "gameplay_field_keep"
romalign 0x1000
include "build/baserom/gameplay_field_keep.o"
include "build/assets/objects/gameplay_field_keep/gameplay_field_keep.o"
number 5
endseg
beginseg
@ -3478,13 +3479,15 @@ endseg
beginseg
name "object_link_child"
romalign 0x1000
include "build/baserom/object_link_child.o"
include "build/assets/objects/object_link_child/object_link_child.o"
number 6
endseg
beginseg
name "object_box"
romalign 0x1000
include "build/baserom/object_box.o"
include "build/assets/objects/object_box/object_box.o"
number 6
endseg
beginseg
@ -3732,7 +3735,8 @@ endseg
beginseg
name "object_mb"
romalign 0x1000
include "build/baserom/object_mb.o"
include "build/assets/objects/object_mb/object_mb.o"
number 6
endseg
beginseg
@ -4164,7 +4168,8 @@ endseg
beginseg
name "object_mori_objects"
romalign 0x1000
include "build/baserom/object_mori_objects.o"
include "build/assets/objects/object_mori_objects/object_mori_objects.o"
number 6
endseg
beginseg
@ -4353,7 +4358,8 @@ endseg
beginseg
name "object_sd"
romalign 0x1000
include "build/baserom/object_sd.o"
include "build/assets/objects/object_sd/object_sd.o"
number 6
endseg
beginseg
@ -4948,7 +4954,8 @@ endseg
beginseg
name "object_jya_obj"
romalign 0x1000
include "build/baserom/object_jya_obj.o"
include "build/assets/objects/object_jya_obj/object_jya_obj.o"
number 6
endseg
beginseg
@ -5633,7 +5640,8 @@ endseg
beginseg
name "object_ec"
romalign 0x1000
include "build/baserom/object_ec.o"
include "build/assets/objects/object_ec/object_ec.o"
number 6
endseg
beginseg
@ -5741,7 +5749,8 @@ endseg
beginseg
name "object_gr"
romalign 0x1000
include "build/baserom/object_gr.o"
include "build/assets/objects/object_gr/object_gr.o"
number 6
endseg
beginseg