diff --git a/config/GZ2J01/rels/d_a_b_bq/splits.txt b/config/GZ2J01/rels/d_a_b_bq/splits.txt index 5b706b2efe..bcc48ab376 100644 --- a/config/GZ2J01/rels/d_a_b_bq/splits.txt +++ b/config/GZ2J01/rels/d_a_b_bq/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_bq.cpp: .text start:0x000000EC end:0x000070F4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000002EC .data start:0x00000000 end:0x000004D0 - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_b_go/splits.txt b/config/GZ2J01/rels/d_a_b_go/splits.txt index c18b1b429d..6ef11f39b6 100644 --- a/config/GZ2J01/rels/d_a_b_go/splits.txt +++ b/config/GZ2J01/rels/d_a_b_go/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_go.cpp: .text start:0x000000EC end:0x00000F70 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000050 .data start:0x00000000 end:0x000000A4 - .bss start:0x0000000C end:0x00000030 + .bss start:0x00000008 end:0x00000030 diff --git a/config/GZ2J01/rels/d_a_b_mgn/splits.txt b/config/GZ2J01/rels/d_a_b_mgn/splits.txt index b846002232..13e6c0c18c 100644 --- a/config/GZ2J01/rels/d_a_b_mgn/splits.txt +++ b/config/GZ2J01/rels/d_a_b_mgn/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_mgn.cpp: .text start:0x000000EC end:0x0000A78C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000002B4 .data start:0x00000000 end:0x000003A4 - .bss start:0x0000000C end:0x0000003C + .bss start:0x00000008 end:0x0000003C diff --git a/config/GZ2J01/rels/d_a_b_yo_ice/splits.txt b/config/GZ2J01/rels/d_a_b_yo_ice/splits.txt index 8e8ae2bf39..8349ae09b3 100644 --- a/config/GZ2J01/rels/d_a_b_yo_ice/splits.txt +++ b/config/GZ2J01/rels/d_a_b_yo_ice/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_yo_ice.cpp: .text start:0x000000EC end:0x00003C10 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000120 .data start:0x00000000 end:0x00000238 - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_b_zant_mobile/splits.txt b/config/GZ2J01/rels/d_a_b_zant_mobile/splits.txt index 563b62592a..80ce04e0f1 100644 --- a/config/GZ2J01/rels/d_a_b_zant_mobile/splits.txt +++ b/config/GZ2J01/rels/d_a_b_zant_mobile/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_zant_mobile.cpp: .text start:0x000000EC end:0x00002088 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000A0 .data start:0x00000000 end:0x00000140 - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_crod/splits.txt b/config/GZ2J01/rels/d_a_crod/splits.txt index 3ee25fc9c8..6cb63ab101 100644 --- a/config/GZ2J01/rels/d_a_crod/splits.txt +++ b/config/GZ2J01/rels/d_a_crod/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_crod.cpp: .text start:0x00000078 end:0x00001324 .rodata start:0x00000000 end:0x00000050 .data start:0x00000000 end:0x000000D8 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_door_boss/splits.txt b/config/GZ2J01/rels/d_a_door_boss/splits.txt index f615bd399b..a95fa3aab2 100644 --- a/config/GZ2J01/rels/d_a_door_boss/splits.txt +++ b/config/GZ2J01/rels/d_a_door_boss/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_door_boss.cpp: .text start:0x00000078 end:0x0000156C .rodata start:0x00000000 end:0x0000010C .data start:0x00000000 end:0x00000190 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_door_bossL1/splits.txt b/config/GZ2J01/rels/d_a_door_bossL1/splits.txt index 10518a19b9..1dfb9a81d7 100644 --- a/config/GZ2J01/rels/d_a_door_bossL1/splits.txt +++ b/config/GZ2J01/rels/d_a_door_bossL1/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_door_bossL1.cpp: .text start:0x00000078 end:0x00002CEC .rodata start:0x00000000 end:0x000003E4 .data start:0x00000000 end:0x000002AC + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_door_bossL5/splits.txt b/config/GZ2J01/rels/d_a_door_bossL5/splits.txt index 0c04a6deb5..ef8f8f9a42 100644 --- a/config/GZ2J01/rels/d_a_door_bossL5/splits.txt +++ b/config/GZ2J01/rels/d_a_door_bossL5/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_door_bossL5.cpp: .text start:0x00000078 end:0x00001900 .rodata start:0x00000000 end:0x0000012C .data start:0x00000000 end:0x000001A8 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_door_mbossL1/splits.txt b/config/GZ2J01/rels/d_a_door_mbossL1/splits.txt index dfab08b19f..e2794228ba 100644 --- a/config/GZ2J01/rels/d_a_door_mbossL1/splits.txt +++ b/config/GZ2J01/rels/d_a_door_mbossL1/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_door_mbossL1.cpp: .text start:0x00000078 end:0x00004D90 .rodata start:0x00000000 end:0x00000418 .data start:0x00000000 end:0x000003C4 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_door_push/splits.txt b/config/GZ2J01/rels/d_a_door_push/splits.txt index 45de372200..91a36b4313 100644 --- a/config/GZ2J01/rels/d_a_door_push/splits.txt +++ b/config/GZ2J01/rels/d_a_door_push/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_door_push.cpp: .text start:0x00000078 end:0x00001184 .rodata start:0x00000000 end:0x00000084 .data start:0x00000000 end:0x00000120 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_e_ai/splits.txt b/config/GZ2J01/rels/d_a_e_ai/splits.txt index 445efb26e1..baa5914f6b 100644 --- a/config/GZ2J01/rels/d_a_e_ai/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ai/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ai.cpp: .text start:0x000000EC end:0x00003368 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000144 .data start:0x00000000 end:0x00000150 - .bss start:0x0000000C end:0x00000038 + .bss start:0x00000008 end:0x00000038 diff --git a/config/GZ2J01/rels/d_a_e_ba/splits.txt b/config/GZ2J01/rels/d_a_e_ba/splits.txt index 95bf2e8d51..6e14363e38 100644 --- a/config/GZ2J01/rels/d_a_e_ba/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ba/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ba.cpp: .text start:0x000000EC end:0x000037A8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000E0 .data start:0x00000000 end:0x00000190 - .bss start:0x0000000C end:0x00000134 + .bss start:0x00000008 end:0x00000134 diff --git a/config/GZ2J01/rels/d_a_e_bg/splits.txt b/config/GZ2J01/rels/d_a_e_bg/splits.txt index bd4e070477..3dfd48865c 100644 --- a/config/GZ2J01/rels/d_a_e_bg/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bg/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bg.cpp: .text start:0x000000EC end:0x00004B10 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000D0 .data start:0x00000000 end:0x0000019C - .bss start:0x0000000C end:0x0000003C + .bss start:0x00000008 end:0x0000003C diff --git a/config/GZ2J01/rels/d_a_e_bs/splits.txt b/config/GZ2J01/rels/d_a_e_bs/splits.txt index ea5e815a9e..52104b5bdc 100644 --- a/config/GZ2J01/rels/d_a_e_bs/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bs/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bs.cpp: .text start:0x000000EC end:0x00002D84 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000EC .data start:0x00000000 end:0x000001C0 - .bss start:0x0000000C end:0x00000038 + .bss start:0x00000008 end:0x00000038 diff --git a/config/GZ2J01/rels/d_a_e_bu/splits.txt b/config/GZ2J01/rels/d_a_e_bu/splits.txt index f5825080b5..d099d0c2a5 100644 --- a/config/GZ2J01/rels/d_a_e_bu/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bu/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bu.cpp: .text start:0x000000EC end:0x000035BC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000EC .data start:0x00000000 end:0x000001D0 - .bss start:0x0000000C end:0x00000134 + .bss start:0x00000008 end:0x00000134 diff --git a/config/GZ2J01/rels/d_a_e_cr/splits.txt b/config/GZ2J01/rels/d_a_e_cr/splits.txt index 62476de3ec..1e0c62a5d5 100644 --- a/config/GZ2J01/rels/d_a_e_cr/splits.txt +++ b/config/GZ2J01/rels/d_a_e_cr/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_cr.cpp: .text start:0x000000EC end:0x00001D7C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000009C .data start:0x00000000 end:0x00000134 - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_e_db/splits.txt b/config/GZ2J01/rels/d_a_e_db/splits.txt index 19c4a762d8..04791bb43c 100644 --- a/config/GZ2J01/rels/d_a_e_db/splits.txt +++ b/config/GZ2J01/rels/d_a_e_db/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_db.cpp: .text start:0x000000EC end:0x00006EF8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000168 .data start:0x00000000 end:0x0000031C - .bss start:0x0000000C end:0x00000030 + .bss start:0x00000008 end:0x00000030 diff --git a/config/GZ2J01/rels/d_a_e_dd/splits.txt b/config/GZ2J01/rels/d_a_e_dd/splits.txt index fbbe5b41fa..31e1c647ec 100644 --- a/config/GZ2J01/rels/d_a_e_dd/splits.txt +++ b/config/GZ2J01/rels/d_a_e_dd/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dd.cpp: .text start:0x000000EC end:0x00005030 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000FC .data start:0x00000000 end:0x000001EC - .bss start:0x0000000C end:0x00000140 + .bss start:0x00000008 end:0x00000140 diff --git a/config/GZ2J01/rels/d_a_e_df/splits.txt b/config/GZ2J01/rels/d_a_e_df/splits.txt index 09bc3f3512..c29b8e5455 100644 --- a/config/GZ2J01/rels/d_a_e_df/splits.txt +++ b/config/GZ2J01/rels/d_a_e_df/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_df.cpp: .text start:0x000000EC end:0x0000291C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000D4 .data start:0x00000000 end:0x000000C4 - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_e_dk/splits.txt b/config/GZ2J01/rels/d_a_e_dk/splits.txt index c274fc593b..d180106753 100644 --- a/config/GZ2J01/rels/d_a_e_dk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_dk/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dk.cpp: .text start:0x000000EC end:0x00003424 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000FC .data start:0x00000000 end:0x000001B8 - .bss start:0x0000000C end:0x00000030 + .bss start:0x00000008 end:0x00000030 diff --git a/config/GZ2J01/rels/d_a_e_fz/splits.txt b/config/GZ2J01/rels/d_a_e_fz/splits.txt index 0f116d87f8..c4e0d9a5e5 100644 --- a/config/GZ2J01/rels/d_a_e_fz/splits.txt +++ b/config/GZ2J01/rels/d_a_e_fz/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fz.cpp: .text start:0x000000EC end:0x000030C4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000C8 .data start:0x00000000 end:0x00000198 - .bss start:0x0000000C end:0x00000050 + .bss start:0x00000008 end:0x00000050 diff --git a/config/GZ2J01/rels/d_a_e_ga/splits.txt b/config/GZ2J01/rels/d_a_e_ga/splits.txt index aa5edbf5bf..9eedebfb9b 100644 --- a/config/GZ2J01/rels/d_a_e_ga/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ga/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ga.cpp: .text start:0x000000EC end:0x00000B7C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000050 .data start:0x00000000 end:0x0000005C - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_e_gb/splits.txt b/config/GZ2J01/rels/d_a_e_gb/splits.txt index 86ecd892a9..d6d78508ea 100644 --- a/config/GZ2J01/rels/d_a_e_gb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_gb/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gb.cpp: .text start:0x000000EC end:0x000058D4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000001DC .data start:0x00000000 end:0x0000025C - .bss start:0x0000000C end:0x00000038 + .bss start:0x00000008 end:0x00000038 diff --git a/config/GZ2J01/rels/d_a_e_ge/splits.txt b/config/GZ2J01/rels/d_a_e_ge/splits.txt index ce532a1850..60894697a0 100644 --- a/config/GZ2J01/rels/d_a_e_ge/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ge/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ge.cpp: .text start:0x000000EC end:0x0000568C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000118 .data start:0x00000000 end:0x00000238 - .bss start:0x0000000C end:0x00000050 + .bss start:0x00000008 end:0x00000050 diff --git a/config/GZ2J01/rels/d_a_e_gi/splits.txt b/config/GZ2J01/rels/d_a_e_gi/splits.txt index 6846d279f1..2d4d4d7c9f 100644 --- a/config/GZ2J01/rels/d_a_e_gi/splits.txt +++ b/config/GZ2J01/rels/d_a_e_gi/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gi.cpp: .text start:0x000000EC end:0x00003AAC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000124 .data start:0x00000000 end:0x0000019C - .bss start:0x0000000C end:0x00000048 + .bss start:0x00000008 end:0x00000048 diff --git a/config/GZ2J01/rels/d_a_e_gs/splits.txt b/config/GZ2J01/rels/d_a_e_gs/splits.txt index c9fefcd9ed..1119561263 100644 --- a/config/GZ2J01/rels/d_a_e_gs/splits.txt +++ b/config/GZ2J01/rels/d_a_e_gs/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gs.cpp: .text start:0x000000EC end:0x00000A60 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000040 .data start:0x00000000 end:0x0000005C - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_hb/splits.txt b/config/GZ2J01/rels/d_a_e_hb/splits.txt index fccf5ac8dc..9f53805739 100644 --- a/config/GZ2J01/rels/d_a_e_hb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_hb/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hb.cpp: .text start:0x000000EC end:0x00004E70 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000138 .data start:0x00000000 end:0x0000021C - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_hp/splits.txt b/config/GZ2J01/rels/d_a_e_hp/splits.txt index 40f18da321..5d40f97ca1 100644 --- a/config/GZ2J01/rels/d_a_e_hp/splits.txt +++ b/config/GZ2J01/rels/d_a_e_hp/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hp.cpp: .text start:0x000000EC end:0x000044E0 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000F4 .data start:0x00000000 end:0x000001F4 - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_e_hzelda/splits.txt b/config/GZ2J01/rels/d_a_e_hzelda/splits.txt index 759435c04b..4ea18ee7f1 100644 --- a/config/GZ2J01/rels/d_a_e_hzelda/splits.txt +++ b/config/GZ2J01/rels/d_a_e_hzelda/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hzelda.cpp: .text start:0x000000EC end:0x000048A0 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000148 .data start:0x00000000 end:0x000002C0 - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_e_is/splits.txt b/config/GZ2J01/rels/d_a_e_is/splits.txt index 293bffc73a..ed3b485b0e 100644 --- a/config/GZ2J01/rels/d_a_e_is/splits.txt +++ b/config/GZ2J01/rels/d_a_e_is/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_is.cpp: .text start:0x000000EC end:0x000021F8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000B0 .data start:0x00000000 end:0x000001AC - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_kg/splits.txt b/config/GZ2J01/rels/d_a_e_kg/splits.txt index aac0a25442..32fc575c97 100644 --- a/config/GZ2J01/rels/d_a_e_kg/splits.txt +++ b/config/GZ2J01/rels/d_a_e_kg/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kg.cpp: .text start:0x000000EC end:0x00002590 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000D0 .data start:0x00000000 end:0x0000016C - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_e_kk/splits.txt b/config/GZ2J01/rels/d_a_e_kk/splits.txt index d55b6d38ed..78b412d9ef 100644 --- a/config/GZ2J01/rels/d_a_e_kk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_kk/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kk.cpp: .text start:0x000000EC end:0x00004FB4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000DC .data start:0x00000000 end:0x000001B0 - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_mm/splits.txt b/config/GZ2J01/rels/d_a_e_mm/splits.txt index 7409aedd60..6f15426eb2 100644 --- a/config/GZ2J01/rels/d_a_e_mm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_mm/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mm.cpp: .text start:0x000000EC end:0x00003348 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000B8 .data start:0x00000000 end:0x000001B4 - .bss start:0x0000000C end:0x0000004C + .bss start:0x00000008 end:0x0000004C diff --git a/config/GZ2J01/rels/d_a_e_nest/splits.txt b/config/GZ2J01/rels/d_a_e_nest/splits.txt index 2239837a1d..8ad0484758 100644 --- a/config/GZ2J01/rels/d_a_e_nest/splits.txt +++ b/config/GZ2J01/rels/d_a_e_nest/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_nest.cpp: .text start:0x000000EC end:0x00003828 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000120 .data start:0x00000000 end:0x0000014C - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_e_ph/splits.txt b/config/GZ2J01/rels/d_a_e_ph/splits.txt index aa2d25a3a0..98f255d16e 100644 --- a/config/GZ2J01/rels/d_a_e_ph/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ph/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ph.cpp: .text start:0x000000EC end:0x00004880 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000128 .data start:0x00000000 end:0x00000098 - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_rb/splits.txt b/config/GZ2J01/rels/d_a_e_rb/splits.txt index dd908d24e2..4869ba857e 100644 --- a/config/GZ2J01/rels/d_a_e_rb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_rb/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rb.cpp: .text start:0x000000EC end:0x00002A58 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000D0 .data start:0x00000000 end:0x0000019C - .bss start:0x0000000C end:0x00000054 + .bss start:0x00000008 end:0x00000054 diff --git a/config/GZ2J01/rels/d_a_e_sh/splits.txt b/config/GZ2J01/rels/d_a_e_sh/splits.txt index 4e6a5935f5..209a4f3e61 100644 --- a/config/GZ2J01/rels/d_a_e_sh/splits.txt +++ b/config/GZ2J01/rels/d_a_e_sh/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sh.cpp: .text start:0x000000EC end:0x00003AFC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000158 .data start:0x00000000 end:0x00000224 - .bss start:0x0000000C end:0x00000044 + .bss start:0x00000008 end:0x00000044 diff --git a/config/GZ2J01/rels/d_a_e_th/splits.txt b/config/GZ2J01/rels/d_a_e_th/splits.txt index 394160f6a2..aa251c7a89 100644 --- a/config/GZ2J01/rels/d_a_e_th/splits.txt +++ b/config/GZ2J01/rels/d_a_e_th/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_th.cpp: .text start:0x000000EC end:0x000041E8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000001B0 .data start:0x00000000 end:0x00000218 - .bss start:0x0000000C end:0x00000030 + .bss start:0x00000008 end:0x00000030 diff --git a/config/GZ2J01/rels/d_a_e_tk/splits.txt b/config/GZ2J01/rels/d_a_e_tk/splits.txt index 4f83f57e0a..8bdea734c5 100644 --- a/config/GZ2J01/rels/d_a_e_tk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_tk/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tk.cpp: .text start:0x000000EC end:0x00002158 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000008C .data start:0x00000000 end:0x00000138 - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_tk2/splits.txt b/config/GZ2J01/rels/d_a_e_tk2/splits.txt index f5a000b109..c66e709551 100644 --- a/config/GZ2J01/rels/d_a_e_tk2/splits.txt +++ b/config/GZ2J01/rels/d_a_e_tk2/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tk2.cpp: .text start:0x000000EC end:0x00001914 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000080 .data start:0x00000000 end:0x0000010C - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_ws/splits.txt b/config/GZ2J01/rels/d_a_e_ws/splits.txt index 955024afc9..f71158b422 100644 --- a/config/GZ2J01/rels/d_a_e_ws/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ws/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ws.cpp: .text start:0x000000EC end:0x000039CC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000110 .data start:0x00000000 end:0x0000019C - .bss start:0x0000000C end:0x00000040 + .bss start:0x00000008 end:0x00000040 diff --git a/config/GZ2J01/rels/d_a_e_yd/splits.txt b/config/GZ2J01/rels/d_a_e_yd/splits.txt index d2ad4c0e17..7939bb0da7 100644 --- a/config/GZ2J01/rels/d_a_e_yd/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yd/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yd.cpp: .text start:0x000000EC end:0x00004EAC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000138 .data start:0x00000000 end:0x00000228 - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_yh/splits.txt b/config/GZ2J01/rels/d_a_e_yh/splits.txt index 83bbd134ed..aa325aec54 100644 --- a/config/GZ2J01/rels/d_a_e_yh/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yh/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yh.cpp: .text start:0x000000EC end:0x00006E88 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000016C .data start:0x00000000 end:0x00000328 - .bss start:0x0000000C end:0x00000030 + .bss start:0x00000008 end:0x00000030 diff --git a/config/GZ2J01/rels/d_a_e_yk/splits.txt b/config/GZ2J01/rels/d_a_e_yk/splits.txt index decd5fae0a..13da412364 100644 --- a/config/GZ2J01/rels/d_a_e_yk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yk/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yk.cpp: .text start:0x000000EC end:0x00003548 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000D4 .data start:0x00000000 end:0x0000017C - .bss start:0x0000000C end:0x00000134 + .bss start:0x00000008 end:0x00000134 diff --git a/config/GZ2J01/rels/d_a_e_ym/splits.txt b/config/GZ2J01/rels/d_a_e_ym/splits.txt index 97a3a87ef7..4d2dd8ee29 100644 --- a/config/GZ2J01/rels/d_a_e_ym/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ym/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ym.cpp: .text start:0x000000EC end:0x0000D940 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000170 .data start:0x00000000 end:0x00000218 - .bss start:0x0000000C end:0x00000044 + .bss start:0x00000008 end:0x00000044 diff --git a/config/GZ2J01/rels/d_a_e_zm/splits.txt b/config/GZ2J01/rels/d_a_e_zm/splits.txt index 2e2e47401a..7bc8d7cd26 100644 --- a/config/GZ2J01/rels/d_a_e_zm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_zm/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zm.cpp: .text start:0x000000EC end:0x00003484 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000CC .data start:0x00000000 end:0x000001B4 - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_e_zs/splits.txt b/config/GZ2J01/rels/d_a_e_zs/splits.txt index 5a3acd360d..aeb1314d0a 100644 --- a/config/GZ2J01/rels/d_a_e_zs/splits.txt +++ b/config/GZ2J01/rels/d_a_e_zs/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zs.cpp: .text start:0x000000EC end:0x000022FC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000007C .data start:0x00000000 end:0x0000014C - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_econt/splits.txt b/config/GZ2J01/rels/d_a_econt/splits.txt index 6c08e38b5b..0d18e3f54d 100644 --- a/config/GZ2J01/rels/d_a_econt/splits.txt +++ b/config/GZ2J01/rels/d_a_econt/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_econt.cpp: .text start:0x00000078 end:0x000002D4 .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x00000050 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_fr/splits.txt b/config/GZ2J01/rels/d_a_fr/splits.txt index d1d8e8dc3d..62ca034015 100644 --- a/config/GZ2J01/rels/d_a_fr/splits.txt +++ b/config/GZ2J01/rels/d_a_fr/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_fr.cpp: .text start:0x000000EC end:0x000021B4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000CC .data start:0x00000000 end:0x00000170 - .bss start:0x0000000C end:0x00000044 + .bss start:0x00000008 end:0x00000044 diff --git a/config/GZ2J01/rels/d_a_kago/splits.txt b/config/GZ2J01/rels/d_a_kago/splits.txt index 3517e58922..60a4519ae8 100644 --- a/config/GZ2J01/rels/d_a_kago/splits.txt +++ b/config/GZ2J01/rels/d_a_kago/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_kago.cpp: .text start:0x000000EC end:0x0000B630 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000248 .data start:0x00000000 end:0x00000214 - .bss start:0x0000000C end:0x00000074 + .bss start:0x00000008 end:0x00000074 diff --git a/config/GZ2J01/rels/d_a_mant/splits.txt b/config/GZ2J01/rels/d_a_mant/splits.txt index b10cba8fab..518de054fb 100644 --- a/config/GZ2J01/rels/d_a_mant/splits.txt +++ b/config/GZ2J01/rels/d_a_mant/splits.txt @@ -13,4 +13,4 @@ d/actor/d_a_mant.cpp: .text start:0x00000078 end:0x00001A24 .rodata start:0x00000000 end:0x000000D4 .data start:0x00000000 end:0x0000924C - .bss start:0x00000004 end:0x00000008 + .bss start:0x00000000 end:0x00000008 diff --git a/config/GZ2J01/rels/d_a_npc_du/splits.txt b/config/GZ2J01/rels/d_a_npc_du/splits.txt index 6403d9113e..28773a55db 100644 --- a/config/GZ2J01/rels/d_a_npc_du/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_du/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_du.cpp: .text start:0x000000EC end:0x00001BD4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000A4 .data start:0x00000000 end:0x000000F4 - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_npc_lf/splits.txt b/config/GZ2J01/rels/d_a_npc_lf/splits.txt index a28410ff45..62c53eb27e 100644 --- a/config/GZ2J01/rels/d_a_npc_lf/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_lf/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_lf.cpp: .text start:0x000000EC end:0x00000EE8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000A0 .data start:0x00000000 end:0x00000068 - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_npc_sq/splits.txt b/config/GZ2J01/rels/d_a_npc_sq/splits.txt index 214c53f6c2..7efa26d57f 100644 --- a/config/GZ2J01/rels/d_a_npc_sq/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_sq/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_sq.cpp: .text start:0x000000EC end:0x000014F4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000A0 .data start:0x00000000 end:0x0000010C - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_npc_tkj2/splits.txt b/config/GZ2J01/rels/d_a_npc_tkj2/splits.txt index 18c8947c39..85c1b46230 100644 --- a/config/GZ2J01/rels/d_a_npc_tkj2/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_tkj2/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkj2.cpp: .text start:0x000000EC end:0x000035C8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000DC .data start:0x00000000 end:0x0000013C - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_npc_tr/splits.txt b/config/GZ2J01/rels/d_a_npc_tr/splits.txt index cbca206a10..59b845f265 100644 --- a/config/GZ2J01/rels/d_a_npc_tr/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_tr/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tr.cpp: .text start:0x000000EC end:0x00000C48 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000094 .data start:0x00000000 end:0x0000005C - .bss start:0x0000000C end:0x00000034 + .bss start:0x00000008 end:0x00000034 diff --git a/config/GZ2J01/rels/d_a_obj_ari/splits.txt b/config/GZ2J01/rels/d_a_obj_ari/splits.txt index a24f7d947b..47d0b4945c 100644 --- a/config/GZ2J01/rels/d_a_obj_ari/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ari/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ari.cpp: .text start:0x000000EC end:0x00002E54 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000114 .data start:0x00000000 end:0x000000BC - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_avalanche/splits.txt b/config/GZ2J01/rels/d_a_obj_avalanche/splits.txt index 9cb40bc066..19567b270c 100644 --- a/config/GZ2J01/rels/d_a_obj_avalanche/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_avalanche/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_avalanche.cpp: .text start:0x00000078 end:0x00000E94 .rodata start:0x00000000 end:0x00000074 .data start:0x00000000 end:0x00000130 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_batta/splits.txt b/config/GZ2J01/rels/d_a_obj_batta/splits.txt index 4da0ee0b55..d77e6ade50 100644 --- a/config/GZ2J01/rels/d_a_obj_batta/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_batta/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_batta.cpp: .text start:0x000000EC end:0x00002C1C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000100 .data start:0x00000000 end:0x0000020C - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_bmshutter/splits.txt b/config/GZ2J01/rels/d_a_obj_bmshutter/splits.txt index 1d33b26b49..158383dc96 100644 --- a/config/GZ2J01/rels/d_a_obj_bmshutter/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_bmshutter/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_bmshutter.cpp: .text start:0x00000078 end:0x00000DC8 .rodata start:0x00000000 end:0x0000007C .data start:0x00000000 end:0x00000144 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_cb/splits.txt b/config/GZ2J01/rels/d_a_obj_cb/splits.txt index b43a93a901..a0b87e2f7a 100644 --- a/config/GZ2J01/rels/d_a_obj_cb/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_cb/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cb.cpp: .text start:0x000000EC end:0x00000D90 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000070 .data start:0x00000000 end:0x00000098 - .bss start:0x0000000C end:0x00000020 + .bss start:0x00000008 end:0x00000020 diff --git a/config/GZ2J01/rels/d_a_obj_cdoor/splits.txt b/config/GZ2J01/rels/d_a_obj_cdoor/splits.txt index cfb21b6e98..fdbda619dc 100644 --- a/config/GZ2J01/rels/d_a_obj_cdoor/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_cdoor/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_cdoor.cpp: .text start:0x00000078 end:0x00000FD0 .rodata start:0x00000000 end:0x00000040 .data start:0x00000000 end:0x00000160 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_chest/splits.txt b/config/GZ2J01/rels/d_a_obj_chest/splits.txt index 9af3a86ebf..148265d82f 100644 --- a/config/GZ2J01/rels/d_a_obj_chest/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_chest/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_chest.cpp: .text start:0x00000078 end:0x00001174 .rodata start:0x00000000 end:0x000000BC .data start:0x00000000 end:0x00000144 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_cho/splits.txt b/config/GZ2J01/rels/d_a_obj_cho/splits.txt index 502da6d253..bc07dfd3e9 100644 --- a/config/GZ2J01/rels/d_a_obj_cho/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_cho/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cho.cpp: .text start:0x000000EC end:0x00002344 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000110 .data start:0x00000000 end:0x000000BC - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_dan/splits.txt b/config/GZ2J01/rels/d_a_obj_dan/splits.txt index 39ed56ff6b..df7be832f3 100644 --- a/config/GZ2J01/rels/d_a_obj_dan/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_dan/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_dan.cpp: .text start:0x000000EC end:0x00001EFC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000CC .data start:0x00000000 end:0x000000E0 - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_digsnow/splits.txt b/config/GZ2J01/rels/d_a_obj_digsnow/splits.txt index 91ce11a3c2..17340ecca4 100644 --- a/config/GZ2J01/rels/d_a_obj_digsnow/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_digsnow/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_digsnow.cpp: .text start:0x00000078 end:0x00000AE0 .rodata start:0x00000000 end:0x00000020 .data start:0x00000000 end:0x00000174 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_firepillar/splits.txt b/config/GZ2J01/rels/d_a_obj_firepillar/splits.txt index 21655c756c..2df89e525c 100644 --- a/config/GZ2J01/rels/d_a_obj_firepillar/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_firepillar/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_firepillar.cpp: .text start:0x00000078 end:0x000009F8 .rodata start:0x00000000 end:0x0000001C .data start:0x00000000 end:0x00000170 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_firepillar2/splits.txt b/config/GZ2J01/rels/d_a_obj_firepillar2/splits.txt index 172c4a5456..6475f6d003 100644 --- a/config/GZ2J01/rels/d_a_obj_firepillar2/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_firepillar2/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_firepillar2.cpp: .text start:0x00000078 end:0x0000187C .rodata start:0x00000000 end:0x00000064 .data start:0x00000000 end:0x000001B4 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_food/splits.txt b/config/GZ2J01/rels/d_a_obj_food/splits.txt index 44f500babd..00ffb11a11 100644 --- a/config/GZ2J01/rels/d_a_obj_food/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_food/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_food.cpp: .text start:0x000000EC end:0x0000175C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000088 .data start:0x00000000 end:0x00000120 - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_obj_fw/splits.txt b/config/GZ2J01/rels/d_a_obj_fw/splits.txt index 8f9bae3cff..b07e9ec321 100644 --- a/config/GZ2J01/rels/d_a_obj_fw/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_fw/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fw.cpp: .text start:0x000000EC end:0x00000BD4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000064 .data start:0x00000000 end:0x0000006C - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_obj_geyser/splits.txt b/config/GZ2J01/rels/d_a_obj_geyser/splits.txt index eebed3f1f5..dd18a89363 100644 --- a/config/GZ2J01/rels/d_a_obj_geyser/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_geyser/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_geyser.cpp: .text start:0x00000078 end:0x00002140 .rodata start:0x00000000 end:0x00000080 .data start:0x00000000 end:0x000001D8 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_gm/splits.txt b/config/GZ2J01/rels/d_a_obj_gm/splits.txt index 7ace9f6a54..5a84ec5cc0 100644 --- a/config/GZ2J01/rels/d_a_obj_gm/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_gm/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gm.cpp: .text start:0x000000EC end:0x000022B8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000009C .data start:0x00000000 end:0x000001C8 - .bss start:0x0000000C end:0x00000020 + .bss start:0x00000008 end:0x00000020 diff --git a/config/GZ2J01/rels/d_a_obj_gomikabe/splits.txt b/config/GZ2J01/rels/d_a_obj_gomikabe/splits.txt index 052986b8a3..e2b75e2cd5 100644 --- a/config/GZ2J01/rels/d_a_obj_gomikabe/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_gomikabe/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gomikabe.cpp: .text start:0x000000EC end:0x00001AC8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000114 .data start:0x00000000 end:0x000000D0 - .bss start:0x0000000C end:0x00000020 + .bss start:0x00000008 end:0x00000020 diff --git a/config/GZ2J01/rels/d_a_obj_ice_s/splits.txt b/config/GZ2J01/rels/d_a_obj_ice_s/splits.txt index 225bce5e24..5a1b8599f3 100644 --- a/config/GZ2J01/rels/d_a_obj_ice_s/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ice_s/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ice_s.cpp: .text start:0x000000EC end:0x00001224 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000B0 .data start:0x00000000 end:0x00000088 - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_iceblock/splits.txt b/config/GZ2J01/rels/d_a_obj_iceblock/splits.txt index 64161e7444..89bbaeea96 100644 --- a/config/GZ2J01/rels/d_a_obj_iceblock/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_iceblock/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_iceblock.cpp: .text start:0x00000078 end:0x0000268C .rodata start:0x00000000 end:0x000001DC .data start:0x00000000 end:0x000001C8 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_ito/splits.txt b/config/GZ2J01/rels/d_a_obj_ito/splits.txt index 3abe8d9d33..57e4daea3e 100644 --- a/config/GZ2J01/rels/d_a_obj_ito/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ito/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ito.cpp: .text start:0x000000EC end:0x000025FC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000CC .data start:0x00000000 end:0x000000E4 - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_obj_kabuto/splits.txt b/config/GZ2J01/rels/d_a_obj_kabuto/splits.txt index f214edf03e..ede0d65156 100644 --- a/config/GZ2J01/rels/d_a_obj_kabuto/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kabuto/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kabuto.cpp: .text start:0x000000EC end:0x0000337C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000118 .data start:0x00000000 end:0x000000BC - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_obj_kag/splits.txt b/config/GZ2J01/rels/d_a_obj_kag/splits.txt index d9497b9ebe..0f89dce71b 100644 --- a/config/GZ2J01/rels/d_a_obj_kag/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kag/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kag.cpp: .text start:0x000000EC end:0x00002E18 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000124 .data start:0x00000000 end:0x000001B8 - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_kamakiri/splits.txt b/config/GZ2J01/rels/d_a_obj_kamakiri/splits.txt index 9b28eb28eb..0f4ccae4fd 100644 --- a/config/GZ2J01/rels/d_a_obj_kamakiri/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kamakiri/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kamakiri.cpp: .text start:0x000000EC end:0x00003354 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000104 .data start:0x00000000 end:0x000000BC - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_kantera/splits.txt b/config/GZ2J01/rels/d_a_obj_kantera/splits.txt index f21d60e1c9..90b6cc7a12 100644 --- a/config/GZ2J01/rels/d_a_obj_kantera/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kantera/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_kantera.cpp: .text start:0x00000078 end:0x00001040 .rodata start:0x00000000 end:0x00000094 .data start:0x00000000 end:0x00000180 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_katatsumuri/splits.txt b/config/GZ2J01/rels/d_a_obj_katatsumuri/splits.txt index f2d750a44d..a445b88e2d 100644 --- a/config/GZ2J01/rels/d_a_obj_katatsumuri/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_katatsumuri/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_katatsumuri.cpp: .text start:0x000000EC end:0x00002DE0 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000FC .data start:0x00000000 end:0x000000BC - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_key/splits.txt b/config/GZ2J01/rels/d_a_obj_key/splits.txt index 9adbcdd10d..f0e95d6771 100644 --- a/config/GZ2J01/rels/d_a_obj_key/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_key/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_key.cpp: .text start:0x000000EC end:0x00001CB8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000A8 .data start:0x00000000 end:0x0000009C - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_obj_kgate/splits.txt b/config/GZ2J01/rels/d_a_obj_kgate/splits.txt index 8abed24629..bcb480dd90 100644 --- a/config/GZ2J01/rels/d_a_obj_kgate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kgate/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_kgate.cpp: .text start:0x00000078 end:0x00002B28 .rodata start:0x00000000 end:0x000001F4 .data start:0x00000000 end:0x00000180 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_ki/splits.txt b/config/GZ2J01/rels/d_a_obj_ki/splits.txt index 832a7a0c56..a220f5d6da 100644 --- a/config/GZ2J01/rels/d_a_obj_ki/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ki/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ki.cpp: .text start:0x000000EC end:0x00000D2C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000050 .data start:0x00000000 end:0x0000006C - .bss start:0x0000000C end:0x00000020 + .bss start:0x00000008 end:0x00000020 diff --git a/config/GZ2J01/rels/d_a_obj_kita/splits.txt b/config/GZ2J01/rels/d_a_obj_kita/splits.txt index 67ec956b6d..332b298e53 100644 --- a/config/GZ2J01/rels/d_a_obj_kita/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kita/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kita.cpp: .text start:0x000000EC end:0x00000CA8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000070 .data start:0x00000000 end:0x0000005C - .bss start:0x0000000C end:0x00000030 + .bss start:0x00000008 end:0x00000030 diff --git a/config/GZ2J01/rels/d_a_obj_kuwagata/splits.txt b/config/GZ2J01/rels/d_a_obj_kuwagata/splits.txt index 3d5a52e212..c9ede69e1b 100644 --- a/config/GZ2J01/rels/d_a_obj_kuwagata/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kuwagata/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kuwagata.cpp: .text start:0x000000EC end:0x0000337C .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000010C .data start:0x00000000 end:0x000000BC - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_lbox/splits.txt b/config/GZ2J01/rels/d_a_obj_lbox/splits.txt index d34a2663f3..3fff317a32 100644 --- a/config/GZ2J01/rels/d_a_obj_lbox/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lbox/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lbox.cpp: .text start:0x000000EC end:0x00000B28 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000004C .data start:0x00000000 end:0x000000D8 - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_life_container/splits.txt b/config/GZ2J01/rels/d_a_obj_life_container/splits.txt index 20211ae85e..b34a30d1b6 100644 --- a/config/GZ2J01/rels/d_a_obj_life_container/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_life_container/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_life_container.cpp: .text start:0x00000078 end:0x00001C8C .rodata start:0x00000000 end:0x000000D8 .data start:0x00000000 end:0x000001D4 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_lv4digsand/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4digsand/splits.txt index 7b747b8434..de3f4e9cfb 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4digsand/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4digsand/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_lv4digsand.cpp: .text start:0x00000078 end:0x00000B2C .rodata start:0x00000000 end:0x00000018 .data start:0x00000000 end:0x00000174 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_lv4floor/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4floor/splits.txt index c48c3087c8..e4b152da0a 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4floor/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4floor/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_lv4floor.cpp: .text start:0x00000078 end:0x000005F8 .rodata start:0x00000000 end:0x0000001C .data start:0x00000000 end:0x000000E4 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_lv6bemos/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6bemos/splits.txt index 4e8d736f92..82cecc6a71 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6bemos/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6bemos/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_lv6bemos.cpp: .text start:0x00000078 end:0x00001424 .rodata start:0x00000000 end:0x000000AC .data start:0x00000000 end:0x000001C0 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_maki/splits.txt b/config/GZ2J01/rels/d_a_obj_maki/splits.txt index 3f65c7fccd..231f501a3c 100644 --- a/config/GZ2J01/rels/d_a_obj_maki/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_maki/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_maki.cpp: .text start:0x000000EC end:0x00000C00 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000040 .data start:0x00000000 end:0x000000D0 - .bss start:0x0000000C end:0x00000020 + .bss start:0x00000008 end:0x00000020 diff --git a/config/GZ2J01/rels/d_a_obj_mvstair/splits.txt b/config/GZ2J01/rels/d_a_obj_mvstair/splits.txt index 8ef19961c4..5c75796c0a 100644 --- a/config/GZ2J01/rels/d_a_obj_mvstair/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_mvstair/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_mvstair.cpp: .text start:0x00000078 end:0x00001884 .rodata start:0x00000000 end:0x00000074 .data start:0x00000000 end:0x00000184 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_myogan/splits.txt b/config/GZ2J01/rels/d_a_obj_myogan/splits.txt index 05819a36b2..7be77c73e5 100644 --- a/config/GZ2J01/rels/d_a_obj_myogan/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_myogan/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_myogan.cpp: .text start:0x000000EC end:0x000007B4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000020 .data start:0x00000000 end:0x00000068 - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_nan/splits.txt b/config/GZ2J01/rels/d_a_obj_nan/splits.txt index 756a3a6502..52a0243278 100644 --- a/config/GZ2J01/rels/d_a_obj_nan/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_nan/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_nan.cpp: .text start:0x000000EC end:0x00002CE8 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000F4 .data start:0x00000000 end:0x000001DC - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_octhashi/splits.txt b/config/GZ2J01/rels/d_a_obj_octhashi/splits.txt index 71ac7e1d2f..203ce86ad3 100644 --- a/config/GZ2J01/rels/d_a_obj_octhashi/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_octhashi/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_octhashi.cpp: .text start:0x00000078 end:0x00001938 .rodata start:0x00000000 end:0x00000104 .data start:0x00000000 end:0x000000FC + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_pdoor/splits.txt b/config/GZ2J01/rels/d_a_obj_pdoor/splits.txt index f7b2f8c37d..1985d46f6c 100644 --- a/config/GZ2J01/rels/d_a_obj_pdoor/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_pdoor/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_pdoor.cpp: .text start:0x00000078 end:0x00000CF8 .rodata start:0x00000000 end:0x0000002C .data start:0x00000000 end:0x000000E4 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_riverrock/splits.txt b/config/GZ2J01/rels/d_a_obj_riverrock/splits.txt index 2666b83e9e..ecd6bae4b0 100644 --- a/config/GZ2J01/rels/d_a_obj_riverrock/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_riverrock/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_riverrock.cpp: .text start:0x000000EC end:0x00001468 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000E4 .data start:0x00000000 end:0x000000A0 - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_rope_bridge/splits.txt b/config/GZ2J01/rels/d_a_obj_rope_bridge/splits.txt index 6ce72bf8c8..fb47fb2844 100644 --- a/config/GZ2J01/rels/d_a_obj_rope_bridge/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_rope_bridge/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_rope_bridge.cpp: .text start:0x00000078 end:0x00001FB4 .rodata start:0x00000000 end:0x000000E8 .data start:0x00000000 end:0x00000294 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_rstair/splits.txt b/config/GZ2J01/rels/d_a_obj_rstair/splits.txt index 4c5c5a70f3..9b286d5e80 100644 --- a/config/GZ2J01/rels/d_a_obj_rstair/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_rstair/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_rstair.cpp: .text start:0x00000078 end:0x00001218 .rodata start:0x00000000 end:0x0000003C .data start:0x00000000 end:0x00000144 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_rw/splits.txt b/config/GZ2J01/rels/d_a_obj_rw/splits.txt index 14402e7fd8..512cc1b3b7 100644 --- a/config/GZ2J01/rels/d_a_obj_rw/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_rw/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rw.cpp: .text start:0x000000EC end:0x00001240 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000060 .data start:0x00000000 end:0x00000124 - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_obj_shield/splits.txt b/config/GZ2J01/rels/d_a_obj_shield/splits.txt index 16c6e8315f..ec2d034972 100644 --- a/config/GZ2J01/rels/d_a_obj_shield/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_shield/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_shield.cpp: .text start:0x00000078 end:0x0000188C .rodata start:0x00000000 end:0x000000C8 .data start:0x00000000 end:0x000001E0 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_smallkey/splits.txt b/config/GZ2J01/rels/d_a_obj_smallkey/splits.txt index 30d0f95622..38638b4f58 100644 --- a/config/GZ2J01/rels/d_a_obj_smallkey/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_smallkey/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_smallkey.cpp: .text start:0x00000078 end:0x000020AC .rodata start:0x00000000 end:0x000000B4 .data start:0x00000000 end:0x00000204 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_so/splits.txt b/config/GZ2J01/rels/d_a_obj_so/splits.txt index f3494d0597..866abd824a 100644 --- a/config/GZ2J01/rels/d_a_obj_so/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_so/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_so.cpp: .text start:0x000000EC end:0x000036F4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000188 .data start:0x00000000 end:0x00000114 - .bss start:0x0000000C end:0x00000024 + .bss start:0x00000008 end:0x00000024 diff --git a/config/GZ2J01/rels/d_a_obj_stone/splits.txt b/config/GZ2J01/rels/d_a_obj_stone/splits.txt index 96b409aa47..bccc8332f3 100644 --- a/config/GZ2J01/rels/d_a_obj_stone/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_stone/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_stone.cpp: .text start:0x00000078 end:0x00003AAC .rodata start:0x00000000 end:0x000001A0 .data start:0x00000000 end:0x000001BC + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_swBallC/splits.txt b/config/GZ2J01/rels/d_a_obj_swBallC/splits.txt index 0a65f91e14..0bfae94e97 100644 --- a/config/GZ2J01/rels/d_a_obj_swBallC/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_swBallC/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_swBallC.cpp: .text start:0x00000078 end:0x000011AC .rodata start:0x00000000 end:0x000000BC .data start:0x00000000 end:0x00000184 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_sword/splits.txt b/config/GZ2J01/rels/d_a_obj_sword/splits.txt index 0c22727864..31e266ce4a 100644 --- a/config/GZ2J01/rels/d_a_obj_sword/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_sword/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_sword.cpp: .text start:0x00000078 end:0x0000099C .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x00000174 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_swturn/splits.txt b/config/GZ2J01/rels/d_a_obj_swturn/splits.txt index e892ff4678..bcc0b1acba 100644 --- a/config/GZ2J01/rels/d_a_obj_swturn/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_swturn/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_swturn.cpp: .text start:0x00000078 end:0x00001504 .rodata start:0x00000000 end:0x00000060 .data start:0x00000000 end:0x000000D0 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_ten/splits.txt b/config/GZ2J01/rels/d_a_obj_ten/splits.txt index cd37d0e366..2df8d2c33b 100644 --- a/config/GZ2J01/rels/d_a_obj_ten/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ten/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ten.cpp: .text start:0x000000EC end:0x000031FC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000104 .data start:0x00000000 end:0x000000BC - .bss start:0x0000000C end:0x00000028 + .bss start:0x00000008 end:0x00000028 diff --git a/config/GZ2J01/rels/d_a_obj_thdoor/splits.txt b/config/GZ2J01/rels/d_a_obj_thdoor/splits.txt index c6706002d7..21f462dfcd 100644 --- a/config/GZ2J01/rels/d_a_obj_thdoor/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_thdoor/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_thdoor.cpp: .text start:0x00000078 end:0x00001170 .rodata start:0x00000000 end:0x00000060 .data start:0x00000000 end:0x00000184 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_timer/splits.txt b/config/GZ2J01/rels/d_a_obj_timer/splits.txt index 3ece6881a9..ed6df947df 100644 --- a/config/GZ2J01/rels/d_a_obj_timer/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_timer/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_timer.cpp: .text start:0x00000078 end:0x00000518 .rodata start:0x00000000 end:0x00000008 .data start:0x00000000 end:0x000000A0 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_tombo/splits.txt b/config/GZ2J01/rels/d_a_obj_tombo/splits.txt index 2df0955a14..94e308ea4c 100644 --- a/config/GZ2J01/rels/d_a_obj_tombo/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_tombo/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tombo.cpp: .text start:0x000000EC end:0x000025E4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000120 .data start:0x00000000 end:0x000000EC - .bss start:0x0000000C end:0x0000002C + .bss start:0x00000008 end:0x0000002C diff --git a/config/GZ2J01/rels/d_a_obj_volcbom/splits.txt b/config/GZ2J01/rels/d_a_obj_volcbom/splits.txt index b9030ded23..4f3c77cb45 100644 --- a/config/GZ2J01/rels/d_a_obj_volcbom/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_volcbom/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_volcbom.cpp: .text start:0x00000078 end:0x00002A34 .rodata start:0x00000000 end:0x000000F8 .data start:0x00000000 end:0x00000254 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_warp_kbrg/splits.txt b/config/GZ2J01/rels/d_a_obj_warp_kbrg/splits.txt index d9d3d9c03b..fb3f538852 100644 --- a/config/GZ2J01/rels/d_a_obj_warp_kbrg/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_warp_kbrg/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_warp_kbrg.cpp: .text start:0x00000078 end:0x000026EC .rodata start:0x00000000 end:0x0000015C .data start:0x00000000 end:0x00000218 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_warp_obrg/splits.txt b/config/GZ2J01/rels/d_a_obj_warp_obrg/splits.txt index e56ec26207..1d53402a1b 100644 --- a/config/GZ2J01/rels/d_a_obj_warp_obrg/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_warp_obrg/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_warp_obrg.cpp: .text start:0x00000078 end:0x00001EB0 .rodata start:0x00000000 end:0x0000011C .data start:0x00000000 end:0x00000170 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_web0/splits.txt b/config/GZ2J01/rels/d_a_obj_web0/splits.txt index 08958e3e0f..9a26cfe380 100644 --- a/config/GZ2J01/rels/d_a_obj_web0/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_web0/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_web0.cpp: .text start:0x000000EC end:0x00000D28 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000004C .data start:0x00000000 end:0x000000C0 - .bss start:0x0000000C end:0x00000020 + .bss start:0x00000008 end:0x00000020 diff --git a/config/GZ2J01/rels/d_a_obj_web1/splits.txt b/config/GZ2J01/rels/d_a_obj_web1/splits.txt index 7ba436f1ef..bcd1efd14d 100644 --- a/config/GZ2J01/rels/d_a_obj_web1/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_web1/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_web1.cpp: .text start:0x000000EC end:0x00000DEC .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x0000006C .data start:0x00000000 end:0x000000C4 - .bss start:0x0000000C end:0x00000020 + .bss start:0x00000008 end:0x00000020 diff --git a/config/GZ2J01/rels/d_a_obj_well_cover/splits.txt b/config/GZ2J01/rels/d_a_obj_well_cover/splits.txt index 5b5ef773a2..ccb0c64ae8 100644 --- a/config/GZ2J01/rels/d_a_obj_well_cover/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_well_cover/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_well_cover.cpp: .text start:0x00000078 end:0x000007E4 .rodata start:0x00000000 end:0x00000040 .data start:0x00000000 end:0x000000CC + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_wood_statue/splits.txt b/config/GZ2J01/rels/d_a_obj_wood_statue/splits.txt index 1570c623f5..9602c15f34 100644 --- a/config/GZ2J01/rels/d_a_obj_wood_statue/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_wood_statue/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_obj_wood_statue.cpp: .text start:0x00000078 end:0x00001870 .rodata start:0x00000000 end:0x000000E4 .data start:0x00000000 end:0x000001D4 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_obj_zraMark/splits.txt b/config/GZ2J01/rels/d_a_obj_zraMark/splits.txt index 0b77589674..9e5f017970 100644 --- a/config/GZ2J01/rels/d_a_obj_zraMark/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_zraMark/splits.txt @@ -12,5 +12,5 @@ REL/executor.c: d/actor/d_a_obj_zraMark.cpp: .text start:0x00000078 end:0x000017A0 .rodata start:0x00000000 end:0x00000218 - .data start:0x00000004 end:0x0000007C + .data start:0x00000000 end:0x0000007C .bss start:0x00000000 end:0x00000008 diff --git a/config/GZ2J01/rels/d_a_scene_exit2/splits.txt b/config/GZ2J01/rels/d_a_scene_exit2/splits.txt index 8e18fbb365..65ce1c9624 100644 --- a/config/GZ2J01/rels/d_a_scene_exit2/splits.txt +++ b/config/GZ2J01/rels/d_a_scene_exit2/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_scene_exit2.cpp: .text start:0x00000078 end:0x0000070C .rodata start:0x00000000 end:0x00000044 .data start:0x00000000 end:0x000000E4 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_sq/splits.txt b/config/GZ2J01/rels/d_a_sq/splits.txt index cea3d1e8f6..88422c0ac5 100644 --- a/config/GZ2J01/rels/d_a_sq/splits.txt +++ b/config/GZ2J01/rels/d_a_sq/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_sq.cpp: .text start:0x000000EC end:0x00001BC4 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000090 .data start:0x00000000 end:0x00000140 - .bss start:0x0000000C end:0x00000048 + .bss start:0x00000008 end:0x00000048 diff --git a/config/GZ2J01/rels/d_a_swc00/splits.txt b/config/GZ2J01/rels/d_a_swc00/splits.txt index c6e01aaa04..456d804ee8 100644 --- a/config/GZ2J01/rels/d_a_swc00/splits.txt +++ b/config/GZ2J01/rels/d_a_swc00/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_swc00.cpp: .text start:0x00000078 end:0x00000A0C .rodata start:0x00000000 end:0x00000040 .data start:0x00000000 end:0x00000150 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_tag_lv2prchk/splits.txt b/config/GZ2J01/rels/d_a_tag_lv2prchk/splits.txt index d425c36e06..7bdccf0799 100644 --- a/config/GZ2J01/rels/d_a_tag_lv2prchk/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_lv2prchk/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_tag_lv2prchk.cpp: .text start:0x00000078 end:0x0000077C .rodata start:0x00000000 end:0x00000008 .data start:0x00000000 end:0x000000A0 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_tag_river_back/splits.txt b/config/GZ2J01/rels/d_a_tag_river_back/splits.txt index c74caf5f66..dbd849ab1e 100644 --- a/config/GZ2J01/rels/d_a_tag_river_back/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_river_back/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_tag_river_back.cpp: .text start:0x00000078 end:0x000006BC .rodata start:0x00000000 end:0x0000003C .data start:0x00000000 end:0x000000E4 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_tag_statue_evt/splits.txt b/config/GZ2J01/rels/d_a_tag_statue_evt/splits.txt index 6fc6ecfc0d..e488d167e9 100644 --- a/config/GZ2J01/rels/d_a_tag_statue_evt/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_statue_evt/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_tag_statue_evt.cpp: .text start:0x00000078 end:0x0000121C .rodata start:0x00000000 end:0x000000F8 .data start:0x00000000 end:0x00000190 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_tag_waterfall/splits.txt b/config/GZ2J01/rels/d_a_tag_waterfall/splits.txt index 776c3afa2d..5b17cf97a0 100644 --- a/config/GZ2J01/rels/d_a_tag_waterfall/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_waterfall/splits.txt @@ -12,11 +12,11 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 - .bss start:0x00000000 end:0x0000000C + .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_waterfall.cpp: .text start:0x000000EC end:0x00000820 .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x00000020 .data start:0x00000000 end:0x00000060 - .bss start:0x0000000C end:0x0000003C + .bss start:0x00000008 end:0x0000003C diff --git a/config/GZ2J01/rels/d_a_tbox2/splits.txt b/config/GZ2J01/rels/d_a_tbox2/splits.txt index 45d0f7c727..8ede83bb4a 100644 --- a/config/GZ2J01/rels/d_a_tbox2/splits.txt +++ b/config/GZ2J01/rels/d_a_tbox2/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_tbox2.cpp: .text start:0x00000078 end:0x000017B8 .rodata start:0x00000000 end:0x000000FC .data start:0x00000000 end:0x00000220 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/splits.txt b/config/GZ2J01/splits.txt index 63e963ac4e..0dbbc2a1b0 100644 --- a/config/GZ2J01/splits.txt +++ b/config/GZ2J01/splits.txt @@ -439,7 +439,7 @@ d/d_demo.cpp: .data start:0x803A1A70 end:0x803A1D78 .bss start:0x8041E788 end:0x8041E7B8 .sdata start:0x8044A760 end:0x8044A768 - .sbss start:0x8044AF40 end:0x8044AF9C + .sbss start:0x8044AF40 end:0x8044AF98 .sdata2 start:0x8044BEF0 end:0x8044BF30 d/d_door_param2.cpp: @@ -471,7 +471,7 @@ d/d_map_path_dmap.cpp: .rodata start:0x8037C100 end:0x8037C228 .data start:0x803A1EE0 end:0x803A20D8 .sdata start:0x8044A770 end:0x8044A780 - .sbss start:0x8044AF9C end:0x8044AFD0 + .sbss start:0x8044AF98 end:0x8044AFD0 .sdata2 start:0x8044BF68 end:0x8044C000 d/d_event.cpp: @@ -511,7 +511,7 @@ d/d_particle.cpp: .rodata start:0x8037C5B0 end:0x8037C620 .data start:0x803A2468 end:0x803A2730 .bss start:0x8041E850 end:0x8041EA10 - .sbss start:0x8044AFD0 end:0x8044B014 + .sbss start:0x8044AFD0 end:0x8044B010 .sdata2 start:0x8044C080 end:0x8044C138 d/d_particle_name.cpp: @@ -534,7 +534,7 @@ d/d_drawlist.cpp: .data start:0x803A2900 end:0x803A2FF8 .bss start:0x8041EA10 end:0x8041EA78 .sdata start:0x8044A788 end:0x8044A7A0 - .sbss start:0x8044B014 end:0x8044B020 + .sbss start:0x8044B010 end:0x8044B020 .sdata2 start:0x8044C148 end:0x8044C220 .sbss2 start:0x80450C88 end:0x80450C90 @@ -765,7 +765,7 @@ d/actor/d_a_npc.cpp: .rodata start:0x8038C700 end:0x8038CA98 .data start:0x803AD808 end:0x803ADCE0 .bss start:0x8041F848 end:0x8041FAB8 - .sbss start:0x8044B118 end:0x8044B144 + .sbss start:0x8044B118 end:0x8044B138 .sdata2 start:0x8044D520 end:0x8044D600 d/actor/d_a_npc_cd.cpp: @@ -774,6 +774,7 @@ d/actor/d_a_npc_cd.cpp: .rodata start:0x8038CA98 end:0x8038D2D0 .data start:0x803ADCE0 end:0x803B0320 .bss start:0x8041FAB8 end:0x80422750 + .sbss start:0x8044B138 end:0x8044B140 .sdata2 start:0x8044D600 end:0x8044D628 d/actor/d_a_npc_cd2.cpp: @@ -782,7 +783,7 @@ d/actor/d_a_npc_cd2.cpp: .rodata start:0x8038D2D0 end:0x8038DE08 .data start:0x803B0320 end:0x803B3F00 .bss start:0x80422750 end:0x80426A38 - .sbss start:0x8044B144 end:0x8044B158 + .sbss start:0x8044B140 end:0x8044B150 .sdata2 start:0x8044D628 end:0x8044D698 d/actor/d_a_obj_item.cpp: @@ -791,6 +792,7 @@ d/actor/d_a_obj_item.cpp: .rodata start:0x8038DE08 end:0x8038DE18 .data start:0x803B3F00 end:0x803B41D8 .sdata start:0x8044A7E8 end:0x8044A7F0 + .sbss start:0x8044B150 end:0x8044B158 .sdata2 start:0x8044D698 end:0x8044D728 d/d_insect.cpp: @@ -873,7 +875,7 @@ d/d_select_icon.cpp: .ctors start:0x80375CE4 end:0x80375CE8 .data start:0x803B5918 end:0x803B5928 .bss start:0x80426B50 end:0x80426B60 - .sbss start:0x8044B190 end:0x8044B19C + .sbss start:0x8044B190 end:0x8044B198 .sdata2 start:0x8044DBA8 end:0x8044DBC0 d/d_shop_camera.cpp: @@ -892,7 +894,7 @@ d/d_shop_system.cpp: .rodata start:0x8038EC90 end:0x8038ECA8 .data start:0x803B59F8 end:0x803B5CB0 .sdata start:0x8044A828 end:0x8044A840 - .sbss start:0x8044B19C end:0x8044B1A8 + .sbss start:0x8044B198 end:0x8044B1A8 .sdata2 start:0x8044DC38 end:0x8044DCB8 d/d_gameover.cpp: @@ -1818,7 +1820,7 @@ JSystem/JAudio2/JASProbe.cpp: JSystem/JAudio2/JASReport.cpp: .text start:0x80293394 end:0x80293490 .bss start:0x8042B7A0 end:0x8042B7B8 - .sbss start:0x8044B360 end:0x8044B378 + .sbss start:0x8044B360 end:0x8044B370 JSystem/JAudio2/JASCmdStack.cpp: .text start:0x80293490 end:0x80293658 @@ -1989,7 +1991,7 @@ JSystem/JAudio2/dsptask.cpp: .text start:0x802A0B20 end:0x802A0E40 .data start:0x803C1A60 end:0x803C3960 .bss start:0x8042C0C0 end:0x8042E1A0 - .sbss start:0x8044B440 end:0x8044B44C + .sbss start:0x8044B440 end:0x8044B448 JSystem/JAudio2/osdsp.cpp: .text start:0x802A0E40 end:0x802A0F60 @@ -1998,7 +2000,7 @@ JSystem/JAudio2/osdsp.cpp: JSystem/JAudio2/osdsp_task.cpp: .text start:0x802A0F60 end:0x802A13EC .bss start:0x8042E1A0 end:0x8042E1B8 - .sbss start:0x8044B44C end:0x8044B474 + .sbss start:0x8044B448 end:0x8044B450 JSystem/JAudio2/JAIAudible.cpp: .text start:0x802A13EC end:0x802A1434 @@ -2141,7 +2143,7 @@ JSystem/JMessage/locale.cpp: Z2AudioLib/Z2Calc.cpp: .text start:0x802ABACC end:0x802ABE74 - .sbss start:0x8044B474 end:0x8044B478 + .sbss start:0x8044B470 end:0x8044B478 .sdata2 start:0x8044F940 end:0x8044F958 Z2AudioLib/Z2Param.cpp: diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt index 2170587bf6..0f0f6db3a6 100644 --- a/config/GZ2J01/symbols.txt +++ b/config/GZ2J01/symbols.txt @@ -22108,11 +22108,11 @@ taskwritep = .sbss:0x8044B444; // type:object size:0x4 scope:global align:4 data lbl_8044B448 = .sbss:0x8044B448; // type:object size:0x1 data:byte lbl_8044B449 = .sbss:0x8044B449; // type:object size:0x1 data:byte DSP_prior_task = .sbss:0x8044B44C; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044B450 = .sbss:0x8044B450; // type:object size:0x8 data:byte -lbl_8044B458 = .sbss:0x8044B458; // type:object size:0x8 data:byte -lbl_8044B460 = .sbss:0x8044B460; // type:object size:0x8 data:byte -lbl_8044B468 = .sbss:0x8044B468; // type:object size:0x8 data:byte -lbl_8044B470 = .sbss:0x8044B470; // type:object size:0x1 data:byte +init$localstatic4$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .sbss:0x8044B450; // type:object size:0x1 data:byte +init$localstatic4$getMemPool___35JASPoolAllocObject<13JAISoundChild>Fv = .sbss:0x8044B458; // type:object size:0x1 data:byte +init$localstatic4$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .sbss:0x8044B460; // type:object size:0x1 data:byte +init$localstatic4$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .sbss:0x8044B468; // type:object size:0x1 data:byte +init$80 = .sbss:0x8044B470; // type:object size:0x1 data:byte oRandom$401 = .sbss:0x8044B474; // type:object size:0x4 scope:local align:4 data:4byte MIN_DISTANCE_VOLUME__7Z2Param = .sbss:0x8044B478; // type:object size:0x4 scope:global align:4 data:float ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param = .sbss:0x8044B47C; // type:object size:0x4 scope:global align:4 data:float diff --git a/configure.py b/configure.py index 298aa33a2b..ffee1a004c 100755 --- a/configure.py +++ b/configure.py @@ -468,7 +468,7 @@ config.libs = [ Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "m_Do/m_Do_audio.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "m_Do/m_Do_controller_pad.cpp"), Object(NonMatching, "m_Do/m_Re_controller_pad.cpp"), - Object(MatchingFor("GZ2E01"), "m_Do/m_Do_graphic.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "m_Do/m_Do_graphic.cpp"), Object(NonMatching, "m_Do/m_Do_machine.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "m_Do/m_Do_mtx.cpp"), Object(NonMatching, "m_Do/m_Do_ext.cpp"), @@ -584,7 +584,7 @@ config.libs = [ Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_a_item_static.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_a_shop_item_static.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_a_horse_static.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_demo.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_demo.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_door_param2.cpp"), # debug weak func order Object(NonMatching, "d/d_resorce.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_map_path.cpp"), @@ -645,7 +645,7 @@ config.libs = [ Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/actor/d_a_itembase.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/actor/d_a_no_chg_room.cpp"), Object(NonMatching, "d/actor/d_a_npc.cpp"), - Object(MatchingFor("GZ2E01"), "d/actor/d_a_npc_cd.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/actor/d_a_npc_cd.cpp"), Object(NonMatching, "d/actor/d_a_npc_cd2.cpp"), Object(NonMatching, "d/actor/d_a_obj_item.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_insect.cpp"), @@ -657,7 +657,7 @@ config.libs = [ Object(NonMatching, "d/d_file_sel_warning.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_file_sel_info.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_bright_check.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_scope.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_scope.cpp"), Object(Equivalent, "d/d_select_cursor.cpp"), # vtable padding Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_select_icon.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_shop_camera.cpp"), @@ -683,7 +683,7 @@ config.libs = [ Object(MatchingFor("GZ2E01"), "d/d_menu_letter.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_option.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_ring.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_menu_save.cpp"), # missing 0x24 bytes of padding between vtables, likely some abstract base class vtable that gets stripped out + Object(MatchingFor("GZ2E01"), "d/d_menu_save.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_skill.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_window_HIO.cpp"), Object(Equivalent, "d/d_menu_window.cpp"), # weak func order @@ -897,7 +897,7 @@ config.libs = [ Object(NonMatching, "JSystem/JAudio2/JASHeapCtrl.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JASResArcLoader.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JASProbe.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASReport.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASReport.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JASCmdStack.cpp"), Object(NonMatching, "JSystem/JAudio2/JASTrack.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JASTrackPort.cpp"), @@ -929,7 +929,7 @@ config.libs = [ Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/dspproc.cpp", extra_cflags=["-O4", "-func_align 32"]), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/dsptask.cpp", extra_cflags=["-O4", "-func_align 32"]), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/osdsp.cpp", extra_cflags=["-O4", "-func_align 32", "-str nopool"]), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/osdsp_task.cpp", extra_cflags=["-O4", "-func_align 32"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/osdsp_task.cpp", extra_cflags=["-O4", "-func_align 32"]), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01", "ShieldD"), "JSystem/JAudio2/JAIAudible.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JAIAudience.cpp"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JAISe.cpp"), @@ -977,7 +977,7 @@ config.libs = [ "progress_category": "core", "host": True, "objects": [ - Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2Calc.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2Calc.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2AudioArcLoader.cpp"), Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2Param.cpp"), Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundMgr.cpp"), @@ -1448,9 +1448,9 @@ config.libs = [ Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c"), Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c"), @@ -1508,7 +1508,7 @@ config.libs = [ "objects": [ Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "REL/executor.c"), Object( - MatchingFor("GZ2E01"), + MatchingFor("GZ2E01", "GZ2J01"), "REL/global_destructor_chain.c", source="PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c", ), @@ -1535,7 +1535,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_ito"), ActorRel(NonMatching, "d_a_obj_movebox"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_swpush"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_timer"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_timer"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_path_line"), ActorRel(NonMatching, "d_a_scene_exit"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_set_bgobj"), @@ -1555,18 +1555,18 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_push"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_telop"), ActorRel(NonMatching, "d_a_tbox"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tbox2"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tbox2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_vrbox"), ActorRel(NonMatching, "d_a_vrbox2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_arrow"), ActorRel(NonMatching, "d_a_boomerang"), - ActorRel(MatchingFor("GZ2E01"), "d_a_crod"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_crod"), ActorRel(NonMatching, "d_a_demo00"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_disappear"), ActorRel(NonMatching, "d_a_mg_rod"), ActorRel(NonMatching, "d_a_midna"), ActorRel(Equivalent, "d_a_nbomb"), # weak func order - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_life_container"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_life_container"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_yousei"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_spinner"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_suspend"), @@ -1577,21 +1577,21 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_canoe"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_cstaF"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_demo_item"), - ActorRel(MatchingFor("GZ2E01"), "d_a_door_bossL1"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_bossL1"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dn"), ActorRel(Equivalent, "d_a_e_fm"), # regalloc - ActorRel(MatchingFor("GZ2E01"), "d_a_e_ga"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_hb"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_nest"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_rd"), - ActorRel(MatchingFor("GZ2E01"), "d_a_econt"), - ActorRel(MatchingFor("GZ2E01"), "d_a_fr"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ga"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_hb"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_nest"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_rd"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_econt"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_fr"), ActorRel(NonMatching, "d_a_grass"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag05"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag10"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag11"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag14"), - ActorRel(MatchingFor("GZ2E01"), "d_a_mg_fish"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_mg_fish"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_besu"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fairy_seirei"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fish"), @@ -1613,7 +1613,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_hhashi"), ActorRel(NonMatching, "d_a_obj_kanban2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kbacket"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kgate"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kgate"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_klift00"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ktOnFire"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ladder"), @@ -1623,17 +1623,17 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_mgate"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_nameplate"), ActorRel(NonMatching, "d_a_obj_ornament_cloth"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rope_bridge"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_rope_bridge"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sWallShutter"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stick"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stoneMark"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_swpropeller"), ActorRel(NonMatching, "d_a_obj_swpush5"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_yobikusa"), - ActorRel(MatchingFor("GZ2E01"), "d_a_scene_exit2"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_scene_exit2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_shop_item"), - ActorRel(MatchingFor("GZ2E01"), "d_a_sq"), - ActorRel(MatchingFor("GZ2E01"), "d_a_swc00"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_sq"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_swc00"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_CstaSw"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_ajnot"), ActorRel(NonMatching, "d_a_tag_attack_item"), @@ -1641,12 +1641,12 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_hinit"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_hjump"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_hstop"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tag_lv2prchk"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_lv2prchk"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_magne"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_mhint"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_mstop"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_spring"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tag_statue_evt"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_statue_evt"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_ykgr"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_L7demo_dr"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_L7low_dr"), @@ -1659,7 +1659,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_gg"), ActorRel(NonMatching, "d_a_b_gm"), ActorRel(NonMatching, "d_a_b_gnd"), - ActorRel(MatchingFor("GZ2E01"), "d_a_b_go"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_go"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_gos"), ActorRel(Equivalent, "d_a_b_mgn"), # extra mr/regalloc ActorRel(NonMatching, "d_a_b_ob"), @@ -1667,10 +1667,10 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_oh2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_tn"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_yo"), - ActorRel(MatchingFor("GZ2E01"), "d_a_b_yo_ice"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_yo_ice"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_zant"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_zant_magic"), - ActorRel(MatchingFor("GZ2E01"), "d_a_b_zant_mobile"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_zant_mobile"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_b_zant_sima"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_balloon_2D"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_bullet"), @@ -1679,51 +1679,51 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_cow"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_cstatue"), ActorRel(Equivalent, "d_a_do"), # Z2SoundObjSimple dtor - ActorRel(MatchingFor("GZ2E01"), "d_a_door_boss"), - ActorRel(MatchingFor("GZ2E01"), "d_a_door_bossL5"), - ActorRel(MatchingFor("GZ2E01"), "d_a_door_mbossL1"), - ActorRel(MatchingFor("GZ2E01"), "d_a_door_push"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_ai"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_boss"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_bossL5"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_mbossL1"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_push"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ai"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_arrow"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_ba"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ba"), ActorRel(NonMatching, "d_a_e_bee"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_bg"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_bg"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_bi"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_bi_leaf"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_bs"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_bu"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_bs"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_bu"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_bug"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_cr"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_cr"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_cr_egg"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_db"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_db"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_db_leaf"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_dd"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_df"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_dk"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dd"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_df"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dk"), ActorRel(Equivalent, "d_a_e_dt"), # weak func order ActorRel(NonMatching, "d_a_e_fb"), ActorRel(Equivalent, "d_a_e_fk"), # weak func order ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fs"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_fz"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fz"), ActorRel(NonMatching, "d_a_e_gb"), ActorRel(NonMatching, "d_a_e_ge"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_gi"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_gi"), ActorRel(NonMatching, "d_a_e_gm"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_gob"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_gs"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_gs"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_hb_leaf"), ActorRel(NonMatching, "d_a_e_hm"), ActorRel(NonMatching, "d_a_e_hp"), ActorRel(NonMatching, "d_a_e_hz"), ActorRel(NonMatching, "d_a_e_hzelda"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_is"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_kg"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_kk"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_is"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kg"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kk"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kr"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_mb"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_md"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_mf"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_mk"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_mk"), ActorRel(NonMatching, "d_a_e_mk_bo"), ActorRel(NonMatching, "d_a_e_mm"), ActorRel(NonMatching, "d_a_e_mm_mt"), @@ -1732,11 +1732,11 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_oc"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_oct_bg"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ot"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_ph"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ph"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_pm"), ActorRel(NonMatching, "d_a_e_po"), ActorRel(Equivalent, "d_a_e_pz"), # inline issue - ActorRel(MatchingFor("GZ2E01"), "d_a_e_rb"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_rb"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_rdb"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_rdy"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_s1"), @@ -1749,10 +1749,10 @@ config.libs = [ ActorRel(NonMatching, "d_a_e_st"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_st_line"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_sw"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_th"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_th"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_th_ball"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_tk"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_tk2"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_tk"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_tk2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_tk_ball"), ActorRel(NonMatching, "d_a_e_tt"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_vt"), @@ -1765,14 +1765,14 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_yd_leaf"), ActorRel(NonMatching, "d_a_e_yg"), ActorRel(NonMatching, "d_a_e_yh"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_yk"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_ym"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_yk"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ym"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ym_tag"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ymb"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_yr"), ActorRel(NonMatching, "d_a_e_zh"), ActorRel(NonMatching, "d_a_e_zm"), - ActorRel(MatchingFor("GZ2E01"), "d_a_e_zs"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_zs"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_formation_mng"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_guard_mng"), ActorRel(NonMatching, "d_a_horse"), @@ -1846,7 +1846,7 @@ config.libs = [ ActorRel(Equivalent, "d_a_npc_ks"), # weak func order ActorRel(NonMatching, "d_a_npc_kyury"), ActorRel(NonMatching, "d_a_npc_len"), - ActorRel(MatchingFor("GZ2E01"), "d_a_npc_lf"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_lf"), ActorRel(NonMatching, "d_a_npc_lud"), ActorRel(NonMatching, "d_a_npc_midp"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_mk"), @@ -1880,15 +1880,15 @@ config.libs = [ ActorRel(NonMatching, "d_a_npc_sola"), ActorRel(NonMatching, "d_a_npc_soldierA"), ActorRel(NonMatching, "d_a_npc_soldierB"), - ActorRel(MatchingFor("GZ2E01"), "d_a_npc_sq"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_sq"), ActorRel(NonMatching, "d_a_npc_the", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_theB"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_tk"), ActorRel(NonMatching, "d_a_npc_tkc"), - ActorRel(MatchingFor("GZ2E01"), "d_a_npc_tkj2"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_tkj2"), ActorRel(NonMatching, "d_a_npc_tks", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_toby"), - ActorRel(MatchingFor("GZ2E01"), "d_a_npc_tr"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_tr"), ActorRel(NonMatching, "d_a_npc_uri"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_worm"), ActorRel(NonMatching, "d_a_npc_wrestler", extra_cflags=[DANPCF_C_HACK]), @@ -1911,12 +1911,12 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_TvCdlst"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_Y_taihou"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_amiShutter"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ari"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ari"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_automata"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_avalanche"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_avalanche"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_balloon"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_barDesk"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_batta"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_batta"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bbox"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bed"), ActorRel(NonMatching, "d_a_obj_bemos"), @@ -1924,19 +1924,19 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bk_leaf"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bky_rock"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bmWindow"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bmshutter"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bmshutter"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bombf"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_boumato"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_brg"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bsGate"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bubblePilar"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_catdoor"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cb"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_cb"), ActorRel(Equivalent, "d_a_obj_cblock"), # weird weak data issue - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cdoor"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_chandelier"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_chest"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cho"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_cdoor"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_chandelier"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_chest"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_cho"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_cowdoor"), ActorRel(NonMatching, "d_a_obj_crope"), ActorRel(NonMatching, "d_a_obj_crvfence"), @@ -1948,9 +1948,9 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_crystal"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_cwall"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_damCps"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_dan"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_dan"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_digholl"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_digsnow"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_digsnow"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_dmelevator"), ActorRel(NonMatching, "d_a_obj_drop"), ActorRel(NonMatching, "d_a_obj_dust"), @@ -1960,22 +1960,22 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_fchain"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_fireWood"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_fireWood2"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_firepillar"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_firepillar2"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_firepillar"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_firepillar2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_flag"), ActorRel(Equivalent, "d_a_obj_flag2"), # weak function order ActorRel(NonMatching, "d_a_obj_flag3"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_food"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fw"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_food"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_fw"), ActorRel(NonMatching, "d_a_obj_gadget"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ganonwall"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ganonwall2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_gb"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_geyser"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_geyser"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_glowSphere"), ActorRel(NonMatching, "d_a_obj_gm"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_goGate"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_gomikabe"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_gomikabe"), ActorRel(Equivalent, "d_a_obj_gra2"), # weak function order ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_graWall"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_gra_rock"), @@ -1994,28 +1994,28 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_hsTarget"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ice_l"), ActorRel(NonMatching, "d_a_obj_ice_s"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_iceblock"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_iceblock"), ActorRel(NonMatching, "d_a_obj_iceleaf"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ihasi"), ActorRel(NonMatching, "d_a_obj_ikada"), ActorRel(NonMatching, "d_a_obj_inobone"), ActorRel(NonMatching, "d_a_obj_ita"), ActorRel(NonMatching, "d_a_obj_itamato"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kabuto"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kag"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kabuto"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kag"), ActorRel(NonMatching, "d_a_obj_kage"), ActorRel(NonMatching, "d_a_obj_kago"), ActorRel(NonMatching, "d_a_obj_kaisou"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kamakiri"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kantera"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_katatsumuri"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kamakiri"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kantera"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_katatsumuri"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kazeneko"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kbox"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_key"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_key"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_keyhole"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ki"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ki"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kiPot"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kita"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kita"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kjgjs"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kkanban"), ActorRel(NonMatching, "d_a_obj_knBullet"), @@ -2026,7 +2026,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_kznkarm"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_laundry"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_laundry_rope"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lbox"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lbox"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lp"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv1Candle00"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv1Candle01"), @@ -2046,8 +2046,8 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_lv4SlideWall"), ActorRel(NonMatching, "d_a_obj_lv4bridge"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4chandelier"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4digsand"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4floor"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4digsand"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4floor"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4gear"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv4prelvtr"), ActorRel(NonMatching, "d_a_obj_lv4prwall"), @@ -2065,7 +2065,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_lv6Tenbin"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv6TogeRoll"), ActorRel(NonMatching, "d_a_obj_lv6TogeTrap"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv6bemos"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_lv6bemos"), ActorRel(NonMatching, "d_a_obj_lv6bemos2"), ActorRel(NonMatching, "d_a_obj_lv6egate"), ActorRel(NonMatching, "d_a_obj_lv6elevta"), @@ -2080,7 +2080,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_lv9SwShutter"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_magLift"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_magLiftRot"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_maki"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_maki"), ActorRel(Equivalent, "d_a_obj_master_sword"), #weak function and vtable order ActorRel(NonMatching, "d_a_obj_mato"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_mhole"), @@ -2091,18 +2091,18 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_mirror_screw"), ActorRel(NonMatching, "d_a_obj_mirror_table"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_msima"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_mvstair"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_myogan"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_mvstair"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_myogan"), ActorRel(NonMatching, "d_a_obj_nagaisu"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_nan"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_nan"), ActorRel(NonMatching, "d_a_obj_ndoor"), ActorRel(NonMatching, "d_a_obj_nougu"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_octhashi"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_octhashi"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_oiltubo"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_onsen"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_onsenFire"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_onsenTaru"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_pdoor"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_pdoor"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_pdtile"), ActorRel(NonMatching, "d_a_obj_pdwall"), ActorRel(NonMatching, "d_a_obj_picture"), @@ -2116,25 +2116,25 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_rcircle"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_rfHole"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_rgate"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_riverrock"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_riverrock"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_rock"), ActorRel(NonMatching, "d_a_obj_rotBridge"), ActorRel(NonMatching, "d_a_obj_rotTrap"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_roten"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rstair"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_rstair"), ActorRel(NonMatching, "d_a_obj_rw"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_saidan"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sakuita"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sakuita"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sakuita_rope"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_scannon"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_scannon_crs"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_scannon_ten"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_scannon"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_scannon_crs"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_scannon_ten"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sekidoor"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sekizo"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sekizoa"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_shield"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_shield"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sm_door"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_smallkey"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_smallkey"), ActorRel(NonMatching, "d_a_obj_smgdoor"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_smoke"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_smtile"), @@ -2146,32 +2146,32 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_ss_drink"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ss_item"), ActorRel(NonMatching, "d_a_obj_stairBlock"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_stone"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stone"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stopper"), ActorRel(NonMatching, "d_a_obj_stopper2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_suisya"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sw"), ActorRel(NonMatching, "d_a_obj_swBallA"), ActorRel(NonMatching, "d_a_obj_swBallB"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_swBallC"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_swBallC"), ActorRel(NonMatching, "d_a_obj_swLight"), ActorRel(NonMatching, "d_a_obj_swchain"), ActorRel(Equivalent, "d_a_obj_swhang"), # vtable order - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sword"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_sword"), ActorRel(NonMatching, "d_a_obj_swpush2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_swspinner"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_swturn"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_swturn"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_syRock"), ActorRel(NonMatching, "d_a_obj_szbridge"), ActorRel(NonMatching, "d_a_obj_taFence"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_table"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_takaraDai"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_tatigi"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ten"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ten"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_testcube"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_tgake"), ActorRel(NonMatching, "d_a_obj_thashi"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_thdoor"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_thdoor"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_timeFire"), ActorRel(Equivalent, "d_a_obj_tks", extra_cflags=[DANPCF_C_HACK]), # weak function order, sinShort inline issue ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_tmoon"), @@ -2179,7 +2179,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_toby"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_tobyhouse"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_togeTrap"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tombo"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_tombo"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_tornado"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_tornado2"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_tp"), @@ -2189,22 +2189,22 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_usaku"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_vground"), ActorRel(NonMatching, "d_a_obj_volcball"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_volcbom"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_warp_kbrg"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_warp_obrg"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_volcbom"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_warp_kbrg"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_warp_obrg"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_waterGate"), ActorRel(Equivalent, "d_a_obj_waterPillar"), # weak func order ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_waterfall"), ActorRel(NonMatching, "d_a_obj_wchain"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_wdStick"), ActorRel(NonMatching, "d_a_obj_web0"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_web1"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_well_cover"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_web1"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_well_cover"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_wflag"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_wind_stone"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_window"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_wood_pendulum"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_wood_statue"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_wood_statue"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_wsword"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_yel_bag"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ystone"), @@ -2212,11 +2212,11 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_zdoor"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_zrTurara"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_zrTuraraRock"), - ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zraMark"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_zraMark"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_zra_freeze"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_zra_rock"), ActorRel(NonMatching, "d_a_passer_mng"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tag_arena"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_arena"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_peru"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_ppolamp"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_skip_2D"), @@ -2249,7 +2249,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_poFire"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_qs"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_ret_room"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tag_river_back"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_river_back"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_rmbit_sw"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_schedule"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_setBall"), @@ -2264,7 +2264,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_theB_hint"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_wara_howl"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_watchge"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tag_waterfall"), + ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_waterfall"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_wljump"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_tag_yami"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_talk"), diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 540bf381e1..2090fba076 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -572,6 +572,10 @@ static void e_mk_shoot(e_mk_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_MK_V_CATCH_BOOM, -1); i_this->mSound.startCreatureSound(Z2SE_EN_MK_CATCH_BOOM, 0, -1); + +#if VERSION == VERSION_GCN_JPN + return; +#endif } } diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index 35177bea85..7ab4d0aaa9 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -1510,7 +1510,7 @@ static int daE_YK_Create(fopAc_ac_c* i_this) { } else { if (yk->mPathIdx != 0xff) { yk->mpPath = dPath_GetRoomPath(yk->mPathIdx,fopAcM_GetRoomNo(yk)); - + if (!yk->mpPath) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index b0d2fe1d1b..064ce29be6 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -3904,7 +3904,11 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) { a_this->mResName = "O_gD_bott"; } +#if VERSION == VERSION_GCN_JPN + lit_1008 = 0; +#else lit_1008 = 1; +#endif cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, a_this->mResName); cPhs__Step retval = phase;