Invert NENT_DEPRECATED define

To define ENT_DEPRECATED in files that still need the old entity structs.

include/entity.h

@@ -220,7 +220,7 @@ typedef struct Entity_ {
     /*0x62*/ u8 spriteOffsetX;
     /*0x63*/ s8 spriteOffsetY;
     /*0x64*/ void* myHeap; /**< Heap data allocated with #zMalloc. */
-#ifndef NENT_DEPRECATED
+#ifdef ENT_DEPRECATED
     GENERIC_ENTITY_FIELDS
 #endif
 } Entity;

include/object/deathFx.h

@@ -1,7 +1,7 @@
 #ifndef DEATHFX_H
 #define DEATHFX_H
 
-#ifndef NENT_DEPRECATED
+#ifdef ENT_DEPRECATED
 #error "deathFx.h requires new entities"
 #endif
 #include "entity.h"

include/object/linkAnimation.h

@@ -1,7 +1,7 @@
 #ifndef LINKANIMATION_H
 #define LINKANIMATION_H
 
-#ifndef NENT_DEPRECATED
+#ifdef ENT_DEPRECATED
 #error "linkAnimtion.h requires new entities"
 #endif
 #include "entity.h"

src/beanstalkSubtask.c

@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "beanstalkSubtask.h"
 
 #include "backgroundAnimations.h"

src/code_08049CD4.c

@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 #include "global.h"
 #include "room.h"
 

src/code_08049DF4.c

@@ -1,4 +1,3 @@
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "global.h"
 #include "entity.h"

src/collision.c

@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "common.h"

src/enemy/acroBandits.c

@@ -4,7 +4,6 @@
  *
  * @brief Acro Bandits enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/armos.c

@@ -4,7 +4,6 @@
  *
  * @brief Armos enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "common.h"
 #include "enemy.h"

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"

src/enemy/beetle.c

@@ -4,7 +4,6 @@
  *
  * @brief Beetle enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/bladeTrap.c

@@ -4,7 +4,6 @@
  *
  * @brief Blade Trap enemy
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "object.h"
 #include "room.h"

src/enemy/bobomb.c

@@ -4,7 +4,6 @@
  *
  * @brief Bobomb enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "enemy.h"

src/enemy/bombPeahat.c

@@ -4,7 +4,6 @@
  *
  * @brief Bomb Peahat enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy.h"
 #include "entity.h"

src/enemy/bombarossa.c

@@ -4,7 +4,6 @@
  *
  * @brief Bombarossa enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "object.h"

src/enemy/bowMoblin.c

@@ -4,7 +4,6 @@
  *
  * @brief Bow Moblin enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/businessScrub.c

@@ -4,7 +4,6 @@
  *
  * @brief Business Scrub enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy.h"
 #include "functions.h"

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"

src/enemy/chaser.c

@@ -4,7 +4,6 @@
  *
  * @brief Chaser enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/chuchu.c

@@ -4,7 +4,6 @@
  *
  * @brief Chuchu enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/chuchuBoss.c

@@ -4,7 +4,6 @@
  *
  * @brief Chuchu Boss enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "object.h"

src/enemy/cloudPiranha.c

@@ -4,7 +4,6 @@
  *
  * @brief Cloud Piranha enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/crow.c

@@ -4,7 +4,6 @@
  *
  * @brief Crow enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/cuccoAggr.c

@@ -4,7 +4,6 @@
  *
  * @brief Cucco Aggr enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/cuccoChickAggr.c

@@ -4,7 +4,6 @@
  *
  * @brief Cucco Chick Aggr enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/curtain.c

@@ -4,7 +4,6 @@
  *
  * @brief Curtain enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 

src/enemy/darkNut.c

@@ -4,7 +4,6 @@
  *
  * @brief Dark Nut enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/doorMimic.c

@@ -4,7 +4,6 @@
  *
  * @brief Door Mimic enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "sound.h"

src/enemy/dust.c

@@ -4,7 +4,6 @@
  *
  * @brief Dust enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "enemy.h"
 #include "entity.h"

src/enemy/enemy4D.c

@@ -4,7 +4,6 @@
  *
  * @brief Enemy4D enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/enemy50.c

