Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-10-07 02:24:01 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
b349483d16
sotn-decomp/Makefile

591 lines
28 KiB
Makefile
Raw Normal View History

Simplify Makefile
2022-02-23 18:17:18 +00:00
.SECONDEXPANSION:
Do not delete intermediary files
2022-03-02 00:38:54 +00:00
.SECONDARY:
Simplify Makefile
2022-02-23 18:17:18 +00:00
Upload disassembly
2022-01-01 17:45:41 +00:00
# Binaries
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
VERSION ?= us
Upload disassembly
2022-01-01 17:45:41 +00:00
MAIN := main
DRA := dra
# Compilers
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
CC1PSX := ./bin/cc1-psx-26
Upload disassembly
2022-01-01 17:45:41 +00:00
CROSS := mipsel-linux-gnu-
AS := $(CROSS)as
Update compiler to use little endian
2023-04-05 18:08:14 +00:00
CC := $(CC1PSX)
Upload disassembly
2022-01-01 17:45:41 +00:00
LD := $(CROSS)ld
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
CPP := $(CROSS)cpp
Upload disassembly
2022-01-01 17:45:41 +00:00
OBJCOPY := $(CROSS)objcopy
AS should not use the $gp register
2023-02-12 00:22:31 +00:00
AS_FLAGS += -Iinclude -march=r3000 -mtune=r3000 -no-pad-sections -O1 -G0
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
CC_FLAGS += -mcpu=3000 -quiet -G0 -w -O2 -funsigned-char -fpeephole -ffunction-cse -fpcc-struct-return -fcommon -fverbose-asm -fgnu-linker -mgas -msoft-float -gcoff
CPP_FLAGS += -Iinclude -undef -Wall -lang-c -fno-builtin
Fix __attribute__ decompilation error
2023-03-12 00:11:04 +00:00
CPP_FLAGS += -Dmips -D__GNUC__=2 -D__OPTIMIZE__ -D__mips__ -D__mips -Dpsx -D__psx__ -D__psx -D_PSYQ -D__EXTENSIONS__ -D_MIPSEL -D_LANGUAGE_C -DLANGUAGE_C -DHACKS
Makefile game version clean-up
2023-05-04 22:32:35 +00:00
CPP_FLAGS += -D_internal_version_$(VERSION)
Upload disassembly
2022-01-01 17:45:41 +00:00
# Directories
Change assembly location from asm/ to asm/us/
2023-02-21 19:11:05 +00:00
ASM_DIR := asm/$(VERSION)
Upload disassembly
2022-01-01 17:45:41 +00:00
SRC_DIR := src
Asset extraction and build experimentation
2023-02-03 15:38:48 +00:00
ASSETS_DIR := assets
Automatically format code to the LLVM format
2022-08-26 18:16:27 +00:00
INCLUDE_DIR := include
Writes built binaries into build/us/
2023-02-21 20:06:27 +00:00
BUILD_DIR := build/$(VERSION)
Change how game assets are managed
2023-02-21 23:25:24 +00:00
DISK_DIR := $(BUILD_DIR)/${VERSION}/disk
Upload disassembly
2022-01-01 17:45:41 +00:00
CONFIG_DIR := config
TOOLS_DIR := tools
# Files
MAIN_ASM_DIRS := $(ASM_DIR)/$(MAIN) $(ASM_DIR)/$(MAIN)/psxsdk $(ASM_DIR)/$(MAIN)/data
MAIN_SRC_DIRS := $(SRC_DIR)/$(MAIN) $(SRC_DIR)/$(MAIN)/psxsdk
MAIN_S_FILES := $(foreach dir,$(MAIN_ASM_DIRS),$(wildcard $(dir)/*.s)) \
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
$(foreach dir,$(MAIN_ASM_DIRS),$(wildcard $(dir)/**/*.s))
Upload disassembly
2022-01-01 17:45:41 +00:00
MAIN_C_FILES := $(foreach dir,$(MAIN_SRC_DIRS),$(wildcard $(dir)/*.c)) \
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
$(foreach dir,$(MAIN_SRC_DIRS),$(wildcard $(dir)/**/*.c))
Upload disassembly
2022-01-01 17:45:41 +00:00
MAIN_O_FILES := $(foreach file,$(MAIN_S_FILES),$(BUILD_DIR)/$(file).o) \
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
$(foreach file,$(MAIN_C_FILES),$(BUILD_DIR)/$(file).o)
Upload disassembly
2022-01-01 17:45:41 +00:00
MAIN_TARGET := $(BUILD_DIR)/$(MAIN)
# Tooling
PYTHON := python3
SPLAT_DIR := $(TOOLS_DIR)/n64splat
Ensure asm-differ is installed
2022-10-14 20:19:34 +00:00
SPLAT_APP := $(SPLAT_DIR)/split.py
Create context with Makefile
2022-10-15 10:18:32 +00:00
SPLAT := $(PYTHON) $(SPLAT_APP)
Ensure asm-differ is installed
2022-10-14 20:19:34 +00:00
ASMDIFFER_DIR := $(TOOLS_DIR)/asm-differ
ASMDIFFER_APP := $(ASMDIFFER_DIR)/diff.py
Create context with Makefile
2022-10-15 10:18:32 +00:00
M2CTX_APP := $(TOOLS_DIR)/m2ctx.py
M2CTX := $(PYTHON) $(M2CTX_APP)
Decompile code with make
2022-10-15 10:45:20 +00:00
M2C_DIR := $(TOOLS_DIR)/m2c
M2C_APP := $(M2C_DIR)/m2c.py
M2C := $(PYTHON) $(M2C_APP)
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
M2C_ARGS := -P 4
Fix CI pipeline
2023-06-17 11:29:42 +00:00
MASPSX_DIR := $(TOOLS_DIR)/maspsx
MASPSX_APP := $(MASPSX_DIR)/maspsx.py
MASPSX := $(PYTHON) $(MASPSX_APP) --no-macro-inc --expand-div
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
GO := $(HOME)/go/bin/go
GOPATH := $(HOME)/go
SOTNDISK := $(GOPATH)/bin/sotn-disk
GFXSTAGE := $(PYTHON) $(TOOLS_DIR)/gfxstage.py
Integrate splitting for saturn (#233) This PR does some initial integration work for splitting the Saturn version. It adds T_BAT.PRG (Bat overlay) and GAME.PRG (similar to DRA.BIN). These are extracted to asm/saturn/* and src/saturn/*. Right now there's no attempt to compile. I haven't been able to figure out the issues with sotn-disk so this requires pre-extracted files in disks/saturn. Something like this is able to do it: ``` bchunk saturn.bin saturn.cue saturn.iso 7z x saturn.iso ``` The Saturn version has the code split up differently so I think putting it in a separate folder to begin with makes sense. For example the Random function is in GAME.PRG rather than in the stage overlays. There's also an Alucard overlay rather than it being included in GAME.PRG. See here for some comparisons: https://github.com/Xeeynamo/sotn-decomp/wiki/Saturn-Matching I didn't attempt to install Rust as part of the project setup like with Go. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-05-25 18:29:10 +00:00
SATURN_SPLITTER_DIR := $(TOOLS_DIR)/saturn-splitter
SATURN_SPLITTER_APP := $(SATURN_SPLITTER_DIR)/rust-dis/target/release/rust-dis
Extract Saturn adpcm music (#252) This adds a new tool that extracts the Saturn ADPCM music files to WAV. @sonicdcer pointed me to an old winamp plugin that had support for this format, so I reworked the relevant part into a standalone tool. This doesn't try to re-encode, since I would want to examine the original decompression code to make sure that it's 1:1 with this implementation first. Not all the files seem to be in this format, so I explicitly list the ones that are in the Makefile. I think the other PCM files are the voice tracks, which would make sense to use a voice-oriented codec. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-16 18:39:45 +00:00
SATURN_ADPCM_EXTRACT_APP := $(SATURN_SPLITTER_DIR)/adpcm-extract/target/release/adpcm-extract
Upload disassembly
2022-01-01 17:45:41 +00:00
Simplify Makefile
2022-02-23 18:17:18 +00:00
define list_src_files
$(foreach dir,$(ASM_DIR)/$(1),$(wildcard $(dir)/**.s))
$(foreach dir,$(ASM_DIR)/$(1)/data,$(wildcard $(dir)/**.s))
$(foreach dir,$(ASM_DIR)/$(1)/psxsdk,$(wildcard $(dir)/**.s))
$(foreach dir,$(SRC_DIR)/$(1),$(wildcard $(dir)/**.c))
$(foreach dir,$(SRC_DIR)/$(1)/psxsdk,$(wildcard $(dir)/**.c))
WRP split some data and add new split tools (#109) The objective is to separate the data that is usually written into `asm/*/data` into separate files. Those will initially be binary files. There is also an utility that allows to decompress compressed data. The decompressed data is currently not read as we are missing a compression algorithm that matches the original one. I tried writing one in the past: it worked, it re-created similar files but sadly not the same ones. The decompression algorithm is there to allow to do some data mining and understand what the data is and how it is used.
2023-03-09 13:32:00 +00:00
$(foreach dir,$(ASSETS_DIR)/$(1),$(wildcard $(dir)/**))
Simplify Makefile
2022-02-23 18:17:18 +00:00
endef
define list_o_files
$(foreach file,$(call list_src_files,$(1)),$(BUILD_DIR)/$(file).o)
endef
define link
$(LD) -o $(2) \
-Map $(BUILD_DIR)/$(1).map \
-T $(1).ld \
Update splat (#247)
2023-06-12 05:04:25 +00:00
-T $(CONFIG_DIR)/undefined_syms.$(VERSION).txt \
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
-T $(CONFIG_DIR)/undefined_syms_auto.$(VERSION).$(1).txt \
-T $(CONFIG_DIR)/undefined_funcs_auto.$(VERSION).$(1).txt \
Simplify Makefile
2022-02-23 18:17:18 +00:00
--no-check-sections \
-nostdlib \
-s
endef
Patch assembly code
2022-10-26 06:41:13 +00:00
all: build check
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
build: main dra ric cen dre mad no3 np3 nz0 sel st0 wrp rwrp tt_000
Upload disassembly
2022-01-01 17:45:41 +00:00
clean:
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
git clean -fdx assets/
Enhanced make clean
2022-10-16 08:10:43 +00:00
git clean -fdx asm/
Writes built binaries into build/us/
2023-02-21 20:06:27 +00:00
git clean -fdx build/
Enhanced make clean
2022-10-16 08:10:43 +00:00
git clean -fdx config/
Automatically format code to the LLVM format
2022-08-26 18:16:27 +00:00
format:
Fix make format command
2022-11-06 17:47:57 +00:00
clang-format -i $$(find $(SRC_DIR)/ -type f -name "*.c")
Enhance formatter
2023-07-02 23:17:21 +00:00
clang-format -i $$(find $(SRC_DIR)/ -type f -name "*.h")
Fix make format command
2022-11-06 17:47:57 +00:00
clang-format -i $$(find $(INCLUDE_DIR)/ -type f -name "*.h")
Enhance formatter
2023-07-02 23:17:21 +00:00
VERSION=us $(PYTHON) ./tools/symbols.py sort
VERSION=hd $(PYTHON) ./tools/symbols.py sort
Add rule to create the 'expected' folder for asm-differ
2022-10-23 16:55:36 +00:00
check:
Writes built binaries into build/us/
2023-02-21 20:06:27 +00:00
sha1sum --check config/check.$(VERSION).sha
Add rule to create the 'expected' folder for asm-differ
2022-10-23 16:55:36 +00:00
expected: check
Fix to makefile to properly create the directory before cp'ing into it (#222) Solves the issue mentioned in discord - When you `cp` into expected, and expected does not exist, the CONTENTS of build get copied into the newly-created `expected` directory. This PR solves this by running `mkdir -p expected` first (-p causes mkdir to not error if `expected` already exists). Then, when `cp` runs, `expected` will always exist, thus `build` properly gets copied into it.
2023-05-07 09:24:15 +00:00
mkdir -p expected
Add rule to create the 'expected' folder for asm-differ
2022-10-23 16:55:36 +00:00
rm -rf expected/build
cp -r build expected/
Upload disassembly
2022-01-01 17:45:41 +00:00
main: main_dirs $(MAIN_TARGET).exe
main_dirs:
$(foreach dir,$(MAIN_ASM_DIRS) $(MAIN_SRC_DIRS),$(shell mkdir -p $(BUILD_DIR)/$(dir)))
$(MAIN_TARGET).exe: $(MAIN_TARGET).elf
Update splat right before 0.11.0
2022-10-16 09:31:54 +00:00
$(OBJCOPY) -O binary $< $@
Upload disassembly
2022-01-01 17:45:41 +00:00
$(MAIN_TARGET).elf: $(MAIN_O_FILES)
$(LD) -o $@ \
-Map $(MAIN_TARGET).map \
-T $(MAIN).ld \
Update splat (#247)
2023-06-12 05:04:25 +00:00
-T $(CONFIG_DIR)/undefined_syms.$(VERSION).txt \
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
-T $(CONFIG_DIR)/undefined_syms_auto.$(VERSION).$(MAIN).txt \
Upload disassembly
2022-01-01 17:45:41 +00:00
--no-check-sections \
-nostdlib \
-s
Simplify Makefile
2022-02-23 18:17:18 +00:00
dra: dra_dirs $(BUILD_DIR)/DRA.BIN
$(BUILD_DIR)/DRA.BIN: $(BUILD_DIR)/$(DRA).elf
Upload disassembly
2022-01-01 17:45:41 +00:00
$(OBJCOPY) -O binary $< $@
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/$(DRA).elf: $(call list_o_files,dra)
$(call link,dra,$@)
Upload disassembly
2022-01-01 17:45:41 +00:00
Add RIC.BIN
2022-03-07 22:46:43 +00:00
ric: ric_dirs $(BUILD_DIR)/RIC.BIN
$(BUILD_DIR)/RIC.BIN: $(BUILD_DIR)/ric.elf
$(OBJCOPY) -O binary $< $@
$(BUILD_DIR)/ric.elf: $(call list_o_files,ric)
$(call link,ric,$@)
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cen: stcen_dirs $(BUILD_DIR)/CEN.BIN $(BUILD_DIR)/F_CEN.BIN
CEN overlay extracted (#19)
2022-10-28 22:46:47 +00:00
$(BUILD_DIR)/CEN.BIN: $(BUILD_DIR)/stcen.elf
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(BUILD_DIR)/F_CEN.BIN:
$(GFXSTAGE) e assets/st/cen $@
CEN overlay extracted (#19)
2022-10-28 22:46:47 +00:00
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
dre: stdre_dirs $(BUILD_DIR)/DRE.BIN $(BUILD_DIR)/F_DRE.BIN
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/DRE.BIN: $(BUILD_DIR)/stdre.elf
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(BUILD_DIR)/F_DRE.BIN:
$(GFXSTAGE) e assets/st/dre $@
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
mad: stmad_dirs $(BUILD_DIR)/MAD.BIN $(BUILD_DIR)/F_MAD.BIN
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/MAD.BIN: $(BUILD_DIR)/stmad.elf
Add two map files
2022-01-20 22:02:05 +00:00
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(BUILD_DIR)/F_MAD.BIN:
$(GFXSTAGE) e assets/st/mad $@
Add two map files
2022-01-20 22:02:05 +00:00
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
no3: stno3_dirs $(BUILD_DIR)/NO3.BIN $(BUILD_DIR)/F_NO3.BIN
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/NO3.BIN: $(BUILD_DIR)/stno3.elf
Add two map files
2022-01-20 22:02:05 +00:00
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(BUILD_DIR)/F_NO3.BIN:
$(GFXSTAGE) e assets/st/no3 $@
Add two map files
2022-01-20 22:02:05 +00:00
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
np3: stnp3_dirs $(BUILD_DIR)/NP3.BIN $(BUILD_DIR)/F_NP3.BIN
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/NP3.BIN: $(BUILD_DIR)/stnp3.elf
Add NP3.BIN
2022-02-05 17:16:17 +00:00
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(BUILD_DIR)/F_NP3.BIN:
$(GFXSTAGE) e assets/st/np3 $@
Add NP3.BIN
2022-02-05 17:16:17 +00:00
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
nz0: stnz0_dirs $(BUILD_DIR)/NZ0.BIN $(BUILD_DIR)/F_NZ0.BIN
NZ0 Extracted + File descriptions (#20)
2022-10-29 17:58:02 +00:00
$(BUILD_DIR)/NZ0.BIN: $(BUILD_DIR)/stnz0.elf
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(BUILD_DIR)/F_NZ0.BIN:
$(GFXSTAGE) e assets/st/nz0 $@
NZ0 Extracted + File descriptions (#20)
2022-10-29 17:58:02 +00:00
Add SEL overlay
2022-12-21 16:33:15 +00:00
sel: stsel_dirs $(BUILD_DIR)/SEL.BIN
$(BUILD_DIR)/SEL.BIN: $(BUILD_DIR)/stsel.elf
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
st0: stst0_dirs $(BUILD_DIR)/ST0.BIN $(BUILD_DIR)/F_ST0.BIN
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/ST0.BIN: $(BUILD_DIR)/stst0.elf
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(BUILD_DIR)/F_ST0.BIN:
$(GFXSTAGE) e assets/st/st0 $@
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
Extract WRP stage graphics
2023-03-10 03:59:33 +00:00
wrp: stwrp_dirs $(BUILD_DIR)/WRP.BIN $(BUILD_DIR)/F_WRP.BIN
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/WRP.BIN: $(BUILD_DIR)/stwrp.elf
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
$(OBJCOPY) -O binary $< $@
Extract WRP stage graphics
2023-03-10 03:59:33 +00:00
$(BUILD_DIR)/F_WRP.BIN:
$(GFXSTAGE) e assets/st/wrp $@
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
rwrp: strwrp_dirs $(BUILD_DIR)/RWRP.BIN $(BUILD_DIR)/F_RWRP.BIN
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/RWRP.BIN: $(BUILD_DIR)/strwrp.elf
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
$(OBJCOPY) -O binary $< $@
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(BUILD_DIR)/F_RWRP.BIN:
$(GFXSTAGE) e assets/st/rwrp $@
Disassemble DRE, ST0, WRP and RWRP
2022-02-09 12:49:33 +00:00
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
tt_000: tt_000_dirs $(BUILD_DIR)/TT_000.BIN
$(BUILD_DIR)/TT_000.BIN: $(BUILD_DIR)/tt_000.elf
$(OBJCOPY) -O binary $< $@
MAD reworked symbols and patches from the ground-up
2023-02-19 18:15:49 +00:00
mad_fix: stmad_dirs $$(call list_o_files,st/mad)
$(LD) -o $(BUILD_DIR)/stmad_fix.elf \
-Map $(BUILD_DIR)/stmad_fix.map \
-T stmad.ld \
Update splat (#247)
2023-06-12 05:04:25 +00:00
-T $(CONFIG_DIR)/undefined_syms.$(VERSION).txt \
MAD reworked symbols and patches from the ground-up
2023-02-19 18:15:49 +00:00
-T $(CONFIG_DIR)/undefined_syms_auto.stmad.txt \
-T $(CONFIG_DIR)/undefined_funcs_auto.stmad.txt \
--no-check-sections \
-nostdlib \
-s
$(OBJCOPY) -O binary $(BUILD_DIR)/stmad_fix.elf $(BUILD_DIR)/MAD.BIN
Compile partially fixed debug room
2022-03-05 02:45:54 +00:00
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
tt_%_dirs:
$(foreach dir,$(ASM_DIR)/servant/tt_$* $(ASM_DIR)/servant/tt_$*/data $(SRC_DIR)/servant/tt_$* $(ASSETS_DIR)/servant/tt_$*,$(shell mkdir -p $(BUILD_DIR)/$(dir)))
Simplify Makefile
2022-02-23 18:17:18 +00:00
st%_dirs:
Asset extraction and build experimentation
2023-02-03 15:38:48 +00:00
$(foreach dir,$(ASM_DIR)/st/$* $(ASM_DIR)/st/$*/data $(SRC_DIR)/st/$* $(ASSETS_DIR)/st/$*,$(shell mkdir -p $(BUILD_DIR)/$(dir)))
Simplify Makefile
2022-02-23 18:17:18 +00:00
%_dirs:
Asset extraction and build experimentation
2023-02-03 15:38:48 +00:00
$(foreach dir,$(ASM_DIR)/$* $(ASM_DIR)/$*/data $(SRC_DIR)/$* $(ASSETS_DIR)/$*,$(shell mkdir -p $(BUILD_DIR)/$(dir)))
Simplify Makefile
2022-02-23 18:17:18 +00:00
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
$(BUILD_DIR)/tt_%.elf: $$(call list_o_files,servant/tt_$$*)
$(call link,tt_$*,$@)
MAD reworked symbols and patches from the ground-up
2023-02-19 18:15:49 +00:00
$(BUILD_DIR)/stmad.elf: $$(call list_o_files,st/mad)
$(LD) -o $@ \
-Map $(BUILD_DIR)/stmad.map \
-T stmad.ld \
Update splat (#247)
2023-06-12 05:04:25 +00:00
-T $(CONFIG_DIR)/undefined_syms.beta.txt \
MAD reworked symbols and patches from the ground-up
2023-02-19 18:15:49 +00:00
-T $(CONFIG_DIR)/undefined_syms_auto.stmad.txt \
-T $(CONFIG_DIR)/undefined_funcs_auto.stmad.txt \
--no-check-sections \
-nostdlib \
-s
Simplify Makefile
2022-02-23 18:17:18 +00:00
$(BUILD_DIR)/st%.elf: $$(call list_o_files,st/$$*)
$(call link,st$*,$@)
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
extract: extract_main extract_dra extract_ric extract_stcen extract_stdre extract_stmad extract_stno3 extract_stnp3 extract_stnz0 extract_stsel extract_stst0 extract_stwrp extract_strwrp extract_tt_000
Speed-up progress and duplicate report jobs
2023-02-25 15:02:43 +00:00
extract_main: $(SPLAT_APP)
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
$(SPLAT) $(CONFIG_DIR)/splat.$(VERSION).$(MAIN).yaml
Speed-up progress and duplicate report jobs
2023-02-25 15:02:43 +00:00
extract_dra: $(SPLAT_APP)
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
cat $(CONFIG_DIR)/symbols.$(VERSION).txt $(CONFIG_DIR)/symbols.$(VERSION).dra.txt > $(CONFIG_DIR)/generated.symbols.$(VERSION).dra.txt
$(SPLAT) $(CONFIG_DIR)/splat.$(VERSION).$(DRA).yaml
Speed-up progress and duplicate report jobs
2023-02-25 15:02:43 +00:00
extract_ric: $(SPLAT_APP)
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
cat $(CONFIG_DIR)/symbols.$(VERSION).txt $(CONFIG_DIR)/symbols.$(VERSION).ric.txt > $(CONFIG_DIR)/generated.symbols.$(VERSION).ric.txt
$(SPLAT) $(CONFIG_DIR)/splat.$(VERSION).ric.yaml
Speed-up progress and duplicate report jobs
2023-02-25 15:02:43 +00:00
extract_stmad: $(SPLAT_APP)
MAD reworked symbols and patches from the ground-up
2023-02-19 18:15:49 +00:00
cat $(CONFIG_DIR)/symbols.beta.txt $(CONFIG_DIR)/symbols.stmad.txt > $(CONFIG_DIR)/generated.symbols.stmad.txt
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
$(SPLAT) $(CONFIG_DIR)/splat.$(VERSION).stmad.yaml
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
$(GFXSTAGE) d disks/$(VERSION)/ST/MAD/F_MAD.BIN $(ASSETS_DIR)/st/mad
Speed-up progress and duplicate report jobs
2023-02-25 15:02:43 +00:00
extract_st%: $(SPLAT_APP)
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
cat $(CONFIG_DIR)/symbols.$(VERSION).txt $(CONFIG_DIR)/symbols.$(VERSION).st$*.txt > $(CONFIG_DIR)/generated.symbols.$(VERSION).st$*.txt
$(SPLAT) $(CONFIG_DIR)/splat.$(VERSION).st$*.yaml
Extract WRP stage graphics
2023-03-10 03:59:33 +00:00
$(GFXSTAGE) d disks/$(VERSION)/ST/$$(echo '$*' | tr '[:lower:]' '[:upper:]')/F_$$(echo '$*' | tr '[:lower:]' '[:upper:]').BIN $(ASSETS_DIR)/st/$*
Speed-up progress and duplicate report jobs
2023-02-25 15:02:43 +00:00
extract_tt_%: $(SPLAT_APP)
Rename config folder to use game version
2023-02-21 01:42:33 +00:00
cat $(CONFIG_DIR)/symbols.$(VERSION).txt $(CONFIG_DIR)/symbols.$(VERSION).tt_$*.txt > $(CONFIG_DIR)/generated.symbols.$(VERSION).tt_$*.txt
$(SPLAT) $(CONFIG_DIR)/splat.$(VERSION).tt_$*.yaml
$(CONFIG_DIR)/generated.$(VERSION).symbols.%.txt:
Create context with Makefile
2022-10-15 10:18:32 +00:00
Integrate splitting for saturn (#233) This PR does some initial integration work for splitting the Saturn version. It adds T_BAT.PRG (Bat overlay) and GAME.PRG (similar to DRA.BIN). These are extracted to asm/saturn/* and src/saturn/*. Right now there's no attempt to compile. I haven't been able to figure out the issues with sotn-disk so this requires pre-extracted files in disks/saturn. Something like this is able to do it: ``` bchunk saturn.bin saturn.cue saturn.iso 7z x saturn.iso ``` The Saturn version has the code split up differently so I think putting it in a separate folder to begin with makes sense. For example the Random function is in GAME.PRG rather than in the stage overlays. There's also an Alucard overlay rather than it being included in GAME.PRG. See here for some comparisons: https://github.com/Xeeynamo/sotn-decomp/wiki/Saturn-Matching I didn't attempt to install Rust as part of the project setup like with Go. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-05-25 18:29:10 +00:00
extract_saturn: $(SATURN_SPLITTER_APP)
$(SATURN_SPLITTER_APP) $(CONFIG_DIR)/saturn/game.prg.yaml
$(SATURN_SPLITTER_APP) $(CONFIG_DIR)/saturn/t_bat.prg.yaml
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
$(SATURN_SPLITTER_APP) $(CONFIG_DIR)/saturn/zero.bin.yaml
Extract Alchemy Lab, decompile func_060e1ff8 (#240) This adds the Alchemy Lab overlay and decompiles func_060e1ff8 to check that it's working. func_060e1ff8 seems similar to https://github.com/Xeeynamo/sotn-decomp/blob/31d04a46d3f9c258722cedc56627d0dd627cbf71/src/st/nz0/36DE4.c#L101 but it's not clear if it's the same function yet. I think it probably makes sense to add one overlay of each type. Right now there's no stage overlay extracted. I picked Alchemy Lab since it's the furthest along on PSX.
2023-06-06 22:28:19 +00:00
$(SATURN_SPLITTER_APP) $(CONFIG_DIR)/saturn/stage_02.prg.yaml
Saturn: Extract warp program
2023-07-02 16:48:23 +00:00
$(SATURN_SPLITTER_APP) $(CONFIG_DIR)/saturn/warp.prg.yaml
Integrate splitting for saturn (#233) This PR does some initial integration work for splitting the Saturn version. It adds T_BAT.PRG (Bat overlay) and GAME.PRG (similar to DRA.BIN). These are extracted to asm/saturn/* and src/saturn/*. Right now there's no attempt to compile. I haven't been able to figure out the issues with sotn-disk so this requires pre-extracted files in disks/saturn. Something like this is able to do it: ``` bchunk saturn.bin saturn.cue saturn.iso 7z x saturn.iso ``` The Saturn version has the code split up differently so I think putting it in a separate folder to begin with makes sense. For example the Random function is in GAME.PRG rather than in the stage overlays. There's also an Alucard overlay rather than it being included in GAME.PRG. See here for some comparisons: https://github.com/Xeeynamo/sotn-decomp/wiki/Saturn-Matching I didn't attempt to install Rust as part of the project setup like with Go. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-05-25 18:29:10 +00:00
Extract Saturn adpcm music (#252) This adds a new tool that extracts the Saturn ADPCM music files to WAV. @sonicdcer pointed me to an old winamp plugin that had support for this format, so I reworked the relevant part into a standalone tool. This doesn't try to re-encode, since I would want to examine the original decompression code to make sure that it's 1:1 with this implementation first. Not all the files seem to be in this format, so I explicitly list the ones that are in the Makefile. I think the other PCM files are the voice tracks, which would make sense to use a voice-oriented codec. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-16 18:39:45 +00:00
extract_saturn_pcm: $(SATURN_SPLITTER_APP)
mkdir -p build/saturn/SD
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD01.PCM build/saturn/SD/SD01.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD02.PCM build/saturn/SD/SD02.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD03.PCM build/saturn/SD/SD03.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD04.PCM build/saturn/SD/SD04.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD05.PCM build/saturn/SD/SD05.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD06.PCM build/saturn/SD/SD06.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD07.PCM build/saturn/SD/SD07.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD08.PCM build/saturn/SD/SD08.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD09.PCM build/saturn/SD/SD09.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD0A.PCM build/saturn/SD/SD0A.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD0B.PCM build/saturn/SD/SD0B.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD0C.PCM build/saturn/SD/SD0C.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD0D.PCM build/saturn/SD/SD0D.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD0E.PCM build/saturn/SD/SD0E.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD0F.PCM build/saturn/SD/SD0F.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD10.PCM build/saturn/SD/SD10.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD11.PCM build/saturn/SD/SD11.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD12.PCM build/saturn/SD/SD12.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD13.PCM build/saturn/SD/SD13.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD14.PCM build/saturn/SD/SD14.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD15.PCM build/saturn/SD/SD15.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD16.PCM build/saturn/SD/SD16.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD17.PCM build/saturn/SD/SD17.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD18.PCM build/saturn/SD/SD18.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD19.PCM build/saturn/SD/SD19.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD1A.PCM build/saturn/SD/SD1A.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD1B.PCM build/saturn/SD/SD1B.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD1C.PCM build/saturn/SD/SD1C.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD1D.PCM build/saturn/SD/SD1D.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD1E.PCM build/saturn/SD/SD1E.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD1F.PCM build/saturn/SD/SD1F.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD20.PCM build/saturn/SD/SD20.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD21.PCM build/saturn/SD/SD21.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD22.PCM build/saturn/SD/SD22.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD23.PCM build/saturn/SD/SD23.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD24.PCM build/saturn/SD/SD24.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD25.PCM build/saturn/SD/SD25.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD26.PCM build/saturn/SD/SD26.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD27.PCM build/saturn/SD/SD27.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD28.PCM build/saturn/SD/SD28.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD29.PCM build/saturn/SD/SD29.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD2A.PCM build/saturn/SD/SD2A.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD2B.PCM build/saturn/SD/SD2B.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD2C.PCM build/saturn/SD/SD2C.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD2D.PCM build/saturn/SD/SD2D.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD2E.PCM build/saturn/SD/SD2E.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD2F.PCM build/saturn/SD/SD2F.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD30.PCM build/saturn/SD/SD30.wav
$(SATURN_ADPCM_EXTRACT_APP) disks/saturn/SD/SD31.PCM build/saturn/SD/SD31.wav
Allow to forcefully export all the assembly code
2023-05-29 17:06:28 +00:00
# Force to extract all the assembly code regardless if a function is already decompiled
force_extract:
mv src src_tmp
make extract -j
rm -rf src/
mv src_tmp src
DRA functions + PSXSDK docs (#30) Co-authored-by: @pixel-stuck, @Mr-Wiseguy, @Rainchus, @DavidSM64
2022-12-19 05:32:00 +00:00
context:
$(M2CTX) $(SOURCE)
@echo ctx.c has been updated.
Add make extract_disk compatibility for PSP ISOs This allows to extract PSP versions of the game, including the infamous HDBIN version of the game.
2023-05-05 21:26:39 +00:00
extract_disk: extract_disk_$(VERSION)
extract_disk_us: extract_disk_ps1us
extract_disk_hd: extract_disk_pspeu
extract_disk_psp%:
mkdir -p disks/psp$*
7z x disks/sotn.psp$*.iso -odisks/psp$*/
extract_disk_ps1%: $(SOTNDISK)
$(SOTNDISK) extract disks/sotn.$*.cue disks/$*
Integrate splitting for saturn (#233) This PR does some initial integration work for splitting the Saturn version. It adds T_BAT.PRG (Bat overlay) and GAME.PRG (similar to DRA.BIN). These are extracted to asm/saturn/* and src/saturn/*. Right now there's no attempt to compile. I haven't been able to figure out the issues with sotn-disk so this requires pre-extracted files in disks/saturn. Something like this is able to do it: ``` bchunk saturn.bin saturn.cue saturn.iso 7z x saturn.iso ``` The Saturn version has the code split up differently so I think putting it in a separate folder to begin with makes sense. For example the Random function is in GAME.PRG rather than in the stage overlays. There's also an Alucard overlay rather than it being included in GAME.PRG. See here for some comparisons: https://github.com/Xeeynamo/sotn-decomp/wiki/Saturn-Matching I didn't attempt to install Rust as part of the project setup like with Go. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-05-25 18:29:10 +00:00
extract_disk_saturn:
bchunk disks/sotn.saturn.bin disks/sotn.saturn.cue disks/sotn.saturn.iso
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
7z x disks/sotn.saturn.iso01.iso -odisks/saturn/ || true
'make disk' now works without deleting 'sotn.cue'
2023-01-10 20:38:49 +00:00
disk: build $(SOTNDISK)
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
mkdir -p $(DISK_DIR)
Change how game assets are managed
2023-02-21 23:25:24 +00:00
cp -r disks/${VERSION}/* $(DISK_DIR)
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/main.exe $(DISK_DIR)/SLUS_000.67
cp $(BUILD_DIR)/DRA.BIN $(DISK_DIR)/DRA.BIN
cp $(BUILD_DIR)/RIC.BIN $(DISK_DIR)/BIN/RIC.BIN
cp $(BUILD_DIR)/CEN.BIN $(DISK_DIR)/ST/CEN/CEN.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_CEN.BIN $(DISK_DIR)/ST/CEN/F_CEN.BIN
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/DRE.BIN $(DISK_DIR)/ST/DRE/DRE.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_DRE.BIN $(DISK_DIR)/ST/DRE/F_DRE.BIN
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/MAD.BIN $(DISK_DIR)/ST/MAD/MAD.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_MAD.BIN $(DISK_DIR)/ST/MAD/F_MAD.BIN
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/NO3.BIN $(DISK_DIR)/ST/NO3/NO3.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_NO3.BIN $(DISK_DIR)/ST/NO3/F_NO3.BIN
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/NP3.BIN $(DISK_DIR)/ST/NP3/NP3.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_NP3.BIN $(DISK_DIR)/ST/NP3/F_NP3.BIN
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/NZ0.BIN $(DISK_DIR)/ST/NZ0/NZ0.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_NZ0.BIN $(DISK_DIR)/ST/NZ0/F_NZ0.BIN
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/RWRP.BIN $(DISK_DIR)/ST/RWRP/RWRP.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_RWRP.BIN $(DISK_DIR)/ST/RWRP/F_RWRP.BIN
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/SEL.BIN $(DISK_DIR)/ST/SEL/SEL.BIN
cp $(BUILD_DIR)/ST0.BIN $(DISK_DIR)/ST/ST0/ST0.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_ST0.BIN $(DISK_DIR)/ST/ST0/F_ST0.BIN
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
cp $(BUILD_DIR)/WRP.BIN $(DISK_DIR)/ST/WRP/WRP.BIN
Extract and assemble stage graphics for all stages
2023-03-10 04:04:18 +00:00
cp $(BUILD_DIR)/F_WRP.BIN $(DISK_DIR)/ST/WRP/F_WRP.BIN
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
cp $(BUILD_DIR)/TT_000.BIN $(DISK_DIR)/SERVANT/TT_000.BIN
Writes built binaries into build/us/
2023-02-21 20:06:27 +00:00
$(SOTNDISK) make build/sotn.$(VERSION).cue $(DISK_DIR) $(CONFIG_DIR)/disk.us.lba
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
update-dependencies updates Saturn toolsets
2023-06-17 13:23:44 +00:00
update-dependencies: $(SPLAT_APP) $(ASMDIFFER_APP) $(M2CTX_APP) $(M2C_APP) $(MASPSX_APP) $(SATURN_SPLITTER_APP) $(GO)
cd $(SATURN_SPLITTER_DIR)/rust-dis && cargo build --release
cd $(SATURN_SPLITTER_DIR)/adpcm-extract && cargo build --release
Add make update-dependencies
2022-10-25 20:26:35 +00:00
pip3 install -r $(TOOLS_DIR)/requirements-python.txt
Creates a new game image based on built binaries (#34)
2023-01-01 20:49:12 +00:00
$(GO) install github.com/xeeynamo/sotn-decomp/tools/gfxsotn@latest
$(GO) install github.com/xeeynamo/sotn-decomp/tools/sotn-disk@latest
Update compiler to use little endian
2023-04-05 18:08:14 +00:00
git clean -fd bin/
Ensure asm-differ is installed
2022-10-14 20:19:34 +00:00
Update compiler to use little endian
2023-04-05 18:08:14 +00:00
bin/%:
cd ./bin && wget https://github.com/Xeeynamo/sotn-decomp/releases/download/$*/$*.tar.gz
rm -f $*.tar.gz*
cd ./bin && sha256sum --check $*.tar.gz.sha256 && tar -xzf $*.tar.gz
rm -f $*.tar.gz*
Ensure asm-differ is installed
2022-10-14 20:19:34 +00:00
$(SPLAT_APP):
Upload disassembly
2022-01-01 17:45:41 +00:00
git submodule init $(SPLAT_DIR)
git submodule update $(SPLAT_DIR)
Fix GitHub pipeline (#36) Creates a workaround to force using spimdisasm 1.9.0 as 1.9.1 currently breaks the repo
2023-01-01 20:59:50 +00:00
pip3 install -r $(TOOLS_DIR)/requirements-python.txt
Ensure asm-differ is installed
2022-10-14 20:19:34 +00:00
$(ASMDIFFER_APP):
Fix update-tools
2022-10-14 20:26:57 +00:00
git submodule init $(ASMDIFFER_DIR)
git submodule update $(ASMDIFFER_DIR)
Create context with Makefile
2022-10-15 10:18:32 +00:00
$(M2CTX_APP):
curl -o $@ https://raw.githubusercontent.com/ethteck/m2ctx/main/m2ctx.py
Decompile code with make
2022-10-15 10:45:20 +00:00
$(M2C_APP):
git submodule init $(M2C_DIR)
git submodule update $(M2C_DIR)
python3 -m pip install --upgrade pycparser
Fix CI pipeline
2023-06-17 11:29:42 +00:00
$(MASPSX_APP):
git submodule init $(MASPSX_DIR)
git submodule update $(MASPSX_DIR)
Patch assembly code
2022-10-26 06:41:13 +00:00
$(GO):
Install GO in the home directory instead in the repo
2023-03-16 12:28:17 +00:00
curl -L -o go1.19.7.linux-amd64.tar.gz https://go.dev/dl/go1.19.7.linux-amd64.tar.gz
tar -C $(HOME) -xzf go1.19.7.linux-amd64.tar.gz
rm go1.19.7.linux-amd64.tar.gz
Add tool to extract the game image
2022-12-26 20:37:34 +00:00
$(SOTNDISK): $(GO)
$(GO) install github.com/xeeynamo/sotn-decomp/tools/sotn-disk@latest
Upload disassembly
2022-01-01 17:45:41 +00:00
Integrate splitting for saturn (#233) This PR does some initial integration work for splitting the Saturn version. It adds T_BAT.PRG (Bat overlay) and GAME.PRG (similar to DRA.BIN). These are extracted to asm/saturn/* and src/saturn/*. Right now there's no attempt to compile. I haven't been able to figure out the issues with sotn-disk so this requires pre-extracted files in disks/saturn. Something like this is able to do it: ``` bchunk saturn.bin saturn.cue saturn.iso 7z x saturn.iso ``` The Saturn version has the code split up differently so I think putting it in a separate folder to begin with makes sense. For example the Random function is in GAME.PRG rather than in the stage overlays. There's also an Alucard overlay rather than it being included in GAME.PRG. See here for some comparisons: https://github.com/Xeeynamo/sotn-decomp/wiki/Saturn-Matching I didn't attempt to install Rust as part of the project setup like with Go. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-05-25 18:29:10 +00:00
$(SATURN_SPLITTER_APP):
git submodule init $(SATURN_SPLITTER_DIR)
git submodule update $(SATURN_SPLITTER_DIR)
cd $(SATURN_SPLITTER_DIR)/rust-dis && cargo build --release
Extract Saturn adpcm music (#252) This adds a new tool that extracts the Saturn ADPCM music files to WAV. @sonicdcer pointed me to an old winamp plugin that had support for this format, so I reworked the relevant part into a standalone tool. This doesn't try to re-encode, since I would want to examine the original decompression code to make sure that it's 1:1 with this implementation first. Not all the files seem to be in this format, so I explicitly list the ones that are in the Makefile. I think the other PCM files are the voice tracks, which would make sense to use a voice-oriented codec. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-16 18:39:45 +00:00
cd $(SATURN_SPLITTER_DIR)/adpcm-extract && cargo build --release
Integrate splitting for saturn (#233) This PR does some initial integration work for splitting the Saturn version. It adds T_BAT.PRG (Bat overlay) and GAME.PRG (similar to DRA.BIN). These are extracted to asm/saturn/* and src/saturn/*. Right now there's no attempt to compile. I haven't been able to figure out the issues with sotn-disk so this requires pre-extracted files in disks/saturn. Something like this is able to do it: ``` bchunk saturn.bin saturn.cue saturn.iso 7z x saturn.iso ``` The Saturn version has the code split up differently so I think putting it in a separate folder to begin with makes sense. For example the Random function is in GAME.PRG rather than in the stage overlays. There's also an Alucard overlay rather than it being included in GAME.PRG. See here for some comparisons: https://github.com/Xeeynamo/sotn-decomp/wiki/Saturn-Matching I didn't attempt to install Rust as part of the project setup like with Go. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-05-25 18:29:10 +00:00
Upload disassembly
2022-01-01 17:45:41 +00:00
$(BUILD_DIR)/%.s.o: %.s
$(AS) $(AS_FLAGS) -o $@ $<
Fix CI pipeline
2023-06-17 11:29:42 +00:00
$(BUILD_DIR)/%.c.o: %.c $(MASPSX_APP) $(CC1PSX)
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
$(CPP) $(CPP_FLAGS) $< | $(CC) $(CC_FLAGS) | $(MASPSX) | $(AS) $(AS_FLAGS) -o $@
Upload disassembly
2022-01-01 17:45:41 +00:00
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
build_saturn_dosemu_docker_container:
Switch ASPATCH to MASPSX (#254) This PR replaces the ASPATCH command with my custom script named MASPSX. It's very new, and so is likely to have bugs and/or missing functionality. That said it's producing an :ok: build across all overlays, and is matching a few functions that required psyq3.5/aspsx. I have not attempted to match any of the functions that require rodata, nor any of the functions that refused to compile / had diffs. Note that I have added `-gcoff` to the `CC_FLAGS`, this will give you line numbers in asm-differ. ---------------------- Thank you in advance for contributing to sotn-decomp. Before submitting this PR, please make sure: - [x] The PR is small and focuses to address a single task - [x] `make all` reports all `OK` - [x] `make format` reports no files changed - [x] Have Actions enabled in your fork to run the auto-formatter
2023-06-16 18:51:16 +00:00
docker build -t dosemu:latest -f tools/saturn_toolchain/dosemu_dockerfile .
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
build_saturn_binutils_docker_container:
docker build -t binutils-sh-elf:latest -f tools/saturn_toolchain/binutils_dockerfile .
build_saturn_toolchain_gccsh:
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
# get GCCSH
wget -nc https://github.com/sozud/saturn-compilers/archive/refs/heads/main.zip
unzip -n main.zip
rm -rf ./tools/saturn_toolchain/GCCSH
mv saturn-compilers-main/cygnus-2.7-96Q3-bin ./tools/saturn_toolchain/GCCSH
rm -rf main.zip
rm -rf saturn-compilers-main
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
# parallel OK
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
build_saturn_toolchain_docker: build_saturn_dosemu_docker_container build_saturn_binutils_docker_container build_saturn_toolchain_gccsh $(SATURN_SPLITTER_APP)
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
# CI prep, don't build dosemu container (parallel OK)
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
build_saturn_toolchain_native: extract_disk_saturn build_saturn_toolchain_gccsh $(SATURN_SPLITTER_APP)
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
SATURN_BUILD_DIR := build/saturn
# absolute path for docker mounts
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
SATURN_BUILD_ABS := $(shell pwd)/$(SATURN_BUILD_DIR)
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
SATURN_DISK_DIR := disks/saturn
# absolute path for docker mounts
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
SATURN_DISK_ABS := $(shell pwd)/$(SATURN_DISK_DIR)
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
build_saturn_copy_files:
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
# copy everything into same directory since dosemu is hard to use otherwise
rm -rf $(SATURN_BUILD_DIR)
mkdir -p $(SATURN_BUILD_DIR)
cp -r ./tools/saturn_toolchain/GCCSH/* $(SATURN_BUILD_DIR)
cp ./src/saturn/inc_asm.h $(SATURN_BUILD_DIR)
cp ./src/saturn/macro.inc $(SATURN_BUILD_DIR)
cp ./src/saturn/game.c $(SATURN_BUILD_DIR)
cp ./src/saturn/t_bat.c $(SATURN_BUILD_DIR)
cp ./src/saturn/zero.c $(SATURN_BUILD_DIR)
Extract Alchemy Lab, decompile func_060e1ff8 (#240) This adds the Alchemy Lab overlay and decompiles func_060e1ff8 to check that it's working. func_060e1ff8 seems similar to https://github.com/Xeeynamo/sotn-decomp/blob/31d04a46d3f9c258722cedc56627d0dd627cbf71/src/st/nz0/36DE4.c#L101 but it's not clear if it's the same function yet. I think it probably makes sense to add one overlay of each type. Right now there's no stage overlay extracted. I picked Alchemy Lab since it's the furthest along on PSX.
2023-06-06 22:28:19 +00:00
cp ./src/saturn/stage_02.c $(SATURN_BUILD_DIR)
Decompile EntityRedEyeBust (#304) I made a change in the Makefile to auto-format Saturn headers.
2023-07-01 21:02:56 +00:00
cp ./src/saturn/stage_02.h $(SATURN_BUILD_DIR)
Saturn: Extract warp program
2023-07-02 16:48:23 +00:00
cp ./src/saturn/warp.c $(SATURN_BUILD_DIR)
Extract Alchemy Lab, decompile func_060e1ff8 (#240) This adds the Alchemy Lab overlay and decompiles func_060e1ff8 to check that it's working. func_060e1ff8 seems similar to https://github.com/Xeeynamo/sotn-decomp/blob/31d04a46d3f9c258722cedc56627d0dd627cbf71/src/st/nz0/36DE4.c#L101 but it's not clear if it's the same function yet. I think it probably makes sense to add one overlay of each type. Right now there's no stage overlay extracted. I picked Alchemy Lab since it's the furthest along on PSX.
2023-06-06 22:28:19 +00:00
cp ./src/saturn/sattypes.h $(SATURN_BUILD_DIR)
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
mkdir -p $(SATURN_BUILD_DIR)/asm/saturn/
mkdir -p $(SATURN_BUILD_DIR)/asm/saturn/
cp -r ./asm/saturn/game $(SATURN_BUILD_DIR)/asm/saturn/game
cp -r ./asm/saturn/t_bat $(SATURN_BUILD_DIR)/asm/saturn/t_bat
cp -r ./asm/saturn/zero $(SATURN_BUILD_DIR)/asm/saturn/zero
Extract Alchemy Lab, decompile func_060e1ff8 (#240) This adds the Alchemy Lab overlay and decompiles func_060e1ff8 to check that it's working. func_060e1ff8 seems similar to https://github.com/Xeeynamo/sotn-decomp/blob/31d04a46d3f9c258722cedc56627d0dd627cbf71/src/st/nz0/36DE4.c#L101 but it's not clear if it's the same function yet. I think it probably makes sense to add one overlay of each type. Right now there's no stage overlay extracted. I picked Alchemy Lab since it's the furthest along on PSX.
2023-06-06 22:28:19 +00:00
cp -r ./asm/saturn/stage_02 $(SATURN_BUILD_DIR)/asm/saturn/stage_02
Saturn: Extract warp program
2023-07-02 16:48:23 +00:00
cp -r ./asm/saturn/warp $(SATURN_BUILD_DIR)/asm/saturn/warp
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
cp ./tools/saturn_toolchain/compile_dosemu.sh $(SATURN_BUILD_DIR)
chmod +x $(SATURN_BUILD_DIR)/compile_dosemu.sh
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
build_saturn_dosemu_native:
cd build/saturn && FILENAME=game sh ./compile_dosemu.sh
cd build/saturn && FILENAME=t_bat sh ./compile_dosemu.sh
cd build/saturn && FILENAME=zero sh ./compile_dosemu.sh
cd build/saturn && FILENAME=stage_02 sh ./compile_dosemu.sh
Saturn: Extract warp program
2023-07-02 16:48:23 +00:00
cd build/saturn && FILENAME=warp sh ./compile_dosemu.sh
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
build_saturn_dosemu_docker:
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
docker run --rm -e FILENAME=game -v $(SATURN_BUILD_ABS):/build -w /build dosemu:latest /bin/bash -c "./compile_dosemu.sh"
docker run --rm -e FILENAME=t_bat -v $(SATURN_BUILD_ABS):/build -w /build dosemu:latest /bin/bash -c "./compile_dosemu.sh"
docker run --rm -e FILENAME=zero -v $(SATURN_BUILD_ABS):/build -w /build dosemu:latest /bin/bash -c "./compile_dosemu.sh"
Extract Alchemy Lab, decompile func_060e1ff8 (#240) This adds the Alchemy Lab overlay and decompiles func_060e1ff8 to check that it's working. func_060e1ff8 seems similar to https://github.com/Xeeynamo/sotn-decomp/blob/31d04a46d3f9c258722cedc56627d0dd627cbf71/src/st/nz0/36DE4.c#L101 but it's not clear if it's the same function yet. I think it probably makes sense to add one overlay of each type. Right now there's no stage overlay extracted. I picked Alchemy Lab since it's the furthest along on PSX.
2023-06-06 22:28:19 +00:00
docker run --rm -e FILENAME=stage_02 -v $(SATURN_BUILD_ABS):/build -w /build dosemu:latest /bin/bash -c "./compile_dosemu.sh"
Saturn: Extract warp program
2023-07-02 16:48:23 +00:00
docker run --rm -e FILENAME=warp -v $(SATURN_BUILD_ABS):/build -w /build dosemu:latest /bin/bash -c "./compile_dosemu.sh"
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
build_saturn_link_docker_ld:
docker run --rm -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c "sh-elf-ld -o zero_li.o -Map zero.map -T zero.ld -T all_syms.txt -verbose zero.o --no-check-sections -nostdlib -s"
docker run --rm -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c "sh-elf-ld -o t_bat_li.o -Map t_bat.map -T t_bat.ld -T all_syms.txt -T t_bat_user_syms.txt -verbose t_bat.o --no-check-sections -nostdlib -s"
docker run --rm -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c "sh-elf-ld -o game_li.o -Map game.map -T game.ld -T all_syms.txt -T game_user_syms.txt -verbose game.o --no-check-sections -nostdlib -s"
docker run --rm -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c "sh-elf-ld -o stage_02_li.o -Map stage_02.map -T stage_02.ld -T all_syms.txt -T stage_02_user_syms.txt -verbose stage_02.o --no-check-sections -nostdlib -s"
Saturn: Extract warp program
2023-07-02 16:48:23 +00:00
docker run --rm -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c "sh-elf-ld -o warp_li.o -Map warp.map -T warp.ld -T all_syms.txt -T warp_user_syms.txt -verbose warp.o --no-check-sections -nostdlib -s"
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
build_saturn_link_native_ld:
cd build/saturn && sh-elf-ld -o zero_li.o -Map zero.map -T zero.ld -T all_syms.txt -verbose zero.o --no-check-sections -nostdlib -s
cd build/saturn && sh-elf-ld -o t_bat_li.o -Map t_bat.map -T t_bat.ld -T all_syms.txt -T t_bat_user_syms.txt -verbose t_bat.o --no-check-sections -nostdlib -s
cd build/saturn && sh-elf-ld -o game_li.o -Map game.map -T game.ld -T all_syms.txt -T game_user_syms.txt -verbose game.o --no-check-sections -nostdlib -s
cd build/saturn && sh-elf-ld -o stage_02_li.o -Map stage_02.map -T stage_02.ld -T all_syms.txt -T stage_02_user_syms.txt -verbose stage_02.o --no-check-sections -nostdlib -s
Saturn: Extract warp program
2023-07-02 16:48:23 +00:00
cd build/saturn && sh-elf-ld -o warp_li.o -Map warp.map -T warp.ld -T all_syms.txt -T warp_user_syms.txt -verbose warp.o --no-check-sections -nostdlib -s
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
build_saturn_link_copy:
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
# link
cat ./config/saturn/game_syms.txt > ./build/saturn/all_syms.txt
cat ./config/saturn/t_bat_syms.txt >> ./build/saturn/all_syms.txt
cat ./config/saturn/zero_syms.txt >> ./build/saturn/all_syms.txt
cp ./config/saturn/t_bat_user_syms.txt ./build/saturn/
cp ./config/saturn/game_user_syms.txt ./build/saturn/
Extract Alchemy Lab, decompile func_060e1ff8 (#240) This adds the Alchemy Lab overlay and decompiles func_060e1ff8 to check that it's working. func_060e1ff8 seems similar to https://github.com/Xeeynamo/sotn-decomp/blob/31d04a46d3f9c258722cedc56627d0dd627cbf71/src/st/nz0/36DE4.c#L101 but it's not clear if it's the same function yet. I think it probably makes sense to add one overlay of each type. Right now there's no stage overlay extracted. I picked Alchemy Lab since it's the furthest along on PSX.
2023-06-06 22:28:19 +00:00
cp ./config/saturn/stage_02_user_syms.txt ./build/saturn/
Saturn: Extract warp program
2023-07-02 16:48:23 +00:00
cp ./config/saturn/warp_user_syms.txt ./build/saturn/
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
cp ./config/saturn/*.ld ./build/saturn
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
build_saturn_link_docker: build_saturn_link_copy build_saturn_link_docker_ld
build_saturn_link_native: build_saturn_link_copy build_saturn_link_native_ld
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
# do not run in parallel
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
build_saturn_docker: build_saturn_copy_files build_saturn_dosemu_docker build_saturn_link_docker
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
# do not run in parallel
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
build_saturn_native: build_saturn_copy_files build_saturn_dosemu_native build_saturn_link_native
Set up Saturn CI (#248) This was working on my fork but may require a little tweaking for this repo since I can't test the dependency fetching. The CI build uses a regular install of dosemu2 since you can't run it in a container on GitHub actions. I rearranged the Makefile a bit to parallelize some actions and reduce duplication for the two workflows. --------- Co-authored-by: sozud <sozud@users.noreply.github.com>
2023-06-12 07:27:29 +00:00
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
check_saturn_docker:
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
# dump binaries using sh binutils container
chmod +x tools/saturn_toolchain/strip.sh
cp tools/saturn_toolchain/strip.sh $(SATURN_BUILD_DIR)
docker run --rm -e INPUT_FILENAME=game_li.o -e OUTPUT_FILENAME=GAME.PRG -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c ./strip.sh
docker run --rm -e INPUT_FILENAME=t_bat_li.o -e OUTPUT_FILENAME=T_BAT.PRG -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c ./strip.sh
docker run --rm -e INPUT_FILENAME=zero_li.o -e OUTPUT_FILENAME=0.BIN -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c ./strip.sh
Extract Alchemy Lab, decompile func_060e1ff8 (#240) This adds the Alchemy Lab overlay and decompiles func_060e1ff8 to check that it's working. func_060e1ff8 seems similar to https://github.com/Xeeynamo/sotn-decomp/blob/31d04a46d3f9c258722cedc56627d0dd627cbf71/src/st/nz0/36DE4.c#L101 but it's not clear if it's the same function yet. I think it probably makes sense to add one overlay of each type. Right now there's no stage overlay extracted. I picked Alchemy Lab since it's the furthest along on PSX.
2023-06-06 22:28:19 +00:00
docker run --rm -e INPUT_FILENAME=stage_02_li.o -e OUTPUT_FILENAME=STAGE_02.PRG -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c ./strip.sh
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
# check hashes
Make tools working with the env 'VERSION'
2023-07-02 22:13:37 +00:00
sha1sum --check config/check.saturn.sha
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
check_saturn_native:
# dump binaries using sh binutils container
sh-elf-objcopy ./build/saturn/game_li.o -O binary ./build/saturn/GAME.PRG
sh-elf-objcopy ./build/saturn/t_bat_li.o -O binary ./build/saturn/T_BAT.PRG
sh-elf-objcopy ./build/saturn/zero_li.o -O binary ./build/saturn/0.BIN
sh-elf-objcopy ./build/saturn/stage_02_li.o -O binary ./build/saturn/STAGE_02.PRG
# check hashes
Make tools working with the env 'VERSION'
2023-07-02 22:13:37 +00:00
sha1sum --check config/check.saturn.sha
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
diff_saturn_docker:
Add Saturn toolchain (#234) This adds some new Makefile commands: build_saturn_toolchain: Downloads GCCSH, and builds two docker containers. One container is binutils for SuperH, and the other has Dosemu. build_saturn: Copies GCCSH, the source code, and asm into the build directory and runs the GCCSH via Dosemu in the docker container. Everything is kept in the same directory since it's hard to use Dosemu otherwise. check_saturn: Dumps the object files to binary using the binutils Docker container, then checks the hashes. diff_saturn: Compares the binaries and outputs a diff to build/saturn/$FILENAME-diff.txt. Used like FILENAME=GAME.PRG make diff_saturn. I've added the source for game.c and t_bat.c. I've replaced one of the asm functions in t_bat.c to show that it's possible to match simple functions. I'm not able to generate linker scripts yet so functions that rely on symbols from other overlays generally can't be matched yet. This workflow is not all that clean so I'm open to ideas on improving it. I tried using various versions of https://github.com/decompals/old-gcc to try to get a native compiler but couldn't get a matching build. I'm not 100% sure that this version of GCCSH is correct but initial results seem promising. As of right now, it's not possible to run this in CI since the dosemu container changes the USER and Github won't let you write to disk if you do that. https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
2023-06-03 18:09:44 +00:00
chmod +x tools/saturn_toolchain/diff.sh
cp tools/saturn_toolchain/diff.sh $(SATURN_BUILD_DIR)
docker run --rm -e FILENAME=$(FILENAME) -v $(SATURN_DISK_ABS):/theirs -v $(SATURN_BUILD_ABS):/build -w /build binutils-sh-elf:latest /bin/bash -c ./diff.sh
Dockerless Saturn build (#266) @sonicdcer was having trouble with Docker so here is a Dockerless build. I've changed the CI to use this since it's faster.
2023-06-19 19:10:09 +00:00
diff_saturn_native:
sh-elf-objdump -z -m sh2 -b binary -D ./build/saturn/$(FILENAME) > ./build/saturn/$(FILENAME)-ours.txt && \
sh-elf-objdump -z -m sh2 -b binary -D ./disks/saturn/$(FILENAME) > ./build/saturn/$(FILENAME)-theirs.txt && \
diff ./build/saturn/$(FILENAME)-ours.txt ./build/saturn/$(FILENAME)-theirs.txt > ./build/saturn/$(FILENAME)-diff.txt || true
WRP split some data and add new split tools (#109) The objective is to separate the data that is usually written into `asm/*/data` into separate files. Those will initially be binary files. There is also an utility that allows to decompress compressed data. The decompressed data is currently not read as we are missing a compression algorithm that matches the original one. I tried writing one in the past: it worked, it re-created similar files but sadly not the same ones. The decompression algorithm is there to allow to do some data mining and understand what the data is and how it is used.
2023-03-09 13:32:00 +00:00
# Handles assets
$(BUILD_DIR)/$(ASSETS_DIR)/%.layoutobj.json.o: $(ASSETS_DIR)/%.layoutobj.json
./tools/splat_ext/layoutobj.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
$(LD) -r -b binary -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
$(BUILD_DIR)/$(ASSETS_DIR)/%.roomdef.json.o: $(ASSETS_DIR)/%.roomdef.json
./tools/splat_ext/roomdef.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
$(LD) -r -b binary -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
Add script to extract and rebuild room data
2023-03-31 07:41:52 +00:00
$(BUILD_DIR)/$(ASSETS_DIR)/%.layers.json.o: $(ASSETS_DIR)/%.layers.json
./tools/splat_ext/layers.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.s
$(AS) $(AS_FLAGS) -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.s
WRP split some data and add new split tools (#109) The objective is to separate the data that is usually written into `asm/*/data` into separate files. Those will initially be binary files. There is also an utility that allows to decompress compressed data. The decompressed data is currently not read as we are missing a compression algorithm that matches the original one. I tried writing one in the past: it worked, it re-created similar files but sadly not the same ones. The decompression algorithm is there to allow to do some data mining and understand what the data is and how it is used.
2023-03-09 13:32:00 +00:00
$(BUILD_DIR)/$(ASSETS_DIR)/%.tiledef.json.o: $(ASSETS_DIR)/%.tiledef.json
./tools/splat_ext/tiledef.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.s
$(AS) $(AS_FLAGS) -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.s
RIC extract spritesheet (#199) Thanks to @MottZilla research I was able to extract the spritesheets of Richter as PNGs in conjunction with the original palette from `F_GAME2.BIN`. When the binaries are built, the PNGs are recompiled back into binary. In case of modding, it is possible to modify the sprite size to accommodate bigger or smaller sprites. Although it is not possible to modify the existing palette as currently we have no way to extract and rebuild `F_GAME2.BIN`. You would have to modify the palette via hex yourself. The file `config/splat.us.ric.yaml` shows in which offset the palette is located. Just for reference, the colour format for the palette is RGBA5551. It is important that edited PNGs has 16 colours otherwise the build will fail. The `padding` field is required to reconstruct some left-over / junk data that is not part of the data sprite. For the sake of modding, the `padding` field can be whatever. I am not sure if `RIC.BIN` pointers can be relocated. If that is the case you might get a black screen when playing with Richter. It should be easily fixable though. ![image](https://user-images.githubusercontent.com/6128729/233791249-0155a6fb-c5fc-4142-b294-9f44b5524dde.png)
2023-04-22 20:03:55 +00:00
$(BUILD_DIR)/$(ASSETS_DIR)/%.spritesheet.json.o: $(ASSETS_DIR)/%.spritesheet.json
./tools/splat_ext/spritesheet.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.s
$(AS) $(AS_FLAGS) -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.s
WRP split some data and add new split tools (#109) The objective is to separate the data that is usually written into `asm/*/data` into separate files. Those will initially be binary files. There is also an utility that allows to decompress compressed data. The decompressed data is currently not read as we are missing a compression algorithm that matches the original one. I tried writing one in the past: it worked, it re-created similar files but sadly not the same ones. The decompression algorithm is there to allow to do some data mining and understand what the data is and how it is used.
2023-03-09 13:32:00 +00:00
$(BUILD_DIR)/$(ASSETS_DIR)/%.spriteparts.json.o: $(ASSETS_DIR)/%.spriteparts.json
./tools/splat_ext/spriteparts.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
$(LD) -r -b binary -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
Extract Equipment data as JSON
2023-03-18 14:16:56 +00:00
$(BUILD_DIR)/$(ASSETS_DIR)/%.equipment.json.o: $(ASSETS_DIR)/%.equipment.json
./tools/splat_ext/equipment.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
$(LD) -r -b binary -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
Accessories extracted and building (#264) Like Equipment, this will take the accessories, extract to a json in the assets directory, and then when building the game, read items from that json. Full list of changes required for this capability, and their reasons/purposes: Addition of entry in the makefile for the accessory json. This is literally just the equipment one copied and the name changed. Adjustment of splat extraction. Accessory data runs all the way up until a bunch of strings which are now in 8258.data.s. Previously, the file 8000.data.s was created, and was just a whole bunch of uninterpreted .word values. The accessory table runs all the way up to 0x8258. Happily, this means there is no longer any gap between understood and non-understood data in this region of the ROM. Accessory.py is extremely similar to the existing Equipment.py. As stated in the large comment at the top of this script, it would be neat if we could combine the two scripts to one script that would process all equippables in the game. For now, this is functional. Tidying this up could be a nice future task, especially for someone new to the project who is more comfortable with Python than C. Finally, the dictionary of punctuation in the utils.py has been expanded. The question mark shows up in the description of the Alucart Mail "Resists fire, lightning, ice?", while the plus signs show up in many items which provide stat bonuses that have descriptions like "DEF+15". These symbols were previously unknown. Feels very nice to now have equipment and accessories both extracting to human-editable forms!
2023-06-19 18:12:20 +00:00
$(BUILD_DIR)/$(ASSETS_DIR)/%.accessory.json.o: $(ASSETS_DIR)/%.accessory.json
./tools/splat_ext/accessory.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
$(LD) -r -b binary -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.bin
WRP split some data and add new split tools (#109) The objective is to separate the data that is usually written into `asm/*/data` into separate files. Those will initially be binary files. There is also an utility that allows to decompress compressed data. The decompressed data is currently not read as we are missing a compression algorithm that matches the original one. I tried writing one in the past: it worked, it re-created similar files but sadly not the same ones. The decompression algorithm is there to allow to do some data mining and understand what the data is and how it is used.
2023-03-09 13:32:00 +00:00
$(BUILD_DIR)/$(ASSETS_DIR)/%.spritepartslist.json.o: $(ASSETS_DIR)/%.spritepartslist.json
./tools/splat_ext/spritepartslist.py $< $(BUILD_DIR)/$(ASSETS_DIR)/$*.s
$(AS) $(AS_FLAGS) -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(BUILD_DIR)/$(ASSETS_DIR)/$*.s
$(BUILD_DIR)/$(ASSETS_DIR)/%.tilelayout.bin.o: $(ASSETS_DIR)/%.tilelayout.bin
$(LD) -r -b binary -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $(ASSETS_DIR)/$*.tilelayout.bin
$(BUILD_DIR)/$(ASSETS_DIR)/%.bin.o: $(ASSETS_DIR)/%.bin
$(LD) -r -b binary -o $(BUILD_DIR)/$(ASSETS_DIR)/$*.o $<
$(BUILD_DIR)/$(ASSETS_DIR)/%.dec.o: $(ASSETS_DIR)/%.dec
# for now '.dec' files are ignored
touch $@
RIC extract spritesheet (#199) Thanks to @MottZilla research I was able to extract the spritesheets of Richter as PNGs in conjunction with the original palette from `F_GAME2.BIN`. When the binaries are built, the PNGs are recompiled back into binary. In case of modding, it is possible to modify the sprite size to accommodate bigger or smaller sprites. Although it is not possible to modify the existing palette as currently we have no way to extract and rebuild `F_GAME2.BIN`. You would have to modify the palette via hex yourself. The file `config/splat.us.ric.yaml` shows in which offset the palette is located. Just for reference, the colour format for the palette is RGBA5551. It is important that edited PNGs has 16 colours otherwise the build will fail. The `padding` field is required to reconstruct some left-over / junk data that is not part of the data sprite. For the sake of modding, the `padding` field can be whatever. I am not sure if `RIC.BIN` pointers can be relocated. If that is the case you might get a black screen when playing with Richter. It should be easily fixable though. ![image](https://user-images.githubusercontent.com/6128729/233791249-0155a6fb-c5fc-4142-b294-9f44b5524dde.png)
2023-04-22 20:03:55 +00:00
$(BUILD_DIR)/$(ASSETS_DIR)/%.png.o: $(ASSETS_DIR)/%.png
touch $@
WRP split some data and add new split tools (#109) The objective is to separate the data that is usually written into `asm/*/data` into separate files. Those will initially be binary files. There is also an utility that allows to decompress compressed data. The decompressed data is currently not read as we are missing a compression algorithm that matches the original one. I tried writing one in the past: it worked, it re-created similar files but sadly not the same ones. The decompression algorithm is there to allow to do some data mining and understand what the data is and how it is used.
2023-03-09 13:32:00 +00:00
Upload disassembly
2022-01-01 17:45:41 +00:00
SHELL = /bin/bash -e -o pipefail
Add rule to create the 'expected' folder for asm-differ
2022-10-23 16:55:36 +00:00
.PHONY: all, clean, format, check, expected
Add SERVANT/TT_000.BIN overlay
2023-02-08 14:03:44 +00:00
.PHONY: main, dra, ric, cen, dre, mad, no3, np3, nz0, st0, wrp, rwrp, tt_000
Simplify Makefile
2022-02-23 18:17:18 +00:00
.PHONY: %_dirs
.PHONY: extract, extract_%
Add make update-dependencies
2022-10-25 20:26:35 +00:00
.PHONY: require-tools,update-dependencies
Reference in New Issue Copy Permalink