diff --git a/src/openrct2/entity/Balloon.cpp b/src/openrct2/entity/Balloon.cpp
index e94a96f17e..856f592306 100644
--- a/src/openrct2/entity/Balloon.cpp
+++ b/src/openrct2/entity/Balloon.cpp
@@ -106,3 +106,7 @@ void Balloon::Serialise(DataSerialiser& stream)
     stream << time_to_move;
     stream << colour;
 }
+
+void Balloon::Paint() const
+{
+}
diff --git a/src/openrct2/entity/Balloon.h b/src/openrct2/entity/Balloon.h
index 472480df8e..1470f52fda 100644
--- a/src/openrct2/entity/Balloon.h
+++ b/src/openrct2/entity/Balloon.h
@@ -26,4 +26,5 @@ struct Balloon : EntityBase
     void Pop();
     void Press();
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 };
diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp
index 17e989bb33..3677a45c34 100644
--- a/src/openrct2/entity/Duck.cpp
+++ b/src/openrct2/entity/Duck.cpp
@@ -362,3 +362,7 @@ void Duck::Serialise(DataSerialiser& stream)
     stream << target_y;
     stream << state;
 }
+
+void Duck::Paint() const
+{
+}
diff --git a/src/openrct2/entity/Duck.h b/src/openrct2/entity/Duck.h
index 0166050a3a..263df19779 100644
--- a/src/openrct2/entity/Duck.h
+++ b/src/openrct2/entity/Duck.h
@@ -38,6 +38,7 @@ struct Duck : EntityBase
     bool IsFlying();
     void Remove();
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 
 private:
     void UpdateFlyToWater();
diff --git a/src/openrct2/entity/EntityBase.cpp b/src/openrct2/entity/EntityBase.cpp
index 9914b4901b..291f3e5519 100644
--- a/src/openrct2/entity/EntityBase.cpp
+++ b/src/openrct2/entity/EntityBase.cpp
@@ -76,3 +76,9 @@ void EntityBase::Serialise(DataSerialiser& stream)
     stream << z;
     stream << sprite_direction;
 }
+
+// Exists only for signature
+void EntityBase::Paint() const
+{
+    Guard::Assert(false, "You are not supposed to call this");
+}
diff --git a/src/openrct2/entity/EntityBase.h b/src/openrct2/entity/EntityBase.h
index 4e0c1004f3..04e6d6eec7 100644
--- a/src/openrct2/entity/EntityBase.h
+++ b/src/openrct2/entity/EntityBase.h
@@ -70,4 +70,6 @@ struct EntityBase
     }
 
     void Serialise(class DataSerialiser& stream);
+
+    void Paint() const;
 };
diff --git a/src/openrct2/entity/Fountain.cpp b/src/openrct2/entity/Fountain.cpp
index 28be2ad737..0c93e0cc19 100644
--- a/src/openrct2/entity/Fountain.cpp
+++ b/src/openrct2/entity/Fountain.cpp
@@ -392,3 +392,7 @@ void JumpingFountain::Serialise(DataSerialiser& stream)
     stream << TargetY;
     stream << Iteration;
 }
+
+void JumpingFountain::Paint() const
+{
+}
diff --git a/src/openrct2/entity/Fountain.h b/src/openrct2/entity/Fountain.h
index 06220322ca..20258c7b02 100644
--- a/src/openrct2/entity/Fountain.h
+++ b/src/openrct2/entity/Fountain.h
@@ -35,6 +35,7 @@ struct JumpingFountain : EntityBase
     void Update();
     static void StartAnimation(JumpingFountainType newType, const CoordsXY& newLoc, const TileElement* tileElement);
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 
 private:
     JumpingFountainType GetType() const;
diff --git a/src/openrct2/entity/Litter.cpp b/src/openrct2/entity/Litter.cpp
index 8a94d6e3f0..f6648fd126 100644
--- a/src/openrct2/entity/Litter.cpp
+++ b/src/openrct2/entity/Litter.cpp
@@ -144,3 +144,7 @@ void Litter::Serialise(DataSerialiser& stream)
     stream << SubType;
     stream << creationTick;
 }
+
+void Litter::Paint() const
+{
+}
diff --git a/src/openrct2/entity/Litter.h b/src/openrct2/entity/Litter.h
index 52c8381f60..3f34ce31cd 100644
--- a/src/openrct2/entity/Litter.h
+++ b/src/openrct2/entity/Litter.h
@@ -41,4 +41,5 @@ struct Litter : EntityBase
     void Serialise(DataSerialiser& stream);
     rct_string_id GetName() const;
     uint32_t GetAge() const;
+    void Paint() const;
 };
diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp
index 10ffcfe4c3..1c519039e1 100644
--- a/src/openrct2/entity/MoneyEffect.cpp
+++ b/src/openrct2/entity/MoneyEffect.cpp
@@ -164,3 +164,7 @@ void MoneyEffect::Serialise(DataSerialiser& stream)
     stream << OffsetX;
     stream << Wiggle;
 }
+
+void MoneyEffect::Paint() const
+{
+}
diff --git a/src/openrct2/entity/MoneyEffect.h b/src/openrct2/entity/MoneyEffect.h
index cd94fb1042..00dece01cc 100644
--- a/src/openrct2/entity/MoneyEffect.h
+++ b/src/openrct2/entity/MoneyEffect.h
@@ -31,4 +31,5 @@ struct MoneyEffect : EntityBase
     void Update();
     std::pair<rct_string_id, money64> GetStringId() const;
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 };
diff --git a/src/openrct2/entity/Particle.cpp b/src/openrct2/entity/Particle.cpp
index a5518e8992..87be21a967 100644
--- a/src/openrct2/entity/Particle.cpp
+++ b/src/openrct2/entity/Particle.cpp
@@ -144,6 +144,10 @@ void VehicleCrashParticle::Serialise(DataSerialiser& stream)
     stream << acceleration_z;
 }
 
+void VehicleCrashParticle::Paint() const
+{
+}
+
 /**
  *
  *  rct2: 0x00673699
@@ -181,6 +185,10 @@ void CrashSplashParticle::Serialise(DataSerialiser& stream)
     stream << frame;
 }
 
+void CrashSplashParticle::Paint() const
+{
+}
+
 /**
  *
  *  rct2: 0x006734B2
@@ -231,6 +239,10 @@ void SteamParticle::Serialise(DataSerialiser& stream)
     stream << time_to_move;
 }
 
+void SteamParticle::Paint() const
+{
+}
+
 /**
  *
  *  rct2: 0x0067363D
@@ -268,6 +280,10 @@ void ExplosionCloud::Serialise(DataSerialiser& stream)
     stream << frame;
 }
 
+void ExplosionCloud::Paint() const
+{
+}
+
 /**
  *
  *  rct2: 0x0067366B
@@ -304,3 +320,7 @@ void ExplosionFlare::Serialise(DataSerialiser& stream)
     EntityBase::Serialise(stream);
     stream << frame;
 }
+
+void ExplosionFlare::Paint() const
+{
+}
diff --git a/src/openrct2/entity/Particle.h b/src/openrct2/entity/Particle.h
index aa11a61e13..390ff6ecb8 100644
--- a/src/openrct2/entity/Particle.h
+++ b/src/openrct2/entity/Particle.h
@@ -31,6 +31,7 @@ struct VehicleCrashParticle : EntityBase
     static void Create(rct_vehicle_colour colours, const CoordsXYZ& vehiclePos);
     void Update();
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 };
 
 struct CrashSplashParticle : EntityBase
@@ -40,6 +41,7 @@ struct CrashSplashParticle : EntityBase
     static void Create(const CoordsXYZ& splashPos);
     void Update();
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 };
 
 struct ExplosionFlare : EntityBase
@@ -49,6 +51,7 @@ struct ExplosionFlare : EntityBase
     static void Create(const CoordsXYZ& flarePos);
     void Update();
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 };
 
 struct ExplosionCloud : EntityBase
@@ -58,6 +61,7 @@ struct ExplosionCloud : EntityBase
     static void Create(const CoordsXYZ& cloudPos);
     void Update();
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 };
 
 struct SteamParticle : EntityBase
@@ -69,4 +73,5 @@ struct SteamParticle : EntityBase
     static void Create(const CoordsXYZ& coords);
     void Update();
     void Serialise(DataSerialiser& stream);
+    void Paint() const;
 };
diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
index 287c10fb7f..4498ff4345 100644
--- a/src/openrct2/entity/Peep.cpp
+++ b/src/openrct2/entity/Peep.cpp
@@ -2675,3 +2675,7 @@ void Peep::Serialise(DataSerialiser& stream)
     stream << WalkingFrameNum;
     stream << PeepFlags;
 }
+
+void Peep::Paint() const
+{
+}
diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h
index abca1b86b2..e657f41643 100644
--- a/src/openrct2/entity/Peep.h
+++ b/src/openrct2/entity/Peep.h
@@ -409,6 +409,7 @@ public: // Peep
     [[nodiscard]] CoordsXY GetDestination() const;
 
     void Serialise(class DataSerialiser& stream);
+    void Paint() const;
 
     // TODO: Make these private again when done refactoring
 public: // Peep