From b2fc1d2683958a772da702d74bbbfd8e4a1d514c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 20 Sep 2023 09:22:35 -0700 Subject: [PATCH] Move statics out of actor/ dir --- config/GZLE01/splits.txt | 26 ++++++++++----------- config/GZLJ01/splits.txt | 26 ++++++++++----------- config/GZLP01/splits.txt | 26 ++++++++++----------- configure.py | 2 +- src/d/{actor => }/d_a_boko_static.cpp | 0 src/d/{actor => }/d_a_bomb_static.cpp | 0 src/d/{actor => }/d_a_branch_static.cpp | 0 src/d/{actor => }/d_a_item_static.cpp | 0 src/d/{actor => }/d_a_itembase_static.cpp | 0 src/d/{actor => }/d_a_leaflift_static.cpp | 0 src/d/{actor => }/d_a_mgameboard_static.cpp | 0 src/d/{actor => }/d_a_npc_cb1_static.cpp | 0 src/d/{actor => }/d_a_npc_mk_static.cpp | 0 src/d/{actor => }/d_a_obj_tribox_static.cpp | 0 src/d/{actor => }/d_a_race_item_static.cpp | 0 src/d/{actor => }/d_a_ship_static.cpp | 0 src/d/{actor => }/d_a_shop_item_static.cpp | 0 17 files changed, 40 insertions(+), 40 deletions(-) rename src/d/{actor => }/d_a_boko_static.cpp (100%) rename src/d/{actor => }/d_a_bomb_static.cpp (100%) rename src/d/{actor => }/d_a_branch_static.cpp (100%) rename src/d/{actor => }/d_a_item_static.cpp (100%) rename src/d/{actor => }/d_a_itembase_static.cpp (100%) rename src/d/{actor => }/d_a_leaflift_static.cpp (100%) rename src/d/{actor => }/d_a_mgameboard_static.cpp (100%) rename src/d/{actor => }/d_a_npc_cb1_static.cpp (100%) rename src/d/{actor => }/d_a_npc_mk_static.cpp (100%) rename src/d/{actor => }/d_a_obj_tribox_static.cpp (100%) rename src/d/{actor => }/d_a_race_item_static.cpp (100%) rename src/d/{actor => }/d_a_ship_static.cpp (100%) rename src/d/{actor => }/d_a_shop_item_static.cpp (100%) diff --git a/config/GZLE01/splits.txt b/config/GZLE01/splits.txt index 76202e490..6226bc5ed 100644 --- a/config/GZLE01/splits.txt +++ b/config/GZLE01/splits.txt @@ -489,52 +489,52 @@ d/actor/d_a_obj.cpp: .sbss start:0x803F6BA0 end:0x803F6BA8 .sdata2 start:0x803F84C8 end:0x803F8530 -d/actor/d_a_obj_tribox_static.cpp: +d/d_a_obj_tribox_static.cpp: .text start:0x80067D1C end:0x80067D94 .ctors start:0x803386C8 end:0x803386CC .bss start:0x803E1F30 end:0x803E1F48 .sbss start:0x803F6BA8 end:0x803F6BC0 -d/actor/d_a_ship_static.cpp: +d/d_a_ship_static.cpp: .text start:0x80067D94 end:0x80067E78 .sdata2 start:0x803F8530 end:0x803F8538 -d/actor/d_a_boko_static.cpp: +d/d_a_boko_static.cpp: .text start:0x80067E78 end:0x80067FA0 .data start:0x80377018 end:0x80377168 .sdata start:0x803F61E0 end:0x803F61E8 -d/actor/d_a_bomb_static.cpp: +d/d_a_bomb_static.cpp: .text start:0x80067FA0 end:0x800684F4 .text start:0x800684F4 end:0x80068510 .rodata start:0x8034FC58 end:0x8034FC90 -d/actor/d_a_branch_static.cpp: +d/d_a_branch_static.cpp: .text start:0x80068510 end:0x800685F8 .rodata start:0x8034FC90 end:0x8034FCC0 -d/actor/d_a_mgameboard_static.cpp: +d/d_a_mgameboard_static.cpp: .text start:0x800685F8 end:0x80068650 -d/actor/d_a_itembase_static.cpp: +d/d_a_itembase_static.cpp: .text start:0x80068650 end:0x80068820 .rodata start:0x8034FCC0 end:0x8034FD10 -d/actor/d_a_item_static.cpp: +d/d_a_item_static.cpp: .text start:0x80068820 end:0x800689F0 .sdata2 start:0x803F8538 end:0x803F8540 -d/actor/d_a_shop_item_static.cpp: +d/d_a_shop_item_static.cpp: .text start:0x800689F0 end:0x80068A58 .rodata start:0x8034FD10 end:0x80351DF0 .sdata2 start:0x803F8540 end:0x803F8550 -d/actor/d_a_race_item_static.cpp: +d/d_a_race_item_static.cpp: .text start:0x80068A58 end:0x800690E4 .data start:0x80377168 end:0x80377228 .sdata2 start:0x803F8550 end:0x803F8558 -d/actor/d_a_leaflift_static.cpp: +d/d_a_leaflift_static.cpp: .text start:0x800690E4 end:0x800692C4 .sdata2 start:0x803F8558 end:0x803F8580 @@ -952,11 +952,11 @@ d/d_2dnumber.cpp: .data start:0x803890C8 end:0x80389138 .sdata2 start:0x803F9488 end:0x803F9508 -d/actor/d_a_npc_cb1_static.cpp: +d/d_a_npc_cb1_static.cpp: .text start:0x800CB5C4 end:0x800CB5CC .sbss start:0x803F6E60 end:0x803F6E68 -d/actor/d_a_npc_mk_static.cpp: +d/d_a_npc_mk_static.cpp: .text start:0x800CB5CC end:0x800CC734 .sdata2 start:0x803F9508 end:0x803F9560 diff --git a/config/GZLJ01/splits.txt b/config/GZLJ01/splits.txt index 25011b85a..8a10d4cd7 100644 --- a/config/GZLJ01/splits.txt +++ b/config/GZLJ01/splits.txt @@ -489,52 +489,52 @@ d/actor/d_a_obj.cpp: .sbss start:0x803EA070 end:0x803EA078 .sdata2 start:0x803EB980 end:0x803EB9E8 -d/actor/d_a_obj_tribox_static.cpp: +d/d_a_obj_tribox_static.cpp: .text start:0x80065B50 end:0x80065BC8 .ctors start:0x803360C4 end:0x803360C8 .bss start:0x803D5420 end:0x803D5438 .sbss start:0x803EA078 end:0x803EA090 -d/actor/d_a_ship_static.cpp: +d/d_a_ship_static.cpp: .text start:0x80065BC8 end:0x80065CAC .sdata2 start:0x803EB9E8 end:0x803EB9F0 -d/actor/d_a_boko_static.cpp: +d/d_a_boko_static.cpp: .text start:0x80065CAC end:0x80065DD4 .data start:0x8036A4B8 end:0x8036A608 .sdata start:0x803E96C8 end:0x803E96D0 -d/actor/d_a_bomb_static.cpp: +d/d_a_bomb_static.cpp: .text start:0x80065DD4 end:0x80066328 .text start:0x80066328 end:0x80066344 .rodata start:0x803436B8 end:0x803436F0 -d/actor/d_a_branch_static.cpp: +d/d_a_branch_static.cpp: .text start:0x80066344 end:0x8006642C .rodata start:0x803436F0 end:0x80343720 -d/actor/d_a_mgameboard_static.cpp: +d/d_a_mgameboard_static.cpp: .text start:0x8006642C end:0x80066484 -d/actor/d_a_itembase_static.cpp: +d/d_a_itembase_static.cpp: .text start:0x80066484 end:0x80066654 .rodata start:0x80343720 end:0x80343770 -d/actor/d_a_item_static.cpp: +d/d_a_item_static.cpp: .text start:0x80066654 end:0x80066824 .sdata2 start:0x803EB9F0 end:0x803EB9F8 -d/actor/d_a_shop_item_static.cpp: +d/d_a_shop_item_static.cpp: .text start:0x80066824 end:0x8006688C .rodata start:0x80343770 end:0x80345850 .sdata2 start:0x803EB9F8 end:0x803EBA08 -d/actor/d_a_race_item_static.cpp: +d/d_a_race_item_static.cpp: .text start:0x8006688C end:0x80066F18 .data start:0x8036A608 end:0x8036A6C8 .sdata2 start:0x803EBA08 end:0x803EBA10 -d/actor/d_a_leaflift_static.cpp: +d/d_a_leaflift_static.cpp: .text start:0x80066F18 end:0x800670F8 .sdata2 start:0x803EBA10 end:0x803EBA38 @@ -952,11 +952,11 @@ d/d_2dnumber.cpp: .data start:0x8037C568 end:0x8037C5D8 .sdata2 start:0x803EC950 end:0x803EC9D0 -d/actor/d_a_npc_cb1_static.cpp: +d/d_a_npc_cb1_static.cpp: .text start:0x800C855C end:0x800C8564 .sbss start:0x803EA330 end:0x803EA338 -d/actor/d_a_npc_mk_static.cpp: +d/d_a_npc_mk_static.cpp: .text start:0x800C8564 end:0x800C96CC .sdata2 start:0x803EC9D0 end:0x803ECA28 diff --git a/config/GZLP01/splits.txt b/config/GZLP01/splits.txt index 409e61d08..9a79cbdb2 100644 --- a/config/GZLP01/splits.txt +++ b/config/GZLP01/splits.txt @@ -489,52 +489,52 @@ d/actor/d_a_obj.cpp: .sbss start:0x803FE3A0 end:0x803FE3A8 .sdata2 start:0x803FFCF0 end:0x803FFD58 -d/actor/d_a_obj_tribox_static.cpp: +d/d_a_obj_tribox_static.cpp: .text start:0x8006BAFC end:0x8006BB74 .ctors start:0x8033DC08 end:0x8033DC0C .bss start:0x803E9858 end:0x803E9870 .sbss start:0x803FE3A8 end:0x803FE3C0 -d/actor/d_a_ship_static.cpp: +d/d_a_ship_static.cpp: .text start:0x8006BB74 end:0x8006BC58 .sdata2 start:0x803FFD58 end:0x803FFD60 -d/actor/d_a_boko_static.cpp: +d/d_a_boko_static.cpp: .text start:0x8006BC58 end:0x8006BD80 .data start:0x8037DCF8 end:0x8037DE48 .sdata start:0x803FD9E0 end:0x803FD9E8 -d/actor/d_a_bomb_static.cpp: +d/d_a_bomb_static.cpp: .text start:0x8006BD80 end:0x8006C2D4 .text start:0x8006C2D4 end:0x8006C2F0 .rodata start:0x80355FA8 end:0x80355FE0 -d/actor/d_a_branch_static.cpp: +d/d_a_branch_static.cpp: .text start:0x8006C2F0 end:0x8006C3D8 .rodata start:0x80355FE0 end:0x80356010 -d/actor/d_a_mgameboard_static.cpp: +d/d_a_mgameboard_static.cpp: .text start:0x8006C3D8 end:0x8006C430 -d/actor/d_a_itembase_static.cpp: +d/d_a_itembase_static.cpp: .text start:0x8006C430 end:0x8006C600 .rodata start:0x80356010 end:0x80356060 -d/actor/d_a_item_static.cpp: +d/d_a_item_static.cpp: .text start:0x8006C600 end:0x8006C7D0 .sdata2 start:0x803FFD60 end:0x803FFD68 -d/actor/d_a_shop_item_static.cpp: +d/d_a_shop_item_static.cpp: .text start:0x8006C7D0 end:0x8006C838 .rodata start:0x80356060 end:0x80358140 .sdata2 start:0x803FFD68 end:0x803FFD78 -d/actor/d_a_race_item_static.cpp: +d/d_a_race_item_static.cpp: .text start:0x8006C838 end:0x8006CEC4 .data start:0x8037DE48 end:0x8037DF08 .sdata2 start:0x803FFD78 end:0x803FFD80 -d/actor/d_a_leaflift_static.cpp: +d/d_a_leaflift_static.cpp: .text start:0x8006CEC4 end:0x8006D0A4 .sdata2 start:0x803FFD80 end:0x803FFDA8 @@ -952,11 +952,11 @@ d/d_2dnumber.cpp: .data start:0x8038FDA8 end:0x8038FE18 .sdata2 start:0x80400CB0 end:0x80400D30 -d/actor/d_a_npc_cb1_static.cpp: +d/d_a_npc_cb1_static.cpp: .text start:0x800CF264 end:0x800CF26C .sbss start:0x803FE660 end:0x803FE668 -d/actor/d_a_npc_mk_static.cpp: +d/d_a_npc_mk_static.cpp: .text start:0x800CF26C end:0x800D03D4 .sdata2 start:0x80400D30 end:0x80400D88 diff --git a/configure.py b/configure.py index fe08176ca..74c1054bb 100644 --- a/configure.py +++ b/configure.py @@ -413,7 +413,7 @@ config.libs = [ Object(NonMatching, "d/actor/d_a_boomerang.cpp"), Object(NonMatching, "d/actor/d_a_dai_item.cpp"), Object(NonMatching, "d/actor/d_a_demo00.cpp"), - Object(Matching, "d/actor/d_a_disappear.cpp"), + Object(Matching, "d/actor/d_a_disappear.cpp"), Object(NonMatching, "d/actor/d_a_esa.cpp"), Object(NonMatching, "d/actor/d_a_grid.cpp"), Object(NonMatching, "d/actor/d_a_himo2.cpp"), diff --git a/src/d/actor/d_a_boko_static.cpp b/src/d/d_a_boko_static.cpp similarity index 100% rename from src/d/actor/d_a_boko_static.cpp rename to src/d/d_a_boko_static.cpp diff --git a/src/d/actor/d_a_bomb_static.cpp b/src/d/d_a_bomb_static.cpp similarity index 100% rename from src/d/actor/d_a_bomb_static.cpp rename to src/d/d_a_bomb_static.cpp diff --git a/src/d/actor/d_a_branch_static.cpp b/src/d/d_a_branch_static.cpp similarity index 100% rename from src/d/actor/d_a_branch_static.cpp rename to src/d/d_a_branch_static.cpp diff --git a/src/d/actor/d_a_item_static.cpp b/src/d/d_a_item_static.cpp similarity index 100% rename from src/d/actor/d_a_item_static.cpp rename to src/d/d_a_item_static.cpp diff --git a/src/d/actor/d_a_itembase_static.cpp b/src/d/d_a_itembase_static.cpp similarity index 100% rename from src/d/actor/d_a_itembase_static.cpp rename to src/d/d_a_itembase_static.cpp diff --git a/src/d/actor/d_a_leaflift_static.cpp b/src/d/d_a_leaflift_static.cpp similarity index 100% rename from src/d/actor/d_a_leaflift_static.cpp rename to src/d/d_a_leaflift_static.cpp diff --git a/src/d/actor/d_a_mgameboard_static.cpp b/src/d/d_a_mgameboard_static.cpp similarity index 100% rename from src/d/actor/d_a_mgameboard_static.cpp rename to src/d/d_a_mgameboard_static.cpp diff --git a/src/d/actor/d_a_npc_cb1_static.cpp b/src/d/d_a_npc_cb1_static.cpp similarity index 100% rename from src/d/actor/d_a_npc_cb1_static.cpp rename to src/d/d_a_npc_cb1_static.cpp diff --git a/src/d/actor/d_a_npc_mk_static.cpp b/src/d/d_a_npc_mk_static.cpp similarity index 100% rename from src/d/actor/d_a_npc_mk_static.cpp rename to src/d/d_a_npc_mk_static.cpp diff --git a/src/d/actor/d_a_obj_tribox_static.cpp b/src/d/d_a_obj_tribox_static.cpp similarity index 100% rename from src/d/actor/d_a_obj_tribox_static.cpp rename to src/d/d_a_obj_tribox_static.cpp diff --git a/src/d/actor/d_a_race_item_static.cpp b/src/d/d_a_race_item_static.cpp similarity index 100% rename from src/d/actor/d_a_race_item_static.cpp rename to src/d/d_a_race_item_static.cpp diff --git a/src/d/actor/d_a_ship_static.cpp b/src/d/d_a_ship_static.cpp similarity index 100% rename from src/d/actor/d_a_ship_static.cpp rename to src/d/d_a_ship_static.cpp diff --git a/src/d/actor/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp similarity index 100% rename from src/d/actor/d_a_shop_item_static.cpp rename to src/d/d_a_shop_item_static.cpp