diff --git a/Makefile b/Makefile index b54fea568..4ee2d2644 100644 --- a/Makefile +++ b/Makefile @@ -232,7 +232,7 @@ ASSET_FILES := \ $(patsubst $(A_DIR)/files/chrs/%.bin, $(B_DIR)/assets/files/C%Z, $(shell find $(A_DIR) -path '*/files/chrs/*.bin')) \ $(patsubst $(A_DIR)/files/guns/%.bin, $(B_DIR)/assets/files/G%Z, $(shell find $(A_DIR) -path '*/files/guns/*.bin')) \ $(patsubst $(A_DIR)/files/props/%.bin, $(B_DIR)/assets/files/P%Z, $(shell find $(A_DIR) -path '*/files/props/*.bin')) \ - $(patsubst src/files/setup/%.c, $(B_DIR)/assets/files/U%Z, $(shell find src/files/setup -name '*.c')) \ + $(patsubst src/setups/%.c, $(B_DIR)/assets/files/U%Z, $(shell find src/setups -name '*.c')) \ $(patsubst $(A_DIR)/files/bgdata/%.seg, $(B_DIR)/assets/files/bgdata/%.seg, $(shell find $(A_DIR) -path '*/files/bgdata/*.seg')) \ $(B_DIR)/assets/files/ob/ob_mid.seg.o @@ -531,7 +531,7 @@ $(B_DIR)/assets/files/P%Z: $(A_DIR)/files/props/%.bin # -> B_DIR/assets/files/setup/foo.bin (done here) # -> B_DIR/assets/files/UsetupfooZ (done here) # -> B_DIR/assets/files/UsetupfooZ.o (done elsewhere) -$(B_DIR)/assets/files/setup/%.o: src/files/setup/%.c $(ASSETMGR_O_FILES) $(RECOMP_FILES) +$(B_DIR)/assets/files/setup/%.o: src/setups/%.c $(ASSETMGR_O_FILES) $(RECOMP_FILES) @mkdir -p $(dir $@) $(CC) -c $(CFLAGS) -o $@ $< diff --git a/src/files/setup/mp_setupame.c b/src/setups/mp_setupame.c similarity index 100% rename from src/files/setup/mp_setupame.c rename to src/setups/mp_setupame.c diff --git a/src/files/setup/mp_setuparch.c b/src/setups/mp_setuparch.c similarity index 100% rename from src/files/setup/mp_setuparch.c rename to src/setups/mp_setuparch.c diff --git a/src/files/setup/mp_setuparec.c b/src/setups/mp_setuparec.c similarity index 100% rename from src/files/setup/mp_setuparec.c rename to src/setups/mp_setuparec.c diff --git a/src/files/setup/mp_setupark.c b/src/setups/mp_setupark.c similarity index 100% rename from src/files/setup/mp_setupark.c rename to src/setups/mp_setupark.c diff --git a/src/files/setup/mp_setupash.c b/src/setups/mp_setupash.c similarity index 100% rename from src/files/setup/mp_setupash.c rename to src/setups/mp_setupash.c diff --git a/src/files/setup/mp_setupate.c b/src/setups/mp_setupate.c similarity index 100% rename from src/files/setup/mp_setupate.c rename to src/setups/mp_setupate.c diff --git a/src/files/setup/mp_setupazt.c b/src/setups/mp_setupazt.c similarity index 100% rename from src/files/setup/mp_setupazt.c rename to src/setups/mp_setupazt.c diff --git a/src/files/setup/mp_setupcat.c b/src/setups/mp_setupcat.c similarity index 100% rename from src/files/setup/mp_setupcat.c rename to src/setups/mp_setupcat.c diff --git a/src/files/setup/mp_setupcave.c b/src/setups/mp_setupcave.c similarity index 100% rename from src/files/setup/mp_setupcave.c rename to src/setups/mp_setupcave.c diff --git a/src/files/setup/mp_setupcrad.c b/src/setups/mp_setupcrad.c similarity index 100% rename from src/files/setup/mp_setupcrad.c rename to src/setups/mp_setupcrad.c diff --git a/src/files/setup/mp_setupcryp.c b/src/setups/mp_setupcryp.c similarity index 100% rename from src/files/setup/mp_setupcryp.c rename to src/setups/mp_setupcryp.c diff --git a/src/files/setup/mp_setupdam.c b/src/setups/mp_setupdam.c similarity index 100% rename from src/files/setup/mp_setupdam.c rename to src/setups/mp_setupdam.c diff --git a/src/files/setup/mp_setupdepo.c b/src/setups/mp_setupdepo.c similarity index 100% rename from src/files/setup/mp_setupdepo.c rename to src/setups/mp_setupdepo.c diff --git a/src/files/setup/mp_setupdest.c b/src/setups/mp_setupdest.c similarity index 100% rename from src/files/setup/mp_setupdest.c rename to src/setups/mp_setupdest.c diff --git a/src/files/setup/mp_setupdish.c b/src/setups/mp_setupdish.c similarity index 100% rename from src/files/setup/mp_setupdish.c rename to src/setups/mp_setupdish.c diff --git a/src/files/setup/mp_setupear.c b/src/setups/mp_setupear.c similarity index 100% rename from src/files/setup/mp_setupear.c rename to src/setups/mp_setupear.c diff --git a/src/files/setup/mp_setupeld.c b/src/setups/mp_setupeld.c similarity index 100% rename from src/files/setup/mp_setupeld.c rename to src/setups/mp_setupeld.c diff --git a/src/files/setup/mp_setupimp.c b/src/setups/mp_setupimp.c similarity index 100% rename from src/files/setup/mp_setupimp.c rename to src/setups/mp_setupimp.c diff --git a/src/files/setup/mp_setupjun.c b/src/setups/mp_setupjun.c similarity index 100% rename from src/files/setup/mp_setupjun.c rename to src/setups/mp_setupjun.c diff --git a/src/files/setup/mp_setuplam.c b/src/setups/mp_setuplam.c similarity index 100% rename from src/files/setup/mp_setuplam.c rename to src/setups/mp_setuplam.c diff --git a/src/files/setup/mp_setuplee.c b/src/setups/mp_setuplee.c similarity index 100% rename from src/files/setup/mp_setuplee.c rename to src/setups/mp_setuplee.c diff --git a/src/files/setup/mp_setuplen.c b/src/setups/mp_setuplen.c similarity index 100% rename from src/files/setup/mp_setuplen.c rename to src/setups/mp_setuplen.c diff --git a/src/files/setup/mp_setuplip.c b/src/setups/mp_setuplip.c similarity index 100% rename from src/files/setup/mp_setuplip.c rename to src/setups/mp_setuplip.c diff --git a/src/files/setup/mp_setuplue.c b/src/setups/mp_setuplue.c similarity index 100% rename from src/files/setup/mp_setuplue.c rename to src/setups/mp_setuplue.c diff --git a/src/files/setup/mp_setupmp1.c b/src/setups/mp_setupmp1.c similarity index 100% rename from src/files/setup/mp_setupmp1.c rename to src/setups/mp_setupmp1.c diff --git a/src/files/setup/mp_setupmp10.c b/src/setups/mp_setupmp10.c similarity index 100% rename from src/files/setup/mp_setupmp10.c rename to src/setups/mp_setupmp10.c diff --git a/src/files/setup/mp_setupmp11.c b/src/setups/mp_setupmp11.c similarity index 100% rename from src/files/setup/mp_setupmp11.c rename to src/setups/mp_setupmp11.c diff --git a/src/files/setup/mp_setupmp12.c b/src/setups/mp_setupmp12.c similarity index 100% rename from src/files/setup/mp_setupmp12.c rename to src/setups/mp_setupmp12.c diff --git a/src/files/setup/mp_setupmp13.c b/src/setups/mp_setupmp13.c similarity index 100% rename from src/files/setup/mp_setupmp13.c rename to src/setups/mp_setupmp13.c diff --git a/src/files/setup/mp_setupmp14.c b/src/setups/mp_setupmp14.c similarity index 100% rename from src/files/setup/mp_setupmp14.c rename to src/setups/mp_setupmp14.c diff --git a/src/files/setup/mp_setupmp15.c b/src/setups/mp_setupmp15.c similarity index 100% rename from src/files/setup/mp_setupmp15.c rename to src/setups/mp_setupmp15.c diff --git a/src/files/setup/mp_setupmp16.c b/src/setups/mp_setupmp16.c similarity index 100% rename from src/files/setup/mp_setupmp16.c rename to src/setups/mp_setupmp16.c diff --git a/src/files/setup/mp_setupmp17.c b/src/setups/mp_setupmp17.c similarity index 100% rename from src/files/setup/mp_setupmp17.c rename to src/setups/mp_setupmp17.c diff --git a/src/files/setup/mp_setupmp18.c b/src/setups/mp_setupmp18.c similarity index 100% rename from src/files/setup/mp_setupmp18.c rename to src/setups/mp_setupmp18.c diff --git a/src/files/setup/mp_setupmp19.c b/src/setups/mp_setupmp19.c similarity index 100% rename from src/files/setup/mp_setupmp19.c rename to src/setups/mp_setupmp19.c diff --git a/src/files/setup/mp_setupmp2.c b/src/setups/mp_setupmp2.c similarity index 100% rename from src/files/setup/mp_setupmp2.c rename to src/setups/mp_setupmp2.c diff --git a/src/files/setup/mp_setupmp20.c b/src/setups/mp_setupmp20.c similarity index 100% rename from src/files/setup/mp_setupmp20.c rename to src/setups/mp_setupmp20.c diff --git a/src/files/setup/mp_setupmp3.c b/src/setups/mp_setupmp3.c similarity index 100% rename from src/files/setup/mp_setupmp3.c rename to src/setups/mp_setupmp3.c diff --git a/src/files/setup/mp_setupmp4.c b/src/setups/mp_setupmp4.c similarity index 100% rename from src/files/setup/mp_setupmp4.c rename to src/setups/mp_setupmp4.c diff --git a/src/files/setup/mp_setupmp5.c b/src/setups/mp_setupmp5.c similarity index 100% rename from src/files/setup/mp_setupmp5.c rename to src/setups/mp_setupmp5.c diff --git a/src/files/setup/mp_setupmp6.c b/src/setups/mp_setupmp6.c similarity index 100% rename from src/files/setup/mp_setupmp6.c rename to src/setups/mp_setupmp6.c diff --git a/src/files/setup/mp_setupmp7.c b/src/setups/mp_setupmp7.c similarity index 100% rename from src/files/setup/mp_setupmp7.c rename to src/setups/mp_setupmp7.c diff --git a/src/files/setup/mp_setupmp8.c b/src/setups/mp_setupmp8.c similarity index 100% rename from src/files/setup/mp_setupmp8.c rename to src/setups/mp_setupmp8.c diff --git a/src/files/setup/mp_setupmp9.c b/src/setups/mp_setupmp9.c similarity index 100% rename from src/files/setup/mp_setupmp9.c rename to src/setups/mp_setupmp9.c diff --git a/src/files/setup/mp_setupoat.c b/src/setups/mp_setupoat.c similarity index 100% rename from src/files/setup/mp_setupoat.c rename to src/setups/mp_setupoat.c diff --git a/src/files/setup/mp_setupold.c b/src/setups/mp_setupold.c similarity index 100% rename from src/files/setup/mp_setupold.c rename to src/setups/mp_setupold.c diff --git a/src/files/setup/mp_setuppam.c b/src/setups/mp_setuppam.c similarity index 100% rename from src/files/setup/mp_setuppam.c rename to src/setups/mp_setuppam.c diff --git a/src/files/setup/mp_setuppete.c b/src/setups/mp_setuppete.c similarity index 100% rename from src/files/setup/mp_setuppete.c rename to src/setups/mp_setuppete.c diff --git a/src/files/setup/mp_setupref.c b/src/setups/mp_setupref.c similarity index 100% rename from src/files/setup/mp_setupref.c rename to src/setups/mp_setupref.c diff --git a/src/files/setup/mp_setuprit.c b/src/setups/mp_setuprit.c similarity index 100% rename from src/files/setup/mp_setuprit.c rename to src/setups/mp_setuprit.c diff --git a/src/files/setup/mp_setuprun.c b/src/setups/mp_setuprun.c similarity index 100% rename from src/files/setup/mp_setuprun.c rename to src/setups/mp_setuprun.c diff --git a/src/files/setup/mp_setupsev.c b/src/setups/mp_setupsev.c similarity index 100% rename from src/files/setup/mp_setupsev.c rename to src/setups/mp_setupsev.c diff --git a/src/files/setup/mp_setupsevb.c b/src/setups/mp_setupsevb.c similarity index 100% rename from src/files/setup/mp_setupsevb.c rename to src/setups/mp_setupsevb.c diff --git a/src/files/setup/mp_setupsevx.c b/src/setups/mp_setupsevx.c similarity index 100% rename from src/files/setup/mp_setupsevx.c rename to src/setups/mp_setupsevx.c diff --git a/src/files/setup/mp_setupsho.c b/src/setups/mp_setupsho.c similarity index 100% rename from src/files/setup/mp_setupsho.c rename to src/setups/mp_setupsho.c diff --git a/src/files/setup/mp_setupsilo.c b/src/setups/mp_setupsilo.c similarity index 100% rename from src/files/setup/mp_setupsilo.c rename to src/setups/mp_setupsilo.c diff --git a/src/files/setup/mp_setupstat.c b/src/setups/mp_setupstat.c similarity index 100% rename from src/files/setup/mp_setupstat.c rename to src/setups/mp_setupstat.c diff --git a/src/files/setup/mp_setuptra.c b/src/setups/mp_setuptra.c similarity index 100% rename from src/files/setup/mp_setuptra.c rename to src/setups/mp_setuptra.c diff --git a/src/files/setup/mp_setupuff.c b/src/setups/mp_setupuff.c similarity index 100% rename from src/files/setup/mp_setupuff.c rename to src/setups/mp_setupuff.c diff --git a/src/files/setup/mp_setupwax.c b/src/setups/mp_setupwax.c similarity index 100% rename from src/files/setup/mp_setupwax.c rename to src/setups/mp_setupwax.c diff --git a/src/files/setup/setupame.c b/src/setups/setupame.c similarity index 100% rename from src/files/setup/setupame.c rename to src/setups/setupame.c diff --git a/src/files/setup/setuparch.c b/src/setups/setuparch.c similarity index 100% rename from src/files/setup/setuparch.c rename to src/setups/setuparch.c diff --git a/src/files/setup/setuparec.c b/src/setups/setuparec.c similarity index 100% rename from src/files/setup/setuparec.c rename to src/setups/setuparec.c diff --git a/src/files/setup/setupark.c b/src/setups/setupark.c similarity index 100% rename from src/files/setup/setupark.c rename to src/setups/setupark.c diff --git a/src/files/setup/setupash.c b/src/setups/setupash.c similarity index 100% rename from src/files/setup/setupash.c rename to src/setups/setupash.c diff --git a/src/files/setup/setupate.c b/src/setups/setupate.c similarity index 100% rename from src/files/setup/setupate.c rename to src/setups/setupate.c diff --git a/src/files/setup/setupazt.c b/src/setups/setupazt.c similarity index 100% rename from src/files/setup/setupazt.c rename to src/setups/setupazt.c diff --git a/src/files/setup/setupcat.c b/src/setups/setupcat.c similarity index 100% rename from src/files/setup/setupcat.c rename to src/setups/setupcat.c diff --git a/src/files/setup/setupcave.c b/src/setups/setupcave.c similarity index 100% rename from src/files/setup/setupcave.c rename to src/setups/setupcave.c diff --git a/src/files/setup/setupcrad.c b/src/setups/setupcrad.c similarity index 100% rename from src/files/setup/setupcrad.c rename to src/setups/setupcrad.c diff --git a/src/files/setup/setupcryp.c b/src/setups/setupcryp.c similarity index 100% rename from src/files/setup/setupcryp.c rename to src/setups/setupcryp.c diff --git a/src/files/setup/setupdam.c b/src/setups/setupdam.c similarity index 100% rename from src/files/setup/setupdam.c rename to src/setups/setupdam.c diff --git a/src/files/setup/setupdepo.c b/src/setups/setupdepo.c similarity index 100% rename from src/files/setup/setupdepo.c rename to src/setups/setupdepo.c diff --git a/src/files/setup/setupdest.c b/src/setups/setupdest.c similarity index 100% rename from src/files/setup/setupdest.c rename to src/setups/setupdest.c diff --git a/src/files/setup/setupdish.c b/src/setups/setupdish.c similarity index 100% rename from src/files/setup/setupdish.c rename to src/setups/setupdish.c diff --git a/src/files/setup/setupear.c b/src/setups/setupear.c similarity index 100% rename from src/files/setup/setupear.c rename to src/setups/setupear.c diff --git a/src/files/setup/setupeld.c b/src/setups/setupeld.c similarity index 100% rename from src/files/setup/setupeld.c rename to src/setups/setupeld.c diff --git a/src/files/setup/setupimp.c b/src/setups/setupimp.c similarity index 100% rename from src/files/setup/setupimp.c rename to src/setups/setupimp.c diff --git a/src/files/setup/setupjun.c b/src/setups/setupjun.c similarity index 100% rename from src/files/setup/setupjun.c rename to src/setups/setupjun.c diff --git a/src/files/setup/setuplam.c b/src/setups/setuplam.c similarity index 100% rename from src/files/setup/setuplam.c rename to src/setups/setuplam.c diff --git a/src/files/setup/setuplee.c b/src/setups/setuplee.c similarity index 100% rename from src/files/setup/setuplee.c rename to src/setups/setuplee.c diff --git a/src/files/setup/setuplen.c b/src/setups/setuplen.c similarity index 100% rename from src/files/setup/setuplen.c rename to src/setups/setuplen.c diff --git a/src/files/setup/setuplip.c b/src/setups/setuplip.c similarity index 100% rename from src/files/setup/setuplip.c rename to src/setups/setuplip.c diff --git a/src/files/setup/setuplue.c b/src/setups/setuplue.c similarity index 100% rename from src/files/setup/setuplue.c rename to src/setups/setuplue.c diff --git a/src/files/setup/setupmp1.c b/src/setups/setupmp1.c similarity index 100% rename from src/files/setup/setupmp1.c rename to src/setups/setupmp1.c diff --git a/src/files/setup/setupmp10.c b/src/setups/setupmp10.c similarity index 100% rename from src/files/setup/setupmp10.c rename to src/setups/setupmp10.c diff --git a/src/files/setup/setupmp11.c b/src/setups/setupmp11.c similarity index 100% rename from src/files/setup/setupmp11.c rename to src/setups/setupmp11.c diff --git a/src/files/setup/setupmp12.c b/src/setups/setupmp12.c similarity index 100% rename from src/files/setup/setupmp12.c rename to src/setups/setupmp12.c diff --git a/src/files/setup/setupmp13.c b/src/setups/setupmp13.c similarity index 100% rename from src/files/setup/setupmp13.c rename to src/setups/setupmp13.c diff --git a/src/files/setup/setupmp14.c b/src/setups/setupmp14.c similarity index 100% rename from src/files/setup/setupmp14.c rename to src/setups/setupmp14.c diff --git a/src/files/setup/setupmp15.c b/src/setups/setupmp15.c similarity index 100% rename from src/files/setup/setupmp15.c rename to src/setups/setupmp15.c diff --git a/src/files/setup/setupmp16.c b/src/setups/setupmp16.c similarity index 100% rename from src/files/setup/setupmp16.c rename to src/setups/setupmp16.c diff --git a/src/files/setup/setupmp17.c b/src/setups/setupmp17.c similarity index 100% rename from src/files/setup/setupmp17.c rename to src/setups/setupmp17.c diff --git a/src/files/setup/setupmp18.c b/src/setups/setupmp18.c similarity index 100% rename from src/files/setup/setupmp18.c rename to src/setups/setupmp18.c diff --git a/src/files/setup/setupmp19.c b/src/setups/setupmp19.c similarity index 100% rename from src/files/setup/setupmp19.c rename to src/setups/setupmp19.c diff --git a/src/files/setup/setupmp2.c b/src/setups/setupmp2.c similarity index 100% rename from src/files/setup/setupmp2.c rename to src/setups/setupmp2.c diff --git a/src/files/setup/setupmp20.c b/src/setups/setupmp20.c similarity index 100% rename from src/files/setup/setupmp20.c rename to src/setups/setupmp20.c diff --git a/src/files/setup/setupmp3.c b/src/setups/setupmp3.c similarity index 100% rename from src/files/setup/setupmp3.c rename to src/setups/setupmp3.c diff --git a/src/files/setup/setupmp4.c b/src/setups/setupmp4.c similarity index 100% rename from src/files/setup/setupmp4.c rename to src/setups/setupmp4.c diff --git a/src/files/setup/setupmp5.c b/src/setups/setupmp5.c similarity index 100% rename from src/files/setup/setupmp5.c rename to src/setups/setupmp5.c diff --git a/src/files/setup/setupmp6.c b/src/setups/setupmp6.c similarity index 100% rename from src/files/setup/setupmp6.c rename to src/setups/setupmp6.c diff --git a/src/files/setup/setupmp7.c b/src/setups/setupmp7.c similarity index 100% rename from src/files/setup/setupmp7.c rename to src/setups/setupmp7.c diff --git a/src/files/setup/setupmp8.c b/src/setups/setupmp8.c similarity index 100% rename from src/files/setup/setupmp8.c rename to src/setups/setupmp8.c diff --git a/src/files/setup/setupmp9.c b/src/setups/setupmp9.c similarity index 100% rename from src/files/setup/setupmp9.c rename to src/setups/setupmp9.c diff --git a/src/files/setup/setupoat.c b/src/setups/setupoat.c similarity index 100% rename from src/files/setup/setupoat.c rename to src/setups/setupoat.c diff --git a/src/files/setup/setupold.c b/src/setups/setupold.c similarity index 100% rename from src/files/setup/setupold.c rename to src/setups/setupold.c diff --git a/src/files/setup/setuppam.c b/src/setups/setuppam.c similarity index 100% rename from src/files/setup/setuppam.c rename to src/setups/setuppam.c diff --git a/src/files/setup/setuppete.c b/src/setups/setuppete.c similarity index 100% rename from src/files/setup/setuppete.c rename to src/setups/setuppete.c diff --git a/src/files/setup/setupref.c b/src/setups/setupref.c similarity index 100% rename from src/files/setup/setupref.c rename to src/setups/setupref.c diff --git a/src/files/setup/setuprit.c b/src/setups/setuprit.c similarity index 100% rename from src/files/setup/setuprit.c rename to src/setups/setuprit.c diff --git a/src/files/setup/setuprun.c b/src/setups/setuprun.c similarity index 100% rename from src/files/setup/setuprun.c rename to src/setups/setuprun.c diff --git a/src/files/setup/setupsev.c b/src/setups/setupsev.c similarity index 100% rename from src/files/setup/setupsev.c rename to src/setups/setupsev.c diff --git a/src/files/setup/setupsevb.c b/src/setups/setupsevb.c similarity index 100% rename from src/files/setup/setupsevb.c rename to src/setups/setupsevb.c diff --git a/src/files/setup/setupsevx.c b/src/setups/setupsevx.c similarity index 100% rename from src/files/setup/setupsevx.c rename to src/setups/setupsevx.c diff --git a/src/files/setup/setupsevxb.c b/src/setups/setupsevxb.c similarity index 100% rename from src/files/setup/setupsevxb.c rename to src/setups/setupsevxb.c diff --git a/src/files/setup/setupsho.c b/src/setups/setupsho.c similarity index 100% rename from src/files/setup/setupsho.c rename to src/setups/setupsho.c diff --git a/src/files/setup/setupsilo.c b/src/setups/setupsilo.c similarity index 100% rename from src/files/setup/setupsilo.c rename to src/setups/setupsilo.c diff --git a/src/files/setup/setupstat.c b/src/setups/setupstat.c similarity index 100% rename from src/files/setup/setupstat.c rename to src/setups/setupstat.c diff --git a/src/files/setup/setuptra.c b/src/setups/setuptra.c similarity index 100% rename from src/files/setup/setuptra.c rename to src/setups/setuptra.c diff --git a/src/files/setup/setupuff.c b/src/setups/setupuff.c similarity index 100% rename from src/files/setup/setupuff.c rename to src/setups/setupuff.c diff --git a/src/files/setup/setupwax.c b/src/setups/setupwax.c similarity index 100% rename from src/files/setup/setupwax.c rename to src/setups/setupwax.c