@@ -4,7 +4,6 @@
  *
  * @brief Enemy50 enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/enemy64.c

@@ -4,7 +4,6 @@
  *
  * @brief Enemy64 enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "fade.h"
 #include "functions.h"

src/enemy/enemy66.c

@@ -4,7 +4,6 @@
  *
  * @brief Enemy66 enemy
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 
 void (*const gUnk_080D2ABC[])(Entity*);

src/enemy/enemyE.c

@@ -4,7 +4,6 @@
  *
  * @brief EnemyE enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/eyegore.c

@@ -4,7 +4,6 @@
  *
  * @brief Eyegore enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "fade.h"
 #include "functions.h"

src/enemy/fallingBoulder.c

@@ -4,7 +4,6 @@
  *
  * @brief Falling Boulder enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/fireballGuy.c

@@ -4,7 +4,6 @@
  *
  * @brief Fireball Guy enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/flyingPot.c

@@ -4,7 +4,6 @@
  *
  * @brief Flying pot enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/flyingSkull.c

@@ -4,7 +4,6 @@
  *
  * @brief Flying Skull enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"

src/enemy/ghini.c

@@ -4,7 +4,6 @@
  *
  * @brief Ghini enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/gibdo.c

@@ -4,7 +4,6 @@
  *
  * @brief Gibdo enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "object.h"

src/enemy/gleerok.c

@@ -4,7 +4,6 @@
  *
  * @brief Gleerok enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

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"

src/enemy/gyorgFemale.c

@@ -4,7 +4,6 @@
  *
  * @brief Gyorg Female enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "collision.h"
 #include "enemy.h"

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"

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"

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"

src/enemy/gyorgMaleEye.c

@@ -4,7 +4,6 @@
  *
  * @brief GyorgMaleEye enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "fade.h"
 #include "functions.h"

src/enemy/hangingSeed.c

@@ -4,7 +4,6 @@
  *
  * @brief Hanging Seed enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/helmasaur.c

@@ -4,7 +4,6 @@
  *
  * @brief Helmasaur enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/keaton.c

@@ -4,7 +4,6 @@
  *
  * @brief keaton enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/keese.c

@@ -4,7 +4,6 @@
  *
  * @brief Keese enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 #include "player.h"

src/enemy/lakitu.c

@@ -4,7 +4,6 @@
  *
  * @brief Lakitu enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 #include "player.h"

src/enemy/lakituCloud.c

@@ -4,7 +4,6 @@
  *
  * @brief Lakitu Cloud enemy
  */
-#define NENT_DEPRECATED
 #include "asm.h"
 #include "effects.h"
 #include "enemy.h"

src/enemy/leever.c

@@ -4,7 +4,6 @@
  *
  * @brief Leever enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 

src/enemy/likeLike.c

@@ -4,7 +4,6 @@
  *
  * @brief Like Like enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "item.h"
 #include "message.h"

src/enemy/madderpillar.c

@@ -4,7 +4,6 @@
  *
  * @brief Madderpillar enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "hitbox.h"

src/enemy/mazaalBracelet.c

@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Bracelet enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "hitbox.h"

src/enemy/mazaalHand.c

@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Hand enemy
  */
-#define NENT_DEPRECATED
 #include "entity.h"
 #include "hitbox.h"
 

src/enemy/mazaalHead.c

@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Head enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/mazaalMacro.c

@@ -4,7 +4,6 @@
  *
  * @brief Mazaal Macro enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "screenTransitions.h"

src/enemy/miniFireballGuy.c

@@ -4,7 +4,6 @@
  *
  * @brief Mini Fireball Guy enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/miniSlime.c

@@ -4,7 +4,6 @@
  *
  * @brief Mini Slime enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 

src/enemy/moldorm.c

@@ -4,7 +4,6 @@
  *
  * @brief Moldorm enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/moldworm.c

@@ -4,7 +4,6 @@
  *
  * @brief Moldworm enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/mulldozer.c

@@ -4,7 +4,6 @@
  *
  * @brief Mulldozer enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 

src/enemy/octorok.c

@@ -4,7 +4,6 @@
  *
  * @brief Octorok enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 

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"

src/enemy/octorokGolden.c

