diff options
| author | Max Roncace <me@caseif.net> | 2025-09-25 12:27:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-25 10:27:15 -0600 |
| commit | ca55fe6cc969d6c2ee040fc11510eccae4ea5635 (patch) | |
| tree | e0053cf5810aed87e1f9ef4965dff2c0bffe1e1e | |
| parent | 9a2df2162b7ec4a23ad32915c61d46cf20b5003d (diff) | |
Link some newly-matched TUs for PAL and JP (#2699)
| -rw-r--r-- | config/GZ2J01/rels/d_a_obj_smgdoor/splits.txt | 1 | ||||
| -rw-r--r-- | config/GZ2P01/rels/d_a_obj_smgdoor/splits.txt | 1 | ||||
| -rwxr-xr-x | configure.py | 12 |
3 files changed, 8 insertions, 6 deletions
diff --git a/config/GZ2J01/rels/d_a_obj_smgdoor/splits.txt b/config/GZ2J01/rels/d_a_obj_smgdoor/splits.txt index 553478bc4d..1b7886f24e 100644 --- a/config/GZ2J01/rels/d_a_obj_smgdoor/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_smgdoor/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_smgdoor.cpp: .text start:0x00000078 end:0x0000112C .rodata start:0x00000000 end:0x000000D0 .data start:0x00000000 end:0x00000130 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2P01/rels/d_a_obj_smgdoor/splits.txt b/config/GZ2P01/rels/d_a_obj_smgdoor/splits.txt index 553478bc4d..1b7886f24e 100644 --- a/config/GZ2P01/rels/d_a_obj_smgdoor/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_smgdoor/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_smgdoor.cpp: .text start:0x00000078 end:0x0000112C .rodata start:0x00000000 end:0x000000D0 .data start:0x00000000 end:0x00000130 + .bss start:0x00000000 end:0x00000004 diff --git a/configure.py b/configure.py index 5c61dfa254..101103bc3b 100755 --- a/configure.py +++ b/configure.py @@ -1784,7 +1784,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_ym_tag"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_ymb"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_yr"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_zh"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_zh"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_zm"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_zs"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_formation_mng"), @@ -1823,7 +1823,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_npc_clerka"), ActorRel(NonMatching, "d_a_npc_clerkb"), ActorRel(NonMatching, "d_a_npc_clerkt"), - ActorRel(MatchingFor("GZ2E01"), "d_a_npc_coach"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_coach"), ActorRel(NonMatching, "d_a_npc_df"), ActorRel(NonMatching, "d_a_npc_doc"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_doorboy", extra_cflags=[DANPCF_C_HACK]), @@ -1842,7 +1842,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_npc_grs"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_grz", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_guard"), - ActorRel(MatchingFor("GZ2E01"), "d_a_npc_gwolf", extra_cflags=[DANPCF_C_HACK]), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_gwolf", extra_cflags=[DANPCF_C_HACK]), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_hanjo"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_henna0"), ActorRel(NonMatching, "d_a_npc_hoz"), @@ -1885,7 +1885,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_seid"), ActorRel(NonMatching, "d_a_npc_seira"), ActorRel(NonMatching, "d_a_npc_seira2"), - ActorRel(MatchingFor("GZ2E01"), "d_a_npc_seirei"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_seirei"), ActorRel(Equivalent, "d_a_npc_shad", extra_cflags=[DANPCF_C_HACK]), # weak func order ActorRel(NonMatching, "d_a_npc_shaman"), ActorRel(NonMatching, "d_a_npc_shoe", extra_cflags=[DANPCF_C_HACK]), @@ -1952,7 +1952,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_chest"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_cho"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_cowdoor"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_crope"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_crope"), ActorRel(NonMatching, "d_a_obj_crvfence"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_crvgate"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_crvhahen"), @@ -2149,7 +2149,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_shield"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_sm_door"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_smallkey"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_smgdoor"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_smgdoor"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_smoke"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_smtile"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_smw_stone"), |