cadmic
9def6f4d0d
Set up multiversion assets with ZAPD and match gc-eu ( #1967 )
...
* Add ZAPD hack to deal with extracted/VERSION/ in include paths
* Extract assets to extracted/VERSION
* Add ZAPD flags to override virtual address / start offset / end offset
* Configure offsets for code and overlay assets
* Reorganize ZAPD configs
* Match gc-eu-mq
* Match gc-eu
* Remove old asset dirs during distclean
* Revert "Remove old asset dirs during distclean"
This reverts commit fc8027a75f
.
* make zapd addresses globals int64_t so they can store uint32_t addresses and -1
* slight cleanup extract_assets.py
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0285e11f0"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0285e11f0"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-06-24 15:22:39 +02:00
cadmic
39de6ce293
Extract unused scene headers ( #1930 )
...
* Extract unused scene headers
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "1300a4f36"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "1300a4f36"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* Add more unused arguments to CS_LIGHT_SETTING
2024-03-23 12:38:05 -04:00
Dragorn421
bdee3d33b4
No longer use asm-processor ( #1824 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "b3bfa14cf"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "b3bfa14cf"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* use CS_FLOAT
* update csdis
* update committed csdata
* finish updating csdis.py
* add script to reextract committed csdata
* dont use asm-processor, use iconv for reencoding utf8 to eucjp
* remove asm-processor csdata usage remnants
* --cs-float hex
* delete tempfile at end of reencode.sh (may want to rm even if compilation fails though?)
* comment reencode.sh
* comment CMD_F
* do not break permuter guessing compile command, by not reencode.sh-wrapping compilation under PERMUTER (thanks anghelo)
* fix the permuter fix
* pad -> sBssDummyNeg1
* reencode.sh: rm tempfile on script exit (including on error)
* renumber sBssDummy vars in zcolchk from 0
* Revert "--cs-float hex"
This reverts commit 85267dc348
.
* Revert BSS changes
* Add linemarker to reencoded files for better error message
* fix audio/general.c bss
* make reencode.sh work on macOS
* touch up csdis, csdis_re
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
2024-03-01 16:12:22 -05:00
louist103
c1a499c3ae
ZAPD Update ( #1605 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "2b6f459b9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "2b6f459b9"
git-subrepo:
version: "0.4.6"
origin: "???"
commit: "???"
* Update ZAPD
Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
---------
Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
2024-01-07 17:52:45 -05:00
Dragorn421
4e55168eaa
Update ZAPD ( #1569 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "094e79734"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "094e79734"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* Add EnumData.xml where some names are now externalized
* Remove legacy typedefs for zapd, no longer needed!
2023-10-24 21:36:10 -04:00
louist103
629757b3ae
git subrepo pull --force tools/ZAPD ( #1457 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "dcf56d93e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "dcf56d93e"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "dbb99be"
* Add files via upload
* Update Config.xml
2022-12-08 13:15:18 -05:00
louist103
5015af4c57
git subrepo pull --force tools/ZAPD ( #1251 )
...
subrepo:
subdir: "tools/ZAPD"
merged: "f54f2fa96"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "f54f2fa96"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
2022-06-03 00:48:52 +02:00
EllipticEllipsis
9b67778a00
Building on Macs ( #1086 )
...
* git subrepo pull (merge) tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "945e6ca1a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "50242eca9"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Fix extract_assets.py multithreading
* Update binutils doc a bit
* Remove * import, add multiprocessing option
and way to pass arguments to ZAPD
* Update format.sh to be more platform-independent
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "fd5a7f434"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "fd5a7f434"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Remove ;
* Update formatting script to not just use 11
* Add Python requirements,
move the Mac stuff in the README into its own doc
* Fix readme link
* Minor format thing
* .
* Move ZAPDArgs into its own function
* Update readme and remove requirements.txt
* Dragorn-inspired rewrite of processZAPDArgs
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "a0d3f7b68"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "a0d3f7b68"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Fix function definition
* Building docs overhaul
* Add Python packages to Mac and Cygwin
* Heading number
* format format.sh (!)
* Replace "currently"
* Remove Debian
* git subrepo pull (merge) --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0ba781304"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0ba781304"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2022-01-16 19:43:07 -05:00
fig02
68899c2e33
git subrepo pull --force tools/ZAPD ( #1049 )
...
subrepo:
subdir: "tools/ZAPD"
merged: "a3363333d"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "a3363333d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-12-03 21:57:05 +01:00
louist103
42b8cec3d0
Zapd hotfix ( #1009 )
...
* remove fake match
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "4f7b8393e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "4f7b8393e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-10-22 20:02:34 +02:00
louist103
750c0cab35
Update ZAPD ( #1001 )
...
* remove fake match
* 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"
* new extraction script and a hack to make clear tag work
* fix clear tag again
* remove static from clear tag DLists
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "e7a8a48cf"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "e7a8a48cf"
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: "e243634e5"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "e243634e5"
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: "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"
* Update ovl_En_Clear_Tag.xml
2021-10-17 13:32:09 +02: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
Anghelo Carvajal
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
louist103
201c9ec1cd
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)
2021-05-26 18:59:21 -04:00
Nicholas Estelami
0432011bd9
Updated to use latest version of ZAPD ( #777 )
...
* Updated config file
* Added missing files
* Temporarily removed asm_processor changes.
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "96ffc1e62"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "96ffc1e62"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "179af7d11"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "179af7d11"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Cleanup and fixes.
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "50ad2fe78"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "50ad2fe78"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Makefile fix
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "b9120803e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "b9120803e"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2021-04-30 23:23:22 +02:00
fig02
71bbaab485
git subrepo pull --force tools/ZAPD ( #742 )
...
subrepo:
subdir: "tools/ZAPD"
merged: "c4773301a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "c4773301a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-03-27 23:57:14 -04:00
fig02
493bdbc3c6
git subrepo pull --force tools/ZAPD ( #727 )
...
subrepo:
subdir: "tools/ZAPD"
merged: "4751db5c9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "4751db5c9"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-03-20 12:02:12 -04:00
fig02
42af56b231
git subrepo pull --force tools/ZAPD ( #718 )
...
subrepo:
subdir: "tools/ZAPD"
merged: "4bf6600a3"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "4bf6600a3"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-03-14 11:40:25 -04:00
Zelllll
20c1f4e648
Decompile Gameplay_Keep and fix all existing decompiled objects ( #595 )
...
* First batch of files
* Add missing folders back
* Fix missing folders again
* Finish fixing existing texture files
* Gameplay_Keep XML finished
* Most actor gameplay_keep undefined syms removed
* Only ~200 gkeep symbols remain
* All gkeep symbols that ZAP supports are fixed
* Cleanup, and make gkeep names more accurate
* Starting to figure out what some unknown blobs are, merge zeldaret in
* fix a few more things
* refactor gkeep
* Change how gitkeep is handled
* gkeep xml cleanup
* Gkeep finished, now just waiting up ZAP updates
* 100 link animations finished
* 150 link animations finished
* 200 link animations finished
* 250 link animations finished
* 350 link animations finished
* 400 link animations finished
* 450 link animations finished
* 500 link animations finished
* 550 link animations finished
* All Link animations finished
cannot build yet because ZAP doesn't have LinkAnimationHeader yet
* xml changes for new zap stuff
* finish gameplay_keep
* fixing existing objects
* ready for pr besides zap padding issue
* mostly ready for pr
* format all c files
* all conflicts fixed
* make changes that roman requested
* fix thing i didn't mean to change
* some animation symbols renamed
* fixed roman's stuff
* lifemeter hardcoded pointers removed
* fix issue with incorrect data in gameplay_keep
* removed unused asm
* fixed most of fig's comments
* fix all of fig's comments
* reformat files
* Update assets/xml/textures/icon_item_static.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update assets/xml/textures/icon_item_static.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* fixed stuff
* fixed most of roman's comments
* remove leading zeroes
* should build now
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "f84d8337b"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "f84d8337b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* all of gkeep symbols fixed
* compiler error fixed
* format files
* final changes
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-24 19:36:40 -05:00
fig02
588de66d06
git subrepo pull --force tools/ZAPD ( #653 )
...
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"
2021-01-22 16:25:08 -05:00
fig02
00a5edea71
Actor Struct Changes (and a few related things) ( #617 )
...
* reformat header
* type -> category
* done for now i think
* some more stuff
* first -> head
* focus
* flag comment
* ground -> floor
* remove asm, name wrapper funcs
* name func, format
* review
* targetPriority, format
* 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"
* comment
* review
* feet flags
* horse shadow
2021-01-18 16:04:04 -05:00
Ethan Roseman
bda5b83346
MacOS ZAPD fixes ( #606 )
...
* Adding -Wno-return-type to GCC check for MacOS
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0325ec161"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0325ec161"
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: "605f6972e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "605f6972e"
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: "6e6ad445a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "6e6ad445a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Rewrote func to avoid returns without values
2021-01-10 04:04:36 -05:00
fig02
1ff2f0f849
ZAPD update ( #612 )
...
* remove roompoly
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "fd4d53a26"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "fd4d53a26"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-01-08 19:38:28 -05:00
fig02
794538f6f7
ZAPD hotfix ( #599 )
...
* change parent
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "440ed2684"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "440ed2684"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-01-03 17:29:44 -05:00
fig02
ba0c6965ca
Remove submodule and use subrepo for ZAPD ( #591 )
...
* remove zap
* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "cd4a8760b"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "cd4a8760b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* remove thanks.md
* zap2 -> zapd and spec changes
* remove submodule init
2021-01-01 23:24:29 -05:00