Merge branch 'freedoom:master' into Cascade-fist

2025-09-01 13:25:46 -04:00 · 2024-05-06 18:34:12 +07:00 · 2024-05-06 18:34:12 +07:00 · 5a402b053e
commit 5a402b053e
parent 0c0b614e93 b426172edc
14 changed files with 6 additions and 6 deletions
--- a/buildcfg.txt
+++ b/buildcfg.txt
@ -2192,12 +2192,12 @@ PINSA0	15	39
 PINSB0	15	39
 PINSC0	15	39
 PINSD0	15	39
-PISFA0  -144    -69
+PISFA0  -144    -71
-PISGA0  -125    -97
+PISGA0  -127    -96
-PISGB0  -125    -82
+PISGB0  -127    -84
-PISGC0  -124    -87
+PISGC0  -126    -88
-PISGD0  -125    -76        ; Unused
+PISGD0  -122    -76        ; Unused
-PISGE0  -123    -68        ; Unused
+PISGE0  -120    -64        ; Unused
 PISTA0	10	15
 PLAYA1	18	54
 PLAYA2A8	11	54
--- a/levels/e2m3.wad
+++ b/levels/e2m3.wad
--- a/levels/e3m1.wad
+++ b/levels/e3m1.wad
--- a/levels/map05.wad
+++ b/levels/map05.wad
--- a/levels/map28.wad
+++ b/levels/map28.wad
--- a/lumps/endoom.lmp
+++ b/lumps/endoom.lmp
--- a/lumps/endoomdm.lmp
+++ b/lumps/endoomdm.lmp
--- a/patches/plat2_1.png
+++ b/patches/plat2_1.png
--- a/sprites/pisfa0.png
+++ b/sprites/pisfa0.png
--- a/sprites/pisga0.png
+++ b/sprites/pisga0.png
--- a/sprites/pisgb0.png
+++ b/sprites/pisgb0.png
--- a/sprites/pisgc0.png
+++ b/sprites/pisgc0.png
--- a/sprites/pisgd0.png
+++ b/sprites/pisgd0.png
--- a/sprites/pisge0.png
+++ b/sprites/pisge0.png