Merge pull request #365 from Henny022p/droptables

DeathFx, EnemyUtil

include/droptables.h

@@ -24,11 +24,15 @@ typedef union {
 } Droptable;
 static_assert(sizeof(Droptable) == 0x20);
 
-extern const Droptable gUnk_0800137C[];
-extern const Droptable gUnk_0800143C[];
-extern const Droptable gUnk_080015BC[];
-extern const Droptable gUnk_0800161C[];
+extern const Droptable gEnemyDroptables[];
+extern const Droptable gAreaDroptables[];
+extern const Droptable gObjectDroptables[];
 extern const Droptable gUnk_0800191C[];
-extern const Droptable gUnk_08001A1C[];
+enum {
+    DROPTABLE_NONE,
+    DROPTABLE_NO_SHELLS,
+    DROPTABLE_NO_KINSTONES,
+};
+extern const Droptable gDroptableModifiers[];
 
 #endif // TMC_DROPTABLES_H

include/object/deathFx.h

@@ -0,0 +1,17 @@
+#ifndef TMC_DEATHFX_H
+#define TMC_DEATHFX_H
+
+#ifndef NENT_DEPRECATED
+#error "deathFx.h requires new entities"
+#endif
+#include "entity.h"
+
+typedef struct {
+    Entity base;
+    int filler68;
+    u8 unk6c;
+    u8 parentId;
+    u8 item;
+} DeathFxObject;
+
+#endif // TMC_DEATHFX_H

include/room.h

@@ -3,6 +3,7 @@
 
 #include "global.h"
 #include "entity.h"
+#include "droptables.h"
 
 enum RoomTransition {
     TRANSITION_DEFAULT,
@@ -72,8 +73,8 @@ typedef struct {
     /* 0x10 */ u8 unk_10[4];
     /* 0x14 */ u32 flags;
     /* 0x18 */ u32 unk3;
-    /* 0x1c */ u8 filler4[48];
-    /* 0x4c */ u8 filler5[28];
+    /* 0x1c */ u8 filler4[44];
+    /* 0x48 */ Droptable currentAreaDroptable;
     /* 0x68 */ u32 animFlags;
     /* 0x6c */ void* field_0x6c[8];
     /* 0x8c */ void* field_0x8c[8];

include/save.h

@@ -124,6 +124,7 @@ extern const char gUnk_0811E470[];
     }
  */
 void UpdateGlobalProgress(void);
+void sub_0807CD9C(void);
 
 #ifdef DEMO_USA
 extern const u8* const demoPointers[];