Merge branch 'master' into asset-extraction

2026-07-11 23:30:06 -04:00 · 2021-11-12 12:13:13 +01:00
parent b1e2175ffb
commit 9396484df6
340 changed files with 4576 additions and 6192 deletions
@@ -61,7 +61,7 @@ typedef struct {
    u8 field_0x3c;
    u8 field_0x3d;
    u16 field_0x3e;
-    u16 field_0x40;
+    u16 hurtType;
    u16 field_0x42;
    u16 field_0x44;
    u16 field_0x46;
@@ -171,10 +171,7 @@ typedef struct {
    u8 unk1;
    u8 unk2;
    u8 unk3;
-    u8 freezeTime;
-    u8 unk9;
-    u8 unk_0xa;
-    u8 unk_0xb;
+    Entity* unk4;
    u16 unk_0xc;
 } EntityHandler;