@@ -4,7 +4,6 @@
  *
  * @brief Golden Octorock enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "map.h"

src/enemy/peahat.c

@@ -4,7 +4,6 @@
  *
  * @brief Peahat enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 #include "room.h"

src/enemy/pesto.c

@@ -4,7 +4,6 @@
  *
  * @brief Pesto enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "game.h"

src/enemy/puffstool.c

@@ -4,7 +4,6 @@
  *
  * @brief Puffstool enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "object.h"

src/enemy/rockChuchu.c

@@ -4,7 +4,6 @@
  *
  * @brief Rock Chuchu enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "player.h"
 

src/enemy/rollobite.c

@@ -4,7 +4,6 @@
  *
  * @brief Rollobite enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "physics.h"

src/enemy/rope.c

@@ -4,7 +4,6 @@
  *
  * @brief Rope enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 

src/enemy/ropeGolden.c

@@ -4,7 +4,6 @@
  *
  * @brief Golden Rope enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"

src/enemy/rupeeLike.c

@@ -4,7 +4,6 @@
  *
  * @brief Rupee Like enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "hitbox.h"

src/enemy/scissorsBeetle.c

@@ -4,7 +4,6 @@
  *
  * @brief Scissors Beetle enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"

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"

src/enemy/slime.c

@@ -4,7 +4,6 @@
  *
  * @brief Slime enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 #include "room.h"

src/enemy/sluggula.c

@@ -4,7 +4,6 @@
  *
  * @brief Sluggula enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 

src/enemy/smallPesto.c

@@ -4,7 +4,6 @@
  *
  * @brief Small Pesto enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "physics.h"
 

src/enemy/spark.c

@@ -4,7 +4,6 @@
  *
  * @brief Spark enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "object.h"

src/enemy/spearMoblin.c

@@ -4,7 +4,6 @@
  *
  * @brief Spear Moblin enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/spikedBeetle.c

@@ -4,7 +4,6 @@
  *
  * @brief Spiked Beetle enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/spinyBeetle.c

@@ -4,7 +4,6 @@
  *
  * @brief Spiny Beetle enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/spinyChuchu.c

@@ -4,7 +4,6 @@
  *
  * @brief Spiny Chuchu enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "hitbox.h"

src/enemy/stalfos.c

@@ -4,7 +4,6 @@
  *
  * @brief Stalfos enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/sub_080451CC.c

@@ -1,3 +1,4 @@
+#define ENT_DEPRECATED
 #include "entity.h"
 
 void sub_080451CC(Entity* this, Entity* other) {

src/enemy/takkuri.c

@@ -4,7 +4,6 @@
  *
  * @brief Takkuri enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/tektite.c

@@ -4,7 +4,6 @@
  *
  * @brief Tektite enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/tektiteGolden.c

@@ -4,7 +4,6 @@
  *
  * @brief Golden Tektite enemy
  */
-#define NENT_DEPRECATED
 #include "collision.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/torchTrap.c

@@ -4,7 +4,6 @@
  *
  * @brief Torch Trap enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"

src/enemy/treeItem.c

@@ -4,7 +4,6 @@
  *
  * @brief Tree Item enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "item.h"
 #include "object.h"

src/enemy/vaatiArm.c

@@ -4,7 +4,6 @@
  *
  * @brief Vaati Arm enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/vaatiBall.c

@@ -4,7 +4,6 @@
  *
  * @brief Vaati Ball enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/vaatiEyesMacro.c

@@ -4,7 +4,6 @@
  *
  * @brief Vaati Eyes Macro enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/vaatiProjectile.c

@@ -4,7 +4,6 @@
  *
  * @brief Vaati Projectile enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "screenTransitions.h"

src/enemy/vaatiRebornEnemy.c

@@ -4,7 +4,6 @@
  *
  * @brief Vaati Reborn enemy
  */
-#define NENT_DEPRECATED
 #include "area.h"
 #include "enemy.h"
 #include "functions.h"

src/enemy/vaatiTransfigured.c

@@ -4,7 +4,6 @@
  *
  * @brief Vaati Transfigured enemy
  */
-#define NENT_DEPRECATED
 #include "enemy.h"
 #include "functions.h"
 #include "object.h"