Invert NENT_DEPRECATED define

To define ENT_DEPRECATED in files that still need the old entity structs.
author: octorock <79596758+octorock@users.noreply.github.com> 2023-12-30 18:26:19 +0100
committer: octorock <79596758+octorock@users.noreply.github.com> 2023-12-30 18:30:00 +0100
commit: 3b87c0416294e830ad256226f315c6b416160493 (patch)
tree: 80494ea2ce83de07d27094354a931d143fd5d76c /src
parent: 33473d1d5bc818d47526f6a95c470e682b1b1530 (diff)
467 files changed, 42 insertions, 462 deletions
diff --git a/src/beanstalkSubtask.c b/src/beanstalkSubtask.c
index a115acc1..6568047b 100644
--- a/src/beanstalkSubtask.c
+++ b/src/beanstalkSubtask.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "beanstalkSubtask.h"
 
 #include "backgroundAnimations.h"
diff --git a/src/code_08049CD4.c b/src/code_08049CD4.c
index c98323d1..3755f9d6 100644
--- a/src/code_08049CD4.c
+++ b/src/code_08049CD4.c
@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 #include "global.h"
 #include "room.h"
 
diff --git a/src/code_08049DF4.c b/src/code_08049DF4.c
index a4af4474..723626eb 100644
--- a/src/code_08049DF4.c
+++ b/src/code_08049DF4.c
@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "global.h"
 #include "entity.h"
diff --git a/src/collision.c b/src/collision.c
index 7fb08ca4..c3630276 100644
--- a/src/collision.c
+++ b/src/collision.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "common.h"
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index c87277ab..1e5d3057 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -4,7 +4,6 @@
  *
  * @brief Acro Bandits enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/armos.c b/src/enemy/armos.c
index 402fa65e..d03a3089 100644
--- a/src/enemy/armos.c
+++ b/src/enemy/armos.c
@@ -4,7 +4,6 @@
  *
  * @brief Armos enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "common.h"
 #include "enemy.h"
diff --git a/src/enemy/ballChainSoldier.c b/src/enemy/ballChainSoldier.c
index 3efbe43e..b2a34518 100644
--- a/src/enemy/ballChainSoldier.c
+++ b/src/enemy/ballChainSoldier.c
@@ -4,7 +4,6 @@
  *
  * @brief Ball Chain Soldier enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index 8541a580..b1dbd739 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -4,7 +4,6 @@
  *
  * @brief Beetle enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c
index 4d89bc1b..68d229ed 100644
--- a/src/enemy/bladeTrap.c
+++ b/src/enemy/bladeTrap.c
@@ -4,7 +4,6 @@
  *
  * @brief Blade Trap enemy
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "object.h"
 #include "room.h"
diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c
index e1c9b43b..b232c780 100644
--- a/src/enemy/bobomb.c
+++ b/src/enemy/bobomb.c
@@ -4,7 +4,6 @@
  *
  * @brief Bobomb enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "enemy.h"
diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c
index 3d8c3194..02871212 100644
--- a/src/enemy/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
@@ -4,7 +4,6 @@
  *
  * @brief Bomb Peahat enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/enemy/bombarossa.c b/src/enemy/bombarossa.c
index 1f9120fe..1190d281 100644
--- a/src/enemy/bombarossa.c
+++ b/src/enemy/bombarossa.c
@@ -4,7 +4,6 @@
  *
  * @brief Bombarossa enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "object.h"
diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c
index 1f6bdbb5..93358b37 100644
--- a/src/enemy/bowMoblin.c
+++ b/src/enemy/bowMoblin.c
@@ -4,7 +4,6 @@
  *
  * @brief Bow Moblin enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index d7cea1d9..3a9ac5f5 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -4,7 +4,6 @@
  *
  * @brief Business Scrub enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/businessScrubPrologue.c b/src/enemy/businessScrubPrologue.c
index f09bcbdd..b7b7bc16 100644
--- a/src/enemy/businessScrubPrologue.c
+++ b/src/enemy/businessScrubPrologue.c
@@ -4,7 +4,6 @@
  *
  * @brief Business Scrub Prologue enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/chaser.c b/src/enemy/chaser.c
index 8dcd8f80..9255b1f1 100644
--- a/src/enemy/chaser.c
+++ b/src/enemy/chaser.c
@@ -4,7 +4,6 @@
  *
  * @brief Chaser enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index c5122f8a..c7ca7b94 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -4,7 +4,6 @@
  *
  * @brief Chuchu enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
index 1cd12466..73850077 100644
--- a/src/enemy/chuchuBoss.c
+++ b/src/enemy/chuchuBoss.c
@@ -4,7 +4,6 @@
  *
  * @brief Chuchu Boss enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c
index 83061808..7f8f85c4 100644
--- a/src/enemy/cloudPiranha.c
+++ b/src/enemy/cloudPiranha.c
@@ -4,7 +4,6 @@
  *
  * @brief Cloud Piranha enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/crow.c b/src/enemy/crow.c
index ccbf5026..4f0c587b 100644
--- a/src/enemy/crow.c
+++ b/src/enemy/crow.c
@@ -4,7 +4,6 @@
  *
  * @brief Crow enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/cuccoAggr.c b/src/enemy/cuccoAggr.c
index 4eae33ed..9a07ea9e 100644
--- a/src/enemy/cuccoAggr.c
+++ b/src/enemy/cuccoAggr.c
@@ -4,7 +4,6 @@
  *
  * @brief Cucco Aggr enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index 133aca85..da26009c 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -4,7 +4,6 @@
  *
  * @brief Cucco Chick Aggr enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/curtain.c b/src/enemy/curtain.c
index 3450ea7c..e5256714 100644
--- a/src/enemy/curtain.c
+++ b/src/enemy/curtain.c
@@ -4,7 +4,6 @@
  *
  * @brief Curtain enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 
diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
index 863d49d3..9192857d 100644
--- a/src/enemy/darkNut.c
+++ b/src/enemy/darkNut.c
@@ -4,7 +4,6 @@
  *
  * @brief Dark Nut enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c
index e9719c0f..5885ef40 100644
--- a/src/enemy/doorMimic.c
+++ b/src/enemy/doorMimic.c
@@ -4,7 +4,6 @@
  *
  * @brief Door Mimic enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "sound.h"
diff --git a/src/enemy/dust.c b/src/enemy/dust.c
index df2073fe..68d3336d 100644
--- a/src/enemy/dust.c
+++ b/src/enemy/dust.c
@@ -4,7 +4,6 @@
  *
  * @brief Dust enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c
index edda3b77..f333f9cb 100644
--- a/src/enemy/enemy4D.c
+++ b/src/enemy/enemy4D.c
@@ -4,7 +4,6 @@
  *
  * @brief Enemy4D enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c
index 6cddbdc8..0a33c592 100644
--- a/src/enemy/enemy50.c
+++ b/src/enemy/enemy50.c
@@ -4,7 +4,6 @@
  *
  * @brief Enemy50 enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/enemy64.c b/src/enemy/enemy64.c
index d6da9844..b226528f 100644
--- a/src/enemy/enemy64.c
+++ b/src/enemy/enemy64.c
@@ -4,7 +4,6 @@
  *
  * @brief Enemy64 enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "fade.h"
 #include "functions.h"
diff --git a/src/enemy/enemy66.c b/src/enemy/enemy66.c
index ca5a6423..b2010d03 100644
--- a/src/enemy/enemy66.c
+++ b/src/enemy/enemy66.c
@@ -4,7 +4,6 @@
  *
  * @brief Enemy66 enemy
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void (*const gUnk_080D2ABC[])(Entity*);
diff --git a/src/enemy/enemyE.c b/src/enemy/enemyE.c
index b470d584..56a9fe04 100644
--- a/src/enemy/enemyE.c
+++ b/src/enemy/enemyE.c
@@ -4,7 +4,6 @@
  *
  * @brief EnemyE enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c
index 04a1600f..9c8eb9e1 100644
--- a/src/enemy/eyegore.c
+++ b/src/enemy/eyegore.c
@@ -4,7 +4,6 @@
  *
  * @brief Eyegore enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "fade.h"
 #include "functions.h"
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c
index d0b82155..81169608 100644
--- a/src/enemy/fallingBoulder.c
+++ b/src/enemy/fallingBoulder.c
@@ -4,7 +4,6 @@
  *
  * @brief Falling Boulder enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c
index 57dabe31..b35b8117 100644
--- a/src/enemy/fireballGuy.c
+++ b/src/enemy/fireballGuy.c
@@ -4,7 +4,6 @@
  *
  * @brief Fireball Guy enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c
index d69ca000..10e6136d 100644
--- a/src/enemy/flyingPot.c
+++ b/src/enemy/flyingPot.c
@@ -4,7 +4,6 @@
  *
  * @brief Flying pot enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c
index d7d87212..525d40d9 100644
--- a/src/enemy/flyingSkull.c
+++ b/src/enemy/flyingSkull.c
@@ -4,7 +4,6 @@
  *
  * @brief Flying Skull enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c
index f2749f15..683828de 100644
--- a/src/enemy/ghini.c
+++ b/src/enemy/ghini.c
@@ -4,7 +4,6 @@
  *
  * @brief Ghini enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index a225996a..1471e807 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -4,7 +4,6 @@
  *
  * @brief Gibdo enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c
index ea108eb8..ef144203 100644
--- a/src/enemy/gleerok.c
+++ b/src/enemy/gleerok.c
@@ -4,7 +4,6 @@
  *
  * @brief Gleerok enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/gyorgChild.c b/src/enemy/gyorgChild.c
index c7306f5d..c72b4619 100644
--- a/src/enemy/gyorgChild.c
+++ b/src/enemy/gyorgChild.c
@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Child enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy/gyorg.h"
 #include "functions.h"
diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c
index 394ef46b..4270139c 100644
--- a/src/enemy/gyorgFemale.c
+++ b/src/enemy/gyorgFemale.c
@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Female enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "enemy.h"
diff --git a/src/enemy/gyorgFemaleEye.c b/src/enemy/gyorgFemaleEye.c
index 0be6a03e..234d88ed 100644
--- a/src/enemy/gyorgFemaleEye.c
+++ b/src/enemy/gyorgFemaleEye.c
@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Female Eye enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "enemy/gyorg.h"
 #include "entity.h"
diff --git a/src/enemy/gyorgFemaleMouth.c b/src/enemy/gyorgFemaleMouth.c
index d9c224f9..0500b001 100644
--- a/src/enemy/gyorgFemaleMouth.c
+++ b/src/enemy/gyorgFemaleMouth.c
@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Female Mouth enemy
  */
-#define NENT_DEPRECATED
 #include "enemy/gyorg.h"
 #include "player.h"
 #include "room.h"
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index 8d2407f1..1521b85c 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Male enemy
  */
-#define NENT_DEPRECATED
 #include "effects.h"
 #include "enemy.h"
 #include "enemy/gyorg.h"
diff --git a/src/enemy/gyorgMaleEye.c b/src/enemy/gyorgMaleEye.c
index 2bd7f05d..03202469 100644
--- a/src/enemy/gyorgMaleEye.c
+++ b/src/enemy/gyorgMaleEye.c
@@ -4,7 +4,6 @@
  *
  * @brief GyorgMaleEye enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "fade.h"
 #include "functions.h"
diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c
index 2328d5f9..1a383efb 100644
--- a/src/enemy/hangingSeed.c
+++ b/src/enemy/hangingSeed.c
@@ -4,7 +4,6 @@
  *
  * @brief Hanging Seed enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c
index 51e88ab7..6ac69120 100644
--- a/src/enemy/helmasaur.c
+++ b/src/enemy/helmasaur.c
@@ -4,7 +4,6 @@
  *
  * @brief Helmasaur enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c
index dc66bc63..c92b2ade 100644
--- a/src/enemy/keaton.c
+++ b/src/enemy/keaton.c
@@ -4,7 +4,6 @@
  *
  * @brief keaton enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/keese.c b/src/enemy/keese.c
index 467ea0ff..96f3bd08 100644
--- a/src/enemy/keese.c
+++ b/src/enemy/keese.c
@@ -4,7 +4,6 @@
  *
  * @brief Keese enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index d5b5a8cc..5798f410 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -4,7 +4,6 @@
  *
  * @brief Lakitu enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c
index 75c9d18d..3d0c000d 100644
--- a/src/enemy/lakituCloud.c
+++ b/src/enemy/lakituCloud.c
@@ -4,7 +4,6 @@
  *
  * @brief Lakitu Cloud enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "enemy.h"
diff --git a/src/enemy/leever.c b/src/enemy/leever.c
index 66e263c8..647c9a86 100644
--- a/src/enemy/leever.c
+++ b/src/enemy/leever.c
@@ -4,7 +4,6 @@
  *
  * @brief Leever enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index e4b0faab..52f37306 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -4,7 +4,6 @@
  *
  * @brief Like Like enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "item.h"
 #include "message.h"
diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
index 85068daf..4dda2643 100644
--- a/src/enemy/madderpillar.c
+++ b/src/enemy/madderpillar.c
@@ -4,7 +4,6 @@
  *
  * @brief Madderpillar enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index 208d7f9f..a896d130 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Bracelet enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/enemy/mazaalHand.c b/src/enemy/mazaalHand.c
index 65b7d10a..ab6326fb 100644
--- a/src/enemy/mazaalHand.c
+++ b/src/enemy/mazaalHand.c
@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Hand enemy
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "hitbox.h"
 
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index 696431ca..03c5c4de 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Head enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c
index 7eb086e3..a404cbdc 100644
--- a/src/enemy/mazaalMacro.c
+++ b/src/enemy/mazaalMacro.c
@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Macro enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "screenTransitions.h"
diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c
index 3899733e..97365958 100644
--- a/src/enemy/miniFireballGuy.c
+++ b/src/enemy/miniFireballGuy.c
@@ -4,7 +4,6 @@
  *
  * @brief Mini Fireball Guy enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c
index 2fb18dec..bef76f86 100644
--- a/src/enemy/miniSlime.c
+++ b/src/enemy/miniSlime.c
@@ -4,7 +4,6 @@
  *
  * @brief Mini Slime enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 
diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c
index da9d17a2..96d6a9cd 100644
--- a/src/enemy/moldorm.c
+++ b/src/enemy/moldorm.c
@@ -4,7 +4,6 @@
  *
  * @brief Moldorm enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
index c856da19..a6469c11 100644
--- a/src/enemy/moldworm.c
+++ b/src/enemy/moldworm.c
@@ -4,7 +4,6 @@
  *
  * @brief Moldworm enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/mulldozer.c b/src/enemy/mulldozer.c
index f1f3059a..fbc3f09c 100644
--- a/src/enemy/mulldozer.c
+++ b/src/enemy/mulldozer.c
@@ -4,7 +4,6 @@
  *
  * @brief Mulldozer enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index 68ff799c..d33a9a54 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -4,7 +4,6 @@
  *
  * @brief Octorok enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 
diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c
index 7a59d4a9..00f5d79f 100644
--- a/src/enemy/octorokBoss.c
+++ b/src/enemy/octorokBoss.c
@@ -4,7 +4,6 @@
  *
  * @brief Octorok boss enemy
  */
-#define NENT_DEPRECATED
 #include "enemy/octorokBoss.h"
 #include "collision.h"
 #include "functions.h"
diff --git a/src/enemy/octorokGolden.c b/src/enemy/octorokGolden.c
index 7c0fd384..a3295b7c 100644
--- a/src/enemy/octorokGolden.c
+++ b/src/enemy/octorokGolden.c
@@ -4,7 +4,6 @@
  *
  * @brief Golden Octorock enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "map.h"
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c
index 353ad0d5..fee43028 100644
--- a/src/enemy/peahat.c
+++ b/src/enemy/peahat.c
@@ -4,7 +4,6 @@
  *
  * @brief Peahat enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 #include "room.h"
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index bc05635b..612df286 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -4,7 +4,6 @@
  *
  * @brief Pesto enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "game.h"
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index 1b1a93f6..dca8086a 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -4,7 +4,6 @@
  *
  * @brief Puffstool enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "object.h"
diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c
index c1d77726..dc3af233 100644
--- a/src/enemy/rockChuchu.c
+++ b/src/enemy/rockChuchu.c
@@ -4,7 +4,6 @@
  *
  * @brief Rock Chuchu enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "player.h"
 
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index e2a19240..db273ef7 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -4,7 +4,6 @@
  *
  * @brief Rollobite enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "physics.h"
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index 851d3c9a..e8bcbc41 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -4,7 +4,6 @@
  *
  * @brief Rope enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 
diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c
index 39acbc52..77a76670 100644
--- a/src/enemy/ropeGolden.c
+++ b/src/enemy/ropeGolden.c
@@ -4,7 +4,6 @@
  *
  * @brief Golden Rope enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index 1834d7d3..bea1fe2e 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -4,7 +4,6 @@
  *
  * @brief Rupee Like enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "hitbox.h"
diff --git a/src/enemy/scissorsBeetle.c b/src/enemy/scissorsBeetle.c
index 35cc21b1..7b76a9fd 100644
--- a/src/enemy/scissorsBeetle.c
+++ b/src/enemy/scissorsBeetle.c
@@ -4,7 +4,6 @@
  *
  * @brief Scissors Beetle enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c
index db136a3c..31d2bc10 100644
--- a/src/enemy/sensorBladeTrap.c
+++ b/src/enemy/sensorBladeTrap.c
@@ -4,7 +4,6 @@
  *
  * @brief Sensor Blade Trap enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "map.h"
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index 937091d6..81565493 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -4,7 +4,6 @@
  *
  * @brief Slime enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 #include "room.h"
diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c
index c2cf7d5f..2397c3aa 100644
--- a/src/enemy/sluggula.c
+++ b/src/enemy/sluggula.c
@@ -4,7 +4,6 @@
  *
  * @brief Sluggula enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index 05fa2bdf..0c287bbc 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -4,7 +4,6 @@
  *
  * @brief Small Pesto enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 
diff --git a/src/enemy/spark.c b/src/enemy/spark.c
index cc6d1f15..e135424b 100644
--- a/src/enemy/spark.c
+++ b/src/enemy/spark.c
@@ -4,7 +4,6 @@
  *
  * @brief Spark enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "object.h"
diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c
index 675de896..089f0ba8 100644
--- a/src/enemy/spearMoblin.c
+++ b/src/enemy/spearMoblin.c
@@ -4,7 +4,6 @@
  *
  * @brief Spear Moblin enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c
index d009eab2..92406dda 100644
--- a/src/enemy/spikedBeetle.c
+++ b/src/enemy/spikedBeetle.c
@@ -4,7 +4,6 @@
  *
  * @brief Spiked Beetle enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c
index 0e082d7b..8f5dd46f 100644
--- a/src/enemy/spinyBeetle.c
+++ b/src/enemy/spinyBeetle.c
@@ -4,7 +4,6 @@
  *
  * @brief Spiny Beetle enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index 0bd03e83..03b7f09c 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -4,7 +4,6 @@
  *
  * @brief Spiny Chuchu enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c
index 98b2214e..1cbdc67a 100644
--- a/src/enemy/stalfos.c
+++ b/src/enemy/stalfos.c
@@ -4,7 +4,6 @@
  *
  * @brief Stalfos enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/sub_080451CC.c b/src/enemy/sub_080451CC.c
index c7a82990..05425c9c 100644
--- a/src/enemy/sub_080451CC.c
+++ b/src/enemy/sub_080451CC.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "entity.h"
 
 void sub_080451CC(Entity* this, Entity* other) {
diff --git a/src/enemy/takkuri.c b/src/enemy/takkuri.c
index b24e2e3e..20dd168a 100644
--- a/src/enemy/takkuri.c
+++ b/src/enemy/takkuri.c
@@ -4,7 +4,6 @@
  *
  * @brief Takkuri enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index ea1169fe..81573437 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -4,7 +4,6 @@
  *
  * @brief Tektite enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c
index 49ad340c..d92dfdee 100644
--- a/src/enemy/tektiteGolden.c
+++ b/src/enemy/tektiteGolden.c
@@ -4,7 +4,6 @@
  *
  * @brief Golden Tektite enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/torchTrap.c b/src/enemy/torchTrap.c
index 71b2a2c7..de2e12eb 100644
--- a/src/enemy/torchTrap.c
+++ b/src/enemy/torchTrap.c
@@ -4,7 +4,6 @@
  *
  * @brief Torch Trap enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c
index c0a09411..b953432d 100644
--- a/src/enemy/treeItem.c
+++ b/src/enemy/treeItem.c
@@ -4,7 +4,6 @@
  *
  * @brief Tree Item enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "item.h"
 #include "object.h"
diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c
index f0b48b2c..2558f5f0 100644
--- a/src/enemy/vaatiArm.c
+++ b/src/enemy/vaatiArm.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Arm enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c
index 0378c546..7e0d04a6 100644
--- a/src/enemy/vaatiBall.c
+++ b/src/enemy/vaatiBall.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Ball enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c
index 26f3e6b5..3c0d04e5 100644
--- a/src/enemy/vaatiEyesMacro.c
+++ b/src/enemy/vaatiEyesMacro.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Eyes Macro enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c
index e80675e4..666d5fa5 100644
--- a/src/enemy/vaatiProjectile.c
+++ b/src/enemy/vaatiProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Projectile enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "screenTransitions.h"
diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c
index 135b4f4c..64ec55b0 100644
--- a/src/enemy/vaatiRebornEnemy.c
+++ b/src/enemy/vaatiRebornEnemy.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Reborn enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c
index 60912eae..e84b14f8 100644
--- a/src/enemy/vaatiTransfigured.c
+++ b/src/enemy/vaatiTransfigured.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Transfigured enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c
index 2ee0d76a..e417c2fd 100644
--- a/src/enemy/vaatiTransfiguredEye.c
+++ b/src/enemy/vaatiTransfiguredEye.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Transfigured Eye enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index 2aa2b549..8ad668b8 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Wrath enemy
  */
-#define NENT_DEPRECATED
 #include "enemy/vaatiWrath.h"
 #include "functions.h"
 #include "message.h"
diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c
index 42da5f1e..f7782fd2 100644
--- a/src/enemy/vaatiWrathEye.c
+++ b/src/enemy/vaatiWrathEye.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Wrath Eye enemy
  */
-#define NENT_DEPRECATED
 #include "enemy/vaatiWrath.h"
 #include "functions.h"
 
diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c
index 07f63fec..1c72f15d 100644
--- a/src/enemy/wallMaster.c
+++ b/src/enemy/wallMaster.c
@@ -4,7 +4,6 @@
  *
  * @brief Wall Master enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c
index f7ebe0ff..34d7cb6a 100644
--- a/src/enemy/wallMaster2.c
+++ b/src/enemy/wallMaster2.c
@@ -4,7 +4,6 @@
  *
  * @brief Wall Master 2 enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c
index 7dc2b686..6214d93e 100644
--- a/src/enemy/waterDrop.c
+++ b/src/enemy/waterDrop.c
@@ -4,7 +4,6 @@
  *
  * @brief Water Drop enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "object.h"
 #include "screen.h"
diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c
index df73cb4a..1ed368b6 100644
--- a/src/enemy/wisp.c
+++ b/src/enemy/wisp.c
@@ -4,7 +4,6 @@
  *
  * @brief Wisp enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c
index dc1aa173..f81af162 100644
--- a/src/enemy/wizzrobeFire.c
+++ b/src/enemy/wizzrobeFire.c
@@ -4,7 +4,6 @@
  *
  * @brief Wizzrobe Fire enemy
  */
-#define NENT_DEPRECATED
 #include "enemy/wizzrobe.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/wizzrobeIce.c b/src/enemy/wizzrobeIce.c
index 9607a275..0d07a305 100644
--- a/src/enemy/wizzrobeIce.c
+++ b/src/enemy/wizzrobeIce.c
@@ -4,7 +4,6 @@
  *
  * @brief Wizzrobe Ice enemy
  */
-#define NENT_DEPRECATED
 #include "enemy/wizzrobe.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/wizzrobeWind.c b/src/enemy/wizzrobeWind.c
index 33a9e25f..57381154 100644
--- a/src/enemy/wizzrobeWind.c
+++ b/src/enemy/wizzrobeWind.c
@@ -4,7 +4,6 @@
  *
  * @brief Wizzrobe Wind enemy
  */
-#define NENT_DEPRECATED
 #include "enemy/wizzrobe.h"
 #include "collision.h"
 #include "enemy.h"
diff --git a/src/enemyUtils.c b/src/enemyUtils.c
index e030edb1..fa6b4bc0 100644
--- a/src/enemyUtils.c
+++ b/src/enemyUtils.c
@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 #include "enemyUtils.h"
 
 #include "definitions.h"
diff --git a/src/entity.c b/src/entity.c
index b13d5261..fd4cb707 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -1,10 +1,10 @@
-#include "global.h"
+#define ENT_DEPRECATED
+#include "area.h"
 #include "common.h"
 #include "functions.h"
-#include "area.h"
+#include "manager/diggingCaveEntranceManager.h"
 #include "message.h"
 #include "npc.h"
-#include "manager/diggingCaveEntranceManager.h"
 
 typedef struct Temp {
     void* prev;
diff --git a/src/gameUtils.c b/src/gameUtils.c
index d4543147..ef1db81a 100644
--- a/src/gameUtils.c
+++ b/src/gameUtils.c
@@ -3,6 +3,7 @@
  *
  * @brief Game Utils
  */
+#define ENT_DEPRECATED
 #include "backgroundAnimations.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/interrupts.c b/src/interrupts.c
index 44b59a73..3ef7235d 100644
--- a/src/interrupts.c
+++ b/src/interrupts.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "functions.h"
 #include "gba/m4a.h"
 #include "global.h"
diff --git a/src/item/itemGustJar.c b/src/item/itemGustJar.c
index 3ac37366..8a040ec9 100644
--- a/src/item/itemGustJar.c
+++ b/src/item/itemGustJar.c
@@ -1,7 +1,7 @@
-#include "global.h"
+#define ENT_DEPRECATED
 #include "entity.h"
-#include "item.h"
 #include "functions.h"
+#include "item.h"
 #include "playeritem.h"
 
 void (*const ItemGustJar_StateFunctions[])(ItemBehavior* this, u32);
diff --git a/src/item/itemLantern.c b/src/item/itemLantern.c
index 070d9a89..e5b7c91e 100644
--- a/src/item/itemLantern.c
+++ b/src/item/itemLantern.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "item.h"
 #include "functions.h"
 #include "sound.h"
diff --git a/src/item/itemOcarina.c b/src/item/itemOcarina.c
index e4b2ad0e..196ea132 100644
--- a/src/item/itemOcarina.c
+++ b/src/item/itemOcarina.c
@@ -1,6 +1,7 @@
+#define ENT_DEPRECATED
+#include "functions.h"
 #include "item.h"
 #include "sound.h"
-#include "functions.h"
 
 extern void ResetPlayerVelocity(void);
 extern void CreateBird(Entity*);
diff --git a/src/item/itemPegasusBoots.c b/src/item/itemPegasusBoots.c
index 1e24a4e2..21fa559a 100644
--- a/src/item/itemPegasusBoots.c
+++ b/src/item/itemPegasusBoots.c
@@ -1,11 +1,12 @@
+#define ENT_DEPRECATED
 #include "asm.h"
-#include "item.h"
-#include "sound.h"
-#include "functions.h"
 #include "effects.h"
+#include "functions.h"
 #include "game.h"
-#include "save.h"
+#include "item.h"
 #include "playeritem.h"
+#include "save.h"
+#include "sound.h"
 
 void sub_08076964(ItemBehavior*, u32);
 void sub_080768F8(ItemBehavior*, u32);
diff --git a/src/item/itemRocsCape.c b/src/item/itemRocsCape.c
index cfb165a3..6ece003d 100644
--- a/src/item/itemRocsCape.c
+++ b/src/item/itemRocsCape.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "item.h"
 #include "sound.h"
 #include "functions.h"
diff --git a/src/item/itemTryPickupObject.c b/src/item/itemTryPickupObject.c
index 1eb76da5..774ab613 100644
--- a/src/item/itemTryPickupObject.c
+++ b/src/item/itemTryPickupObject.c
@@ -1,7 +1,8 @@
-#include "item.h"
+#define ENT_DEPRECATED
 #include "functions.h"
-#include "sound.h"
+#include "item.h"
 #include "playeritem.h"
+#include "sound.h"
 
 u32 sub_08077F64(ItemBehavior* arg0, u32 index);
 u32 sub_080789A8(void);
diff --git a/src/manager/fallingItemManager.c b/src/manager/fallingItemManager.c
index 966a5702..49ba18e0 100644
--- a/src/manager/fallingItemManager.c
+++ b/src/manager/fallingItemManager.c
@@ -6,6 +6,7 @@
  *
  * If you leave the room without picking the item up and enter again, the item falls from the sky again.
  */
+#define ENT_DEPRECATED
 #include "manager/fallingItemManager.h"
 #include "flags.h"
 #include "object.h"
diff --git a/src/manager/fightManager.c b/src/manager/fightManager.c
index 3f34f5c4..dfef3d50 100644
--- a/src/manager/fightManager.c
+++ b/src/manager/fightManager.c
@@ -9,6 +9,7 @@
  * (There is also a part about changing the music and setting it back when the fight is done, which is song 0x33 (a
  * fight theme) by default but can be overridden through room data)
  */
+#define ENT_DEPRECATED
 #include "manager/fightManager.h"
 #include "area.h"
 #include "common.h"
diff --git a/src/manager/goronMerchantShopManager.c b/src/manager/goronMerchantShopManager.c
index feb2f7c0..b68ceb88 100644
--- a/src/manager/goronMerchantShopManager.c
+++ b/src/manager/goronMerchantShopManager.c
@@ -4,6 +4,7 @@
  *
  * @brief Spawns the shop items for the kinstones for the goron merchant.
  */
+#define ENT_DEPRECATED
 #include "manager/goronMerchantShopManager.h"
 #include "asm.h"
 #include "flags.h"
diff --git a/src/manager/houseSignManager.c b/src/manager/houseSignManager.c
index 8722de83..48784225 100644
--- a/src/manager/houseSignManager.c
+++ b/src/manager/houseSignManager.c
@@ -7,6 +7,7 @@
  * Spawns HOUSE_SIGN objects that check this and unsets the value in the bitfield.
  * Creates the signs on the houses in hyrule town.
  */
+#define ENT_DEPRECATED
 #include "manager/houseSignManager.h"
 #include "area.h"
 #include "object.h"
diff --git a/src/manager/moveableObjectManager.c b/src/manager/moveableObjectManager.c
index 6c697777..bc9a05c2 100644
--- a/src/manager/moveableObjectManager.c
+++ b/src/manager/moveableObjectManager.c
@@ -6,6 +6,7 @@
  *
  * E.g. for pushable rock.
  */
+#define ENT_DEPRECATED
 #include "manager/moveableObjectManager.h"
 #include "flags.h"
 #include "room.h"
diff --git a/src/manager/pushableFurnitureManager.c b/src/manager/pushableFurnitureManager.c
index d8cb00d9..687203a0 100644
--- a/src/manager/pushableFurnitureManager.c
+++ b/src/manager/pushableFurnitureManager.c
@@ -4,6 +4,7 @@
  *
  * @brief Creates pushable furniture based on a room property list.
  */
+#define ENT_DEPRECATED
 #include "manager/pushableFurnitureManager.h"
 #include "flags.h"
 #include "object.h"
diff --git a/src/npc/anju.c b/src/npc/anju.c
index 0c0df5a9..199629d4 100644
--- a/src/npc/anju.c
+++ b/src/npc/anju.c
@@ -4,7 +4,6 @@
  *
  * @brief Anju NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "player.h"
diff --git a/src/npc/beedle.c b/src/npc/beedle.c
index 07a3d0fc..a77d7390 100644
--- a/src/npc/beedle.c
+++ b/src/npc/beedle.c
@@ -4,7 +4,6 @@
  *
  * @brief Beedle NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "game.h"
diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c
index ce6d1bab..aded3196 100644
--- a/src/npc/bigGoron.c
+++ b/src/npc/bigGoron.c
@@ -4,7 +4,6 @@
  *
  * @brief BigGoron NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "item.h"
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 598b0523..002c5d0a 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -4,7 +4,6 @@
  *
  * @brief Blade Brothers NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/brocco.c b/src/npc/brocco.c
index ea14ac04..d4bfa44d 100644
--- a/src/npc/brocco.c
+++ b/src/npc/brocco.c
@@ -4,7 +4,6 @@
  *
  * @brief Brocco NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "message.h"
 #include "npc.h"
diff --git a/src/npc/carlov.c b/src/npc/carlov.c
index 0cc92008..07a9abb5 100644
--- a/src/npc/carlov.c
+++ b/src/npc/carlov.c
@@ -4,7 +4,6 @@
  *
  * @brief Carlov NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "room.h"
diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c
index 3c4dda2a..28123e37 100644
--- a/src/npc/carpenter.c
+++ b/src/npc/carpenter.c
@@ -4,7 +4,6 @@
  *
  * @brief Carpenter NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "item.h"
 #include "npc.h"
diff --git a/src/npc/castleMaid.c b/src/npc/castleMaid.c
index f5e888e3..448f0a30 100644
--- a/src/npc/castleMaid.c
+++ b/src/npc/castleMaid.c
@@ -4,7 +4,6 @@
  *
  * @brief Castle Maid NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c
index b4b61ccd..86365860 100644
--- a/src/npc/castorWildsStatue.c
+++ b/src/npc/castorWildsStatue.c
@@ -4,7 +4,6 @@
  *
  * @brief Castor Wilds Statue NPC
  */
-#define NENT_DEPRECATED
 #include "effects.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/npc/cat.c b/src/npc/cat.c
index eb364e8f..9096a5a4 100644
--- a/src/npc/cat.c
+++ b/src/npc/cat.c
@@ -4,7 +4,6 @@
  *
  * @brief Cat NPC
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/npc/clothesRack.c b/src/npc/clothesRack.c
index 1d63c376..28de3bed 100644
--- a/src/npc/clothesRack.c
+++ b/src/npc/clothesRack.c
@@ -5,7 +5,6 @@
  * @brief Clothes Rack NPC
  */
 #include "npc.h"
-#define NENT_DEPRECATED
 
 void sub_0806DD90(Entity*);
 void sub_0806DEC8(Entity*);
diff --git a/src/npc/cow.c b/src/npc/cow.c
index 8d4f1d4b..944d26b3 100644
--- a/src/npc/cow.c
+++ b/src/npc/cow.c
@@ -4,7 +4,6 @@
  *
  * @brief Cow NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
diff --git a/src/npc/cucco.c b/src/npc/cucco.c
index 33a7d46a..54042add 100644
--- a/src/npc/cucco.c
+++ b/src/npc/cucco.c
@@ -4,7 +4,6 @@
  *
  * @brief Cucco NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "kinstone.h"
 #include "npc.h"
diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c
index 07b03baf..adf6eaf4 100644
--- a/src/npc/cuccoChick.c
+++ b/src/npc/cuccoChick.c
@@ -4,7 +4,6 @@
  *
  * @brief Cucco Chick NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "npc.h"
 
diff --git a/src/npc/dampe.c b/src/npc/dampe.c
index 88cc9e0a..8652612e 100644
--- a/src/npc/dampe.c
+++ b/src/npc/dampe.c
@@ -4,7 +4,6 @@
  *
  * @brief Dampe NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "item.h"
diff --git a/src/npc/din.c b/src/npc/din.c
index cfbef459..b125cc95 100644
--- a/src/npc/din.c
+++ b/src/npc/din.c
@@ -4,7 +4,6 @@
  *
  * @brief Din NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "kinstone.h"
 #include "npc.h"
diff --git a/src/npc/dog.c b/src/npc/dog.c
index 82708d84..f5512406 100644
--- a/src/npc/dog.c
+++ b/src/npc/dog.c
@@ -4,7 +4,6 @@
  *
  * @brief Dog NPC
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/npc/drLeft.c b/src/npc/drLeft.c
index 32b2f062..c89760c5 100644
--- a/src/npc/drLeft.c
+++ b/src/npc/drLeft.c
@@ -4,7 +4,6 @@
  *
  * @brief Dr Left NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "item.h"
 #include "npc.h"
diff --git a/src/npc/emma.c b/src/npc/emma.c
index 9cd04780..7ff05e23 100644
--- a/src/npc/emma.c
+++ b/src/npc/emma.c
@@ -4,7 +4,6 @@
  *
  * @brief Emma NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "screenTransitions.h"
diff --git a/src/npc/epona.c b/src/npc/epona.c
index a852af99..1421262b 100644
--- a/src/npc/epona.c
+++ b/src/npc/epona.c
@@ -4,7 +4,6 @@
  *
  * @brief Epona NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "message.h"
diff --git a/src/npc/ezlo.c b/src/npc/ezlo.c
index c490a29e..15d4a715 100644
--- a/src/npc/ezlo.c
+++ b/src/npc/ezlo.c
@@ -4,7 +4,6 @@
  *
  * @brief Ezlo NPC
  */
-#define NENT_DEPRECATED
 #include "npc.h"
 
 const u8 gUnk_08114134[];
diff --git a/src/npc/farmers.c b/src/npc/farmers.c
index a1f69c55..f98b8ef2 100644
--- a/src/npc/farmers.c
+++ b/src/npc/farmers.c
@@ -4,7 +4,6 @@
  *
  * @brief Farmers NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
diff --git a/src/npc/farore.c b/src/npc/farore.c
index 9624b3bc..5a553f07 100644
--- a/src/npc/farore.c
+++ b/src/npc/farore.c
@@ -4,7 +4,6 @@
  *
  * @brief Farore NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "kinstone.h"
diff --git a/src/npc/festari.c b/src/npc/festari.c
index d32badf2..fb4d15f9 100644
--- a/src/npc/festari.c
+++ b/src/npc/festari.c
@@ -4,7 +4,6 @@
  *
  * @brief Festari NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c
index 8d5cf8dc..7c602e2a 100644
--- a/src/npc/forestMinish.c
+++ b/src/npc/forestMinish.c
@@ -4,7 +4,6 @@
  *
  * @brief Forest Minish NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "item.h"
 #include "kinstone.h"
diff --git a/src/npc/fusionMenuNPC.c b/src/npc/fusionMenuNPC.c
index 01d970e3..63fd2143 100644
--- a/src/npc/fusionMenuNPC.c
+++ b/src/npc/fusionMenuNPC.c
@@ -6,7 +6,6 @@
  *
  * Representation for the NPCs in the fusion menu.
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/gentari.c b/src/npc/gentari.c
index a2e02a34..c7ed252b 100644
--- a/src/npc/gentari.c
+++ b/src/npc/gentari.c
@@ -4,7 +4,6 @@
  *
  * @brief Gentari NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c
index 6628b572..7bf07ad6 100644
--- a/src/npc/ghostBrothers.c
+++ b/src/npc/ghostBrothers.c
@@ -4,7 +4,6 @@
  *
  * @brief Ghost Brothers NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "message.h"
diff --git a/src/npc/gina.c b/src/npc/gina.c
index 8933653f..46b13bcd 100644
--- a/src/npc/gina.c
+++ b/src/npc/gina.c
@@ -4,7 +4,6 @@
  *
  * @brief Gina NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "player.h"
diff --git a/src/npc/gorman.c b/src/npc/gorman.c
index 1b78bc0b..d4a8683a 100644
--- a/src/npc/gorman.c
+++ b/src/npc/gorman.c
@@ -4,7 +4,6 @@
  *
  * @brief Gorman NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "npc.h"
 
diff --git a/src/npc/goron.c b/src/npc/goron.c
index 422fe6cc..a67b0e5f 100644
--- a/src/npc/goron.c
+++ b/src/npc/goron.c
@@ -4,7 +4,6 @@
  *
  * @brief Goron NPC
  */
-#define NENT_DEPRECATED
 #include "effects.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/npc/goronMerchant.c b/src/npc/goronMerchant.c
index 2f497dff..c9bd4d73 100644
--- a/src/npc/goronMerchant.c
+++ b/src/npc/goronMerchant.c
@@ -4,7 +4,6 @@
  *
  * @brief Goron Merchant NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/gregal.c b/src/npc/gregal.c
index 781cfec0..4a2e3fb5 100644
--- a/src/npc/gregal.c
+++ b/src/npc/gregal.c
@@ -4,7 +4,6 @@
  *
  * @brief Gregal NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
diff --git a/src/npc/guard.c b/src/npc/guard.c
index 617d5d13..7a18d62d 100644
--- a/src/npc/guard.c
+++ b/src/npc/guard.c
@@ -4,7 +4,6 @@
  *
  * @brief Guard NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/guardWithSpear.c b/src/npc/guardWithSpear.c
index 52f03587..8d9bf404 100644
--- a/src/npc/guardWithSpear.c
+++ b/src/npc/guardWithSpear.c
@@ -4,7 +4,6 @@
  *
  * @brief Guard with Spear NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/npc/hurdyGurdyMan.c b/src/npc/hurdyGurdyMan.c
index dfb0c4fc..90580f2d 100644
--- a/src/npc/hurdyGurdyMan.c
+++ b/src/npc/hurdyGurdyMan.c
@@ -4,7 +4,6 @@
  *
  * @brief Hurdy Gurdy Man NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
diff --git a/src/npc/kid.c b/src/npc/kid.c
index 70e94ee3..281bbc93 100644
--- a/src/npc/kid.c
+++ b/src/npc/kid.c
@@ -4,7 +4,6 @@
  *
  * @brief Kid NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "message.h"
 #include "npc.h"
diff --git a/src/npc/kingDaltus.c b/src/npc/kingDaltus.c
index d6496e15..cc901f18 100644
--- a/src/npc/kingDaltus.c
+++ b/src/npc/kingDaltus.c
@@ -4,7 +4,6 @@
  *
  * @brief King Daltus NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/npc/kingGustaf.c b/src/npc/kingGustaf.c
index f71678dc..48db93af 100644
--- a/src/npc/kingGustaf.c
+++ b/src/npc/kingGustaf.c
@@ -4,7 +4,6 @@
  *
  * @brief King Gustaf NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "screen.h"
diff --git a/src/npc/librari.c b/src/npc/librari.c
index f0778371..7e2a69ba 100644
--- a/src/npc/librari.c
+++ b/src/npc/librari.c
@@ -4,7 +4,6 @@
  *
  * @brief Librari NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "item.h"
 #include "npc.h"
diff --git a/src/npc/librarians.c b/src/npc/librarians.c
index 86558d16..e19c3cc4 100644
--- a/src/npc/librarians.c
+++ b/src/npc/librarians.c
@@ -4,7 +4,6 @@
  *
  * @brief Librarians NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/mailbox.c b/src/npc/mailbox.c
index cde3c646..5eb4ea9d 100644
--- a/src/npc/mailbox.c
+++ b/src/npc/mailbox.c
@@ -4,7 +4,6 @@
  *
  * @brief Mailbox NPC
  */
-#define NENT_DEPRECATED
 #include "effects.h"
 #include "entity.h"
 #include "message.h"
diff --git a/src/npc/malon.c b/src/npc/malon.c
index 9766732a..65e1ab77 100644
--- a/src/npc/malon.c
+++ b/src/npc/malon.c
@@ -4,7 +4,6 @@
  *
  * @brief Malon NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "script.h"
diff --git a/src/npc/mama.c b/src/npc/mama.c
index 43cdd164..cdcb3cb3 100644
--- a/src/npc/mama.c
+++ b/src/npc/mama.c
@@ -4,7 +4,6 @@
  *
  * @brief Mama NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "save.h"
diff --git a/src/npc/marcy.c b/src/npc/marcy.c
index bfef099e..f7c56f54 100644
--- a/src/npc/marcy.c
+++ b/src/npc/marcy.c
@@ -4,7 +4,6 @@
  *
  * @brief Marcy NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c
index 161b9f36..25887beb 100644
--- a/src/npc/mayorHagen.c
+++ b/src/npc/mayorHagen.c
@@ -4,7 +4,6 @@
  *
  * @brief Mayor Hagen NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "item.h"
diff --git a/src/npc/melari.c b/src/npc/melari.c
index 75ae8ed3..30c08445 100644
--- a/src/npc/melari.c
+++ b/src/npc/melari.c
@@ -4,7 +4,6 @@
  *
  * @brief Melari NPC
  */
-#define NENT_DEPRECATED
 #include "item.h"
 #include "npc.h"
 
diff --git a/src/npc/milkCart.c b/src/npc/milkCart.c
index 37b7f54d..4c581a1e 100644
--- a/src/npc/milkCart.c
+++ b/src/npc/milkCart.c
@@ -4,7 +4,6 @@
  *
  * @brief Milk Cart NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/minishEzlo.c b/src/npc/minishEzlo.c
index b509b1db..54068afc 100644
--- a/src/npc/minishEzlo.c
+++ b/src/npc/minishEzlo.c
@@ -4,7 +4,6 @@
  *
  * @brief Minish Ezlo NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "script.h"
diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c
index 9c0454a5..3004e7ce 100644
--- a/src/npc/ministerPotho.c
+++ b/src/npc/ministerPotho.c
@@ -4,7 +4,6 @@
  *
  * @brief Minister Potho NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "item.h"
diff --git a/src/npc/moblinLady.c b/src/npc/moblinLady.c
index 2aa0e0b3..1fa8d109 100644
--- a/src/npc/moblinLady.c
+++ b/src/npc/moblinLady.c
@@ -4,7 +4,6 @@
  *
  * @brief Moblin Lady NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c
index 6f68a069..24e3be4d 100644
--- a/src/npc/mountainMinish.c
+++ b/src/npc/mountainMinish.c
@@ -4,7 +4,6 @@
  *
  * @brief Mountain Minish NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c
index a9adf6e0..0390ac03 100644
--- a/src/npc/mutoh.c
+++ b/src/npc/mutoh.c
@@ -5,7 +5,6 @@
  *
  * @brief Mutoh NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "item.h"
diff --git a/src/npc/nayru.c b/src/npc/nayru.c
index 4b8bd979..cdf79cc5 100644
--- a/src/npc/nayru.c
+++ b/src/npc/nayru.c
@@ -4,7 +4,6 @@
  *
  * @brief Nayru NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "kinstone.h"
 #include "npc.h"
diff --git a/src/npc/npc23.c b/src/npc/npc23.c
index 51ef213e..4c43992a 100644
--- a/src/npc/npc23.c
+++ b/src/npc/npc23.c
@@ -4,7 +4,6 @@
  *
  * @brief NPC 23
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "message.h"
diff --git a/src/npc/npc26.c b/src/npc/npc26.c
index 6d5a3221..b3b5860b 100644
--- a/src/npc/npc26.c
+++ b/src/npc/npc26.c
@@ -4,7 +4,6 @@
  *
  * @brief NPC 26
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c
index e60812b2..fa1f823f 100644
--- a/src/npc/npc4E.c
+++ b/src/npc/npc4E.c
@@ -4,7 +4,6 @@
  *
  * @brief NPC 4E
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/npc4F.c b/src/npc/npc4F.c
index baaf9e4e..3f9450a3 100644
--- a/src/npc/npc4F.c
+++ b/src/npc/npc4F.c
@@ -4,7 +4,6 @@
  *
  * @brief NPC 4F
  */
-#define NENT_DEPRECATED
 #include "npc.h"
 
 void NPC4F(Entity* this) {
diff --git a/src/npc/npc5.c b/src/npc/npc5.c
index 7cc930e6..da120bee 100644
--- a/src/npc/npc5.c
+++ b/src/npc/npc5.c
@@ -4,7 +4,6 @@
  *
  * @brief NPC 5
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/npc/npc58.c b/src/npc/npc58.c
index 53f841f7..0d599f91 100644
--- a/src/npc/npc58.c
+++ b/src/npc/npc58.c
@@ -4,7 +4,6 @@
  *
  * @brief NPC 58
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/npc9.c b/src/npc/npc9.c
index 71a45f04..99fcccb9 100644
--- a/src/npc/npc9.c
+++ b/src/npc/npc9.c
@@ -4,7 +4,6 @@
  *
  * @brief NPC 9
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "message.h"
 #include "npc.h"
diff --git a/src/npc/percy.c b/src/npc/percy.c
index c0d0eac2..c6dd0b36 100644
--- a/src/npc/percy.c
+++ b/src/npc/percy.c
@@ -4,7 +4,6 @@
  *
  * @brief Percy NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/npc/phonograph.c b/src/npc/phonograph.c
index 469dddb5..ca74c820 100644
--- a/src/npc/phonograph.c
+++ b/src/npc/phonograph.c
@@ -4,7 +4,6 @@
  *
  * @brief Phonograph NPC
  */
-#define NENT_DEPRECATED
 #include "common.h"
 #include "entity.h"
 #include "fileselect.h"
diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c
index 0bb4742b..c384b53b 100644
--- a/src/npc/picolyteBottle.c
+++ b/src/npc/picolyteBottle.c
@@ -4,7 +4,6 @@
  *
  * @brief Picolyte Bottle NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/npc/pina.c b/src/npc/pina.c
index a7a2448d..f4cdc048 100644
--- a/src/npc/pina.c
+++ b/src/npc/pina.c
@@ -4,7 +4,6 @@
  *
  * @brief Pina NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "message.h"
diff --git a/src/npc/pita.c b/src/npc/pita.c
index 673de68b..804a0e38 100644
--- a/src/npc/pita.c
+++ b/src/npc/pita.c
@@ -4,7 +4,6 @@
  *
  * @brief Pita NPC
  */
-#define NENT_DEPRECATED
 #include "item.h"
 #include "npc.h"
 
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 1ae6aa81..3e2f5745 100644
--- a/src/npc/postman.c
+++ b/src/npc/postman.c
@@ -4,7 +4,6 @@
  *
  * @brief Postman NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
diff --git a/src/npc/rem.c b/src/npc/rem.c
index 45d66679..dba2b8dd 100644
--- a/src/npc/rem.c
+++ b/src/npc/rem.c
@@ -4,7 +4,6 @@
  *
  * @brief Rem NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "item.h"
 #include "npc.h"
diff --git a/src/npc/simon.c b/src/npc/simon.c
index 1e599c5f..7551d73d 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -4,7 +4,6 @@
  *
  * @brief Simon NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/npc/sittingPerson.c b/src/npc/sittingPerson.c
index f16d0ea0..649239e0 100644
--- a/src/npc/sittingPerson.c
+++ b/src/npc/sittingPerson.c
@@ -4,7 +4,6 @@
  *
  * @brief Sitting Person NPC
  */
-#define NENT_DEPRECATED
 #include "npc.h"
 #include "functions.h"
 
diff --git a/src/npc/smallTownMinish.c b/src/npc/smallTownMinish.c
index 99566202..bada8800 100644
--- a/src/npc/smallTownMinish.c
+++ b/src/npc/smallTownMinish.c
@@ -4,7 +4,6 @@
  *
  * @brief Small Town Minish NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/npc/smith.c b/src/npc/smith.c
index 61303812..940bd75a 100644
--- a/src/npc/smith.c
+++ b/src/npc/smith.c
@@ -4,7 +4,6 @@
  *
  * @brief Smith NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "npc.h"
 
diff --git a/src/npc/stamp.c b/src/npc/stamp.c
index 59322c18..8051fe44 100644
--- a/src/npc/stamp.c
+++ b/src/npc/stamp.c
@@ -4,7 +4,6 @@
  *
  * @brief Stamp NPC
  */
-#define NENT_DEPRECATED
 #include "effects.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c
index 2c9dbe00..dc930fd9 100644
--- a/src/npc/stockwell.c
+++ b/src/npc/stockwell.c
@@ -4,7 +4,6 @@
  *
  * @brief Stockwell NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "game.h"
diff --git a/src/npc/sturgeon.c b/src/npc/sturgeon.c
index 4ba1906e..9bc3bd84 100644
--- a/src/npc/sturgeon.c
+++ b/src/npc/sturgeon.c
@@ -4,7 +4,6 @@
  *
  * @brief Sturgeon NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/npc/syrup.c b/src/npc/syrup.c
index c8d5d6c4..60083964 100644
--- a/src/npc/syrup.c
+++ b/src/npc/syrup.c
@@ -4,7 +4,6 @@
  *
  * @brief Syrup NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "npc.h"
 #include "object.h"
diff --git a/src/npc/talon.c b/src/npc/talon.c
index 7a93007e..9e2cdfc9 100644
--- a/src/npc/talon.c
+++ b/src/npc/talon.c
@@ -4,7 +4,6 @@
  *
  * @brief Talon NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "item.h"
 #include "npc.h"
diff --git a/src/npc/teachers.c b/src/npc/teachers.c
index 527e357a..609c7bc4 100644
--- a/src/npc/teachers.c
+++ b/src/npc/teachers.c
@@ -4,7 +4,6 @@
  *
  * @brief Teachers NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "player.h"
diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c
index cd113f45..3d4b26e8 100644
--- a/src/npc/tingleSiblings.c
+++ b/src/npc/tingleSiblings.c
@@ -4,7 +4,6 @@
  *
  * @brief Tingle Siblings NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index e8914c76..f29f6e4e 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -4,7 +4,6 @@
  *
  * @brief Town Minish NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index 593c3160..967a6645 100644
--- a/src/npc/townsperson.c
+++ b/src/npc/townsperson.c
@@ -4,7 +4,6 @@
  *
  * @brief Townsperson NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "item.h"
 #include "npc.h"
diff --git a/src/npc/vaati.c b/src/npc/vaati.c
index 9f1c9482..d272f3d8 100644
--- a/src/npc/vaati.c
+++ b/src/npc/vaati.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "script.h"
diff --git a/src/npc/vaatiReborn.c b/src/npc/vaatiReborn.c
index 5e80be89..82c349be 100644
--- a/src/npc/vaatiReborn.c
+++ b/src/npc/vaatiReborn.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati Reborn NPC
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "npc.h"
 
diff --git a/src/npc/wheaton.c b/src/npc/wheaton.c
index 7638a205..41eb8ac9 100644
--- a/src/npc/wheaton.c
+++ b/src/npc/wheaton.c
@@ -4,7 +4,6 @@
  *
  * @brief Wheaton NPC
  */
-#define NENT_DEPRECATED
 #include "npc.h"
 
 void Wheaton(Entity* this) {
diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c
index ef37526f..521e850b 100644
--- a/src/npc/windTribespeople.c
+++ b/src/npc/windTribespeople.c
@@ -4,7 +4,6 @@
  *
  * @brief Wind Tribespeople NPC
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "npc.h"
 #include "sound.h"
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index 8d90f91a..c1f80998 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -4,7 +4,6 @@
  *
  * @brief Zelda NPC
  */
-#define NENT_DEPRECATED
 #include "npc/zelda.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/npc/zeldaFollower.c b/src/npc/zeldaFollower.c
index 349c9338..45315961 100644
--- a/src/npc/zeldaFollower.c
+++ b/src/npc/zeldaFollower.c
@@ -4,7 +4,6 @@
  *
  * @brief Zelda Follower NPC
  */
-#define NENT_DEPRECATED
 #include "npc/zelda.h"
 #include "common.h"
 #include "entity.h"
diff --git a/src/object/ambientClouds.c b/src/object/ambientClouds.c
index c24b16f4..d7470d7d 100644
--- a/src/object/ambientClouds.c
+++ b/src/object/ambientClouds.c
@@ -4,7 +4,6 @@
  *
  * @brief Ambient Clouds object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/object/angryStatue.c b/src/object/angryStatue.c
index 75e705e3..0204c90e 100644
--- a/src/object/angryStatue.c
+++ b/src/object/angryStatue.c
@@ -4,7 +4,6 @@
  *
  * @brief Angry Statue object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "hitbox.h"
diff --git a/src/object/archway.c b/src/object/archway.c
index 2feceae8..76a9df16 100644
--- a/src/object/archway.c
+++ b/src/object/archway.c
@@ -4,7 +4,6 @@
  *
  * @brief Archway object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "game.h"
 
diff --git a/src/object/backgroundCloud.c b/src/object/backgroundCloud.c
index 691ff2cb..0c150823 100644
--- a/src/object/backgroundCloud.c
+++ b/src/object/backgroundCloud.c
@@ -4,7 +4,6 @@
  *
  * @brief BackgroundCloud object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 typedef struct {
diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c
index a84472db..65683a8c 100644
--- a/src/object/bakerOven.c
+++ b/src/object/bakerOven.c
@@ -4,7 +4,6 @@
  *
  * @brief Baker Oven object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/barrelInside.c b/src/object/barrelInside.c
index 1bd43f7e..3ef99da4 100644
--- a/src/object/barrelInside.c
+++ b/src/object/barrelInside.c
@@ -4,7 +4,6 @@
  *
  * @brief Barrel Inside object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 typedef struct {
diff --git a/src/object/barrelSpiderweb.c b/src/object/barrelSpiderweb.c
index a3dcc448..4e5ca85d 100644
--- a/src/object/barrelSpiderweb.c
+++ b/src/object/barrelSpiderweb.c
@@ -4,7 +4,6 @@
  *
  * @brief Barrel Spiderweb object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/beanstalk.c b/src/object/beanstalk.c
index d2f7899c..f1749ccd 100644
--- a/src/object/beanstalk.c
+++ b/src/object/beanstalk.c
@@ -4,7 +4,6 @@
  *
  * @brief Beanstalk object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/bedCover.c b/src/object/bedCover.c
index 7e9f62a3..a24189f5 100644
--- a/src/object/bedCover.c
+++ b/src/object/bedCover.c
@@ -4,7 +4,6 @@
  *
  * @brief Bed Cover object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/bell.c b/src/object/bell.c
index 59d9baf5..5898b204 100644
--- a/src/object/bell.c
+++ b/src/object/bell.c
@@ -4,7 +4,6 @@
  *
  * @brief Bell object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 void Bell_Init(Entity* this);
diff --git a/src/object/bench.c b/src/object/bench.c
index 5c196409..ead81b3b 100644
--- a/src/object/bench.c
+++ b/src/object/bench.c
@@ -4,7 +4,6 @@
  *
  * @brief Bench object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "player.h"
diff --git a/src/object/bigBarrel.c b/src/object/bigBarrel.c
index 07708c40..0dd13f8f 100644
--- a/src/object/bigBarrel.c
+++ b/src/object/bigBarrel.c
@@ -4,7 +4,6 @@
  *
  * @brief Big Barrel object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "common.h"
 #include "entity.h"
diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c
index 6ad61e85..e52d4323 100644
--- a/src/object/bigIceBlock.c
+++ b/src/object/bigIceBlock.c
@@ -4,7 +4,6 @@
  *
  * @brief Big Ice Block object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "item.h"
diff --git a/src/object/bigPushableLever.c b/src/object/bigPushableLever.c
index be0c1a32..41b7a21c 100644
--- a/src/object/bigPushableLever.c
+++ b/src/object/bigPushableLever.c
@@ -4,7 +4,6 @@
  *
  * @brief Big Pushable Lever object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/bigVortex.c b/src/object/bigVortex.c
index 7efe0113..9a5b3c51 100644
--- a/src/object/bigVortex.c
+++ b/src/object/bigVortex.c
@@ -4,7 +4,6 @@
  *
  * @brief Big Vortex object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/bird.c b/src/object/bird.c
index 485c0695..a4fa24dc 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -4,7 +4,6 @@
  *
  * @brief Bird object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "game.h"
diff --git a/src/object/blockPushed.c b/src/object/blockPushed.c
index d871f4ac..b7173736 100644
--- a/src/object/blockPushed.c
+++ b/src/object/blockPushed.c
@@ -4,7 +4,6 @@
  *
  * @brief Block Pushed object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/board.c b/src/object/board.c
index 6bb75f1c..d7bf16d0 100644
--- a/src/object/board.c
+++ b/src/object/board.c
@@ -4,7 +4,6 @@
  *
  * @brief Board object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/bollard.c b/src/object/bollard.c
index 2f73e5be..6a5d45cc 100644
--- a/src/object/bollard.c
+++ b/src/object/bollard.c
@@ -4,7 +4,6 @@
  *
  * @brief Bollard object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/book.c b/src/object/book.c
index 4ebd3f7d..50bf896e 100644
--- a/src/object/book.c
+++ b/src/object/book.c
@@ -4,7 +4,6 @@
  *
  * @brief Book object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/object/bossDoor.c b/src/object/bossDoor.c
index cf18f937..8eb3497e 100644
--- a/src/object/bossDoor.c
+++ b/src/object/bossDoor.c
@@ -4,7 +4,6 @@
  *
  * @brief Boss Door object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/bush.c b/src/object/bush.c
index 857e63f7..4cad7205 100644
--- a/src/object/bush.c
+++ b/src/object/bush.c
@@ -4,7 +4,6 @@
  *
  * @brief Bush object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/button.c b/src/object/button.c
index 0bf4bb7e..2a025542 100644
--- a/src/object/button.c
+++ b/src/object/button.c
@@ -4,7 +4,6 @@
  *
  * @brief Button object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/cabinFurniture.c b/src/object/cabinFurniture.c
index c2704dcd..e23df88c 100644
--- a/src/object/cabinFurniture.c
+++ b/src/object/cabinFurniture.c
@@ -4,7 +4,6 @@
  *
  * @brief Cabin Furniture object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/cameraTarget.c b/src/object/cameraTarget.c
index e21b2f7d..0eaa13ea 100644
--- a/src/object/cameraTarget.c
+++ b/src/object/cameraTarget.c
@@ -4,7 +4,6 @@
  *
  * @brief Camera Target object
  */
-#define NENT_DEPRECATED
 #include "common.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/carlovObject.c b/src/object/carlovObject.c
index 003b61f0..2a093491 100644
--- a/src/object/carlovObject.c
+++ b/src/object/carlovObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Carlov Object object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c
index dd9038db..3b964436 100644
--- a/src/object/chestSpawner.c
+++ b/src/object/chestSpawner.c
@@ -4,7 +4,6 @@
  *
  * @brief Chest Spawner object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "item.h"
 #include "object.h"
diff --git a/src/object/chuchuBossCutscene.c b/src/object/chuchuBossCutscene.c
index 235a1f91..9c1287f2 100644
--- a/src/object/chuchuBossCutscene.c
+++ b/src/object/chuchuBossCutscene.c
@@ -4,7 +4,6 @@
  *
  * @brief Chuchu Boss Cutscene object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "menu.h"
 #include "object.h"
diff --git a/src/object/chuchuBossParticle.c b/src/object/chuchuBossParticle.c
index b0b0da51..355405c4 100644
--- a/src/object/chuchuBossParticle.c
+++ b/src/object/chuchuBossParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief Chuchu Boss Particle object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void ChuchuBossParticle_Init(Entity*);
diff --git a/src/object/chuchuBossStartParticle.c b/src/object/chuchuBossStartParticle.c
index 25763c0f..ddd7032a 100644
--- a/src/object/chuchuBossStartParticle.c
+++ b/src/object/chuchuBossStartParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief Chuchu Boss Start Particle object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/cloud.c b/src/object/cloud.c
index 9f99213d..d1ec3e74 100644
--- a/src/object/cloud.c
+++ b/src/object/cloud.c
@@ -4,7 +4,6 @@
  *
  * @brief Cloud object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 #include "structures.h"
diff --git a/src/object/crackingGround.c b/src/object/crackingGround.c
index 21845417..3c8c9e85 100644
--- a/src/object/crackingGround.c
+++ b/src/object/crackingGround.c
@@ -4,7 +4,6 @@
  *
  * @brief Cracking Ground object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c
index 7480ba07..3b2efb83 100644
--- a/src/object/crenelBeanSprout.c
+++ b/src/object/crenelBeanSprout.c
@@ -4,7 +4,6 @@
  *
  * @brief Crenel Bean Sprout object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c
index 75b9dc59..d1da7c44 100644
--- a/src/object/cuccoMinigame.c
+++ b/src/object/cuccoMinigame.c
@@ -5,7 +5,6 @@
  *
  * @brief Cucco Minigame object
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "fileselect.h"
diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c
index 44fc603f..c1d5cc1e 100644
--- a/src/object/cutsceneMiscObject.c
+++ b/src/object/cutsceneMiscObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Cutscene Misc object
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/object/cutsceneOrchestrator.c b/src/object/cutsceneOrchestrator.c
index e844b93d..efc726a3 100644
--- a/src/object/cutsceneOrchestrator.c
+++ b/src/object/cutsceneOrchestrator.c
@@ -4,7 +4,6 @@
  *
  * @brief Cutscene Orchestrator object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/object/deathFx.c b/src/object/deathFx.c
index 2d4204e4..2f51e110 100644
--- a/src/object/deathFx.c
+++ b/src/object/deathFx.c
@@ -4,7 +4,6 @@
  *
  * @brief Death Fx object
  */
-#define NENT_DEPRECATED
 #include "object/deathFx.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/object/dirtParticle.c b/src/object/dirtParticle.c
index 8bf6bd31..f6bdf51c 100644
--- a/src/object/dirtParticle.c
+++ b/src/object/dirtParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief Dirt Particle object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/doubleBookshelf.c b/src/object/doubleBookshelf.c
index 3003c776..d96a80cb 100644
--- a/src/object/doubleBookshelf.c
+++ b/src/object/doubleBookshelf.c
@@ -4,7 +4,6 @@
  *
  * @brief Double Bookshelf object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/elementsBackground.c b/src/object/elementsBackground.c
index e02bba1b..f046d3b7 100644
--- a/src/object/elementsBackground.c
+++ b/src/object/elementsBackground.c
@@ -4,7 +4,6 @@
  *
  * @brief Elements Background object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "screen.h"
diff --git a/src/object/enemyItem.c b/src/object/enemyItem.c
index 3f199ff8..16cae432 100644
--- a/src/object/enemyItem.c
+++ b/src/object/enemyItem.c
@@ -4,7 +4,6 @@
  *
  * @brief Enemy Item object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/evilSpirit.c b/src/object/evilSpirit.c
index 0208d997..cb42b88b 100644
--- a/src/object/evilSpirit.c
+++ b/src/object/evilSpirit.c
@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "flags.h"
diff --git a/src/object/eyeSwitch.c b/src/object/eyeSwitch.c
index 8769fd4f..152d511a 100644
--- a/src/object/eyeSwitch.c
+++ b/src/object/eyeSwitch.c
@@ -4,7 +4,6 @@
  *
  * @brief EyeSwitch object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "hitbox.h"
diff --git a/src/object/ezloCap.c b/src/object/ezloCap.c
index 4c7f39bb..8cb07487 100644
--- a/src/object/ezloCap.c
+++ b/src/object/ezloCap.c
@@ -4,7 +4,6 @@
  *
  * @brief Ezlo Cap object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "message.h"
 #include "object.h"
diff --git a/src/object/ezloCapFlying.c b/src/object/ezloCapFlying.c
index d05ada5f..21a7faff 100644
--- a/src/object/ezloCapFlying.c
+++ b/src/object/ezloCapFlying.c
@@ -4,7 +4,6 @@
  *
  * @brief Ezlo Cap Flying object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "new_player.h"
 #include "object.h"
diff --git a/src/object/fairy.c b/src/object/fairy.c
index e937288f..1389f1fa 100644
--- a/src/object/fairy.c
+++ b/src/object/fairy.c
@@ -4,7 +4,6 @@
  *
  * @brief Fairy object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/object/fan.c b/src/object/fan.c
index b1197147..bf9e5d27 100644
--- a/src/object/fan.c
+++ b/src/object/fan.c
@@ -4,7 +4,6 @@
  *
  * @brief Fan object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/fanWind.c b/src/object/fanWind.c
index 3f6d74b3..a33a58d7 100644
--- a/src/object/fanWind.c
+++ b/src/object/fanWind.c
@@ -4,7 +4,6 @@
  *
  * @brief Fan Wind object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/figurineDevice.c b/src/object/figurineDevice.c
index 86c09f1d..b3aadfaf 100644
--- a/src/object/figurineDevice.c
+++ b/src/object/figurineDevice.c
@@ -4,7 +4,6 @@
  *
  * @brief Figurine Device object
  */
-#define NENT_DEPRECATED
 #include "figurineMenu.h"
 #include "fileselect.h"
 #include "functions.h"
diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c
index 42afe6f5..b474fdd6 100644
--- a/src/object/fileScreenObjects.c
+++ b/src/object/fileScreenObjects.c
@@ -4,7 +4,6 @@
  *
  * @brief File Screen Objects object
  */
-#define NENT_DEPRECATED
 #include "fileselect.h"
 #include "functions.h"
 #include "main.h"
diff --git a/src/object/fireballChain.c b/src/object/fireballChain.c
index 3e9905a7..af1aa68e 100644
--- a/src/object/fireballChain.c
+++ b/src/object/fireballChain.c
@@ -4,7 +4,6 @@
  *
  * @brief Fireball Chain object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "global.h"
diff --git a/src/object/fireplace.c b/src/object/fireplace.c
index 50b959c3..98cfa2a6 100644
--- a/src/object/fireplace.c
+++ b/src/object/fireplace.c
@@ -4,7 +4,6 @@
  *
  * @brief Fireplace object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/flame.c b/src/object/flame.c
index b31ae8a2..34013762 100644
--- a/src/object/flame.c
+++ b/src/object/flame.c
@@ -4,7 +4,6 @@
  *
  * @brief Flame object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/floatingBlock.c b/src/object/floatingBlock.c
index 7457797f..79b784b5 100644
--- a/src/object/floatingBlock.c
+++ b/src/object/floatingBlock.c
@@ -4,7 +4,6 @@
  *
  * @brief Floating Block object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 void FloatingBlock(Entity* this) {
diff --git a/src/object/floatingPlatform.c b/src/object/floatingPlatform.c
index 76f00964..5da525f0 100644
--- a/src/object/floatingPlatform.c
+++ b/src/object/floatingPlatform.c
@@ -4,7 +4,6 @@
  *
  * @brief Floating Platform object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/object/fourElements.c b/src/object/fourElements.c
index bb99e701..0968a61c 100644
--- a/src/object/fourElements.c
+++ b/src/object/fourElements.c
@@ -4,7 +4,6 @@
  *
  * @brief Four Elements object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/object/frozenFlower.c b/src/object/frozenFlower.c
index d046715c..0b93b1de 100644
--- a/src/object/frozenFlower.c
+++ b/src/object/frozenFlower.c
@@ -4,7 +4,6 @@
  *
  * @brief Frozen Flower object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 void FrozenFlower_Init(Entity*);
diff --git a/src/object/frozenOctorok.c b/src/object/frozenOctorok.c
index 089436dc..800f77fc 100644
--- a/src/object/frozenOctorok.c
+++ b/src/object/frozenOctorok.c
@@ -4,7 +4,6 @@
  *
  * @brief Frozen Octorok object
  */
-#define NENT_DEPRECATED
 #include "enemy/octorokBoss.h"
 #include "functions.h"
 #include "message.h"
diff --git a/src/object/frozenWaterElement.c b/src/object/frozenWaterElement.c
index eb91890c..dd40d3ab 100644
--- a/src/object/frozenWaterElement.c
+++ b/src/object/frozenWaterElement.c
@@ -4,7 +4,6 @@
  *
  * @brief Frozen Water Element object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/furniture.c b/src/object/furniture.c
index 0e88178c..7a816166 100644
--- a/src/object/furniture.c
+++ b/src/object/furniture.c
@@ -4,7 +4,6 @@
  *
  * @brief Furniture object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/object/gentariCurtain.c b/src/object/gentariCurtain.c
index bcfce42e..d980d400 100644
--- a/src/object/gentariCurtain.c
+++ b/src/object/gentariCurtain.c
@@ -4,7 +4,6 @@
  *
  * @brief Gentari Curtain object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/giantBookLadder.c b/src/object/giantBookLadder.c
index fd1e2a25..1553723b 100644
--- a/src/object/giantBookLadder.c
+++ b/src/object/giantBookLadder.c
@@ -4,7 +4,6 @@
  *
  * @brief Giant Book Ladder object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 #include "manager.h"
 
diff --git a/src/object/giantLeaf.c b/src/object/giantLeaf.c
index 15923716..5c6b1d3c 100644
--- a/src/object/giantLeaf.c
+++ b/src/object/giantLeaf.c
@@ -4,7 +4,6 @@
  *
  * @brief Giant Leaf object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 void sub_0808D618(Entity* this);
diff --git a/src/object/giantRock.c b/src/object/giantRock.c
index 9c7cf68f..c8a5747e 100644
--- a/src/object/giantRock.c
+++ b/src/object/giantRock.c
@@ -4,7 +4,6 @@
  *
  * @brief Giant Rock object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void GiantRock(Entity* this) {
diff --git a/src/object/giantRock2.c b/src/object/giantRock2.c
index 09080f29..2f5765da 100644
--- a/src/object/giantRock2.c
+++ b/src/object/giantRock2.c
@@ -4,7 +4,6 @@
  *
  * @brief Giant Rock 2 object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "room.h"
diff --git a/src/object/giantTwig.c b/src/object/giantTwig.c
index 6bb928ce..bc936e18 100644
--- a/src/object/giantTwig.c
+++ b/src/object/giantTwig.c
@@ -4,7 +4,6 @@
  *
  * @brief Giant Twig object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/gleerokParticle.c b/src/object/gleerokParticle.c
index 67efcb36..03ed1d2f 100644
--- a/src/object/gleerokParticle.c
+++ b/src/object/gleerokParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief Gleerok Particle object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/object/graveyardKey.c b/src/object/graveyardKey.c
index bef307ed..84f618df 100644
--- a/src/object/graveyardKey.c
+++ b/src/object/graveyardKey.c
@@ -4,7 +4,6 @@
  *
  * @brief Graveyard Key object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "effects.h"
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index 1416d564..376f931e 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -4,7 +4,6 @@
  *
  * @brief Great Fairy object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 #include "save.h"
diff --git a/src/object/guruguruBar.c b/src/object/guruguruBar.c
index 2c1365c1..40fa7d41 100644
--- a/src/object/guruguruBar.c
+++ b/src/object/guruguruBar.c
@@ -4,7 +4,6 @@
  *
  * @brief Guruguru Bar object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/object/gustJarParticle.c b/src/object/gustJarParticle.c
index 4c03551f..b55e2d16 100644
--- a/src/object/gustJarParticle.c
+++ b/src/object/gustJarParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief Gust Jar Particle object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "physics.h"
diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c
index a5c34d89..0197a246 100644
--- a/src/object/gyorgBossObject.c
+++ b/src/object/gyorgBossObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Boss object
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy/gyorg.h"
 #include "entity.h"
diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c
index 95d1b074..1817b8c3 100644
--- a/src/object/heartContainer.c
+++ b/src/object/heartContainer.c
@@ -4,7 +4,6 @@
  *
  * @brief HeartContainer object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/hiddenLadderDown.c b/src/object/hiddenLadderDown.c
index b17d9717..5b12f8a6 100644
--- a/src/object/hiddenLadderDown.c
+++ b/src/object/hiddenLadderDown.c
@@ -4,7 +4,6 @@
  *
  * @brief Hidden Ladder Down object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/hitSwitch.c b/src/object/hitSwitch.c
index a0931519..4763a4ac 100644
--- a/src/object/hitSwitch.c
+++ b/src/object/hitSwitch.c
@@ -4,7 +4,6 @@
  *
  * @brief Hit Switch object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/object/hittableLever.c b/src/object/hittableLever.c
index d92fbfa3..8e6b63be 100644
--- a/src/object/hittableLever.c
+++ b/src/object/hittableLever.c
@@ -4,7 +4,6 @@
  *
  * @brief Hittable Lever object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c
index 2835e202..676ad461 100644
--- a/src/object/houseDoorExterior.c
+++ b/src/object/houseDoorExterior.c
@@ -4,7 +4,6 @@
  *
  * @brief House Door Exterior object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/houseDoorInterior.c b/src/object/houseDoorInterior.c
index 8e69feef..75b2dd27 100644
--- a/src/object/houseDoorInterior.c
+++ b/src/object/houseDoorInterior.c
@@ -4,7 +4,6 @@
  *
  * @brief House Door Interior object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/houseSign.c b/src/object/houseSign.c
index 4353e3ad..29a7dc5c 100644
--- a/src/object/houseSign.c
+++ b/src/object/houseSign.c
@@ -4,7 +4,6 @@
  *
  * @brief HouseSign object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 
diff --git a/src/object/itemForSale.c b/src/object/itemForSale.c
index 0106fb63..dda0c547 100644
--- a/src/object/itemForSale.c
+++ b/src/object/itemForSale.c
@@ -4,7 +4,6 @@
  *
  * @brief Item for Sale object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "kinstone.h"
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index 8aff156f..f3f6a62f 100644
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -4,7 +4,6 @@
  *
  * @brief Item On Ground object
  */
-#define NENT_DEPRECATED
 #include "object/itemOnGround.h"
 #include "collision.h"
 #include "entity.h"
diff --git a/src/object/jailBars.c b/src/object/jailBars.c
index fb81b2b8..814a7bff 100644
--- a/src/object/jailBars.c
+++ b/src/object/jailBars.c
@@ -4,7 +4,6 @@
  *
  * @brief Jail Bars object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/japaneseSubtitle.c b/src/object/japaneseSubtitle.c
index 745b7b1a..11e7f85f 100644
--- a/src/object/japaneseSubtitle.c
+++ b/src/object/japaneseSubtitle.c
@@ -4,7 +4,6 @@
  *
  * @brief Japanese Subtitle object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "menu.h"
 #include "object.h"
diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c
index 90aaf6a0..aa94b26f 100644
--- a/src/object/jarPortal.c
+++ b/src/object/jarPortal.c
@@ -4,7 +4,6 @@
  *
  * @brief Jar Portal object
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c
index 8a5a40b1..de25fd6a 100644
--- a/src/object/keyStealingTakkuri.c
+++ b/src/object/keyStealingTakkuri.c
@@ -4,7 +4,6 @@
  *
  * @brief Key Stealing Takkuri object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/kinstoneSpark.c b/src/object/kinstoneSpark.c
index 56da199c..ad596c89 100644
--- a/src/object/kinstoneSpark.c
+++ b/src/object/kinstoneSpark.c
@@ -4,7 +4,6 @@
  *
  * @brief Kinstone Fusion Particle object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "kinstone.h"
 #include "object.h"
diff --git a/src/object/ladderHoleInBookshelf.c b/src/object/ladderHoleInBookshelf.c
index 9c856fe8..dd55d741 100644
--- a/src/object/ladderHoleInBookshelf.c
+++ b/src/object/ladderHoleInBookshelf.c
@@ -4,7 +4,6 @@
  *
  * @brief Ladder Hole In Bookshelf object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "player.h"
 
diff --git a/src/object/ladderUp.c b/src/object/ladderUp.c
index 8722022a..8743fadc 100644
--- a/src/object/ladderUp.c
+++ b/src/object/ladderUp.c
@@ -4,7 +4,6 @@
  *
  * @brief Ladder Up object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/object/lamp.c b/src/object/lamp.c
index 705d43e5..1992f36a 100644
--- a/src/object/lamp.c
+++ b/src/object/lamp.c
@@ -4,7 +4,6 @@
  *
  * @brief Lamp object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void Lamp_Init(Entity* this);
diff --git a/src/object/lampParticle.c b/src/object/lampParticle.c
index 85c73532..fbdd3abb 100644
--- a/src/object/lampParticle.c
+++ b/src/object/lampParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief LampParticle object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "item.h"
 #include "player.h"
diff --git a/src/object/lavaPlatform.c b/src/object/lavaPlatform.c
index be968d08..a98cd00b 100644
--- a/src/object/lavaPlatform.c
+++ b/src/object/lavaPlatform.c
@@ -4,7 +4,6 @@
  *
  * @brief Lava Platform object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/lightDoor.c b/src/object/lightDoor.c
index b8c30d7b..e128c65c 100644
--- a/src/object/lightDoor.c
+++ b/src/object/lightDoor.c
@@ -4,7 +4,6 @@
  *
  * @brief Light Door object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 #include "screen.h"
diff --git a/src/object/lightRay.c b/src/object/lightRay.c
index bd437bc6..9d0b6548 100644
--- a/src/object/lightRay.c
+++ b/src/object/lightRay.c
@@ -4,7 +4,6 @@
  *
  * @brief Light Ray object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 #include "screen.h"
diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c
index 4484c9c4..927a4c9d 100644
--- a/src/object/lightableSwitch.c
+++ b/src/object/lightableSwitch.c
@@ -4,7 +4,6 @@
  *
  * @brief Lightable Switch object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index 5571ca47..3f47f21c 100644
--- a/src/object/lilypadLarge.c
+++ b/src/object/lilypadLarge.c
@@ -4,7 +4,6 @@
  *
  * @brief Large Lilypad object
  */
-#define NENT_DEPRECATED
 #include "object/lilypadLarge.h"
 #include "area.h"
 #include "functions.h"
diff --git a/src/object/lilypadLargeFalling.c b/src/object/lilypadLargeFalling.c
index e32b0f88..d0b19b12 100644
--- a/src/object/lilypadLargeFalling.c
+++ b/src/object/lilypadLargeFalling.c
@@ -4,7 +4,6 @@
  *
  * @brief LilypadLargeFalling object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "object/lilypadLarge.h"
diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c
index 1d84c392..78e91a99 100644
--- a/src/object/lilypadSmall.c
+++ b/src/object/lilypadSmall.c
@@ -4,7 +4,6 @@
  *
  * @brief Lilypad Small object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/linkAnimation.c b/src/object/linkAnimation.c
index 5f790559..123d6e77 100644
--- a/src/object/linkAnimation.c
+++ b/src/object/linkAnimation.c
@@ -5,7 +5,6 @@
  * @brief Link Animation object. This is used during "item get" sequences and
  * replaces the player entity for the duration.
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "message.h"
 #include "object.h"
diff --git a/src/object/linkEmptyingBottle.c b/src/object/linkEmptyingBottle.c
index f9787ac4..8f029f69 100644
--- a/src/object/linkEmptyingBottle.c
+++ b/src/object/linkEmptyingBottle.c
@@ -5,7 +5,6 @@
  * @brief Link Emptying Bottle object
  * Handles effects of using water, mineral water or a fairy in a bottle in PlayerItemBottle_UseOther.
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "item.h"
 #include "object.h"
diff --git a/src/object/linkFire.c b/src/object/linkFire.c
index 7a5b4292..8d7223f7 100644
--- a/src/object/linkFire.c
+++ b/src/object/linkFire.c
@@ -4,7 +4,6 @@
  *
  * @brief Link Fire object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/linkHoldingItem.c b/src/object/linkHoldingItem.c
index 009535a7..6e5bedd2 100644
--- a/src/object/linkHoldingItem.c
+++ b/src/object/linkHoldingItem.c
@@ -4,7 +4,6 @@
  *
  * @brief Link Holding Item object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "game.h"
 #include "item.h"
diff --git a/src/object/litArea.c b/src/object/litArea.c
index 8d39ddf1..53b34d1f 100644
--- a/src/object/litArea.c
+++ b/src/object/litArea.c
@@ -4,7 +4,6 @@
  *
  * @brief Lit Area object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c
index ae3ae896..6395744c 100644
--- a/src/object/lockedDoor.c
+++ b/src/object/lockedDoor.c
@@ -4,7 +4,6 @@
  *
  * @brief Looked Door object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "common.h"
 #include "effects.h"
diff --git a/src/object/macroAcorn.c b/src/object/macroAcorn.c
index 044ab9f1..a7f32871 100644
--- a/src/object/macroAcorn.c
+++ b/src/object/macroAcorn.c
@@ -4,7 +4,6 @@
  *
  * @brief Macro Acorn object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "object.h"
 #include "physics.h"
diff --git a/src/object/macroBook.c b/src/object/macroBook.c
index 0c116b44..5e289acb 100644
--- a/src/object/macroBook.c
+++ b/src/object/macroBook.c
@@ -4,7 +4,6 @@
  *
  * @brief Macro Book object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/macroDecorations.c b/src/object/macroDecorations.c
index 5227ec46..4e886ae0 100644
--- a/src/object/macroDecorations.c
+++ b/src/object/macroDecorations.c
@@ -4,7 +4,6 @@
  *
  * @brief Macro Decoration object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "room.h"
diff --git a/src/object/macroMushroomStalk.c b/src/object/macroMushroomStalk.c
index 92f70fa0..45eb8fe0 100644
--- a/src/object/macroMushroomStalk.c
+++ b/src/object/macroMushroomStalk.c
@@ -4,7 +4,6 @@
  *
  * @brief Macro Mushroom Stalk object
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "entity.h"
 #include "main.h"
diff --git a/src/object/macroPlayer.c b/src/object/macroPlayer.c
index deb5a7c8..a313729b 100644
--- a/src/object/macroPlayer.c
+++ b/src/object/macroPlayer.c
@@ -4,7 +4,6 @@
  *
  * @brief Macro Player object
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/macroShoe.c b/src/object/macroShoe.c
index e9b12000..2d4b5ac2 100644
--- a/src/object/macroShoe.c
+++ b/src/object/macroShoe.c
@@ -4,7 +4,6 @@
  *
  * @brief Macro Shoe object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 
diff --git a/src/object/mask.c b/src/object/mask.c
index e6934e5a..dc289996 100644
--- a/src/object/mask.c
+++ b/src/object/mask.c
@@ -4,7 +4,6 @@
  *
  * @brief Mask object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/mazaalBossObject.c b/src/object/mazaalBossObject.c
index c65e7c02..4e05b012 100644
--- a/src/object/mazaalBossObject.c
+++ b/src/object/mazaalBossObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Boss object
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/mazaalObject.c b/src/object/mazaalObject.c
index 68c76041..949e3897 100644
--- a/src/object/mazaalObject.c
+++ b/src/object/mazaalObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Object object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c
index 0703a301..0c7fbfd0 100644
--- a/src/object/metalDoor.c
+++ b/src/object/metalDoor.c
@@ -4,7 +4,6 @@
  *
  * @brief Metal Door object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/object/minecart.c b/src/object/minecart.c
index 73cf2e51..6f0e0b18 100644
--- a/src/object/minecart.c
+++ b/src/object/minecart.c
@@ -4,7 +4,6 @@
  *
  * @brief Minecart object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/minecartDoor.c b/src/object/minecartDoor.c
index a6746467..0ce907e3 100644
--- a/src/object/minecartDoor.c
+++ b/src/object/minecartDoor.c
@@ -4,7 +4,6 @@
  *
  * @brief Minecart Door object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/mineralWaterSource.c b/src/object/mineralWaterSource.c
index 56667b11..e60006d8 100644
--- a/src/object/mineralWaterSource.c
+++ b/src/object/mineralWaterSource.c
@@ -4,7 +4,6 @@
  *
  * @brief Mineral Water Source object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 void MineralWaterSource_Init(Entity*);
diff --git a/src/object/minishEmoticon.c b/src/object/minishEmoticon.c
index 279c66e4..0904b1cb 100644
--- a/src/object/minishEmoticon.c
+++ b/src/object/minishEmoticon.c
@@ -4,7 +4,6 @@
  *
  * @brief Minish Emoticon object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 
diff --git a/src/object/minishLight.c b/src/object/minishLight.c
index 36569b66..382056ee 100644
--- a/src/object/minishLight.c
+++ b/src/object/minishLight.c
@@ -4,7 +4,6 @@
  *
  * @brief Minish Light object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void MinishLight_Init(Entity*);
diff --git a/src/object/minishPortalCloseup.c b/src/object/minishPortalCloseup.c
index e683e3bc..e9ded723 100644
--- a/src/object/minishPortalCloseup.c
+++ b/src/object/minishPortalCloseup.c
@@ -4,7 +4,6 @@
  *
  * @brief Minish Portal Closeup object
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "functions.h"
 #include "main.h"
diff --git a/src/object/minishPortalStone.c b/src/object/minishPortalStone.c
index 5dc4bfcf..929f65ac 100644
--- a/src/object/minishPortalStone.c
+++ b/src/object/minishPortalStone.c
@@ -4,7 +4,6 @@
  *
  * @brief Minish Portal Stone object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 #include "screen.h"
diff --git a/src/object/minishSizedArchway.c b/src/object/minishSizedArchway.c
index e92e6fef..01a81cfc 100644
--- a/src/object/minishSizedArchway.c
+++ b/src/object/minishSizedArchway.c
@@ -4,7 +4,6 @@
  *
  * @brief Minish Sized Archway object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "game.h"
 
diff --git a/src/object/minishSizedEntrance.c b/src/object/minishSizedEntrance.c
index d63eba55..c12192c2 100644
--- a/src/object/minishSizedEntrance.c
+++ b/src/object/minishSizedEntrance.c
@@ -4,7 +4,6 @@
  *
  * @brief MinishSizedEntrance object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "game.h"
 #include "object.h"
diff --git a/src/object/minishVillageObject.c b/src/object/minishVillageObject.c
index dbefdeb9..ef5c9780 100644
--- a/src/object/minishVillageObject.c
+++ b/src/object/minishVillageObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Minish Village Object object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 #include "screen.h"
diff --git a/src/object/moleMittsParticle.c b/src/object/moleMittsParticle.c
index 02f3e72e..29e2a971 100644
--- a/src/object/moleMittsParticle.c
+++ b/src/object/moleMittsParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief Mole Mitts Particle object
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/object/mulldozerSpawnPoint.c b/src/object/mulldozerSpawnPoint.c
index 17a33331..8ba4d3b0 100644
--- a/src/object/mulldozerSpawnPoint.c
+++ b/src/object/mulldozerSpawnPoint.c
@@ -4,7 +4,6 @@
  *
  * @brief Mulldozer Spawn Point object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "sound.h"
 
diff --git a/src/object/object1D.c b/src/object/object1D.c
index 4252f9b0..0635d64c 100644
--- a/src/object/object1D.c
+++ b/src/object/object1D.c
@@ -4,7 +4,6 @@
  *
  * @brief Object1D object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void Object1D_Init(Entity*);
diff --git a/src/object/object1F.c b/src/object/object1F.c
index bff26637..292ee2cd 100644
--- a/src/object/object1F.c
+++ b/src/object/object1F.c
@@ -4,7 +4,6 @@
  *
  * @brief Object1F object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/object/object30.c b/src/object/object30.c
index 446d2bf6..61b3448f 100644
--- a/src/object/object30.c
+++ b/src/object/object30.c
@@ -4,7 +4,6 @@
  *
  * @brief Object30 object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/object/object37.c b/src/object/object37.c
index 619f8482..1ec12de2 100644
--- a/src/object/object37.c
+++ b/src/object/object37.c
@@ -4,7 +4,6 @@
  *
  * @brief Object37 object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/object/object53.c b/src/object/object53.c
index e7716e64..e00e9ef2 100644
--- a/src/object/object53.c
+++ b/src/object/object53.c
@@ -4,7 +4,6 @@
  *
  * @brief Object53 object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/object63.c b/src/object/object63.c
index b87c79f6..bbf74160 100644
--- a/src/object/object63.c
+++ b/src/object/object63.c
@@ -4,7 +4,6 @@
  *
  * @brief Object63 object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/object70.c b/src/object/object70.c
index efe82743..082289c8 100644
--- a/src/object/object70.c
+++ b/src/object/object70.c
@@ -4,7 +4,6 @@
  *
  * @brief Object70 object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/objectA.c b/src/object/objectA.c
index aad2385c..2d4eb4c3 100644
--- a/src/object/objectA.c
+++ b/src/object/objectA.c
@@ -4,7 +4,6 @@
  *
  * @brief ObjectA object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/objectA2.c b/src/object/objectA2.c
index 4f9c55cb..5aca031b 100644
--- a/src/object/objectA2.c
+++ b/src/object/objectA2.c
@@ -4,7 +4,6 @@
  *
  * @brief Object A2 object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "menu.h"
 #include "object.h"
diff --git a/src/object/objectA7.c b/src/object/objectA7.c
index a711d644..bf8cc69e 100644
--- a/src/object/objectA7.c
+++ b/src/object/objectA7.c
@@ -4,7 +4,6 @@
  *
  * @brief Object A7 object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void ObjectA7(Entity* this) {
diff --git a/src/object/objectA8.c b/src/object/objectA8.c
index 819495d4..f44abf38 100644
--- a/src/object/objectA8.c
+++ b/src/object/objectA8.c
@@ -4,7 +4,6 @@
  *
  * @brief ObjectA8 object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/object/objectBF.c b/src/object/objectBF.c
index 0c884d18..a66a2b61 100644
--- a/src/object/objectBF.c
+++ b/src/object/objectBF.c
@@ -4,7 +4,6 @@
  *
  * @brief Object BF object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void ObjectBF(Entity* this) {
diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c
index 18234b59..ecb5ceaf 100644
--- a/src/object/objectBlockingStairs.c
+++ b/src/object/objectBlockingStairs.c
@@ -4,7 +4,6 @@
  *
  * @brief Object Blocking Stairs object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/object/objectOnPillar.c b/src/object/objectOnPillar.c
index 6f3381dc..a4aa5860 100644
--- a/src/object/objectOnPillar.c
+++ b/src/object/objectOnPillar.c
@@ -4,7 +4,6 @@
  *
  * @brief Object on Pillar object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/objectOnSpinyBeetle.c b/src/object/objectOnSpinyBeetle.c
index 8c6beccf..064e987c 100644
--- a/src/object/objectOnSpinyBeetle.c
+++ b/src/object/objectOnSpinyBeetle.c
@@ -4,7 +4,6 @@
  *
  * @brief Object on Spiny Beetle object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c
index 1410d0d1..51143b43 100644
--- a/src/object/octorokBossObject.c
+++ b/src/object/octorokBossObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Octorok Boss Object object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "game.h"
 #include "object.h"
diff --git a/src/object/palaceArchway.c b/src/object/palaceArchway.c
index b7240a49..4f545bef 100644
--- a/src/object/palaceArchway.c
+++ b/src/object/palaceArchway.c
@@ -4,7 +4,6 @@
  *
  * @brief Palace Archway object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 void PalaceArchway_Init(Entity*);
diff --git a/src/object/paper.c b/src/object/paper.c
index a3b515ee..f45f0c6d 100644
--- a/src/object/paper.c
+++ b/src/object/paper.c
@@ -4,7 +4,6 @@
  *
  * @brief Paper object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/parallaxRoomView.c b/src/object/parallaxRoomView.c
index bd08c984..49be0837 100644
--- a/src/object/parallaxRoomView.c
+++ b/src/object/parallaxRoomView.c
@@ -4,7 +4,6 @@
  *
  * @brief Parallax Room View object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "room.h"
 
diff --git a/src/object/picoBloom.c b/src/object/picoBloom.c
index 085295e4..157e344c 100644
--- a/src/object/picoBloom.c
+++ b/src/object/picoBloom.c
@@ -4,7 +4,6 @@
  *
  * @brief Pico Bloom object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "sound.h"
diff --git a/src/object/pinwheel.c b/src/object/pinwheel.c
index e98c5144..35d161a8 100644
--- a/src/object/pinwheel.c
+++ b/src/object/pinwheel.c
@@ -4,7 +4,6 @@
  *
  * @brief Pinwheel object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "object.h"
diff --git a/src/object/playerClone.c b/src/object/playerClone.c
index 56a3c8bf..b4281f78 100644
--- a/src/object/playerClone.c
+++ b/src/object/playerClone.c
@@ -4,7 +4,6 @@
  *
  * @brief Player Clone object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "effects.h"
diff --git a/src/object/pot.c b/src/object/pot.c
index 93bc1995..4f8cd84e 100644
--- a/src/object/pot.c
+++ b/src/object/pot.c
@@ -4,7 +4,6 @@
  *
  * @brief Pot object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/pressurePlate.c b/src/object/pressurePlate.c
index a10818eb..407ba680 100644
--- a/src/object/pressurePlate.c
+++ b/src/object/pressurePlate.c
@@ -4,7 +4,6 @@
  *
  * @brief Pressure Plate object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/object/pullableLever.c b/src/object/pullableLever.c
index 4b99f202..0aaaa1ac 100644
--- a/src/object/pullableLever.c
+++ b/src/object/pullableLever.c
@@ -4,7 +4,6 @@
  *
  * @brief Pullable Lever object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/pullableMushroom.c b/src/object/pullableMushroom.c
index 0fd58dcf..8c786450 100644
--- a/src/object/pullableMushroom.c
+++ b/src/object/pullableMushroom.c
@@ -4,7 +4,6 @@
  *
  * @brief Pullable Mushroom object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "game.h"
 #include "hitbox.h"
diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c
index 58b1c1aa..da7d04d5 100644
--- a/src/object/pushableFurniture.c
+++ b/src/object/pushableFurniture.c
@@ -4,7 +4,6 @@
  *
  * @brief Pushable Furniture object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c
index 245763e3..7c7a3cbe 100644
--- a/src/object/pushableGrave.c
+++ b/src/object/pushableGrave.c
@@ -4,7 +4,6 @@
  *
  * @brief Pushable Grave object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/pushableLever.c b/src/object/pushableLever.c
index 493bf92c..2a16033b 100644
--- a/src/object/pushableLever.c
+++ b/src/object/pushableLever.c
@@ -4,7 +4,6 @@
  *
  * @brief Pushable Lever object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/pushableRock.c b/src/object/pushableRock.c
index ca862173..00d8739a 100644
--- a/src/object/pushableRock.c
+++ b/src/object/pushableRock.c
@@ -4,7 +4,6 @@
  *
  * @brief Pushable Rock object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c
index ed3de97f..f9910b31 100644
--- a/src/object/pushableStatue.c
+++ b/src/object/pushableStatue.c
@@ -4,7 +4,6 @@
  *
  * @brief Pushable Statue object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/railtrack.c b/src/object/railtrack.c
index 9fe52d41..5582202f 100644
--- a/src/object/railtrack.c
+++ b/src/object/railtrack.c
@@ -4,7 +4,6 @@
  *
  * @brief Railtrack object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/rotatingTrapdoor.c b/src/object/rotatingTrapdoor.c
index 9aa0f947..f8e05f49 100644
--- a/src/object/rotatingTrapdoor.c
+++ b/src/object/rotatingTrapdoor.c
@@ -4,7 +4,6 @@
  *
  * @brief Rotating Trapdoor object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/rupee.c b/src/object/rupee.c
index fe38b3ad..b729c071 100644
--- a/src/object/rupee.c
+++ b/src/object/rupee.c
@@ -4,7 +4,6 @@
  *
  * @brief Rupee object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/sanctuaryStoneTablet.c b/src/object/sanctuaryStoneTablet.c
index 4a107f5a..31201381 100644
--- a/src/object/sanctuaryStoneTablet.c
+++ b/src/object/sanctuaryStoneTablet.c
@@ -4,7 +4,6 @@
  *
  * @brief Sanctuary Stone Tablet object
  */
-#define NENT_DEPRECATED
 #include "effects.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/shrinkingHieroglyphs.c b/src/object/shrinkingHieroglyphs.c
index daa132f1..1fcaa801 100644
--- a/src/object/shrinkingHieroglyphs.c
+++ b/src/object/shrinkingHieroglyphs.c
@@ -4,7 +4,6 @@
  *
  * @brief Shrinking Hieroglyphs object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "player.h"
diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c
index 255dbb40..ed2cdea1 100644
--- a/src/object/smallIceBlock.c
+++ b/src/object/smallIceBlock.c
@@ -4,7 +4,6 @@
  *
  * @brief Small Ice Block object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/object/smoke.c b/src/object/smoke.c
index bffaa8b8..62b4d1ac 100644
--- a/src/object/smoke.c
+++ b/src/object/smoke.c
@@ -4,7 +4,6 @@
  *
  * @brief Smoke object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 void Smoke_Type0(Entity*);
diff --git a/src/object/smokeParticle.c b/src/object/smokeParticle.c
index 4e871bfc..ab50e2b8 100644
--- a/src/object/smokeParticle.c
+++ b/src/object/smokeParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief Smoke Particle object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/specialChest.c b/src/object/specialChest.c
index fd57c7fc..f2fbc8ae 100644
--- a/src/object/specialChest.c
+++ b/src/object/specialChest.c
@@ -4,7 +4,6 @@
  *
  * @brief Special Chest object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "player.h"
diff --git a/src/object/specialFx.c b/src/object/specialFx.c
index 8780cf0c..5de442a3 100644
--- a/src/object/specialFx.c
+++ b/src/object/specialFx.c
@@ -4,7 +4,6 @@
  *
  * @brief Special FX object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/object/steam.c b/src/object/steam.c
index d3b7a13e..451afadb 100644
--- a/src/object/steam.c
+++ b/src/object/steam.c
@@ -4,7 +4,6 @@
  *
  * @brief Steam object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "player.h"
diff --git a/src/object/stoneTablet.c b/src/object/stoneTablet.c
index 15605a4b..06049ca9 100644
--- a/src/object/stoneTablet.c
+++ b/src/object/stoneTablet.c
@@ -4,7 +4,6 @@
  *
  * @brief Stone Tablet object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "room.h"
diff --git a/src/object/swordParticle.c b/src/object/swordParticle.c
index 63415fb6..9721e52f 100644
--- a/src/object/swordParticle.c
+++ b/src/object/swordParticle.c
@@ -4,7 +4,6 @@
  *
  * @brief Sword Particle object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "item.h"
 #include "object.h"
diff --git a/src/object/swordsmanNewsletter.c b/src/object/swordsmanNewsletter.c
index 732927c9..bc17266a 100644
--- a/src/object/swordsmanNewsletter.c
+++ b/src/object/swordsmanNewsletter.c
@@ -4,7 +4,6 @@
  *
  * @brief Swordsman Newsletter object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "message.h"
 
diff --git a/src/object/thoughtBubble.c b/src/object/thoughtBubble.c
index 7ab561c5..10b9de5e 100644
--- a/src/object/thoughtBubble.c
+++ b/src/object/thoughtBubble.c
@@ -4,7 +4,6 @@
  *
  * @brief Thought Bubble object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "sound.h"
 
diff --git a/src/object/thunderbolt.c b/src/object/thunderbolt.c
index 697a32e3..b1984fa2 100644
--- a/src/object/thunderbolt.c
+++ b/src/object/thunderbolt.c
@@ -4,7 +4,6 @@
  *
  * @brief Thunderbolt object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/titleScreenObject.c b/src/object/titleScreenObject.c
index 9144d0e3..dc94e9fc 100644
--- a/src/object/titleScreenObject.c
+++ b/src/object/titleScreenObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Title Screen object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/trapdoor.c b/src/object/trapdoor.c
index 2bf94151..34622516 100644
--- a/src/object/trapdoor.c
+++ b/src/object/trapdoor.c
@@ -4,7 +4,6 @@
  *
  * @brief Trapdoor object
  */
-#define NENT_DEPRECATED
 #include "item.h"
 #include "object.h"
 
diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c
index 4acf1d76..fbd447e4 100644
--- a/src/object/treeHidingPortal.c
+++ b/src/object/treeHidingPortal.c
@@ -4,7 +4,6 @@
  *
  * @brief Tree Hiding Portal object
  */
-#define NENT_DEPRECATED
 #include "effects.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/treeThorns.c b/src/object/treeThorns.c
index 15aac684..a51bf700 100644
--- a/src/object/treeThorns.c
+++ b/src/object/treeThorns.c
@@ -4,7 +4,6 @@
  *
  * @brief Three Thorns object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/unusedSkull.c b/src/object/unusedSkull.c
index 68a22cef..204fc9b6 100644
--- a/src/object/unusedSkull.c
+++ b/src/object/unusedSkull.c
@@ -4,7 +4,6 @@
  *
  * @brief Unused Skull object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "hitbox.h"
 #include "object.h"
diff --git a/src/object/vaati1Portal.c b/src/object/vaati1Portal.c
index dfbc8487..e757f9c1 100644
--- a/src/object/vaati1Portal.c
+++ b/src/object/vaati1Portal.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati1 Portal object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
diff --git a/src/object/vaati2Particle.c b/src/object/vaati2Particle.c
index a9d42284..d39afa96 100644
--- a/src/object/vaati2Particle.c
+++ b/src/object/vaati2Particle.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati2 Particle object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/object/vaati3Arm.c b/src/object/vaati3Arm.c
index 6ba31113..f18f0851 100644
--- a/src/object/vaati3Arm.c
+++ b/src/object/vaati3Arm.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati3 Arm object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/object/vaati3Death.c b/src/object/vaati3Death.c
index 04553f75..fd9db473 100644
--- a/src/object/vaati3Death.c
+++ b/src/object/vaati3Death.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati3 Death object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/object/vaati3PlayerObject.c b/src/object/vaati3PlayerObject.c
index b491cb2a..0cec61c1 100644
--- a/src/object/vaati3PlayerObject.c
+++ b/src/object/vaati3PlayerObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Vaati3 Player object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c
index d83bc106..166b17e2 100644
--- a/src/object/warpPoint.c
+++ b/src/object/warpPoint.c
@@ -4,7 +4,6 @@
  *
  * @brief Warp Point object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "game.h"
 #include "hitbox.h"
diff --git a/src/object/waterDropObject.c b/src/object/waterDropObject.c
index d1236267..056afa57 100644
--- a/src/object/waterDropObject.c
+++ b/src/object/waterDropObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Water Drop object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 
diff --git a/src/object/waterElement.c b/src/object/waterElement.c
index 9b4d9902..6f55a27c 100644
--- a/src/object/waterElement.c
+++ b/src/object/waterElement.c
@@ -4,7 +4,6 @@
  *
  * @brief Water Element object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 
diff --git a/src/object/waterfallOpening.c b/src/object/waterfallOpening.c
index 72c724d1..47baad61 100644
--- a/src/object/waterfallOpening.c
+++ b/src/object/waterfallOpening.c
@@ -4,7 +4,6 @@
  *
  * @brief Waterfall Opening object
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/well.c b/src/object/well.c
index ed033493..83c3f324 100644
--- a/src/object/well.c
+++ b/src/object/well.c
@@ -4,7 +4,6 @@
  *
  * @brief Well object
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/object/whirlwind.c b/src/object/whirlwind.c
index 5febac8c..fff6ed52 100644
--- a/src/object/whirlwind.c
+++ b/src/object/whirlwind.c
@@ -4,7 +4,6 @@
  *
  * @brief Whirlwind object
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/object/whiteTriangleEffect.c b/src/object/whiteTriangleEffect.c
index ec70dab3..2d7f24e3 100644
--- a/src/object/whiteTriangleEffect.c
+++ b/src/object/whiteTriangleEffect.c
@@ -4,7 +4,6 @@
  *
  * @brief White Triangle Effect object
  */
-#define NENT_DEPRECATED
 #include "functions.h"
 #include "object.h"
 #include "screen.h"
diff --git a/src/object/windTribeFlag.c b/src/object/windTribeFlag.c
index 19aa7f63..99b8572f 100644
--- a/src/object/windTribeFlag.c
+++ b/src/object/windTribeFlag.c
@@ -4,7 +4,6 @@
  *
  * @brief Wind Tribe Flag object
  */
-#define NENT_DEPRECATED
 #include "object.h"
 
 void WindTribeFlag(Entity* this) {
diff --git a/src/object/windTribeTeleporter.c b/src/object/windTribeTeleporter.c
index fd785ab9..8de92ec3 100644
--- a/src/object/windTribeTeleporter.c
+++ b/src/object/windTribeTeleporter.c
@@ -4,7 +4,6 @@
  *
  * @brief Wind Tribe Teleporter object
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/object/windcrest.c b/src/object/windcrest.c
index 2ce20d42..ad1b63a3 100644
--- a/src/object/windcrest.c
+++ b/src/object/windcrest.c
@@ -4,7 +4,6 @@
  *
  * @brief Windcrest object
  */
-#define NENT_DEPRECATED
 #include "effects.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/objectUtils.c b/src/objectUtils.c
index 29e4deb8..c424e5a3 100644
--- a/src/objectUtils.c
+++ b/src/objectUtils.c
@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 
 #include "global.h"
 #include "entity.h"
diff --git a/src/physics.c b/src/physics.c
index b0cc10b0..497dc793 100644
--- a/src/physics.c
+++ b/src/physics.c
@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "area.h"
 #include "player.h"
diff --git a/src/player.c b/src/player.c
index bb2b14f9..26d12f8a 100644
--- a/src/player.c
+++ b/src/player.c
@@ -4,7 +4,7 @@
  *
  * @brief Player entity
  */
-
+#define ENT_DEPRECATED
 #include "area.h"
 #include "asm.h"
 #include "collision.h"
diff --git a/src/playerItem.c b/src/playerItem.c
index 69b1557e..10e8ac0c 100644
--- a/src/playerItem.c
+++ b/src/playerItem.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "global.h"
 #include "functions.h"
 #include "player.h"
diff --git a/src/playerItem/playerItemBomb.c b/src/playerItem/playerItemBomb.c
index af443266..5535277f 100644
--- a/src/playerItem/playerItemBomb.c
+++ b/src/playerItem/playerItemBomb.c
@@ -4,7 +4,6 @@
  *
  * @brief Bomb Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/playerItem/playerItemBoomerang.c b/src/playerItem/playerItemBoomerang.c
index b8b9229d..498843e4 100644
--- a/src/playerItem/playerItemBoomerang.c
+++ b/src/playerItem/playerItemBoomerang.c
@@ -4,7 +4,6 @@
  *
  * @brief Boomerang Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/playerItem/playerItemBottle.c b/src/playerItem/playerItemBottle.c
index 27a266c1..5cb0217d 100644
--- a/src/playerItem/playerItemBottle.c
+++ b/src/playerItem/playerItemBottle.c
@@ -4,7 +4,6 @@
  *
  * @brief Bottle Player Item
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/playerItem/playerItemBow.c b/src/playerItem/playerItemBow.c
index 061e0a69..e3aba91b 100644
--- a/src/playerItem/playerItemBow.c
+++ b/src/playerItem/playerItemBow.c
@@ -4,7 +4,6 @@
  *
  * @brief Bow Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/playerItem/playerItemCellOverwriteSet.c b/src/playerItem/playerItemCellOverwriteSet.c
index 94445140..22c3f8da 100644
--- a/src/playerItem/playerItemCellOverwriteSet.c
+++ b/src/playerItem/playerItemCellOverwriteSet.c
@@ -4,7 +4,6 @@
  *
  * @brief Cell Overwrite Set Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "common.h"
 #include "entity.h"
diff --git a/src/playerItem/playerItemDashSword.c b/src/playerItem/playerItemDashSword.c
index 59ba47ab..497e128e 100644
--- a/src/playerItem/playerItemDashSword.c
+++ b/src/playerItem/playerItemDashSword.c
@@ -4,7 +4,6 @@
  *
  * @brief Dash Sword Player Item
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "player.h"
diff --git a/src/playerItem/playerItemFireRodProjectile.c b/src/playerItem/playerItemFireRodProjectile.c
index 9c12f1c2..04612e50 100644
--- a/src/playerItem/playerItemFireRodProjectile.c
+++ b/src/playerItem/playerItemFireRodProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Fire Rod Projectile Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/playerItem/playerItemGust.c b/src/playerItem/playerItemGust.c
index 9f098a71..cea176c4 100644
--- a/src/playerItem/playerItemGust.c
+++ b/src/playerItem/playerItemGust.c
@@ -4,7 +4,6 @@
  *
  * @brief Gust Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/playerItem/playerItemGustBig.c b/src/playerItem/playerItemGustBig.c
index 550c2e6e..913be2b1 100644
--- a/src/playerItem/playerItemGustBig.c
+++ b/src/playerItem/playerItemGustBig.c
@@ -4,7 +4,6 @@
  *
  * @brief Gust Big Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/playerItem/playerItemGustJar.c b/src/playerItem/playerItemGustJar.c
index 6e572616..4afa8857 100644
--- a/src/playerItem/playerItemGustJar.c
+++ b/src/playerItem/playerItemGustJar.c
@@ -4,7 +4,6 @@
  *
  * @brief Gust Jar Player Item
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "player.h"
diff --git a/src/playerItem/playerItemHeldObject.c b/src/playerItem/playerItemHeldObject.c
index 5f454d37..60ad9ecb 100644
--- a/src/playerItem/playerItemHeldObject.c
+++ b/src/playerItem/playerItemHeldObject.c
@@ -4,7 +4,6 @@
  *
  * @brief Held Object Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/playerItem/playerItemLantern.c b/src/playerItem/playerItemLantern.c
index 0883dd78..3e66b86f 100644
--- a/src/playerItem/playerItemLantern.c
+++ b/src/playerItem/playerItemLantern.c
@@ -4,7 +4,6 @@
  *
  * @brief Lantern Player Item
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "item.h"
diff --git a/src/playerItem/playerItemPacciCane.c b/src/playerItem/playerItemPacciCane.c
index cc11837b..65c665ad 100644
--- a/src/playerItem/playerItemPacciCane.c
+++ b/src/playerItem/playerItemPacciCane.c
@@ -4,7 +4,6 @@
  *
  * @brief Pacci Cane Player Item
  */
-#define NENT_DEPRECATED
 #include "common.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/playerItem/playerItemPacciCaneProjectile.c b/src/playerItem/playerItemPacciCaneProjectile.c
index 0aec528a..9bc25f27 100644
--- a/src/playerItem/playerItemPacciCaneProjectile.c
+++ b/src/playerItem/playerItemPacciCaneProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Pacci Cane Projectile Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/playerItem/playerItemShield.c b/src/playerItem/playerItemShield.c
index e4fa03b6..a1b38a61 100644
--- a/src/playerItem/playerItemShield.c
+++ b/src/playerItem/playerItemShield.c
@@ -4,7 +4,6 @@
  *
  * @brief Shield Player Item
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/playerItem/playerItemSpiralBeam.c b/src/playerItem/playerItemSpiralBeam.c
index 09f128d6..76901cab 100644
--- a/src/playerItem/playerItemSpiralBeam.c
+++ b/src/playerItem/playerItemSpiralBeam.c
@@ -4,7 +4,6 @@
  *
  * @brief Spiral Beam Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/playerItem/playerItemSword.c b/src/playerItem/playerItemSword.c
index 71c6eed7..647ea097 100644
--- a/src/playerItem/playerItemSword.c
+++ b/src/playerItem/playerItemSword.c
@@ -4,7 +4,6 @@
  *
  * @brief Sword Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c
index 36ad1b73..dfe78825 100644
--- a/src/playerItem/playerItemSwordBeam.c
+++ b/src/playerItem/playerItemSwordBeam.c
@@ -4,7 +4,6 @@
  *
  * @brief Sword Beam Player Item
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "common.h"
 #include "effects.h"
diff --git a/src/playerUtils.c b/src/playerUtils.c
index 9ab584e5..4625029f 100644
--- a/src/playerUtils.c
+++ b/src/playerUtils.c
@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 #include "area.h"
 #include "asm.h"
 #include "common.h"
diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c
index 0320b883..0eda80eb 100644
--- a/src/projectile/arrowProjectile.c
+++ b/src/projectile/arrowProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Arrow Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/ballAndChain.c b/src/projectile/ballAndChain.c
index 62140803..a727240a 100644
--- a/src/projectile/ballAndChain.c
+++ b/src/projectile/ballAndChain.c
@@ -4,7 +4,6 @@
  *
  * @brief Ball and Chain Projectile
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "hitbox.h"
diff --git a/src/projectile/boneProjectile.c b/src/projectile/boneProjectile.c
index 5593b602..711070a7 100644
--- a/src/projectile/boneProjectile.c
+++ b/src/projectile/boneProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Bone Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/cannonballProjectile.c b/src/projectile/cannonballProjectile.c
index b8929f6e..5f2e7e04 100644
--- a/src/projectile/cannonballProjectile.c
+++ b/src/projectile/cannonballProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Cannonball Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/darkNutSwordSlash.c b/src/projectile/darkNutSwordSlash.c
index 5bf0dcf9..ac30135b 100644
--- a/src/projectile/darkNutSwordSlash.c
+++ b/src/projectile/darkNutSwordSlash.c
@@ -4,7 +4,6 @@
  *
  * @brief Dark Nut Sword Slash Projectile
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/projectile/dekuSeedProjectile.c b/src/projectile/dekuSeedProjectile.c
index 59189ac3..bc76acc4 100644
--- a/src/projectile/dekuSeedProjectile.c
+++ b/src/projectile/dekuSeedProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Deku Seed Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c
index d1205188..e1cfe8f1 100644
--- a/src/projectile/dirtBallProjectile.c
+++ b/src/projectile/dirtBallProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Dirt Ball Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/fireProjectile.c b/src/projectile/fireProjectile.c
index 833930f0..fa5e2d5c 100644
--- a/src/projectile/fireProjectile.c
+++ b/src/projectile/fireProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Fire Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c
index 51b374e5..f42d8e17 100644
--- a/src/projectile/gleerokProjectile.c
+++ b/src/projectile/gleerokProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Gleerok Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/guardLineOfSight.c b/src/projectile/guardLineOfSight.c
index fcbe71bf..f76f4360 100644
--- a/src/projectile/guardLineOfSight.c
+++ b/src/projectile/guardLineOfSight.c
@@ -4,7 +4,6 @@
  *
  * @brief Guard Line of Sight Projectile
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "entity.h"
diff --git a/src/projectile/guruguruBarProjectile.c b/src/projectile/guruguruBarProjectile.c
index 6554e43e..c1ab80cf 100644
--- a/src/projectile/guruguruBarProjectile.c
+++ b/src/projectile/guruguruBarProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Guruguru Bar Projectile
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/projectile/gyorgMaleEnergyProjectile.c b/src/projectile/gyorgMaleEnergyProjectile.c
index 45bbff69..e243cec9 100644
--- a/src/projectile/gyorgMaleEnergyProjectile.c
+++ b/src/projectile/gyorgMaleEnergyProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Male Energy Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/gyorgTail.c b/src/projectile/gyorgTail.c
index 0ed9e396..a6f30104 100644
--- a/src/projectile/gyorgTail.c
+++ b/src/projectile/gyorgTail.c
@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Tail Projectile
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/iceProjectile.c b/src/projectile/iceProjectile.c
index 1ad42525..1fa2ea7a 100644
--- a/src/projectile/iceProjectile.c
+++ b/src/projectile/iceProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Ice Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/keatonDagger.c b/src/projectile/keatonDagger.c
index baf5044b..bccb2b96 100644
--- a/src/projectile/keatonDagger.c
+++ b/src/projectile/keatonDagger.c
@@ -4,7 +4,6 @@
  *
  * @brief Keaton Dagger Projectile
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "player.h"
 #include "physics.h"
diff --git a/src/projectile/lakituCloudProjectile.c b/src/projectile/lakituCloudProjectile.c
index 26331589..fe4faed2 100644
--- a/src/projectile/lakituCloudProjectile.c
+++ b/src/projectile/lakituCloudProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Lakitu Cloud Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/lakituLightning.c b/src/projectile/lakituLightning.c
index 92edbc5e..866c5b20 100644
--- a/src/projectile/lakituLightning.c
+++ b/src/projectile/lakituLightning.c
@@ -4,7 +4,6 @@
  *
  * @brief Lakitu Lightning Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c
index 99658d8e..6e797140 100644
--- a/src/projectile/mandiblesProjectile.c
+++ b/src/projectile/mandiblesProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Mandibles Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/mazaalEnergyBeam.c b/src/projectile/mazaalEnergyBeam.c
index 0493b76f..843a0396 100644
--- a/src/projectile/mazaalEnergyBeam.c
+++ b/src/projectile/mazaalEnergyBeam.c
@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Energy Beam Projectile
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "physics.h"
 #include "sound.h"
diff --git a/src/projectile/moblinSpear.c b/src/projectile/moblinSpear.c
index 22220438..ea1ac374 100644
--- a/src/projectile/moblinSpear.c
+++ b/src/projectile/moblinSpear.c
@@ -4,7 +4,6 @@
  *
  * @brief Moblin Spear Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c
index 132bf8a5..e4dcdb93 100644
--- a/src/projectile/octorokBossProjectile.c
+++ b/src/projectile/octorokBossProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Octorock Boss Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/projectile5.c b/src/projectile/projectile5.c
index f25a30c2..f1817057 100644
--- a/src/projectile/projectile5.c
+++ b/src/projectile/projectile5.c
@@ -4,7 +4,6 @@
  *
  * @brief Projectile 5
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c
index 8056b8b1..c3138d16 100644
--- a/src/projectile/removableDust.c
+++ b/src/projectile/removableDust.c
@@ -4,7 +4,6 @@
  *
  * @brief Removable Dust Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c
index 786fe69a..d5d4578e 100644
--- a/src/projectile/rockProjectile.c
+++ b/src/projectile/rockProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Rock Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c
index 85978f0a..a5075b2c 100644
--- a/src/projectile/spiderWeb.c
+++ b/src/projectile/spiderWeb.c
@@ -4,7 +4,6 @@
  *
  * @brief Spider Web Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/spikedRollers.c b/src/projectile/spikedRollers.c
index 51ea296a..bc641510 100644
--- a/src/projectile/spikedRollers.c
+++ b/src/projectile/spikedRollers.c
@@ -4,7 +4,6 @@
  *
  * @brief Spiked Rollers Projectile
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 
diff --git a/src/projectile/stalfosProjectile.c b/src/projectile/stalfosProjectile.c
index a87f3eca..ff776f2e 100644
--- a/src/projectile/stalfosProjectile.c
+++ b/src/projectile/stalfosProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Stalfos Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/torchTrapProjectile.c b/src/projectile/torchTrapProjectile.c
index a1c95101..5176b451 100644
--- a/src/projectile/torchTrapProjectile.c
+++ b/src/projectile/torchTrapProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Torch Trap Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c
index eabc0260..9a1ad6f7 100644
--- a/src/projectile/v1DarkMagicProjectile.c
+++ b/src/projectile/v1DarkMagicProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief V1 Dark Magic Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/v1EyeLaser.c b/src/projectile/v1EyeLaser.c
index 0dacce08..a79f5c94 100644
--- a/src/projectile/v1EyeLaser.c
+++ b/src/projectile/v1EyeLaser.c
@@ -4,7 +4,6 @@
  *
  * @brief V1 Eye Laser Projectile
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "functions.h"
 #include "projectile.h"
diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c
index 952e4a7d..a0f89b5b 100644
--- a/src/projectile/v1FireProjectile.c
+++ b/src/projectile/v1FireProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief V1 Fire Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c
index 7223fd6b..cd42ab11 100644
--- a/src/projectile/v2Projectile.c
+++ b/src/projectile/v2Projectile.c
@@ -4,7 +4,6 @@
  *
  * @brief V2 Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/v3ElectricProjectile.c b/src/projectile/v3ElectricProjectile.c
index ccb207fb..fdd1b670 100644
--- a/src/projectile/v3ElectricProjectile.c
+++ b/src/projectile/v3ElectricProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief V3 Electric Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/v3HandProjectile.c b/src/projectile/v3HandProjectile.c
index e95e05f5..9f9b984d 100644
--- a/src/projectile/v3HandProjectile.c
+++ b/src/projectile/v3HandProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief V3 Hand Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/v3TennisBallProjectile.c b/src/projectile/v3TennisBallProjectile.c
index f731832b..abc6d35c 100644
--- a/src/projectile/v3TennisBallProjectile.c
+++ b/src/projectile/v3TennisBallProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief V3 Tennis Ball Projectile
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
diff --git a/src/projectile/windProjectile.c b/src/projectile/windProjectile.c
index e3ce3d57..499409f2 100644
--- a/src/projectile/windProjectile.c
+++ b/src/projectile/windProjectile.c
@@ -4,7 +4,6 @@
  *
  * @brief Wind Projectile
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/projectile/winder.c b/src/projectile/winder.c
index 79144c7c..5cbea569 100644
--- a/src/projectile/winder.c
+++ b/src/projectile/winder.c
@@ -4,7 +4,6 @@
  *
  * @brief Winder Projectile
  */
-#define NENT_DEPRECATED
 #include "projectile/winder.h"
 #include "asm.h"
 #include "collision.h"
diff --git a/src/room.c b/src/room.c
index 57cfab46..c0c868f4 100644
--- a/src/room.c
+++ b/src/room.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "area.h"
 #include "common.h"
 #include "flags.h"
diff --git a/src/script.c b/src/script.c
index 278ad227..2f50621e 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1,13 +1,14 @@
-#include "script.h"
-#include "main.h"
-#include "screen.h"
+#define ENT_DEPRECATED
 #include "area.h"
-#include "game.h"
-#include "object.h"
-#include "npc.h"
-#include "kinstone.h"
 #include "functions.h"
+#include "game.h"
 #include "item.h"
+#include "kinstone.h"
+#include "main.h"
+#include "npc.h"
+#include "object.h"
+#include "screen.h"
+#include "script.h"
 #include "ui.h"
 
 void InitScriptExecutionContext(ScriptExecutionContext* context, Script* script);
diff --git a/src/scroll.c b/src/scroll.c
index 25c20cd6..815c2be2 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,6 @@
 #include "scroll.h"
 
+#define ENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "common.h"
diff --git a/src/vram.c b/src/vram.c
index ef9f4fba..9c57a8f3 100644
--- a/src/vram.c
+++ b/src/vram.c
@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED // Due to sub_080AE218 indexing with gPlayerEntity
 #include "global.h"
 #include "common.h"
 #include "structures.h"
diff --git a/src/worldEvent/worldEvent15.c b/src/worldEvent/worldEvent15.c
index f79420b9..e30a5c39 100644
--- a/src/worldEvent/worldEvent15.c
+++ b/src/worldEvent/worldEvent15.c
@@ -4,6 +4,7 @@
  *
  * @brief World Event 15
  */
+#define ENT_DEPRECATED
 #include "fade.h"
 #include "flags.h"
 #include "menu.h"
author	octorock <79596758+octorock@users.noreply.github.com>	2023-12-30 18:26:19 +0100
committer	octorock <79596758+octorock@users.noreply.github.com>	2023-12-30 18:30:00 +0100
commit	3b87c0416294e830ad256226f315c6b416160493 (patch)
tree	80494ea2ce83de07d27094354a931d143fd5d76c /src
parent	33473d1d5bc818d47526f6a95c470e682b1b1530 (diff)