diff --git a/buildcfg.txt b/buildcfg.txt index 6720e7df..129c8ac7 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -2233,10 +2233,10 @@ MANFB8B2 27 17 ; These are normal items that appear in both Freedoom and FreeDM. AMMOA0 12 16 -ARM1A0 15 21 -ARM1B0 15 21 -ARM2A0 15 21 -ARM2B0 15 21 +ARM1A0 15 15 +ARM1B0 15 15 +ARM2A0 15 18 +ARM2B0 15 18 BAL1A0 8 8 BAL1B0 8 8 BAL1C0 16 17 @@ -2265,14 +2265,14 @@ BKEYB0 7 19 BLUDA0 7 5 BLUDB0 8 7 BLUDC0 7 7 -BON1A0 7 14 -BON1B0 7 14 -BON1C0 7 14 -BON1D0 7 14 -BON2A0 9 15 -BON2B0 9 15 -BON2C0 9 15 -BON2D0 9 15 +BON1A0 7 16 +BON1B0 7 16 +BON1C0 7 16 +BON1D0 7 16 +BON2A0 11 18 +BON2B0 11 18 +BON2C0 11 18 +BON2D0 11 18 BPAKA0 8 26 BROKA0 27 20 CANDA0 8 18 diff --git a/sprites/arm1a0.gif b/sprites/arm1a0.gif index ca829326..c5e5e824 120000 --- a/sprites/arm1a0.gif +++ b/sprites/arm1a0.gif @@ -1 +1 @@ -fredrik/arm1a0.gif \ No newline at end of file +raymoohawk/arm1a0.gif \ No newline at end of file diff --git a/sprites/arm1b0.gif b/sprites/arm1b0.gif index 1cb2a915..0996733e 120000 --- a/sprites/arm1b0.gif +++ b/sprites/arm1b0.gif @@ -1 +1 @@ -fredrik/arm1b0.gif \ No newline at end of file +raymoohawk/arm1b0.gif \ No newline at end of file diff --git a/sprites/arm2a0.gif b/sprites/arm2a0.gif index b9f1657a..400504e3 120000 --- a/sprites/arm2a0.gif +++ b/sprites/arm2a0.gif @@ -1 +1 @@ -fredrik/arm2a0.gif \ No newline at end of file +raymoohawk/arm2a0.gif \ No newline at end of file diff --git a/sprites/arm2b0.gif b/sprites/arm2b0.gif index 40014806..c8d7ee42 120000 --- a/sprites/arm2b0.gif +++ b/sprites/arm2b0.gif @@ -1 +1 @@ -fredrik/arm2b0.gif \ No newline at end of file +raymoohawk/arm2b0.gif \ No newline at end of file diff --git a/sprites/bon1a0.gif b/sprites/bon1a0.gif index 332db138..3dec67b5 120000 --- a/sprites/bon1a0.gif +++ b/sprites/bon1a0.gif @@ -1 +1 @@ -fredrik/bon1a0.gif \ No newline at end of file +raymoohawk/bon1a0.gif \ No newline at end of file diff --git a/sprites/bon1b0.gif b/sprites/bon1b0.gif index 4a58a055..c5d9fa6b 120000 --- a/sprites/bon1b0.gif +++ b/sprites/bon1b0.gif @@ -1 +1 @@ -fredrik/bon1b0.gif \ No newline at end of file +raymoohawk/bon1b0.gif \ No newline at end of file diff --git a/sprites/bon1c0.gif b/sprites/bon1c0.gif index 2107d11b..185a27f1 120000 --- a/sprites/bon1c0.gif +++ b/sprites/bon1c0.gif @@ -1 +1 @@ -fredrik/bon1c0.gif \ No newline at end of file +raymoohawk/bon1c0.gif \ No newline at end of file diff --git a/sprites/bon1d0.gif b/sprites/bon1d0.gif index fab8655d..6196969a 120000 --- a/sprites/bon1d0.gif +++ b/sprites/bon1d0.gif @@ -1 +1 @@ -fredrik/bon1d0.gif \ No newline at end of file +raymoohawk/bon1d0.gif \ No newline at end of file diff --git a/sprites/bon2a0.gif b/sprites/bon2a0.gif index 6f49e2da..ac0a11cb 120000 --- a/sprites/bon2a0.gif +++ b/sprites/bon2a0.gif @@ -1 +1 @@ -fredrik/bon2a0.gif \ No newline at end of file +raymoohawk/bon2a0.gif \ No newline at end of file diff --git a/sprites/bon2b0.gif b/sprites/bon2b0.gif index 34674d31..920351c5 120000 --- a/sprites/bon2b0.gif +++ b/sprites/bon2b0.gif @@ -1 +1 @@ -fredrik/bon2b0.gif \ No newline at end of file +raymoohawk/bon2b0.gif \ No newline at end of file diff --git a/sprites/bon2c0.gif b/sprites/bon2c0.gif index 0c3b9999..d2e59a02 120000 --- a/sprites/bon2c0.gif +++ b/sprites/bon2c0.gif @@ -1 +1 @@ -fredrik/bon2c0.gif \ No newline at end of file +raymoohawk/bon2c0.gif \ No newline at end of file diff --git a/sprites/bon2d0.gif b/sprites/bon2d0.gif index 75699895..c10ff983 120000 --- a/sprites/bon2d0.gif +++ b/sprites/bon2d0.gif @@ -1 +1 @@ -fredrik/bon2d0.gif \ No newline at end of file +raymoohawk/bon2d0.gif \ No newline at end of file diff --git a/sprites/fredrik/arm1a0.gif b/sprites/fredrik/arm1a0.gif deleted file mode 100644 index 37aaaa99..00000000 Binary files a/sprites/fredrik/arm1a0.gif and /dev/null differ diff --git a/sprites/fredrik/arm1b0.gif b/sprites/fredrik/arm1b0.gif deleted file mode 100644 index d81d4c2c..00000000 Binary files a/sprites/fredrik/arm1b0.gif and /dev/null differ diff --git a/sprites/fredrik/arm2a0.gif b/sprites/fredrik/arm2a0.gif deleted file mode 100644 index 969fb0f7..00000000 Binary files a/sprites/fredrik/arm2a0.gif and /dev/null differ diff --git a/sprites/fredrik/arm2b0.gif b/sprites/fredrik/arm2b0.gif deleted file mode 100644 index 0ad3179a..00000000 Binary files a/sprites/fredrik/arm2b0.gif and /dev/null differ diff --git a/sprites/fredrik/armor.txt b/sprites/fredrik/armor.txt deleted file mode 100644 index 58025e95..00000000 --- a/sprites/fredrik/armor.txt +++ /dev/null @@ -1,11 +0,0 @@ -# DeuTex 4.4.0 by Olivier Montanuy -# PWAD creation directives - -# List of Sprites -[sprites] -ARM2A0 15 21 -ARM2B0 15 21 -ARM1A0 15 21 -ARM1B0 15 21 - -# End of extraction diff --git a/sprites/fredrik/bon1a0.gif b/sprites/fredrik/bon1a0.gif deleted file mode 100644 index 8e83717a..00000000 Binary files a/sprites/fredrik/bon1a0.gif and /dev/null differ diff --git a/sprites/fredrik/bon1b0.gif b/sprites/fredrik/bon1b0.gif deleted file mode 100644 index 3ce97de4..00000000 Binary files a/sprites/fredrik/bon1b0.gif and /dev/null differ diff --git a/sprites/fredrik/bon1c0.gif b/sprites/fredrik/bon1c0.gif deleted file mode 100644 index ca89bf88..00000000 Binary files a/sprites/fredrik/bon1c0.gif and /dev/null differ diff --git a/sprites/fredrik/bon1d0.gif b/sprites/fredrik/bon1d0.gif deleted file mode 100644 index 4590100a..00000000 Binary files a/sprites/fredrik/bon1d0.gif and /dev/null differ diff --git a/sprites/fredrik/bon2a0.gif b/sprites/fredrik/bon2a0.gif deleted file mode 100644 index c25ad177..00000000 Binary files a/sprites/fredrik/bon2a0.gif and /dev/null differ diff --git a/sprites/fredrik/bon2b0.gif b/sprites/fredrik/bon2b0.gif deleted file mode 100644 index ce385762..00000000 Binary files a/sprites/fredrik/bon2b0.gif and /dev/null differ diff --git a/sprites/fredrik/bon2c0.gif b/sprites/fredrik/bon2c0.gif deleted file mode 100644 index 3acb6755..00000000 Binary files a/sprites/fredrik/bon2c0.gif and /dev/null differ diff --git a/sprites/fredrik/bon2d0.gif b/sprites/fredrik/bon2d0.gif deleted file mode 100644 index 04d081af..00000000 Binary files a/sprites/fredrik/bon2d0.gif and /dev/null differ diff --git a/sprites/raymoohawk/arm1a0.gif b/sprites/raymoohawk/arm1a0.gif new file mode 100644 index 00000000..6f88a744 Binary files /dev/null and b/sprites/raymoohawk/arm1a0.gif differ diff --git a/sprites/raymoohawk/arm1b0.gif b/sprites/raymoohawk/arm1b0.gif new file mode 100644 index 00000000..919f9031 Binary files /dev/null and b/sprites/raymoohawk/arm1b0.gif differ diff --git a/sprites/raymoohawk/arm2a0.gif b/sprites/raymoohawk/arm2a0.gif new file mode 100644 index 00000000..c0d5aa80 Binary files /dev/null and b/sprites/raymoohawk/arm2a0.gif differ diff --git a/sprites/raymoohawk/arm2b0.gif b/sprites/raymoohawk/arm2b0.gif new file mode 100644 index 00000000..9392a309 Binary files /dev/null and b/sprites/raymoohawk/arm2b0.gif differ diff --git a/sprites/raymoohawk/bon1a0.gif b/sprites/raymoohawk/bon1a0.gif new file mode 100644 index 00000000..2a006f0e Binary files /dev/null and b/sprites/raymoohawk/bon1a0.gif differ diff --git a/sprites/raymoohawk/bon1b0.gif b/sprites/raymoohawk/bon1b0.gif new file mode 100644 index 00000000..93ee5637 Binary files /dev/null and b/sprites/raymoohawk/bon1b0.gif differ diff --git a/sprites/raymoohawk/bon1c0.gif b/sprites/raymoohawk/bon1c0.gif new file mode 100644 index 00000000..30ab23b2 Binary files /dev/null and b/sprites/raymoohawk/bon1c0.gif differ diff --git a/sprites/raymoohawk/bon1d0.gif b/sprites/raymoohawk/bon1d0.gif new file mode 100644 index 00000000..7b3f182f Binary files /dev/null and b/sprites/raymoohawk/bon1d0.gif differ diff --git a/sprites/raymoohawk/bon2a0.gif b/sprites/raymoohawk/bon2a0.gif new file mode 100644 index 00000000..267823d1 Binary files /dev/null and b/sprites/raymoohawk/bon2a0.gif differ diff --git a/sprites/raymoohawk/bon2b0.gif b/sprites/raymoohawk/bon2b0.gif new file mode 100644 index 00000000..4ad26985 Binary files /dev/null and b/sprites/raymoohawk/bon2b0.gif differ diff --git a/sprites/raymoohawk/bon2c0.gif b/sprites/raymoohawk/bon2c0.gif new file mode 100644 index 00000000..6fcb08e3 Binary files /dev/null and b/sprites/raymoohawk/bon2c0.gif differ diff --git a/sprites/raymoohawk/bon2d0.gif b/sprites/raymoohawk/bon2d0.gif new file mode 100644 index 00000000..d7c2ac90 Binary files /dev/null and b/sprites/raymoohawk/bon2d0.gif differ