Split npc files

include/enemy.h

@@ -5,7 +5,7 @@
 #include "entity.h"
 
 typedef enum {
-    /*0x00*/ OCTOROCK,
+    /*0x00*/ OCTOROK,
     /*0x01*/ CHUCHU,
     /*0x02*/ LEEVER,
     /*0x03*/ PEAHAT,
@@ -62,10 +62,10 @@ typedef enum {
     /*0x36*/ MAZAAL_HEAD,
     /*0x37*/ MAZAAL_MACRO,
     /*0x38*/ MAZAAL_HAND,
-    /*0x39*/ OCTOROCK_BOSS,
+    /*0x39*/ OCTOROK_BOSS,
     /*0x3a*/ FLYING_POT,
     /*0x3b*/ GOBDO,
-    /*0x3c*/ OCTOROCK_GOLDEN,
+    /*0x3c*/ OCTOROK_GOLDEN,
     /*0x3d*/ TEKTITE_GOLDEN,
     /*0x3e*/ ROPE_GOLDEN,
     /*0x3f*/ CLOUD_PIRANHA,
@@ -90,7 +90,7 @@ typedef enum {
     /*0x52*/ VAATI_ARM,
     /*0x53*/ DUST,
     /*0x54*/ VAATI_BALL,
-    /*0x55*/ OCTOROCK2,
+    /*0x55*/ OCTOROK2,
     /*0x56*/ SLIME,
     /*0x57*/ MINI_SLIME,
     /*0x58*/ FIREBALL_GUY,

include/greatFairy.h

@@ -22,7 +22,6 @@ extern void (*const gUnk_081207A4[])(Entity*);
 
 extern u32 gUnk_0810C2E4;
 extern const s16 GreatFairy_RippleOffsets[10];
-extern u32 gUnk_02034350;
 extern u8 gUnk_0812079C[8];
 extern s8 gUnk_081207AC[];
 

include/save.h

@@ -40,7 +40,8 @@ typedef struct {
     /*0x0D0*/ u8 fillerD0[0x71];
     /*0x141*/ u8 unk141[0x34f];
     /*0x490*/ u32 unk490;
-    /*0x494*/ u8 filler494[0x20];
+    /*0x494*/ u32 unk494;
+    /*0x498*/ u8 filler498[0x1C];
 } SaveFile;
 
 extern SaveFile gSave;

include/structures.h

@@ -36,7 +36,8 @@ extern struct_02000010 gUnk_02000010;
 
 typedef struct {
     s32 frameCount; // regular frame count? does anything reset it?
-    u8 field_0x4[0x4];
+    u8 field_0x4[0x2];
+    u16 field_0x8;
     bool8 transitioningOut;
     u8 transitionType; // transition when changing areas
     u16 field_0xa;     // seems to be a tile type

include/utils.h

@@ -1,3 +1,8 @@
+#ifndef UTILS_H
+#define UTILS_H
+
+#include "global.h"
+
 typedef struct {
     u16 heldKeys;
     u16 newKeys;
@@ -62,3 +67,5 @@ void zFree(void* ptr);
  * @param updateHUD bool32 Request refresh of HUD layer (bg 0)
  */
 void DispReset(bool32 updateHUD);
+
+#endif