Merge pull request #477 from notyourav/mas

Name rest of entity fields

9 files changed, 27 insertions, 27 deletions

diff --git a/include/enemy/octorokBoss.h b/include/enemy/octorokBoss.h
index dcdfa2ca..d977c0c2 100644
--- a/include/enemy/octorokBoss.h
+++ b/include/enemy/octorokBoss.h
@@ -5,7 +5,7 @@
 
 typedef struct OctorokBossEntity OctorokBossEntity;
 typedef struct {
-    /*0x00*/ u8 unk_0; // [0,1,2,4]  is later stored in super->field_0xf
+    /*0x00*/ u8 unk_0; // [0,1,2,4]  is later stored in super->subtimer
     /*0x01*/ u8 tailCount;
     /*0x02*/ u8 field_0x2;               // [0,1]
     /*0x03*/ u8 targetAngle;             // relates to this->field_0x7a.HALF.HI
diff --git a/include/entity.h b/include/entity.h
index 99f2b11d..a75ff456 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -124,16 +124,16 @@ typedef struct Entity_ {
     /*0x0b*/ u8 type2;                  /**< For use internally. */
     /*0x0c*/ u8 action;                 /**< Current action. Usually used to index a function table. */
     /*0x0d*/ u8 subAction;              /**< Optional sub-action. */
-    /*0x0e*/ u8 actionDelay;            /**< General purpose timer. */
-    /*0x0f*/ u8 field_0xf;              /**< General purpose timer. */
+    /*0x0e*/ u8 timer;                  /**< General purpose timer. */
+    /*0x0f*/ u8 subtimer;               /**< General purpose timer. */
     /*0x10*/ u8 flags;                  /**< @see EntityFlags */
     /*0x11*/ u8 updatePriority : 4;     /**< Current priority. @see Priority */
     /*    */ u8 updatePriorityPrev : 4; /**< Priority to restore after request is over. @see RequestPriority. */
     /*0x12*/ s16 spriteIndex;
     /*0x14*/ u8 animationState; /**< Animation state. @see AnimationState */
     /*0x15*/ u8 direction;      /**< Facing direction. @see Direction */
-    /*0x16*/ u8 field_0x16;
-    /*0x17*/ u8 field_0x17;
+    /*0x16*/ u8 carryFlags;     /**< Flags for carrying this Entity. */
+    /*0x17*/ u8 followerFlag;   /**< Controls collisions between followers, unused. */
     /*0x18*/ struct {
     /*    */     u32 draw        : 2; /**< Draw type. 0 = disabled, 1 = clip to screen, 3 = draw always */ /* 0x2 */ 
     /*    */     u32 ss2         : 1; /*   4 */
@@ -160,35 +160,35 @@ typedef struct Entity_ {
     /*    */     u32 b1    : 5; /* 0x2-0x10 */
     /*    */     u32 flipY : 2; /* 0x20-0x40 */
     /*    */ } PACKED spriteOrientation;
-    /*0x1c*/ u8 field_0x1c;
-    /*0x1d*/ u8 field_0x1d;
+    /*0x1c*/ u8 gustJarFlags; /**< Controls sfx and other things */
+    /*0x1d*/ u8 gustJarTolerance; /**< Frames needed to pull off ground. */
     /*0x1e*/ u8 frameIndex;
     /*0x1f*/ u8 lastFrameIndex;
     /*0x20*/ s32 zVelocity; /**< Z axis speed, measured in px/frame */
     /*0x24*/ s16 speed;     /**< Magnitude of speed. */
     /*0x26*/ u8 spriteAnimation[3];
     /*0x29*/ SpritePriority spritePriority;
-    /*0x2a*/ u16 collisions;
+    /*0x2a*/ u16 collisions;    /**< Collision flags for each direction. */
     /*0x2c*/ union SplitWord x; /**< X position, fixed point Q16.16. */
     /*0x30*/ union SplitWord y; /**< Y position, fixed point Q16.16. */
     /*0x34*/ union SplitWord z; /**< Z position, fixed point Q16.16. */
     /*0x38*/ u8 collisionLayer; /**< Collision layer. */
     /*0x39*/ s8 interactType;
-    /*0x3a*/ u8 field_0x3a; /**< 4: grabbed by GustJar */
-    /*0x3b*/ u8 flags2;
-    /*0x3c*/ u8 field_0x3c;
+    /*0x3a*/ u8 gustJarState;       /**< 4: grabbed by GustJar */
+    /*0x3b*/ u8 flags2;             /**< Debug visualization related? */
+    /*0x3c*/ u8 collisionFlags;     /**< Controls collision modes. */
     /*0x3d*/ s8 iframes;            /**< Invulnerability frames. */
     /*0x3e*/ u8 knockbackDirection; /**< Direction of knockback. */
     /*0x3f*/ u8 hitType;            /**< Behavior as a collision sender. */
-    /*0x40*/ u8 hurtType;           /**< behavior as a collision receiver. */
-    /*0x41*/ u8 bitfield;
-    /*0x42*/ u8 knockbackDuration; /**< Duration of knockback. */
-    /*0x43*/ u8 confusedTime; /**< Frames that this Entity is confused. */
-    /*0x44*/ u8 damage; /**< Damage this Entity inflicts. */
-    /*0x45*/ u8 health; /**< Health of this Entity. */
-    /*0x46*/ u16 knockbackSpeed; /**< How fast this Entity is knocked back. */
-    /*0x48*/ Hitbox* hitbox; /**< Hitbox associated with this Entity. */
-    /*0x4c*/ struct Entity_* field_0x4c;
+    /*0x40*/ u8 hurtType;           /**< Behavior as a collision receiver. */
+    /*0x41*/ u8 contactFlags;       /**< Information about collision contact. */
+    /*0x42*/ u8 knockbackDuration;  /**< Duration of knockback. */
+    /*0x43*/ u8 confusedTime;       /**< Frames that this Entity is confused. */
+    /*0x44*/ u8 damage;             /**< Damage this Entity inflicts. */
+    /*0x45*/ u8 health;             /**< Health of this Entity. */
+    /*0x46*/ u16 knockbackSpeed;    /**< How fast this Entity is knocked back. */
+    /*0x48*/ Hitbox* hitbox;        /**< Hitbox associated with this Entity. */
+    /*0x4c*/ struct Entity_* contactedEntity;
     /*0x50*/ struct Entity_* parent; /**< Parent Entity. Sometimes points to associated data. */
     /*0x54*/ struct Entity_* child;  /**< Child Entity. Sometimes points to associated data. */
     /*0x58*/ u8 animIndex;
diff --git a/include/functions.h b/include/functions.h
index c2ded725..631f5176 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -5,7 +5,7 @@
 #include "global.h"
 #include "entity.h"
 #include "manager.h"
-#include "coord.h"
+#include "physics.h"
 #include "player.h"
 #include "room.h"
 #include "structures.h"
diff --git a/include/menu.h b/include/menu.h
index f590e999..2549e327 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -104,12 +104,12 @@ typedef struct {
     /*0x14*/ u8 filler14[6];
     /*0x1a*/ u8 unk1a;
     /*0x1b*/ u8 filler1b[1];
-    /*0x1c*/ u8 unk1c;
+    /*0x1c*/ u8 figure_idx;
     /*0x1d*/ u8 unk1d;
     /*0x1e*/ u8 unk1e;
     /*0x1f*/ s8 unk1f;
     /*0x20*/ u8 unk20;
-    /*0x21*/ u8 unk21;
+    /*0x21*/ bool8 duplicate;
     /*0x22*/ u8 filler22[0xc];
     /*0x2e*/ u16 unk2e;
 } FigurineMenu;
diff --git a/include/npc.h b/include/npc.h
index cfe0f9cf..1a57ccc9 100644
--- a/include/npc.h
+++ b/include/npc.h
@@ -9,7 +9,7 @@
 #include "effects.h"
 #include "room.h"
 #include "flags.h"
-#include "coord.h"
+#include "physics.h"
 #include "message.h"
 #include "script.h"
 #include "save.h"
diff --git a/include/object.h b/include/object.h
index eb4582d4..c8b46a16 100644
--- a/include/object.h
+++ b/include/object.h
@@ -9,7 +9,7 @@
 #include "flags.h"
 #include "effects.h"
 #include "room.h"
-#include "coord.h"
+#include "physics.h"
 
 #include "entity.h"
 #include "player.h"
diff --git a/include/coord.h b/include/physics.h
index 2c243c35..2c243c35 100644
--- a/include/coord.h
+++ b/include/physics.h
diff --git a/include/save.h b/include/save.h
index cd5ab988..d85cad01 100644
--- a/include/save.h
+++ b/include/save.h
@@ -38,7 +38,7 @@ typedef struct {
     /*0x002*/ u8 msg_speed;   /**< Message speed. */
     /*0x003*/ u8 brightness;  /**< Brightness. */
     /*0x004*/ u8 filler4[0x2];
-    /*0x006*/ u8 unk6;
+    /*0x006*/ u8 saw_staffroll;
     /*0x007*/ u8 unk7;
     /*0x008*/ u8 global_progress; /**< @see UpdateGlobalProgress */
     /*0x009*/ u8 field_0x9[0x34];
diff --git a/include/sound.h b/include/sound.h
index 2e1e57b8..86fa8ac9 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -297,7 +297,7 @@ typedef enum {
     SFX_106,
     SFX_107,
     SFX_108,
-    SFX_109,
+    SFX_ITEM_GET,
     SFX_10A,
     SFX_10B,
     SFX_BUTTON_PRESS,