diff --git a/include/player.h b/include/player.h
index 6c31cf38..34c4b70e 100644
--- a/include/player.h
+++ b/include/player.h
@@ -254,12 +254,12 @@ typedef enum {
 } PlayerInputState;
 
 typedef struct {
-    /*0x90*/ u16 heldInput; /**< Input currently held @see PlayerInputState */
-    /*0x92*/ u16 newInput;  /**< New input this frame @see PlayerInputState */
-    /*0x94*/ u32 field_0x94;
-    /*0x98*/ u16 playerMacroWaiting;
-    /*0x9a*/ u16 playerMacroHeldKeys;
-    /*0x9c*/ PlayerMacroEntry* playerMacro;
+    /*0x0*/ u16 heldInput; /**< Input currently held @see PlayerInputState */
+    /*0x2*/ u16 newInput;  /**< New input this frame @see PlayerInputState */
+    /*0x4*/ u32 field_0x94;
+    /*0x8*/ u16 playerMacroWaiting;
+    /*0xa*/ u16 playerMacroHeldKeys;
+    /*0xc*/ PlayerMacroEntry* playerMacro;
 } PlayerInput;
 
 typedef enum {
@@ -276,7 +276,7 @@ typedef enum {
 
 typedef struct {
     /*0x00*/ u8 prevAnim;
-    /*0x00*/ u8 grab_status;
+    /*0x01*/ u8 grab_status;
     /*0x02*/ u8 jump_status;
     /*0x03*/ u8 shield_status;
     /*0x04*/ u8 attack_status;
diff --git a/include/save.h b/include/save.h
index 5193e692..aa206fe5 100644
--- a/include/save.h
+++ b/include/save.h
@@ -34,7 +34,7 @@ extern SaveResult HandleSave(u32 idx);
  */
 typedef struct {
     /*0x000*/ u8 invalid;     /**< File is invalid. */
-    /*0x000*/ u8 initialized; /**< File is initialized. */
+    /*0x001*/ u8 initialized; /**< File is initialized. */
     /*0x002*/ u8 msg_speed;   /**< Message speed. */
     /*0x003*/ u8 brightness;  /**< Brightness. */
     /*0x004*/ u8 filler4[0x2];
@@ -69,7 +69,7 @@ typedef struct {
     /*0x25C*/ u8 flags[0x200];       /**< Flags. */
     /*0x45C*/ u8 dungeonKeys[0x10];  // TODO Indexed by dungeon id, keys per dungeon
     /*0x46C*/ u8 dungeonItems[0x10]; // TODO items in the dungeon. 4: compass, 2: big key, 1: small key
-    /*0x46C*/ u8 dungeonWarps[0x10]; // TODO indexed by dungeon id, EnableDungeonWarp, IsDungeonWarpActive
+    /*0x47C*/ u8 dungeonWarps[0x10]; // TODO indexed by dungeon id, EnableDungeonWarp, IsDungeonWarpActive
     /*0x48C*/ u32 timers[7];
     /*0x4A8*/ u32 demo_timer; /**< Demo timer. */
     /*0x4AC*/ u8 filler4ac[0x8];