From a524831f1e77015aaf0dc3048fea4ed2bdb229ae Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Sun, 13 Apr 2025 18:02:55 -0400
Subject: [PATCH] Port v1 objects pt 7: HOHOHO MERRY CHRISTMAS

---
 src/info/mobjs.h   | 13 ++++---------
 src/info/sprites.h |  3 +--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/info/mobjs.h b/src/info/mobjs.h
index 834f25b3a..472347455 100644
--- a/src/info/mobjs.h
+++ b/src/info/mobjs.h
@@ -297,16 +297,11 @@ _(STALAGMITE9)
 // Christmas Scenery
 _(XMASPOLE)
 _(CANDYCANE)
-_(SNOWMAN)    // normal
-_(SNOWMANHAT) // with hat + scarf
-_(LAMPPOST1)  // normal
-_(LAMPPOST2)  // with snow
+_(SNOWMAN)
+_(SNOWMANHAT)
+_(LAMPPOST1)
+_(LAMPPOST2)
 _(HANGSTAR)
-_(MISTLETOE)
-// Xmas GFZ bushes
-_(XMASBLUEBERRYBUSH)
-_(XMASBERRYBUSH)
-_(XMASBUSH)
 
 // Botanic Serenity scenery
 _(BSZTALLFLOWER_RED)
diff --git a/src/info/sprites.h b/src/info/sprites.h
index 2f467e73b..28ceb15ab 100644
--- a/src/info/sprites.h
+++ b/src/info/sprites.h
@@ -202,8 +202,7 @@ _(XMS3) // Snowman
 _(XMS4) // Lamppost
 _(XMS5) // Hanging Star
 _(XMS6) // Mistletoe
-_(FHZI) // FHZ Ice
-_(ROSY)
+
 // Azure Temple Scenery
 _(RCRY) // ATZ Red Crystal (Target)
 _(CFLM) // Green torch flame