diff --git a/buildcfg.txt b/buildcfg.txt index 75bc4ad0..471a6244 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -1748,37 +1748,25 @@ SARGD3D7 25 54 SARGD4D6 24 53 SARGD5 19 52 SARGE1 20 54 -SARGE2 23 54 -SARGE3 23 54 -SARGE4 20 53 +SARGE2E8 23 54 +SARGE3E7 23 54 +SARGE4E6 20 53 SARGE5 16 52 -SARGE6 28 53 -SARGE7 26 54 -SARGE8 26 54 SARGF1 18 55 -SARGF2 25 51 -SARGF3 28 53 -SARGF4 26 52 +SARGF2F8 25 51 +SARGF3F7 28 53 +SARGF4F6 26 52 SARGF5 15 53 -SARGF6 25 52 -SARGF7 29 54 -SARGF8 22 52 SARGG1 15 57 -SARGG2 14 53 -SARGG3 20 53 -SARGG4 19 53 +SARGG2G8 14 53 +SARGG3G7 20 53 +SARGG4G6 19 53 SARGG5 12 51 -SARGG6 23 53 -SARGG7 24 53 -SARGG8 27 54 SARGH1 15 47 -SARGH2 22 47 -SARGH3 22 47 -SARGH4 19 46 +SARGH2H8 22 47 +SARGH3H7 22 47 +SARGH4H6 19 46 SARGH5 14 45 -SARGH6 22 47 -SARGH7 25 46 -SARGH8 19 47 SARGI0 17 55 SARGJ0 19 56 SARGK0 20 50 @@ -1890,61 +1878,40 @@ TROOT0 31 28 TROOU0 32 28 CYBRA1 47 103 ; Cyberdemon -CYBRA2 39 103 -CYBRA3 42 103 -CYBRA4 41 102 +CYBRA2A8 39 103 +CYBRA3A7 42 103 +CYBRA4A6 41 102 CYBRA5 48 103 -CYBRA6 41 102 -CYBRA7 42 103 -CYBRA8 39 103 CYBRB1 50 100 -CYBRB2 39 96 -CYBRB3 54 103 -CYBRB4 49 99 +CYBRB2B8 39 96 +CYBRB3B7 54 103 +CYBRB4B6 49 99 CYBRB5 45 100 -CYBRB6 49 99 -CYBRB7 54 103 -CYBRB8 39 96 CYBRC1 45 98 -CYBRC2 37 103 -CYBRC3 37 98 -CYBRC4 48 102 +CYBRC2C8 37 103 +CYBRC3C7 37 98 +CYBRC4C6 48 102 CYBRC5 39 103 -CYBRC6 48 102 -CYBRC7 37 98 -CYBRC8 37 103 CYBRD1 48 100 -CYBRD2 43 101 -CYBRD3 49 101 -CYBRD4 39 99 +CYBRD2D8 43 101 +CYBRD3D7 49 101 +CYBRD4D6 39 99 CYBRD5 37 100 -CYBRD6 39 99 -CYBRD7 49 101 -CYBRD8 43 101 CYBRE1 44 98 -CYBRE2 52 101 -CYBRE3 46 101 -CYBRE4 33 102 +CYBRE2E8 52 101 +CYBRE3E7 46 101 +CYBRE4E6 33 102 CYBRE5 40 103 -CYBRE6 33 102 -CYBRE7 46 101 -CYBRE8 52 101 CYBRF1 47 99 -CYBRF2 39 99 -CYBRF3 43 100 -CYBRF4 44 99 +CYBRF2F8 39 99 +CYBRF3F7 43 100 +CYBRF4F6 44 99 CYBRF5 44 100 -CYBRF6 44 99 -CYBRF7 43 100 -CYBRF8 39 99 CYBRG1 47 99 -CYBRG2 39 99 -CYBRG3 43 100 -CYBRG4 44 99 +CYBRG2G8 39 99 +CYBRG3G7 43 100 +CYBRG4G6 44 99 CYBRG5 44 100 -CYBRG6 44 99 -CYBRG7 43 100 -CYBRG8 39 99 CYBRH0 47 99 CYBRI0 47 99 CYBRJ0 44 99 diff --git a/sprites/cybra2.png b/sprites/cybra2a8.png similarity index 100% rename from sprites/cybra2.png rename to sprites/cybra2a8.png diff --git a/sprites/cybra3.png b/sprites/cybra3a7.png similarity index 100% rename from sprites/cybra3.png rename to sprites/cybra3a7.png diff --git a/sprites/cybra4.png b/sprites/cybra4a6.png similarity index 100% rename from sprites/cybra4.png rename to sprites/cybra4a6.png diff --git a/sprites/cybra6.png b/sprites/cybra6.png deleted file mode 100644 index 7c802dec..00000000 Binary files a/sprites/cybra6.png and /dev/null differ diff --git a/sprites/cybra7.png b/sprites/cybra7.png deleted file mode 100644 index e3a2ae79..00000000 Binary files a/sprites/cybra7.png and /dev/null differ diff --git a/sprites/cybra8.png b/sprites/cybra8.png deleted file mode 100644 index 2b6fc13e..00000000 Binary files a/sprites/cybra8.png and /dev/null differ diff --git a/sprites/cybrb2.png b/sprites/cybrb2b8.png similarity index 100% rename from sprites/cybrb2.png rename to sprites/cybrb2b8.png diff --git a/sprites/cybrb3.png b/sprites/cybrb3b7.png similarity index 100% rename from sprites/cybrb3.png rename to sprites/cybrb3b7.png diff --git a/sprites/cybrb4.png b/sprites/cybrb4b6.png similarity index 100% rename from sprites/cybrb4.png rename to sprites/cybrb4b6.png diff --git a/sprites/cybrb6.png b/sprites/cybrb6.png deleted file mode 100644 index f1a1a252..00000000 Binary files a/sprites/cybrb6.png and /dev/null differ diff --git a/sprites/cybrb7.png b/sprites/cybrb7.png deleted file mode 100644 index 9c2c671c..00000000 Binary files a/sprites/cybrb7.png and /dev/null differ diff --git a/sprites/cybrb8.png b/sprites/cybrb8.png deleted file mode 100644 index efef7cb1..00000000 Binary files a/sprites/cybrb8.png and /dev/null differ diff --git a/sprites/cybrc2.png b/sprites/cybrc2c8.png similarity index 100% rename from sprites/cybrc2.png rename to sprites/cybrc2c8.png diff --git a/sprites/cybrc3.png b/sprites/cybrc3c7.png similarity index 100% rename from sprites/cybrc3.png rename to sprites/cybrc3c7.png diff --git a/sprites/cybrc4.png b/sprites/cybrc4c6.png similarity index 100% rename from sprites/cybrc4.png rename to sprites/cybrc4c6.png diff --git a/sprites/cybrc6.png b/sprites/cybrc6.png deleted file mode 100644 index 4d6e1113..00000000 Binary files a/sprites/cybrc6.png and /dev/null differ diff --git a/sprites/cybrc7.png b/sprites/cybrc7.png deleted file mode 100644 index 411f222c..00000000 Binary files a/sprites/cybrc7.png and /dev/null differ diff --git a/sprites/cybrc8.png b/sprites/cybrc8.png deleted file mode 100644 index fb3675c3..00000000 Binary files a/sprites/cybrc8.png and /dev/null differ diff --git a/sprites/cybrd2.png b/sprites/cybrd2d8.png similarity index 100% rename from sprites/cybrd2.png rename to sprites/cybrd2d8.png diff --git a/sprites/cybrd3.png b/sprites/cybrd3d7.png similarity index 100% rename from sprites/cybrd3.png rename to sprites/cybrd3d7.png diff --git a/sprites/cybrd4.png b/sprites/cybrd4d6.png similarity index 100% rename from sprites/cybrd4.png rename to sprites/cybrd4d6.png diff --git a/sprites/cybrd6.png b/sprites/cybrd6.png deleted file mode 100644 index fa32c921..00000000 Binary files a/sprites/cybrd6.png and /dev/null differ diff --git a/sprites/cybrd7.png b/sprites/cybrd7.png deleted file mode 100644 index e306254b..00000000 Binary files a/sprites/cybrd7.png and /dev/null differ diff --git a/sprites/cybrd8.png b/sprites/cybrd8.png deleted file mode 100644 index fa4c5a15..00000000 Binary files a/sprites/cybrd8.png and /dev/null differ diff --git a/sprites/cybre2.png b/sprites/cybre2e8.png similarity index 100% rename from sprites/cybre2.png rename to sprites/cybre2e8.png diff --git a/sprites/cybre3.png b/sprites/cybre3e7.png similarity index 100% rename from sprites/cybre3.png rename to sprites/cybre3e7.png diff --git a/sprites/cybre4.png b/sprites/cybre4e6.png similarity index 100% rename from sprites/cybre4.png rename to sprites/cybre4e6.png diff --git a/sprites/cybre6.png b/sprites/cybre6.png deleted file mode 100644 index 49bc5250..00000000 Binary files a/sprites/cybre6.png and /dev/null differ diff --git a/sprites/cybre7.png b/sprites/cybre7.png deleted file mode 100644 index a45f5b2a..00000000 Binary files a/sprites/cybre7.png and /dev/null differ diff --git a/sprites/cybre8.png b/sprites/cybre8.png deleted file mode 100644 index 8fe30447..00000000 Binary files a/sprites/cybre8.png and /dev/null differ diff --git a/sprites/cybrf2.png b/sprites/cybrf2f8.png similarity index 100% rename from sprites/cybrf2.png rename to sprites/cybrf2f8.png diff --git a/sprites/cybrf3.png b/sprites/cybrf3f7.png similarity index 100% rename from sprites/cybrf3.png rename to sprites/cybrf3f7.png diff --git a/sprites/cybrf4.png b/sprites/cybrf4f6.png similarity index 100% rename from sprites/cybrf4.png rename to sprites/cybrf4f6.png diff --git a/sprites/cybrf6.png b/sprites/cybrf6.png deleted file mode 100644 index f66ed9e6..00000000 Binary files a/sprites/cybrf6.png and /dev/null differ diff --git a/sprites/cybrf7.png b/sprites/cybrf7.png deleted file mode 100644 index 9f1d9fa1..00000000 Binary files a/sprites/cybrf7.png and /dev/null differ diff --git a/sprites/cybrf8.png b/sprites/cybrf8.png deleted file mode 100644 index f2591f67..00000000 Binary files a/sprites/cybrf8.png and /dev/null differ diff --git a/sprites/cybrg2.png b/sprites/cybrg2g8.png similarity index 100% rename from sprites/cybrg2.png rename to sprites/cybrg2g8.png diff --git a/sprites/cybrg3.png b/sprites/cybrg3g7.png similarity index 100% rename from sprites/cybrg3.png rename to sprites/cybrg3g7.png diff --git a/sprites/cybrg4.png b/sprites/cybrg4g6.png similarity index 100% rename from sprites/cybrg4.png rename to sprites/cybrg4g6.png diff --git a/sprites/cybrg6.png b/sprites/cybrg6.png deleted file mode 100644 index aa8bb418..00000000 Binary files a/sprites/cybrg6.png and /dev/null differ diff --git a/sprites/cybrg7.png b/sprites/cybrg7.png deleted file mode 100644 index 070eb3e4..00000000 Binary files a/sprites/cybrg7.png and /dev/null differ diff --git a/sprites/cybrg8.png b/sprites/cybrg8.png deleted file mode 100644 index c533850a..00000000 Binary files a/sprites/cybrg8.png and /dev/null differ diff --git a/sprites/sarge2.png b/sprites/sarge2e8.png similarity index 100% rename from sprites/sarge2.png rename to sprites/sarge2e8.png diff --git a/sprites/sarge3.png b/sprites/sarge3e7.png similarity index 100% rename from sprites/sarge3.png rename to sprites/sarge3e7.png diff --git a/sprites/sarge4.png b/sprites/sarge4e6.png similarity index 100% rename from sprites/sarge4.png rename to sprites/sarge4e6.png diff --git a/sprites/sarge6.png b/sprites/sarge6.png deleted file mode 100644 index 2eb9fd5b..00000000 Binary files a/sprites/sarge6.png and /dev/null differ diff --git a/sprites/sarge7.png b/sprites/sarge7.png deleted file mode 100644 index 44dc7a77..00000000 Binary files a/sprites/sarge7.png and /dev/null differ diff --git a/sprites/sarge8.png b/sprites/sarge8.png deleted file mode 100644 index fe40677a..00000000 Binary files a/sprites/sarge8.png and /dev/null differ diff --git a/sprites/sargf2.png b/sprites/sargf2f8.png similarity index 100% rename from sprites/sargf2.png rename to sprites/sargf2f8.png diff --git a/sprites/sargf3.png b/sprites/sargf3f7.png similarity index 100% rename from sprites/sargf3.png rename to sprites/sargf3f7.png diff --git a/sprites/sargf4.png b/sprites/sargf4f6.png similarity index 100% rename from sprites/sargf4.png rename to sprites/sargf4f6.png diff --git a/sprites/sargf6.png b/sprites/sargf6.png deleted file mode 100644 index 4f644dee..00000000 Binary files a/sprites/sargf6.png and /dev/null differ diff --git a/sprites/sargf7.png b/sprites/sargf7.png deleted file mode 100644 index 647f1127..00000000 Binary files a/sprites/sargf7.png and /dev/null differ diff --git a/sprites/sargf8.png b/sprites/sargf8.png deleted file mode 100644 index d6a6ba4d..00000000 Binary files a/sprites/sargf8.png and /dev/null differ diff --git a/sprites/sargg2.png b/sprites/sargg2g8.png similarity index 100% rename from sprites/sargg2.png rename to sprites/sargg2g8.png diff --git a/sprites/sargg3.png b/sprites/sargg3g7.png similarity index 100% rename from sprites/sargg3.png rename to sprites/sargg3g7.png diff --git a/sprites/sargg4.png b/sprites/sargg4g6.png similarity index 100% rename from sprites/sargg4.png rename to sprites/sargg4g6.png diff --git a/sprites/sargg6.png b/sprites/sargg6.png deleted file mode 100644 index dce558e1..00000000 Binary files a/sprites/sargg6.png and /dev/null differ diff --git a/sprites/sargg7.png b/sprites/sargg7.png deleted file mode 100644 index 6b3ad026..00000000 Binary files a/sprites/sargg7.png and /dev/null differ diff --git a/sprites/sargg8.png b/sprites/sargg8.png deleted file mode 100644 index 74e8a858..00000000 Binary files a/sprites/sargg8.png and /dev/null differ diff --git a/sprites/sargh2.png b/sprites/sargh2h8.png similarity index 100% rename from sprites/sargh2.png rename to sprites/sargh2h8.png diff --git a/sprites/sargh3.png b/sprites/sargh3h7.png similarity index 100% rename from sprites/sargh3.png rename to sprites/sargh3h7.png diff --git a/sprites/sargh4.png b/sprites/sargh4h6.png similarity index 100% rename from sprites/sargh4.png rename to sprites/sargh4h6.png diff --git a/sprites/sargh6.png b/sprites/sargh6.png deleted file mode 100644 index 9e9b4f77..00000000 Binary files a/sprites/sargh6.png and /dev/null differ diff --git a/sprites/sargh7.png b/sprites/sargh7.png deleted file mode 100644 index 0c3bd66f..00000000 Binary files a/sprites/sargh7.png and /dev/null differ diff --git a/sprites/sargh8.png b/sprites/sargh8.png deleted file mode 100644 index 6db9b517..00000000 Binary files a/sprites/sargh8.png and /dev/null differ