From a3b35fd0f45197a9b53412ed2b84d10e8d4ef24a Mon Sep 17 00:00:00 2001 From: Joseph <94092417+Jgoodwin64@users.noreply.github.com> Date: Mon, 18 Dec 2023 21:48:02 -0500 Subject: [PATCH 1/5] Update README.md Remove make fix mentions. --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 94ffb2e..903dfa2 100644 --- a/README.md +++ b/README.md @@ -163,17 +163,6 @@ make clean # Build (default build with english audio) make ``` -In case you have any trouble with the ROM running on hardware try padding the ROM. -``` -make fix-nowine -``` -You can also try the old way of paddinng the ROM, but you don't need both. - -This method requires you to install wine to run properly. https://wiki.winehq.org/Ubuntu - -``` -make fix -``` Alternatively, you can also prepare to build with additional audio languages, like this (multiple commands per build possible): From 8f128d5136fc878b649dc4018d0423d8abb0f097 Mon Sep 17 00:00:00 2001 From: Joseph <94092417+Jgoodwin64@users.noreply.github.com> Date: Mon, 18 Dec 2023 21:53:52 -0500 Subject: [PATCH 2/5] Update Makefile Added auto run sh tools/romfix64.sh $(BASE_TARGET_NAME).z64 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 5139cfa..4054675 100644 --- a/Makefile +++ b/Makefile @@ -555,6 +555,7 @@ $(BASE_TARGET_NAME).z64: $(CODESEGMENT)_no_debug.o $(OBJECTS) $(DATA_OBJECTS) $( $(LD) -L. -T $(CP_LD_SCRIPT)_no_debug.ld -Map $(BASE_TARGET_NAME)_no_debug.map -o $(BASE_TARGET_NAME).elf $(OBJCOPY) --pad-to=0x100000 --gap-fill=0xFF $(BASE_TARGET_NAME).elf $(BASE_TARGET_NAME).z64 -O binary makemask $(BASE_TARGET_NAME).z64 + sh tools/romfix64.sh $(BASE_TARGET_NAME).z64 # with debugger CODEOBJECTS_DEBUG = $(CODEOBJECTS) @@ -573,6 +574,7 @@ $(BASE_TARGET_NAME)_debug.z64: $(CODESEGMENT)_debug.o $(OBJECTS) $(DATA_OBJECTS) $(LD) -L. -T $(CP_LD_SCRIPT)_debug.ld -Map $(BASE_TARGET_NAME)_debug.map -o $(BASE_TARGET_NAME)_debug.elf $(OBJCOPY) --pad-to=0x100000 --gap-fill=0xFF $(BASE_TARGET_NAME)_debug.elf $(BASE_TARGET_NAME)_debug.z64 -O binary makemask $(BASE_TARGET_NAME)_debug.z64 + sh tools/romfix64.sh $(BASE_TARGET_NAME).z64 clean: rm -rf build From a8f5ff8abc3db4682a08c93a70c3a521ed26958a Mon Sep 17 00:00:00 2001 From: Joseph <94092417+Jgoodwin64@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:09:20 -0500 Subject: [PATCH 3/5] Delete tools/romfix64.exe I deleted romfix64.exe as it should no longer be needed. --- tools/romfix64.exe | Bin 6144 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 tools/romfix64.exe diff --git a/tools/romfix64.exe b/tools/romfix64.exe deleted file mode 100755 index 92485335400e3aed8b17308c879b259087406d21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6144 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 J_kTG9{{@T=*3$q0 From f79569bfe6f44597b01eda25b96ed0f8cb7f3945 Mon Sep 17 00:00:00 2001 From: Joseph <94092417+Jgoodwin64@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:28:52 -0500 Subject: [PATCH 4/5] Update Makefile Added Chmod so the scripts can run. --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 4054675..6e6e940 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,11 @@ VTF2PNG:=vtf2png SFZ2N64:=sfz2n64 $(SKELATOOL64): + chmod +x skelatool64/setup_dependencies.sh skelatool64/setup_dependencies.sh + + + @$(MAKE) -C skelatool64 OPTIMIZER := -Os @@ -555,6 +559,7 @@ $(BASE_TARGET_NAME).z64: $(CODESEGMENT)_no_debug.o $(OBJECTS) $(DATA_OBJECTS) $( $(LD) -L. -T $(CP_LD_SCRIPT)_no_debug.ld -Map $(BASE_TARGET_NAME)_no_debug.map -o $(BASE_TARGET_NAME).elf $(OBJCOPY) --pad-to=0x100000 --gap-fill=0xFF $(BASE_TARGET_NAME).elf $(BASE_TARGET_NAME).z64 -O binary makemask $(BASE_TARGET_NAME).z64 + chmod +x tools/romfix64.sh sh tools/romfix64.sh $(BASE_TARGET_NAME).z64 # with debugger @@ -574,6 +579,7 @@ $(BASE_TARGET_NAME)_debug.z64: $(CODESEGMENT)_debug.o $(OBJECTS) $(DATA_OBJECTS) $(LD) -L. -T $(CP_LD_SCRIPT)_debug.ld -Map $(BASE_TARGET_NAME)_debug.map -o $(BASE_TARGET_NAME)_debug.elf $(OBJCOPY) --pad-to=0x100000 --gap-fill=0xFF $(BASE_TARGET_NAME)_debug.elf $(BASE_TARGET_NAME)_debug.z64 -O binary makemask $(BASE_TARGET_NAME)_debug.z64 + chmod +x tools/romfix64.sh sh tools/romfix64.sh $(BASE_TARGET_NAME).z64 clean: From d9bcadb55124ac516bc4004725bff270b13068e5 Mon Sep 17 00:00:00 2001 From: Joseph <94092417+Jgoodwin64@users.noreply.github.com> Date: Tue, 19 Dec 2023 20:34:03 -0500 Subject: [PATCH 5/5] Update Makefile Forgot to remove: fix: wine tools/romfix64.exe $(BASE_TARGET_NAME).z64 fix-nowine: chmod +x tools/romfix64.sh sh tools/romfix64.sh $(BASE_TARGET_NAME).z64 --- Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Makefile b/Makefile index 6e6e940..4eb3a52 100644 --- a/Makefile +++ b/Makefile @@ -608,11 +608,4 @@ clean-assets: rm -f $(BASE_TARGET_NAME).z64 rm -f $(BASE_TARGET_NAME)_debug.z64 -fix: - wine tools/romfix64.exe $(BASE_TARGET_NAME).z64 - -fix-nowine: - chmod +x tools/romfix64.sh - sh tools/romfix64.sh $(BASE_TARGET_NAME).z64 - .SECONDARY: