From fff6bd3ed81d53cc1684241e10fe72e896e32202 Mon Sep 17 00:00:00 2001
From: Hedara <hedara90@gmail.com>
Date: Fri, 11 Apr 2025 21:27:49 +0200
Subject: [PATCH] Removed legacy handling, fix if statment argument style

---
 src/data/tilesets/headers.h |  9 ---------
 src/field_effect_helpers.c  |  9 ++++-----
 src/fieldmap.c              | 18 ------------------
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/src/data/tilesets/headers.h b/src/data/tilesets/headers.h
index 6ac09b5f07..2401b65309 100644
--- a/src/data/tilesets/headers.h
+++ b/src/data/tilesets/headers.h
@@ -3,15 +3,6 @@
 // Whether a palette has a night version, located at ((x + 9) % 16).pal
 #define SWAP_PAL(x) ((x) < NUM_PALS_IN_PRIMARY ? 1 << (x) : 1 << ((x) - NUM_PALS_IN_PRIMARY))
 
-// NOTE: Instead of using LIGHT_PAL, 
-// consider taking a look at the .pla files
-// to mark colors as lights, instead.
-// The old method *should* still work, however.
-// Check docs/tutorials/dns.md for details.
-
-// Whether a palette has lights the color indices to blend are stored in the palette's color 0
-#define LIGHT_PAL(x) ((x) < NUM_PALS_IN_PRIMARY ? 1 << (x) : 1 << ((x) - NUM_PALS_IN_PRIMARY))
-
 const struct Tileset gTileset_General =
 {
     .isCompressed = TRUE,
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 40114eb0a7..8174d11135 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -339,11 +339,10 @@ u32 FldEff_Shadow(void)
     for (i = MAX_SPRITES - 1; i > -1; i--) // Search backwards, because of CreateSpriteAtEnd
     {
         // Return early if a shadow sprite already exists
-        if (gSprites[i].callback == UpdateShadowFieldEffect &&
-            gSprites[i].sLocalId == gFieldEffectArguments[0] &&
-            gSprites[i].sMapNum == gFieldEffectArguments[1] &&
-            gSprites[i].sMapGroup == gFieldEffectArguments[2]
-        )
+        if (gSprites[i].callback == UpdateShadowFieldEffect
+         && gSprites[i].sLocalId == gFieldEffectArguments[0]
+         && gSprites[i].sMapNum == gFieldEffectArguments[1]
+         && gSprites[i].sMapGroup == gFieldEffectArguments[2])
             return 0;
     }
     objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
diff --git a/src/fieldmap.c b/src/fieldmap.c
index dc322a9385..8b43ce591f 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -911,24 +911,6 @@ static void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u1
             LoadCompressedPalette((const u32 *)tileset->palettes, destOffset, size);
             ApplyGlobalTintToPaletteEntries(destOffset, size >> 1);
         }
-        // convert legacy light palette system to current
-        if (tileset->lightPalettes)
-        {
-            u32 i, j, color;
-            for (i = low; i < high; i++)
-            {
-                if (tileset->lightPalettes & (1 << (i - low))) // Mark light colors
-                {
-                    for (j = 1, color = gPlttBufferUnfaded[PLTT_ID(i)]; j < 16 && color; j++, color >>= 1)
-                    {
-                        if (color & 1)
-                            gPlttBufferFaded[PLTT_ID(i)+j] = gPlttBufferUnfaded[PLTT_ID(i)+j] |= RGB_ALPHA;
-                    }
-                    if (tileset->customLightColor & (1 << (i - low))) // Copy old custom light color to index 0
-                        gPlttBufferFaded[PLTT_ID(i)] = gPlttBufferUnfaded[PLTT_ID(i)] = gPlttBufferUnfaded[PLTT_ID(i) + 15] | RGB_ALPHA;
-                }
-            }
-        }
     }
 }