diff --git a/src/bin-data/parsing/quest/dat.ts b/src/bin-data/parsing/quest/dat.ts
index a73579fb..e6d9bf5d 100644
--- a/src/bin-data/parsing/quest/dat.ts
+++ b/src/bin-data/parsing/quest/dat.ts
@@ -26,6 +26,7 @@ export interface DatObject extends DatEntity {
 }
 
 export interface DatNpc extends DatEntity {
+    flags: number;
     skin: number;
 }
 
@@ -104,9 +105,11 @@ export function parseDat(cursor: ArrayBufferCursor): DatFile {
                     const rotationX = cursor.i32() / 0xFFFF * 2 * Math.PI;
                     const rotationY = cursor.i32() / 0xFFFF * 2 * Math.PI;
                     const rotationZ = cursor.i32() / 0xFFFF * 2 * Math.PI;
-                    const unknown3 = cursor.u8Array(20);
+                    const unknown3 = cursor.u8Array(4);
+                    const flags = cursor.u32();
+                    const unknown4 = cursor.u8Array(12);
                     const skin = cursor.u32();
-                    const unknown4 = cursor.u8Array(4);
+                    const unknown5 = cursor.u8Array(4);
 
                     npcs.push({
                         typeId,
@@ -115,7 +118,8 @@ export function parseDat(cursor: ArrayBufferCursor): DatFile {
                         rotation: { x: rotationX, y: rotationY, z: rotationZ },
                         skin,
                         areaId,
-                        unknown: [unknown1, unknown2, unknown3, unknown4]
+                        flags,
+                        unknown: [unknown1, unknown2, unknown3, unknown4, unknown5]
                     });
                 }
 
@@ -198,8 +202,10 @@ export function writeDat({ objs, npcs, unknowns }: DatFile): ArrayBufferCursor {
             cursor.writeI32(Math.round(npc.rotation.y / (2 * Math.PI) * 0xFFFF));
             cursor.writeI32(Math.round(npc.rotation.z / (2 * Math.PI) * 0xFFFF));
             cursor.writeU8Array(npc.unknown[2]);
-            cursor.writeU32(npc.skin);
+            cursor.writeU32(npc.flags);
             cursor.writeU8Array(npc.unknown[3]);
+            cursor.writeU32(npc.skin);
+            cursor.writeU8Array(npc.unknown[4]);
         }
     }
 
diff --git a/src/bin-data/parsing/quest/index.ts b/src/bin-data/parsing/quest/index.ts
index 8564a2f8..af467966 100644
--- a/src/bin-data/parsing/quest/index.ts
+++ b/src/bin-data/parsing/quest/index.ts
@@ -223,8 +223,8 @@ function parseNpcData(episode: number, npcs: DatNpc[]): QuestNpc[] {
 }
 
 // TODO: detect Mothmant, St. Rappy, Hallo Rappy, Egg Rappy, Death Gunner, Bulk and Recon.
-function getNpcType(episode: number, { typeId, unknown, skin, areaId }: DatNpc): NpcType {
-    const regular = (unknown[2][6] & 0x80) === 0;
+function getNpcType(episode: number, { typeId, flags, skin, areaId }: DatNpc): NpcType {
+    const regular = (flags & 0x800000) === 0;
 
     switch (`${typeId}, ${skin % 3}, ${episode}`) {
         case `${0x044}, 0, 1`: return NpcType.Booma;
@@ -392,11 +392,12 @@ function objectsToDatData(objects: QuestObject[]): DatObject[] {
 
 function npcsToDatData(npcs: QuestNpc[]): DatNpc[] {
     return npcs.map(npc => {
-        // If the type is unknown, typeData will be null and we use the raw data from the DAT file.
+        // If the type is unknown, typeData will be undefined and we use the raw data from the DAT file.
         const typeData = npcTypeToDatData(npc.type);
+        let flags = npc.dat.flags;
 
         if (typeData) {
-            npc.dat.unknown[2][18] = (npc.dat.unknown[2][18] & ~0x80) | (typeData.regular ? 0 : 0x80);
+            flags = (npc.dat.flags & ~0x800000) | (typeData.regular ? 0 : 0x800000);
         }
 
         return {
@@ -404,6 +405,7 @@ function npcsToDatData(npcs: QuestNpc[]): DatNpc[] {
             sectionId: npc.sectionId,
             position: npc.sectionPosition,
             rotation: npc.rotation,
+            flags,
             skin: typeData ? typeData.skin : npc.dat.skin,
             areaId: npc.areaId,
             unknown: npc.dat.unknown