1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Commit graph

2 commits

Author SHA1 Message Date
louist103
781d497264
Extract the assets from most of the overlays (#985)
* remove fake match

* Fire and Ice arrows

* Light arrows

* Ganon otyuka and end title

* Oceff_Spot

* Add missing Vtx to arrows

* Update assets/xml/overlays/ovl_Arrow_Ice.xml

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

* Update assets/xml/overlays/ovl_Arrow_Light.xml

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

* Fix fire arrows

* Update assets/xml/overlays/ovl_Arrow_Fire.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update ovl_Bg_Ganon_Otyuka.xml

* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Change a comment and rename a DList

* rename DList

* Jya cobra

* shd and elf_msg

* elf msg 2

* En Bili

* Remove extern form ice piece

* remove some externs

* en holl

* kanban

* make

* sda

* ssh and some cleanup

* replace undefined sym in en_kusa

* st

* oceff wipe 3

* oceff wipe

* oceff spot

* oceff spot

* oceff wipe 4

* Update VTXDIS

* update VTXDIS again

* fix sun song

* magic dark

* magic wind and oceff wipe 2

* magic fire and oceff storm

* Update src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/overlays/ovl_En_Sth.xml.ignore

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/overlays/ovl_Elf_Msg.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/overlays/ovl_Magic_Wind.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix emptyDL, run formatter on en_ssh

* run formatter

* Update format.sh

* update to VTXDIS

* small change

* textureDL -> materialDL, vtxDL -> modelDL

* upper CASE

* setupDL -> materialDL

* GeometryDL->ModelDL and VisualDL->MaterialDL

* revert rcp.c

* revert holl.c

* another revert in rcp.c

* some u32 DL -> Gfx* DL

* the rest of dragorns comments

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "3e9ed72e2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "3e9ed72e2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* start updating overlays with static

* en sth OK

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "d0cd6b397"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "d0cd6b397"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* fix names of the overlays

* remove segment 128, add gameplay keep to global config file

* Fix end title and remove hex mode from VTXdis.c

* add code assets

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-08 20:51:45 -05:00
Lucas Shaw
0f644b7545
Decompiled A LOT of objects (#815)
* .

* remove tools/ZAP2 from origin master

* object_spot04_objects

* remove accidentally added xml

* object_spot00_objects

* object_bombf ok

* object_dy_obj

* object_masterzoora

* object_mastergolon and object_masterkokirihead

* object_aob

* object_gt

* object_gt

* object_geff

* object_mag kinda

* object_gjyo_objects OK

* object_ani OK

* object_door_gerudo

* object_md and object_trap

* object_js OK

* object_goroiwa

* object_gs

* object_nwc

* object_niw

* object_ane

* object_os_anime OK

* object_d_hsblock OK

* object_fz OK

* object_ru2 OK

* fixed object_mag

* object_cow OK

* object_spot01_objects OK

* object_spot15_obj

* object_umajump OK

* object_spot18_obj

* object_spot12_obj

* fix symbols in z_item_b_heart

* object_bdan_objects & object_bowl

* object_ddan_objects

* object_owl OK

* object_spot01_matoyab.xml OK

* object_haka OK

* object_heavy_object

* object_ingate and objet_menkuri_objects

* objet_spot00_break & object_relay_objects OK

* object_spot01_matoya OK

* object_spot06_objects OK

* undefined_syms

* object_spot08_obj OK

* object_efc_doughnut & object_zg

* object_ik OK

* object_vm

* object_ei OK

* object_ds OK

* updated spec

* map_48x85_static OK

* object_zl1 & object_peehat ok

* some z_parameter naming and other undefined symbol stuff, object_yukabyun OK

* object_bubble & object_fw ok

* object_shopnuts

* restore delete file

* object_timeblock OK

* object_d_lift OK

* object_kibako2 OK

* object_mamenoki OK

* matches

* remove unused asm

* object_mag ok now

* fixed object_ani

* done for now, im tired

* object_bdan_objects fixed up

* fix bdan

* object_bombf fixed

* object_bowl fixed up

* object_cow fixed

* did more, im tired

* fixed some stuff in object_ddan_objects

* fix object_ddan_object

* object_door_gerudo fixed

* object_ds fix

* object_dy progress

* fixed great fairy

* some more

* more

* object_haka fix

* progress

* ingo_gate fixed

* object_js

* forgot collision

* object_relay_objects fixed

* object_kibako2

* object_mag fixed

* u64* to void*

* more u64* to void*

* object_mamenoki fix

* object_mastergolon & object_masterkokirihead fix

* mido is weird

* fixed build

* fix object_menkuri_objects

* add missing textures in object_menkuri_objects

* object_ms

* fixed object_peehat

* some cleanup stuff

* object_zg fix

* object_spot00_break fix

* object_niw fix

* object_nwc fixed

* object_ru2 object_rr and some of object_owl fix

* object_spot15_obj fix

* business scrub

* object_spot01_matoya fixed

* object_spot18_obj fix

* object_spot01_objects fix

* object_spot04_objects fix

* object_spot04_objects actually fixed

* object_spot12_obj fix

* object_timeblock fix

* object_spot06_objects fixed

* object_spot08_obj fix

* spot01_matoyab fix

* object_trap fix

* object_umajump fix

* object_vm fix

* z_en_niw_lady fix

* object_yukabyun fix

* object_zl1 fixed

* added offsets to object_os_anime

* object_md fix

* object_ane fix

* object_aob fix

* add palette comment

* object_spot00_objects fix

* spot00 fix

* remove unused asm

* updates

* Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815

* Updated object_bdan_objects, ran format.sh

* Change rgb5a1 to rgba16 in my object xmls

* Addressed Anghelo's comments

* review

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 11:53:58 -04:00