Used GetEntityType everywhere

src/dg.c

@@ -1,4 +1,5 @@
 #include "dg.h"
+#include "dungeon_util_static.h"
 
 // file starts at 0x022dea5c
 
@@ -7,5 +8,5 @@ bool8 EntityIsValid__022E0354(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/dg_camera.c

@@ -2,6 +2,7 @@
 #include "dungeon.h"
 #include "dungeon_items.h"
 #include "dungeon_pokemon_attributes.h"
+#include "dungeon_util_static.h"
 
 // file starts at 0x022e26b68
 
@@ -10,7 +11,7 @@ bool8 EntityIsValid__022E32E8(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 bool8 ItemIsActive__022E330C(struct entity *entity, enum item_id item_id)

src/dg_effect.c

@@ -1,4 +1,5 @@
 #include "dg_effect.h"
+#include "dungeon_util_static.h"
 
 // file starts at 0x022e35e4
 
@@ -7,5 +8,5 @@ bool8 EntityIsValid__022E37B8(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/dg_object.c

@@ -1,4 +1,5 @@
 #include "dg_object.h"
+#include "dungeon_util_static.h"
 
 // file starts at 0x022e1608
 
@@ -10,7 +11,7 @@ bool8 EntityIsValid__022E1A1C(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 void UpdateEntityPixelPos(struct entity *entity, struct pixel_position *pixel_pos)

src/dg_uty.c

@@ -1,4 +1,5 @@
 #include "dg_uty.h"
+#include "dungeon_util_static.h"
 
 // file starts at 0x022e9020
 
@@ -7,5 +8,5 @@ bool8 EntityIsValid__022E95F4(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/dungeon_ai.c

@@ -70,7 +70,7 @@ void RunMonsterAi(struct entity *monster, u32 unused)
                     if (target == NULL)
                         entity_is_valid = FALSE;
                     else
-                        entity_is_valid = target->type != ENTITY_NOTHING;
+                        entity_is_valid = GetEntityType(target) != ENTITY_NOTHING;
 
                     if (entity_is_valid &&
                         GetEntInfo(target)->curse_class_status.curse == STATUS_CURSE_DECOY &&

src/dungeon_ai_attack.c

@@ -76,7 +76,7 @@ u32 AiConsiderMove(struct ai_possible_move *ai_possible_move, struct entity *mon
             {
                 struct entity *adjacent_monster = GetTile(monster->pos.x + DIRECTIONS_XY[i].x, monster->pos.y + DIRECTIONS_XY[i].y)->monster;
                 if (adjacent_monster != NULL &&
-                    adjacent_monster->type == ENTITY_MONSTER &&
+                    GetEntityType(adjacent_monster) == ENTITY_MONSTER &&
                     (move_range == RANGE_FRONT_AND_SIDES ||
                     move_range == RANGE_NEARBY ||
                     CanAttackInDirection(monster, i)))
@@ -102,7 +102,7 @@ u32 AiConsiderMove(struct ai_possible_move *ai_possible_move, struct entity *mon
             const struct tile *target_tile = GetTile(monster->pos.x + DIRECTIONS_XY[i].x, monster->pos.y + DIRECTIONS_XY[i].y);
             if (CanAttackInDirection(monster, i))
             {
-                if (target_tile->monster != NULL && target_tile->monster->type == ENTITY_MONSTER)
+                if (target_tile->monster != NULL && GetEntityType(target_tile->monster) == ENTITY_MONSTER)
                 {
                     s32 prev_num_potential_targets = num_potential_targets;
                     num_potential_targets = TryAddTargetToAiTargetList(num_potential_targets, move_target_and_range, monster, target_tile->monster, move, has_status_checker);
@@ -111,7 +111,7 @@ u32 AiConsiderMove(struct ai_possible_move *ai_possible_move, struct entity *mon
                 }
 
                 target_tile = GetTile(monster->pos.x + DIRECTIONS_XY[i].x * 2, monster->pos.y + DIRECTIONS_XY[i].y * 2);
-                if (target_tile->monster != NULL && target_tile->monster->type == ENTITY_MONSTER)
+                if (target_tile->monster != NULL && GetEntityType(target_tile->monster) == ENTITY_MONSTER)
                     num_potential_targets = TryAddTargetToAiTargetList(num_potential_targets, move_target_and_range, monster, target_tile->monster, move, has_status_checker);
             }
         }
@@ -253,7 +253,7 @@ bool8 EntityIsValid__02319F8C(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 s32 TryAddTargetToAiTargetList(s32 current_num_targets, s32 move_ai_range, struct entity *user, struct entity *target, struct move *move, bool8 check_all_conditions)

src/dungeon_ai_item_weight.c

@@ -378,7 +378,7 @@ bool8 IsAdjacentToEnemy(struct entity *entity)
         struct tile *map_tile = GetTile(entity->pos.x + DIRECTIONS_XY[direction].x, entity->pos.y + DIRECTIONS_XY[direction].y);
         if (map_tile->monster != NULL)
         {
-            s32 no_pokemon = map_tile->monster->type == ENTITY_NOTHING;
+            s32 no_pokemon = GetEntityType(map_tile->monster) == ENTITY_NOTHING;
             if (no_pokemon != TRUE && GetTreatmentBetweenMonsters(entity, map_tile->monster, FALSE, TRUE) == TREATMENT_TREAT_AS_ENEMY)
                 return TRUE;
         }

src/dungeon_ai_items.c

@@ -30,7 +30,7 @@ bool8 EntityIsValid__0230E8F0(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 void AiDecideUseItem(struct entity *entity)
@@ -119,7 +119,7 @@ void AiDecideUseItem(struct entity *entity)
             {
                 // This seems unused. toolbox_index can never be 0.
                 const struct tile *map_tile = GetTile(entity->pos.x, entity->pos.y);
-                if (map_tile->object != NULL && map_tile->object->type == ENTITY_ITEM)
+                if (map_tile->object != NULL && GetEntityType(map_tile->object) == ENTITY_ITEM)
                 {
                     item = GetItemInfo(map_tile->object);
                     selected_toolbox_index = GROUND_ITEM_TOOLBOX_INDEX;

src/dungeon_ai_items_1.c

@@ -106,7 +106,7 @@ bool8 EntityIsValid__0230F008(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 void GetPossibleAiArcItemTargets(struct entity *user, struct item *item, struct position positions[], bool8 always_add_position)

src/dungeon_capabilities_4.c

@@ -35,7 +35,7 @@ bool8 CanMonsterMoveOrSwapWithAllyInDirection(struct entity *monster, s32 direct
         return FALSE;
 
     if (current_map_tile->monster != NULL &&
-        current_map_tile->monster->type == ENTITY_MONSTER &&
+        GetEntityType(current_map_tile->monster) == ENTITY_MONSTER &&
         GetTreatmentBetweenMonsters(monster, current_map_tile->monster, TRUE, FALSE) == TREATMENT_TREAT_AS_ENEMY)
         return FALSE;
 
@@ -81,7 +81,7 @@ bool8 CanAttackInDirection(struct entity *monster, s32 direction)
     if (current_map_tile->terrain_flags & TERRAIN_TYPE_IMPASSABLE_WALL)
         return FALSE;
 
-    if (current_map_tile->monster != NULL && current_map_tile->monster->type != ENTITY_MONSTER)
+    if (current_map_tile->monster != NULL && GetEntityType(current_map_tile->monster) != ENTITY_MONSTER)
         return FALSE;
 
     #ifdef JAPAN

src/dungeon_logic_4.c

@@ -7,7 +7,7 @@ bool8 HasLowHealth(struct entity *entity)
     if (!EntityIsValid__022F7364(entity))
         return FALSE;
 
-    if (entity->type != ENTITY_MONSTER)
+    if (GetEntityType(entity) != ENTITY_MONSTER)
         return FALSE;
 
     struct monster *pokemon_info = GetEntInfo(entity);

src/dungeon_visibility.c

@@ -16,9 +16,9 @@ bool8 CanSeeTarget(struct entity *user, struct entity *target)
     if (!target->is_visible)
         return FALSE;
 
-    if (target->type == ENTITY_MONSTER)
+    if (GetEntityType(target) == ENTITY_MONSTER)
     {
-        if (user->type == ENTITY_MONSTER)
+        if (GetEntityType(user) == ENTITY_MONSTER)
         {
             if (!CanSeeInvisibleMonsters(user) && GetEntInfo(target)->invisible_class_status.status == STATUS_INVISIBLE_INVISIBLE)
                 return FALSE;

src/move_checks.c

@@ -214,7 +214,7 @@ bool8 StatusCheckerCheck(struct entity *attacker, struct move *move)
             struct entity *object = GetTileAtEntity(attacker)->object;
             if (object == NULL)
                 return FALSE;
-            if (object->type != ENTITY_TRAP)
+            if (GetEntityType(object) != ENTITY_TRAP)
                 return FALSE;
             break;
         }
@@ -468,5 +468,5 @@ bool8 EntityIsValid__02333FAC(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022EC608.c

@@ -1,9 +1,10 @@
 #include "overlay_29_022EC608.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__022EC608(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022ECDC0.c

@@ -1,9 +1,10 @@
 #include "overlay_29_022ECDC0.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__022ECDC0(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022EE348.c

@@ -1,6 +1,7 @@
 #include "overlay_29_022EE348.h"
 #include "dungeon_items.h"
 #include "dungeon_pokemon_attributes.h"
+#include "dungeon_util_static.h"
 
 bool8 ItemIsActive__022EE318(struct entity *entity, enum item_id item_id)
 {
@@ -15,5 +16,5 @@ bool8 EntityIsValid__022EE348(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022EF7A0.c

@@ -1,9 +1,10 @@
 #include "overlay_29_022EF7A0.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__022EF7A0(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022F0590.c

@@ -1,9 +1,10 @@
 #include "overlay_29_022F0590.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__022F0590(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022F528C.c

@@ -1,9 +1,10 @@
 #include "overlay_29_022F528C.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__022F528C(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022F62A8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_022F62A8.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__022F62A8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022F7364.c

@@ -1,5 +1,6 @@
 #include "overlay_29_022F7364.h"
 #include "dungeon.h"
+#include "dungeon_util_static.h"
 #include "util.h"
 #include "main_02051760.h"
 
@@ -8,12 +9,12 @@ bool8 EntityIsValid__022F7364(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 extern struct dungeon *DUNGEON_PTR[];
 s16 DungeonGetSpriteIndex(s16 monster_id) {
-    return DUNGEON_PTR[0]->sprite_indexes[monster_id];   
+    return DUNGEON_PTR[0]->sprite_indexes[monster_id];
 }
 
 bool32 JoinedAtRangeCheck2Veneer(u8 joined_at) {

src/overlay_29_022F9720.c

@@ -1,9 +1,10 @@
 #include "overlay_29_022F9720.h"
+#include "dungeon_util_static.h"
 
 bool8 IsMonster__022F9720(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }

src/overlay_29_022FC99C.c

@@ -1,9 +1,10 @@
 #include "overlay_29_022FC99C.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__022FC99C(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_022FED98.c

@@ -1,4 +1,5 @@
 #include "overlay_29_022FED98.h"
+#include "dungeon_util_static.h"
 
 #ifndef EUROPE
 bool8 EntityIsValid__022FED98(struct entity *entity)
@@ -6,6 +7,6 @@ bool8 EntityIsValid__022FED98(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 #endif

src/overlay_29_022FEEB8_eu.c

@@ -1,4 +1,5 @@
 #include "overlay_29_022FED98.h"
+#include "dungeon_util_static.h"
 
 #ifdef EUROPE
 bool8 EntityIsValid__022FED98(struct entity *entity)
@@ -6,6 +7,6 @@ bool8 EntityIsValid__022FED98(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 #endif

src/overlay_29_023000E4.c

@@ -1,11 +1,12 @@
 #include "overlay_29_023000E4.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__023000E4(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 #ifndef JAPAN

src/overlay_29_02301A60.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02301A60.h"
+#include "dungeon_util_static.h"
 
 bool8 IsMonster__02301A60(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }

src/overlay_29_02302A38.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02302A38.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02302A38(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_023047B8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_023047B8.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__023047B8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0230558C.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0230558C.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0230558C(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02305C04.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02305C04.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02305C04(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02307EF8.c

@@ -1,13 +1,14 @@
 #include "overlay_29_02307EF8.h"
 #include "dungeon_items.h"
 #include "dungeon_pokemon_attributes.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02307EF8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 bool8 ItemIsActive__02307F1C(struct entity *entity, enum item_id item_id)

src/overlay_29_0230827C.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0230827C.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0230827C(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02308FBC.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02308FBC.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02308FBC(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0230A994.c

@@ -7,7 +7,7 @@ bool8 IsMonster__0230A994(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }
 
 bool8 ExclusiveItemEffectIsActive__0230A9B8(struct entity *entity, enum exclusive_item_effect_id effect_id)

src/overlay_29_0230F980.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0230F980.h"
+#include "dungeon_util_static.h"
 
 bool8 IsMonster__0230F980(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }

src/overlay_29_02311010.c

@@ -9,7 +9,7 @@ bool8 EntityIsValid__02311010(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 bool8 ItemIsActive__02311034(struct entity *entity, enum item_id item_id)

src/overlay_29_023118B4.c

@@ -1,9 +1,10 @@
 #include "overlay_29_023118B4.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__023118B4(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02315118.c

@@ -1,13 +1,14 @@
 #include "overlay_29_02315118.h"
 #include "dungeon_items.h"
 #include "dungeon_pokemon_attributes.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02315118(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 bool8 ItemIsActive__0231513C(struct entity *entity, enum item_id item_id)

src/overlay_29_02318AB0.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02318AB0.h"
+#include "dungeon_util_static.h"
 
 bool8 IsMonster__02318AB0(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }

src/overlay_29_02318D34.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02318D34.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02318D34(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02318E4C.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02318E4C.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02318E4C(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0231A9D4.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0231A9D4.h"
+#include "dungeon_util_static.h"
 
 bool8 IsMonster__0231A9D4(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }

src/overlay_29_0231B194.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0231B194.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0231B194(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0231B318.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0231B318.h"
+#include "dungeon_util_static.h"
 
 bool8 IsMonster__0231B318(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }

src/overlay_29_0231CBC8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0231CBC8.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0231CBC8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0231EDD8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0231EDD8.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0231EDD8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0231F570.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0231F570.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0231F570(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0231FBFC.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0231FBFC.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0231FBFC(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0232017C.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0232017C.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0232017C(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02320764.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02320764.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02320764(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02321438.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02321438.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02321438(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02322DB8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02322DB8.h"
+#include "dungeon_util_static.h"
 
 bool8 IsMonster__02322DB8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }

src/overlay_29_02325620.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02325620.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02325620(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0232800C.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0232800C.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValidMoveEffects__0232800C(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0232A3D8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0232A3D8.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValidMoveEffects__0232A3D8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0232C500.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0232C500.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValidMoveEffects__0232C500(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0232E250.c

@@ -1,4 +1,5 @@
 #include "overlay_29_0232E250.h"
+#include "dungeon_util_static.h"
 
 extern s32 ATK_STAT_IDX;
 extern s32 SPATK_STAT_IDX;
@@ -10,7 +11,7 @@ bool8 EntityIsValidMoveEffects__0232E250(struct entity *entity)
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }
 
 bool8 DoMoveDefendOrder(struct entity* attacker, struct entity* defender, struct move* move, enum item_id item_id)

src/overlay_29_0232E840.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0232E840.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0232E840(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_023350D8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_023350D8.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__023350D8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02337CA8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02337CA8.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02337CA8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02344AF8.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02344AF8.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02344AF8(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02345698.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02345698.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02345698(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_02347BA4.c

@@ -1,9 +1,10 @@
 #include "overlay_29_02347BA4.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__02347BA4(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0234987C.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0234987C.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0234987C(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0234D460.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0234D460.h"
+#include "dungeon_util_static.h"
 
 bool8 IsMonster__0234D460(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type == ENTITY_MONSTER;
+    return GetEntityType(entity) == ENTITY_MONSTER;
 }

src/overlay_29_0234DDD0.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0234DDD0.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0234DDD0(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_29_0234EC14.c

@@ -1,9 +1,10 @@
 #include "overlay_29_0234EC14.h"
+#include "dungeon_util_static.h"
 
 bool8 EntityIsValid__0234EC14(struct entity *entity)
 {
     if (entity == NULL)
         return FALSE;
 
-    return entity->type != ENTITY_NOTHING;
+    return GetEntityType(entity) != ENTITY_NOTHING;
 }

src/overlay_31_02382820.c

@@ -1,5 +1,6 @@
 #include "overlay_31_02382820.h"
 #include "dungeon_ai_targeting.h"
+#include "dungeon_util_static.h"
 #include "number_util.h"
 
 extern const u8 DUNGEON_MENU_SWITCH_STR1[];// = "[dungeon:0]";
@@ -114,7 +115,7 @@ void DrawDungeonMenuStatusWindow(struct Window* window)
         if (party_member == NULL) {
             is_valid_member = FALSE;
         } else {
-            is_valid_member = (party_member->type != ENTITY_NOTHING);
+            is_valid_member = GetEntityType(party_member) != ENTITY_NOTHING;
         }
         if (is_valid_member) {
             struct monster* member_info = party_member->info;