mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-22 06:44:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,711 Commits 1 Branch 0 Tags
5dd19e4862efdcca3b6d0c9f48c5ea829e583fd2
Commit Graph

73 Commits

Author SHA1 Message Date
cadmic 5dd19e4862 Use virtualenv in Makefile for python dependencies (#1619) 
* Use virtualenv in Makefile for python dependencies

* Create separate targets for venv creation and installation

* Fix install-python-deps prerequisite

* Try simplifying Jenkinsfile

* Simplify venv targets

* Fix merge

* Update README.md

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

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-01-25 01:39:13 +01:00
cadmic 16f9ff39be Rename make compressed to make compress (#1620) 2024-01-24 18:02:53 -05:00
Anghelo Carvajal 3d9db8d34d Setup rom decompression and compression (#1614) 
* decompress baserom

* cleanup

* specific hash check

* rename baserom

* git subrepo clone (merge) --branch=5da3132606e4fd427a8d72b8428e4f921cd6e56f git@github.com:z64tools/z64compress.git tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "5da313260"
upstream:
  origin:   "git@github.com:z64tools/z64compress.git"
  branch:   "5da3132606e4fd427a8d72b8428e4f921cd6e56f"
  commit:   "5da313260"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* setup compression

* Add all compressed segments to the spec

* Update md5 files

* readme instructions

* cleanup

* Setup python dependencies on Jenkinsfile

* Update Makefile

Co-authored-by: cadmic <cadmic24@gmail.com>

* review

* . .venv/bin/activate

* update readme

* whoops

* Yeet other versions from decompress_baserom.py

* my bad

* Move everything to baseroms/VERSION/

* Active venv on each command

* jenkinsfile: use multiline syntax

* Put the correct path on the jenkinsfile

* Forgot to call per_version_fixes

* CC0

* Update readme

* Change where baserom segments are put into

* Update Makefile

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

* Update crunch64

* Label compressed instead of uncompressed

* Update README.md

Co-authored-by: fig02 <fig02srl@gmail.com>

* Fix

* `make rom`

* baserom-uncompressed

* Update README.md

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

* Update README.md

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

* Update README.md

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

* Update README.md

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

* Update README.md

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

* review

* baserom-decompressed.z64

* ignore baseroms

* rm -rf tools/z64compress

* wip crunch64-based compress.py

* OK compress

* use ipl3checksum sum directly for cic update on compressed rom

* multithreading

* "docs"

* fix MT: move set_sigint_ignored to global level for pickling

* license compress.py

* rm junk

* Fix (or at least sort out) compress_ranges.txt dependencies

* Update tools/overlayhelpers/damage_table.py

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

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-01-24 13:00:10 -05:00
cadmic 324db1d578 Replace most osSyncPrintf calls with PRINTF macro (#1598) 
* Replace most osSyncPrintf calls with PRINTF macro

* DEBUG -> OOT_DEBUG
 2024-01-12 10:38:13 -05:00
Yanis42 8a09f33c8f Makefile: Change EMULATOR := to N64_EMULATOR ?= (#1608) 
* ``EMULATOR :=`` -> ``N64_EMULATOR ?=``

* change other instances of EMULATOR and removed EMU_FLAGS

* missing one EMULATOR
 2024-01-09 12:49:12 -05:00
cadmic cd917b0cb8 Create debug macros for common functions (#1597) 
* Create debug macros for common functions

* Revert NDEBUG change

* MALLOCR -> MALLOC_R

* DEBUG -> OOT_DEBUG

* Use the same name for debug and non-debug matrix functions

* Fix file/line argument order

* Revert g[s]DPNoOp[Tag]

* Use SystemArena_MallocDebug directly in GameAlloc_MallocDebug

* MTXF_TO_MTX -> MATRIX_TO_MTX
 2024-01-09 07:59:03 -05:00
cadmic 25ff0a27de Create separate build directories based on version (#1591) 
* Create separate build directories based on version

* Fix find_unused_asm.sh

* Remove find_unused_asm.sh from Jenkinsfile

* Revert diff.py

* Clarify that gc-eu-mq is not "supported" yet

* Revert xmlcreate.py (to be deleted)

* Remove gc-eu-mq for now

* Add version flags to diff_settings.py and sym_info.py

* --version -> --oot-version

* Fix --oot-version

* Revert adding version flags to tools

* Delete find_unused_asm.sh

* Revert changes to first_diff.py output in tutorial

* Factor out sed usages for spec
 2024-01-05 23:27:19 +01:00
cadmic 1f9c28f370 Change ?= to := for Makefile variables (#1599) 
* Change ?= to := for most Makefile variables

* Remove empty ?= assignments

* Revert "Remove empty ?= assignments"

This reverts commit 3db472faea.
 2023-12-16 16:45:02 -05:00
Tharo 3475651701 libc cleanup (#1568) 
* libc cleanup

* Suggested changes, small alloca tweak

* Remove printf include
 2023-10-27 16:06:44 +02:00
Tharo 503f6d86d5 Track most header dependencies for include/tables headers (#1566) 
* Makefile automatically rebuild source files including headers from include/tables

* Fix typo, make z_actor.c also depend on actor_table.h

* Add message data dependencies for z_message_PAL, adjust comments
 2023-10-20 19:14:52 +02:00
fig02 2875ab4fcf Emulator related changes in the makefile (#1528) 
* emu related changes to make file

* spaces

* add error

* remove unwanted file (thanks ares)
 2023-08-28 18:48:52 -04:00
engineer124 d307a37233 Reorganize Audio Files & Name Remaining Audio Files (#1494) 
* reorganize audio files

* audio code files

* split audio and libaudio

* audio_init_params to audio_configuration

* simplify file names

* move aisetnextbuf to libaudio

* move src/audio -> src/code/audio

* adjust makefile comment

* reorganize again into internal/external

* adjust comment

* restructure again
 2023-07-06 17:55:10 -04:00
Billy 8e04ae917f Improve missing mips-linux-gnu error message (#1497) 
* Improve error message and match up with https://github.com/zeldaret/mm/pull/1173

* Update Makefile

More descriptive error messaging

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

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2023-03-20 11:07:18 -04:00
playerskel 9f0b7bb8a3 another round of trailing whitespaces (#1495) 2023-02-26 17:26:07 +01:00
Roman971 1cb00350d9 Skip compiling C-included files during the build (#1386) 
* Update the makefile to skip .inc.c files when building

* Rename all C-included source files to .inc.c
 2022-10-04 12:36:25 +02:00
Roman971 1652b7e5d7 Fix audio strings with -use_readwrite_const and -signed (#1324) 
* Fix audio strings with -use_readwrite_const and -signed

* Add comments for audio flags in makefile
 2022-07-29 20:35:09 -04:00
Roman971 08c8126ba5 Enable int-conversion warnings and fix all current instances (#1280) 
* Enable int-conversion warnings for gcc/clang

* Fix all current int-conversion warnings

* Run format.sh

* Apply review suggestions
 2022-06-15 20:15:44 -04:00
Roman971 feadb0d9ee Enable more IDO warnings and apply fixes (#1264) 
* Update asm-processor and fix includes with EARLY

* Enable more IDO warnings and disable unwanted warning 516

* Fix most new and remaining warnings

* Improve skelanime comment

* Improve asmproc pragma comment

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Add suggested comment for a wrong prototype

* Update asm-processor with the latest fix

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
 2022-06-12 19:24:45 -04:00
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
Tharo 4775fd4a7e Rename and move handwritten asm files (#1254) 
* Rename handwritten asm files and move them to src

* Fix progress.py

* Remove handling for asm dir from Makefile
 2022-06-03 16:33:18 -04:00
EllipticEllipsis 0e51a51fb1 Document SkelCurve system (#1192) 
* Rename and document SkelCurve

* AVOID_UB in DemoTreLgt_OverrideLimbDraw

* Rename code_8006C510

* Objdump flags in the makefile

* Move CC_CHECK above compilation

* Review 1

* Review 2

* Review 3

* Review
Add doxygen comments to file head
use angle macro,
improve bug comment,
make arguments of SkelCurve_Draw more consistent,
Change this temp to pad in MagicWind
 2022-05-20 02:27:54 -04:00
EllipticEllipsis 912b916875 Tweak preprocessing to work on both clang and gcc (#1212) 2022-05-01 18:14:44 -04:00
EllipticEllipsis e84f5ab387 Memstuff (#1164) 
* Un-fake a couple of matches in memory manip functions

* Document fmodf

* Un-fake a couple of matches in memory manip functions

* Document fmodf

* Rename functions and files

* Document memmove, memsets, memcpys

* Format

* Sort out some missing sizeofs

* Name fmodf

* Rename local variables

* size_t

* Use COBRA_SHADOW_TEX_SIZE

* Review

* Tweak the Doxyfile to remove @brief requirement

* Roman's review

* Fix a bug comment

* Change fmodf
 2022-05-02 00:06:35 +02:00
Tharo 7334ffa373 Improve the state of handwritten assembly files (#865) 
* Format all handwritten asm and document some

* Use c preprocessor for constants

* Fix

* Fix PI_STATUS_ERROR, some label improvements

* Avoid hi/lo for constants

* Some more comments

* Properly mark functions as functions and their sizes

* Fix merge

* Improvements

* Review suggestions, rework procedure start/end macros to be more like libreultra

* Move IPL3 symbol definitions into ipl3.s

* Fix undefined_syms, add include and language guards to asm.h and fix the comment in gbi.h

* Consistent hex capitalization, add some MIPS builtin defines to CC_CHECK to behave properly

* Add -no-pad-sections assembler option and clean up alignment in gu files and bzero

* Further suggestions and improvements

* Matrix conversion function clarifications

* Fix passing AVOID_UB to gcc

* Suggestions

* Suggestions, global interrupt mask improvements

* Further suggestions, interrupt mask comments

* Comments fixes, rdb.h

* Switch from # comments to // comments, remove unnecesary .set gp=64 directives

* Further review suggestions

* Missed one
 2022-05-01 01:03:22 +02:00
Tharo 362bc5e613 Name fmodf (#1162) 2022-03-01 20:29:42 +01:00
Pierre de La Morinerie 267e20dd4c tools: teach msgenc to avoid comments (#1151) 
Currently the C preprocessor is used to remove comments from the text
files before encoding them.

However the option used (`-fpreprocessed`) is only supported by gcc –
but not by clang, which breaks the macOS build.

By using Python to remove comments, we can remove the use of this
gcc-specific option, and fix the macOS build.
 2022-02-20 20:01:06 +01:00
Revo c3533052ca Add GCC compiler option. (#1056) 
* GCC support.

* Add note about gcc-mips-linux-gnu requirement to README.md.

* changes

* changes based on Tharo's suggestion

* Cant reproduce file_choose.h error. Removing unnecessary -I

* changes

* wording based on Fig's suggestion

* add AVOID_UB for eyes/mouth reordering issue.

* remove unneeded flags and deprecate ZAPDFLAGS.

* some changes, waiting on prs for the rest

* fixes

* discard header sections

* change section handling in mkldscript

* avoid_ub in DmaMgr_GetFileNameImpl

* move asm to inline asm (consolidate gcc functions)

* change prefix back

* remove space

* fix warnings

* Revert "remove space"

This reverts commit 94af6977b3.

* Revert "fix warnings"

This reverts commit d729ddf457.

* finish up missing_gcc_functions

* revert unwanted mkldscript change

* temporary workaround. TODO: Stop the asm processor from choking

* fix ido build

* Revert "temporary workaround. TODO: Stop the asm processor from choking"

This reverts commit 9df892b7ac.

* review

* remove unused line in mkldscript

* remove tabs

* clarify zf comment

* review2

* review

* remove duplicate cc_check

* vanilla code always come first

* std_dma avoid ub

* add compiler_gcc to cflags

* only use two blocks when necessary

* clarify zf comment

Co-authored-by: fig02 <fig02srl@gmail.com>
 2022-02-19 16:50:56 -05:00
Tharo 251d90301c Make text headers encoding more robust (#1145) 
* Improve encoding stage of text headers

* Fix r string

* Remove another unnecessary backslash
 2022-02-15 00:26:03 +01:00
EllipticEllipsis eadc477187 New relocation-generating program (#1016) 
* Update makefiles

* git subrepo clone git@github.com:EllipticEllipsis/fado.git tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "46c4d751a"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "46c4d751a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "88114ebce"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "88114ebce"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* A few ideas for computing dependencies

* Remove reserved identifiers from spec.h and util.h
and add required headers

* Fix a couple more headers

* Program for reloc prerequisites

* git subrepo pull tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "36a905f72"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "36a905f72"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Update makefile to make dependency files and use overlay's name

* git subrepo pull tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "43c339a59"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "43c339a59"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Change awk to grep, delete ZAPD files, gitignore elf

* Delete all the cfg files

* Fix memory leaks

* Rename and add coloured errors

* Makefile tweaks
- preprocess spec before grep
- split order prerequisites via phony target to reduce dependency edges
- remove `resources` target
- remove separate overlays targets
- use `$(SPEC)` throughout
- change to using filenames of relocs for overlay names via `$*`
- Rearrange targets to better reflect their categories

* Update gitignore

* Review

* Add a check for the reloc file name

* get_segment_by_name

* get_stmt_id_by_stmt_name

* Cleaning up

* algorithm change

* function rename

* Fix typos

Co-authored-by: angie <angheloalf95@gmail.com>
 2022-02-06 14:40:26 -05:00
Tyler Phillips 4b4099e84c Expose MIPS_BINUTILS_PREFIX for building on alternative platforms (#1076) 
* Define MIPS_BINUTILS_PREFIX for crossdev generated binaries (mips-gentoo-linux-gnu)

* Update error message to reflect binutils prefix

* Add documentation around MIPS_BINUTILS_PREFIX

* Clear up documentation

* Update Makefile

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

* Update Makefile

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

* Update Makefile

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

* Update Makefile

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

* Update Makefile

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

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2022-01-20 00:57:39 +01:00
louist103 0a48548da7 Extract z_select_static (#1074) 
* merge master

* z_select_static OK

* remove jenkins file

* missed a DL

* Update z_select_static.xml

* new ZAPD
 2022-01-17 18:42:33 -05: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
Tharo f1d183d6fe libultra files and directories restructure (#1038) 
* Restructure files, begin header restructure

* Format

* us2dex

* Fix parallel spelling

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>

* Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer

* Uppercase hex, exception vector address defines

* Interrupt flags 1

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

* Interrupt flags 2

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

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-11-30 19:08:57 -05:00
Tharo 04a9d51e90 Rework handling of dmadata (#1036) 
* Generate dmadata

* Remove tab indentations in mkdmadata.c and mkldscript.c

* Fix

* Review suggestions

* Hopefully fix

* Fix index

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

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2021-12-01 00:29:09 +01:00
Roman971 1fa6e3874b Move kaleido scope and map mark data to a misc folder (#1033) 2021-11-28 08:25:30 -05:00
Tharo a497f33bda z_message_PAL, message_data_static and surrounding doc (#996) 
* Initial progress on z_message_PAL, very messy

* Fix merge

* Some more progress

* Fix merge

* More z_message_PAL

* Small progress

* More small progress

* message_data_static files OK

* Prepare z_message_tables

* Matched another function, small updates

* Attempt to use asm-processor static-symbols branch

* Refactor text id declarations

* Begin large text codes parser function

* Fix merge

* Refactor done

* Build OK, add color and highscore names

* Remove encoded text headers and automatically encode during build

* Fix kanfont

* Various cleanups

* DISP macros

* Another match aside data

* Further progress

* Small improvements

* Deduplicate magic values for text control codes, small improvements

* Tiny progress

* Minor cleanups

* Clean up z_message_PAL comment

* Progress on large functions

* Further progress on large functions

* Changes to mkldscript to link .data in the .rodata section

* data OK

* Few improvements

* Use gDPLoadTextureBlock macros where appropriate

* rm z_message_tables, progress on large functions

* 2 more matches

* Improvements

* Small progress

* More progress on big function

* progress

* match func_80107980

* match Message_Update

* match func_8010BED8

* done

* Progress on remaining large functions

* Small progress on largest function

* Another match, extract text and move to assets, improve text build system

* Small nonmatchings improvements

* docs wip

* Largest function maybe equivalent

* Fix merge

* Document do_action values, largest function is almost instruction-matching

* Rename NAVI do_action to NONE, as that appears to be how that value is used in practice

* Fix merge

* one match

* Last function is instruction-matching

* Fix

* Improvements thanks to engineer124

* Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup

* More variables labeled, use text state enum everywhere

* More labels and names

* Fix

* Actor_IsTalking -> Actor_TalkRequested

* Match func_8010C39C and remove unused asm

* More docs

* Mostly ocarina related docs

* All msgModes named

* Fix assetclean

* Cleanup

* Extraction fixes and headers

* Suggestions

* Review suggestions

* Change text extraction again, only extract if the headers do not already exist

* Fix

* Use ast for charmap, fix assetclean for real this time

* Review suggestions

* BGM ids and ran formatter

* Review comments

* rename include_readonly to include_data_with_rodata

* Remove leading 0s in number directives

* Review suggestions for message_data_static

* textbox pos enum comments, rename several enum names from Message to TextBox

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <romanlasnier@hotmail.com>
 2021-11-22 20:20:30 -05:00
louist103 8ac359fda5 Only use the ASM processor where it is needed (#919) 
* remove fake match

* Remove asm processor from files that don't need it

* Update Makefile
 2021-09-18 13:13:53 -04:00
Anghelo Carvajal 672cc6e90d Add -I. (#971) 
* Add `-I.`

* Remove unused rule
 2021-09-18 14:07:51 +02:00
Anghelo Carvajal 45012658d3 Track XML extraction time (#826) 
* extracted-assets.json

* delete `.extracted-assets.json` in distclean

* Move `rm .extracted-assets.json` to `assetclean`
 2021-05-26 19:40:48 -04:00
louist103 a597d71e54 Add clean assets (#785) 
* makefile change

* also delete

* Add cleantools

* rename cleanassets and assetclean

* add rules to PHONY in makefile

* Remove toolsclean
 2021-05-17 19:50:19 +02:00
Anghelo Carvajal ea703138bb Simplify PNGs rules in the makefile (#814) 
* simplify rules

* update `-eh`
 2021-05-15 14:14:51 -04:00
EllipticEllipsis 278e471074 Delete -j from make setup and document use of -jN and -j in readme (#804) 
* Add nproc to make setup

* Add cross-platform nproc equivalents

* Scrap that, just ditch -j in makefile altogether

* Clarified thread advice
 2021-05-03 13:37:54 -04:00
Roman971 4e9f40cb13 Update asm-processor and add make dependencies for global asm and early includes (#801) 
* Update asm-processor to latest master

* Add make dependencies for global asm and early includes

* Update asm-processor to latest master
 2021-05-02 16:21:27 -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
Anghelo Carvajal fa5e785760 Add needed rules for prerenders extraction (#752) 
* update makefile

Signed-off-by: Angie <angheloalf95@gmail.com>

* change jfif to jpg

Signed-off-by: angie <angheloalf95@gmail.com>
 2021-04-03 00:07:29 +02:00
Anghelo Carvajal 867b5a87ba Add distclean rule to makefile (#716) 
* Add clean_everything rule to makefile

Signed-off-by: angie <angheloalf95@gmail.com>

* change `clean_everything` to `distclean`

Signed-off-by: angie <angheloalf95@gmail.com>

* Somehow forgot to commit the makefile

Signed-off-by: angie <angheloalf95@gmail.com>

* Remove nuke

Signed-off-by: angie <angheloalf95@gmail.com>

* Remove redundant variables

Signed-off-by: angie <angheloalf95@gmail.com>

* Forgot to remove `TEXTURE_DIRS`

Signed-off-by: angie <angheloalf95@gmail.com>
 2021-03-14 12:07:46 -04:00
Lucas Shaw 6fd644dff5 libm.s -> ll.c (#661) 
* .

* remove tools/ZAP2 from origin master

* libm.s -> ll.c

* fix progress.py (i think?)
 2021-01-31 13:27:50 -05:00
Random be84e1f0f8 Add Cygwin support (#594) 
* Add Cygwin support

* revert .gitignore changes

* Add Cygwin instructions

* corrections

* specify dependencies in README.md
 2021-01-20 14:46:25 -05:00
Roman971 5c6335f9fb Remove touchasset.py to improve build performance (#611) 2021-01-08 17:42:05 -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