Roman971
b0bfa9eb69
Fix asset file includes to always start with assets/ ( #1260 )
...
* Fix asset includes to consistently start with assets/
* Fix header paths in asset xmls to start with assets/
* Remove -Iassets from compiler options
2022-06-06 15:37:25 -04:00
louist103
71be03da7c
Asset header split ( #1023 )
...
* merge master
* gi objects
* Some more and fix dungeon keep and field keep
* the rest of them
* fix field keep
* Remove extra underscore
2022-01-17 17:38:32 -05:00
louist103
665283432b
Even more objects ( #913 )
...
* malon adult limbs and enum
* malon adult animations
* Malon Adult textures
* Object_ma2 OK
* Cleanup undefined syms file
* more cleanup
* object_in OK
* change
* Object_TA limbs and Limb DLs ok
* Textures in DLs OK
* Object TA animations OK
* Object TA OK
* clean up the xml
* almost done with impa textures
* name impa draw funcs
* fix globalCtx2 in talon_init
* more progress in impa
* eye texture stuff
* impa OK
* remove files
* fix messed up merge
* Switch MA2 blink timer from hex
* Name a function
* Fix skelanime fixer
* Missing malon adult TLUT
* add some missing symbols in DemoEc
* Fix conflicts, part2
* Clean up TLUT related stuff and some minor things
* Remove unused externs from z_demo_ec
* Remove unused symbols from undefined_syms.txt
* PR fixes (Dragorn)
* Dragorn fixes
* Fix various texture-related issues in object_link_child
* Update assets/xml/objects/object_in.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_ta.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_ta.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_ta.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_ta.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_in.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_in.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_in.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_in.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update assets/xml/objects/object_in.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* fix ingo and the rest of Dragorns fix
* impa fixes
* fix ingo again
* fix windmill man missing TLUT
* Fix impa in viewer
* Roman's fixes
* Add limb
* Missed an animation
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 19:37:36 +01:00
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
Anghelo Carvajal
5c147e5e03
ZAPD update: Gotta go fast! ( #877 )
...
* copy over the xml
* Rename anims
* A bunch of renames
* minor extract_assets fixes
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "820678b4e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "820678b4e"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Change rgb5a1 to rgba16
* eye and eyebrows
* some dlists
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6be9af65d"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "6be9af65d"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
2021-07-27 22:16:03 -04:00
Roman971
fa0a0fe81b
Decompile Fishing and document object_fish ( #856 )
...
* Start decompiling Fishing
* Decompile more functions in Fishing
* Decompile a few more functions in Fishing
* Decompile func_80B6E9E0 and func_80B7825C (non matching)
* Minor Fishing cleanups
* Migrate fishing bss to C and match 3 functions
* Decompile and match Fishing_Update
* Migrate fishing data to C and minor cleanups
* Fix the object_fish xml and use its symbols in Fishing
* Partially document Fishing and object_fish
* Add more documentation/cleanups to Fishing and object_fish
* Use object_fish symbols in Demo_Ec and fix naming
* Minor fixes to Fishing docs
* Apply review suggestions for Fishing
* Apply 2 more review suggestions for Fishing
* Apply some review suggestions for Fishing
2021-07-04 13:42:17 -04:00
Anghelo Carvajal
4d5d1fd079
Add every unreserved object in an automated way ( #805 )
...
* it's crashing
* fix stuff
* fix xmls
* problematic objects
* fix tabs
* Fix suffixes
* add missing new lines
* Add comments to the problematic objects
* Find and replace fixes
* Add Fig's objects
* I forgot to add a Name in a cutscene, so I'm adding it here
* Update object decomp tutorial a little bit
* Update problematic objects
* Update docs/tutorial/object_decomp.md
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Change comments
* comment out a few blobs
* dammit tluts
* Change a bunch of objects
* update the last bunch
* update comments on oA11 and oB2
* Ninja-edit to fix compatibility with ZAPD's PR 142
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-05-16 12:36:40 -04:00
