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
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
8e4d1ccd3f
Fix all xmls to explicitly use offsets ( #859 )
...
* Forest and shadow temple
* fire temple
* Water temple
* Spirit temple
* Deku tree
* jabu jabu
* DC
* Inside Ganons castle
* GTG
* Castle courtyard
* great fairy's fountain
* chamber of sages
* shooting gallery
* Temple of time
* market
* back alley
* kokir shop
* goron shop
* zora shop
* House of skulltula
* bazarr
* potion shop
* gravekeepers hut
* lakeside lab
* hyrule field
* kak
* graveyard
* zoras river
* kokiri forest
* lake hylia
* zoras domain
* zoras fountain
* gerudo valley
* lost woods
* the rest of them
* cleanup
* final cleanup
* PR fixes (Zel)
* Fra -> FRA and cleanup map_name_static
* map_name_static
* DONE
* SHould be it
* Done done done done
* vector
* remove another pr
* ?
2021-07-06 19:18:13 +02:00
7446e5eb80
Decompile some more objects ( #848 )
...
* Object_FU limbs and skel OK
* limbs OK
* Object_FU textures OK
* Object_FU face textures OK
* Symbols in en_fu.c
* en_fu.c limb enum
* Remove Object_fu from undefined_syms, move textures to draw, and small cleanup
* Object_bird OK
* Object_Bird OK, added cutscene for shot sun, and song of storms
* Rainbow Bridge CS
* Great fairy CS
* Cutscene -> Cs
* remove '&' from Cutscenes
* Cleanup object_bird
* Update z_en_fu.c
* Update z_en_fu.h
* Update z_en_fu.c
* Update z_en_fu.h
* Update z_en_fu.h
* DC intro CS
* Zeldas lullaby CS
* Nabooru Knuckle CS
* Owl Lake Hylia CS
* Sun song CS
* Undefined sym in Boss Dodongo
* Missed a few more
* DC tex name
* Windmill man limbs
2021-06-29 19:22:36 +02:00
515ebdce9d
ZAPD update: libpng, zroom improvements and others ( #811 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "769f5702a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "769f5702a"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Add `libpng` to readme
* Remove `-ifp` since it doesn't exists anymore in ZAPD
* Remove extra print I added
* Add UNK_09 macro and other minor fixes
* Simplify PNG rules
* simplify gitignore
* Update README.md
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* Update dockerfile
* basic instructions for cygwin and mac
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "86160be69"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "86160be69"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Change nanoseconds to seconds in extract_assets.py
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-05-30 11:09:59 -04:00
8f9881ece2
Add UNK_09 macro and other minor fixes ( #813 )
...
(cherry picked from commit d3a6d4d2e1
2021-05-14 20:11:00 -04:00
9dbebfa38f
Change Hints in scene's XMLs ( #800 )
...
* Remove blobhint
* Add segments and offsets, and remove most hints
* Change PathHint to Path
* Add missing final new lines in scenes xmls
2021-04-30 20:23:50 -04:00
70978762b8
ovl_En_Xc and object_xc OK ( #746 )
...
* Started
* did some more
* did a few more
* update
* Fixed corrupted git repo
* did some more
* Did a few more functions
* taking a break
* fix undefined
* matched the stupid hard function
* a few more
* did some more, done for tonight
* commit in case i mess up
* 3 non matching
* .
* remove tools/ZAP2 from origin master
* idk
* i cant figure this out
* object_xc OK
* compiles now
* the evil function is now ok
* z_en_xc OK
* some documentation
* more documentation i guess
* more documentation
* more z_en_xc docs
* z_en_xc updates
* Final pass, its been nearly a year
* Remove unnecessary comment
* forgot to remove unused asm
* Merge
* Made suggested changes and fixed warnings in z_en_xc
* Remove symbols from undefined_syms.txt
* Add some missing animmode to en_Xc
* review
* review
* fix tot cutscene
* comment
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com >
Co-authored-by: Fig02 <fig02srl@gmail.com >
2021-04-14 18:49:56 -04:00
9e956cbe3f
object_horse and object_hni ( #772 )
...
* object_horse_zelda
Signed-off-by: angie <angheloalf95@gmail.com >
* object_horse_normal
Signed-off-by: angie <angheloalf95@gmail.com >
* object_horse_link_child
Signed-off-by: angie <angheloalf95@gmail.com >
* object_horse_ganon
Signed-off-by: angie <angheloalf95@gmail.com >
* object_horse
Signed-off-by: angie <angheloalf95@gmail.com >
* object_hni
Signed-off-by: Angie <angheloalf95@gmail.com >
* ZAPD is falling to do vtx
Signed-off-by: Angie <angheloalf95@gmail.com >
* Testing
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename horse_link_child variables
Signed-off-by: angie <angheloalf95@gmail.com >
* horse_zelda with names
Signed-off-by: angie <angheloalf95@gmail.com >
* I'm suspecting that this game doesn't use z_en_horse_ganon
Signed-off-by: angie <angheloalf95@gmail.com >
* Child epona eye textures
Signed-off-by: Angie <angheloalf95@gmail.com >
* Extract eyes textures from Epona
Signed-off-by: Angie <angheloalf95@gmail.com >
* Small rename
Signed-off-by: Angie <angheloalf95@gmail.com >
* change references in EnHorseNormal
Signed-off-by: angie <angheloalf95@gmail.com >
* Rename a few HorseNormal animations
Signed-off-by: angie <angheloalf95@gmail.com >
* Add normal horse eye texture
Signed-off-by: angie <angheloalf95@gmail.com >
* Add some textures
Signed-off-by: angie <angheloalf95@gmail.com >
* change pointers in EnViewer
Signed-off-by: angie <angheloalf95@gmail.com >
* Rename some animations of HorseGanon
Signed-off-by: angie <angheloalf95@gmail.com >
* Add a few dlists in object_horse
Signed-off-by: Angie <angheloalf95@gmail.com >
* Add whinnies
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename last animations remaining in horse_normal and horse_ganon
Signed-off-by: angie <angheloalf95@gmail.com >
* remove the other horses from this branch
Signed-off-by: angie <angheloalf95@gmail.com >
* Rename Epona animations
Signed-off-by: angie <angheloalf95@gmail.com >
* rename animations of ingo's horse
Signed-off-by: angie <angheloalf95@gmail.com >
* add textures in hni
Signed-off-by: angie <angheloalf95@gmail.com >
* Give proper animation names
Signed-off-by: angie <angheloalf95@gmail.com >
* Update symbols
Signed-off-by: angie <angheloalf95@gmail.com >
* cutscenes
Signed-off-by: angie <angheloalf95@gmail.com >
* ./format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
* Add most of epona's textures and some limbs
Signed-off-by: angie <angheloalf95@gmail.com >
* add a bunch of textures and limbs of hni
Signed-off-by: Angie <angheloalf95@gmail.com >
* typo
Signed-off-by: Angie <angheloalf95@gmail.com >
* trailling comma memes
Signed-off-by: Angie <angheloalf95@gmail.com >
* all textures from hni
Signed-off-by: angie <angheloalf95@gmail.com >
* The remaining epona's textures
Signed-off-by: Angie <angheloalf95@gmail.com >
* Use proper names for bridge cutscene
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com >
2021-04-14 17:12:00 -04:00
3aad8f7244
object_du OK ( #693 )
...
* .gitkeep and xml
Signed-off-by: angie <angheloalf95@gmail.com >
* comment out most of the xml
Signed-off-by: angie <angheloalf95@gmail.com >
* add all animations
Signed-off-by: angie <angheloalf95@gmail.com >
* textures
Signed-off-by: angie <angheloalf95@gmail.com >
* more textures
Signed-off-by: angie <angheloalf95@gmail.com >
* another texture
Signed-off-by: angie <angheloalf95@gmail.com >
* eye and mouth textures
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* add to spec and comment out a problematic skeleton
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* replace almost all d_ references
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* add missing include
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* fix problems with overlapping data
Signed-off-by: angie <angheloalf95@gmail.com >
* replace references to Darunia's skeleton
Signed-off-by: Angie <angheloalf95@gmail.com >
* rename cutscenes in en_du
Signed-off-by: Angie <angheloalf95@gmail.com >
* last renaming
Signed-off-by: Angie <angheloalf95@gmail.com >
* ups, forgot to delete some pointers from undefined_syms.txt
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename the animations
Signed-off-by: angie <angheloalf95@gmail.com >
* run format
Signed-off-by: angie <angheloalf95@gmail.com >
* gDaruniaSageFormationAnim
Signed-off-by: angie <angheloalf95@gmail.com >
* update actor symbols from object
Signed-off-by: angie <angheloalf95@gmail.com >
* rename eyes
Signed-off-by: angie <angheloalf95@gmail.com >
* rename a mouth texture
Signed-off-by: angie <angheloalf95@gmail.com >
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* typo
Signed-off-by: angie <angheloalf95@gmail.com >
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com >
* link of the pr
Signed-off-by: Angie <angheloalf95@gmail.com >
* update the cs name to the correct one
Signed-off-by: angie <angheloalf95@gmail.com >
* tlut
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* add object name to outname in palettes
Signed-off-by: angie <angheloalf95@gmail.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-03-27 23:02:45 -04:00
da55eaa2d8
En_Zl4 ( #590 )
...
* significant progress
* cutscene data
* match
* docs
* dist from link
* compiler warnings
* cutscene and such
* object decomp
* stuff
* cleanup
* name some things
* stuff
* cutscenes fixed
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "44f5d7cb9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "44f5d7cb9"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* reorder
* unused content
* documented cutscene dlists
* enviewer update
* Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* formatter
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
Co-authored-by: Fig02 <fig02srl@gmail.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-02-12 17:16:40 -05:00
6615d212eb
Demo_Kekkai, its object, and its cutscenes ( #627 )
...
* first pass
* scene
* object
* name
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "44f5d7cb9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "44f5d7cb9"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* now with cutscenes
* one last name
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* ZAPD works
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "2e1174063"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "2e1174063"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* now with vtx arrays
* revert zap changes
* review
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
Co-authored-by: Fig02 <fig02srl@gmail.com >
2021-02-01 14:52:23 -05:00
b95643b397
Updated Texture Asset Handling ( #478 )
...
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Finished matching remaining scenes.
* Removed old commented out spec lines
* Decompiled a few object files.
* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.
* Updated texture and object file decomp
* Fixed newline issue with ZAPD
* Moved scenes/ into the assets/ folder
* Fixed a few compile errors
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Finished matching remaining scenes.
* Removed old commented out spec lines
* Decompiled a few object files.
* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.
* Updated texture and object file decomp
* Moved scenes/ into the assets/ folder
* Fixed a few compile errors
* Fixed merge issues.
* Fixed makefile merge error
* Fixed additional merge error
* Fixed several more merge issues
* Commented out gameplay_keep and sk2 extraction, since currently unused.
* Reenabled gameplay_keep extraction since it's used in the spec
* Fixed build error
* Removed test struct
* Fixed makefile error that would happen on fresh builds
* Fixed merge issue
* Removed relative paths
* Multithreading on extraction, spec uses numbers, few changes to XMLs
* Removed redundant code from the extract_assets script
* object_sk2 and object_spot09_obj OK
* object_spot11_obj OK
* object_spot17_obj OK
* Test: One of the gameplay_keep dlists given a proper symbol
* Updated asset symbol names based on new naming scheme
* XMLs use "Offset" instead of "Address" now
* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file
* Updated to use latest build of ZAPD
* Updated ZAPD again
* Updated ZAP to remove assimp dependency
* Jenkins Test: Added .gitkeep file
* Updated ZAP once more
* Updated png file name to comply with new naming scheme.
* Fixed bad include
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com >
2020-12-26 06:39:52 -05:00
Lucas Shaw