Support Servants in make-config.py (#1917)
Some checks are pending
Format code / format (push) Waiting to run
Build C code / extract-assets (push) Waiting to run
Build C code / build-linux (x86_64, Debug, clang, custom) (push) Blocked by required conditions
Build C code / build-linux (x86_64, Debug, clang, lle) (push) Blocked by required conditions
Build C code / build-linux (x86_64, Debug, gcc, custom) (push) Blocked by required conditions
Build C code / build-linux (x86_64, Debug, gcc, lle) (push) Blocked by required conditions
Build C code / build-linux (x86_64, RelWithDebInfo, clang, custom) (push) Blocked by required conditions
Build C code / build-linux (x86_64, RelWithDebInfo, clang, lle) (push) Blocked by required conditions
Build C code / build-linux (x86_64, RelWithDebInfo, gcc, custom) (push) Blocked by required conditions
Build C code / build-linux (x86_64, RelWithDebInfo, gcc, lle) (push) Blocked by required conditions
Build C code / build-macos (Debug, custom) (push) Blocked by required conditions
Build C code / build-macos (Debug, lle) (push) Blocked by required conditions
Build C code / build-macos (RelWithDebInfo, custom) (push) Blocked by required conditions
Build C code / build-macos (RelWithDebInfo, lle) (push) Blocked by required conditions
Build C code / build-windows (Debug, custom) (push) Blocked by required conditions
Build C code / build-windows (Debug, lle) (push) Blocked by required conditions
Build C code / build-windows (RelWithDebInfo, custom) (push) Blocked by required conditions
Build C code / build-windows (RelWithDebInfo, lle) (push) Blocked by required conditions
Build Saturn version / build-and-test-saturn (push) Waiting to run
Build Saturn version / function-finder-saturn (push) Waiting to run
Build Debug Module tool / build (push) Waiting to run
Build PSX and PSP version / build-and-test (pspeu, hd) (push) Waiting to run
Build PSX and PSP version / build-and-test (pspeu, pspeu) (push) Waiting to run
Build PSX and PSP version / build-and-test (us, us) (push) Waiting to run
Build PSX and PSP version / generate-progress-report (pspeu, hd) (push) Blocked by required conditions
Build PSX and PSP version / generate-progress-report (pspeu, pspeu) (push) Blocked by required conditions
Build PSX and PSP version / generate-progress-report (us, us) (push) Blocked by required conditions
Build PSX and PSP version / generate-duplicates-report (us, us) (push) Blocked by required conditions
Build PSX and PSP version / generate-duplicates-report-psp (pspeu, pspeu) (push) Blocked by required conditions

Adds match targets for servants.
This commit is contained in:
Jonathan Hohle 2024-11-19 12:36:37 -07:00 committed by GitHub
parent b1c617a1dd
commit 249cd2ae7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -964,8 +964,8 @@ def hydrate_psx_duplicate_symbols(splat_config, ovl_name: str, version: str):
samples = ["stsel"]
dup_paths = ["st/sel"]
elif is_servant(ovl_name):
samples = [ovl_name]
dup_paths = [f"servant/{ovl_name}"]
samples = ["tt_000", "tt_001", "tt_002"]
dup_paths = ["servant/tt_000", "servant/tt_001", "servant/tt_002"]
else:
samples = ["stdre", "stnp3", "stnz0", "stst0", "stwrp"]
dup_paths = ["st/dre", "st/np3", "st/nz0", "st/st0", "st/wrp"]
@ -1032,6 +1032,9 @@ def hydrate_psx_cross_ref_symbols(splat_config, ovl_name: str, version: str):
elif is_stage(ovl_name) or is_boss(ovl_name):
# pick NZ0 as the most complete overlay to cross-reference symbols
right_matchings_path = f"asm/us/{make_dst_path('nz0')}/matchings"
elif is_servant(ovl_name):
# pick TT_002 as the most complete overlay to cross-reference symbols
right_matchings_path = f"asm/us/{make_dst_path('tt_002')}/matchings"
else:
yowarning(
f"cannot find a similar overlay to {version}/{ovl_name} to cross-reference"