From 89f11fc14231233325d2772df54bc857d29c0e9c Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Tue, 14 May 2024 10:59:18 -0300 Subject: [PATCH] fix jp rev0 build --- Makefile | 5 +++++ linker_scripts/jp/rev0/undefined_syms.ld | 1 + starfox64.jp.rev0.uncompressed.md5 | 1 + yamls/jp/rev0/main.yaml | 1 + yamls/us/rev0/assets.yaml | 0 yamls/us/rev0/header.yaml | 0 yamls/us/rev0/main.yaml | 0 yamls/us/rev0/overlays.yaml | 0 8 files changed, 8 insertions(+) create mode 100644 starfox64.jp.rev0.uncompressed.md5 delete mode 100644 yamls/us/rev0/assets.yaml delete mode 100644 yamls/us/rev0/header.yaml delete mode 100644 yamls/us/rev0/main.yaml delete mode 100644 yamls/us/rev0/overlays.yaml diff --git a/Makefile b/Makefile index bd3722a6..61e21933 100644 --- a/Makefile +++ b/Makefile @@ -279,9 +279,14 @@ endif $(shell mkdir -p asm bin linker_scripts/$(VERSION)/$(REV)/auto) SRC_DIRS := $(shell find src -type d) +# Temporary, until we decide how we're gonna handle other versions +ifeq ($(VERSION), jp) +SRC_DIRS := $(shell find srcjp -type d) +endif ASM_DIRS := $(shell find asm/$(VERSION)/$(REV) -type d -not -path "asm/$(VERSION)/$(REV)/nonmatchings/*") BIN_DIRS := $(shell find bin -type d) + C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) C_FILES := $(filter-out %.inc.c,$(C_FILES)) S_FILES := $(foreach dir,$(ASM_DIRS) $(SRC_DIRS),$(wildcard $(dir)/*.s)) diff --git a/linker_scripts/jp/rev0/undefined_syms.ld b/linker_scripts/jp/rev0/undefined_syms.ld index fa606254..2956b524 100644 --- a/linker_scripts/jp/rev0/undefined_syms.ld +++ b/linker_scripts/jp/rev0/undefined_syms.ld @@ -2443,6 +2443,7 @@ D_8017E112 = 0x8017E112; D_8017E210 = 0x8017E210; D_8017E218 = 0x8017E218; D_80180001 = 0x80180001; +D_80180058 = 0x80180058; D_8018CFB0 = 0x8018CFB0; D_8018CFC0 = 0x8018CFC0; D_i6_8018DD90 = 0x8018DD90; diff --git a/starfox64.jp.rev0.uncompressed.md5 b/starfox64.jp.rev0.uncompressed.md5 new file mode 100644 index 00000000..27fb7cab --- /dev/null +++ b/starfox64.jp.rev0.uncompressed.md5 @@ -0,0 +1 @@ +7815171b128791fc3c0cd16debe30bec ./build/starfox64.jp.rev0.uncompressed.z64 \ No newline at end of file diff --git a/yamls/jp/rev0/main.yaml b/yamls/jp/rev0/main.yaml index 03cb25fd..35bd9c30 100644 --- a/yamls/jp/rev0/main.yaml +++ b/yamls/jp/rev0/main.yaml @@ -40,6 +40,7 @@ - [0x1FB40, c, 1FA60] - [0x1FB50, hasm, mio0] - [0x1FBF0, hasm, rdramcheck] + - [0x1FCA0, textbin, alt_ipl3] - [0x206C0, c, libc_sprintf] # Libultra diff --git a/yamls/us/rev0/assets.yaml b/yamls/us/rev0/assets.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/yamls/us/rev0/header.yaml b/yamls/us/rev0/header.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/yamls/us/rev0/main.yaml b/yamls/us/rev0/main.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/yamls/us/rev0/overlays.yaml b/yamls/us/rev0/overlays.yaml deleted file mode 100644 index e69de29b..00000000