pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Yay0 matching compression OK! :nice:

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-17 17:08:57 -04:00
parent 948697d3d8
commit de8d3fd839
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -11,6 +11,7 @@ SRC_DIRS := src src/os src/os/nusys
ASM_DIRS := asm asm/os
INCLUDE_DIRS := include include/PR src
DATA_DIRS := bin
YAY0_DIRS := bin/Yay0
# Source code files
C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c))
@ -26,6 +27,7 @@ O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \
$(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \
$(foreach file,$(DATA_FILES),$(BUILD_DIR)/$(file:.bin=.o)) \
YAY0_FILES := $(foreach file,$(YAY0_FILES),$(BUILD_DIR)/$(file:.bin=.bin.Yay0))
####################### Other Tools #########################
@ -69,7 +71,7 @@ submodules:
git submodule update --init --recursive
split:
rm -rf $(DATA_DIRS) && ./tools/n64splat/split.py baserom.z64 tools/splat.yaml . --modes ld bin
rm -rf $(DATA_DIRS) && ./tools/n64splat/split.py baserom.z64 tools/splat.yaml . --modes ld bin Yay0
split-all:
rm -rf $(DATA_DIRS) && ./tools/n64splat/split.py baserom.z64 tools/splat.yaml . --modes all
@ -97,9 +99,10 @@ $(BUILD_DIR)/%.o: %.c $(H_FILES)
$(BUILD_DIR)/%.o: %.bin
$(LD) -r -b binary -o $@ $<
$(BUILD_DIR)/%.Yay0: %.bin
tools/Yay0compress $< $@
$(LD) -r -b binary -o $@ $<
$(BUILD_DIR)/%.bin.Yay0: %.bin
mkdir -p build/bin/Yay0
tools/Yay0compress $< $<.Yay0
$(LD) -r -b binary -o $@ $<.Yay0
$(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
$(OBJCOPY) $< $@ -O binary

2
tools/Makefile
View File

@ -3,7 +3,7 @@ default: all
all: Yay0compress
Yay0compress:
gcc Yay0compress.c -o Yay0compress
gcc Yay0compress.c -O3 -o Yay0compress
clean:
rm -f Yay0compress

BIN
tools/Yay0compress
View File

Binary file not shown.

2
tools/Yay0compress.c
View File

@ -196,7 +196,7 @@ void encode()
}
if ( v1 != 0x80000000 )
++cp;
fprintf(stderr, "IN=%d OUT=%d\n", insize, dp + 2 * pp + 4 * cp + 16);
//fprintf(stderr, "IN=%d OUT=%d\n", insize, dp + 2 * pp + 4 * cp + 16);
}
void search(unsigned int a1, int a2, int *a3, unsigned int *a4)

2
tools/n64splat

@ -1 +1 @@
Subproject commit 7abe8ac584c09cd1da6cdd5919b1904edcb7126a
Subproject commit 1d2c07c0a5749289d08aa991ab15ef356ddda96c