mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into gc-eu-mq-disasm

Browse source
This commit is contained in:
cadmic 2024-01-24 15:48:20 -08:00
commit 08038979a7
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -288,7 +288,7 @@ ifneq ($(COMPARE),0)
@md5sum -c baseroms/$(VERSION)/checksum.md5 @md5sum -c baseroms/$(VERSION)/checksum.md5
endif endif
compressed: $(ROMC) compress: $(ROMC)
ifneq ($(COMPARE),0) ifneq ($(COMPARE),0)
@md5sum $(ROMC) @md5sum $(ROMC)
@md5sum -c baseroms/$(VERSION)/checksum-compressed.md5 @md5sum -c baseroms/$(VERSION)/checksum-compressed.md5
@ -325,9 +325,9 @@ endif
$(N64_EMULATOR) $< $(N64_EMULATOR) $<
.PHONY: all rom compressed clean setup disasm run distclean assetclean .PHONY: all rom compress clean setup disasm run distclean assetclean
.DEFAULT_GOAL := rom .DEFAULT_GOAL := rom
all: rom compressed all: rom compress
#### Various Recipes #### #### Various Recipes ####

2
README.md
View file

@ -121,7 +121,7 @@ Keep in mind that for each new terminal session, you will need to **activate** t
Now you can install the Python dependencies, to do so run: Now you can install the Python dependencies, to do so run:
```bash ```bash
python3 -m pip install -U -r requirements.txt pip install -U -r requirements.txt
``` ```
#### 4. Prepare a base ROM #### 4. Prepare a base ROM

2
tools/mkdmadata.c
View file

@ -54,7 +54,7 @@ static void usage(const char *execname)
fprintf(stderr, "zelda64 dmadata generation tool v0.01\n" fprintf(stderr, "zelda64 dmadata generation tool v0.01\n"
"usage: %s SPEC_FILE DMADATA_TABLE COMPRESS_RANGES\n" "usage: %s SPEC_FILE DMADATA_TABLE COMPRESS_RANGES\n"
"SPEC_FILE file describing the organization of object files into segments\n" "SPEC_FILE file describing the organization of object files into segments\n"
"DMADATA_TABLE filename of output dmadata table header\n", "DMADATA_TABLE filename of output dmadata table header\n"
"COMPRESS_RANGES filename to write which files are compressed (e.g. 0-5,7,10-20)\n", "COMPRESS_RANGES filename to write which files are compressed (e.g. 0-5,7,10-20)\n",
execname); execname);
} }