decomp appendGfx_player, fix warnings in 77480.c file (#572)

* decomp appendGfx_player, fix warnings in 77480.c file * small style fixes * fix action state enum and make use of enum
pmret · Dec 28, 2021 · 3345775 · 3345775
1 parent fe374e5
commit 3345775
Show file tree

Hide file tree

Showing 4 changed files with 141 additions and 312 deletions.
diff --git a/include/common_structs.h b/include/common_structs.h
@@ -1765,7 +1765,8 @@ typedef struct PlayerStatus {
     /* 0x000 */ s32 flags;
     /* 0x004 */ u32 animFlags;
     /* 0x008 */ s16 framesOnGround; /* Number of frames since last jump landed */
-    /* 0x00A */ char unk_0A[2];
+    /* 0x00A */ s8 unk_0A;
+    /* 0x00B */ char unk_0B;
     /* 0x00C */ s8 peachDisguise;
     /* 0x00D */ s8 unk_0D;
     /* 0x00E */ u8 alpha1;

diff --git a/include/enums.h b/include/enums.h
@@ -1411,8 +1411,8 @@ enum ActionStates {
     ACTION_STATE_ULTRA_POUND                    = 0x00000010,
     ACTION_STATE_SLIDING                        = 0x00000011,
     ACTION_STATE_HAMMER                         = 0x00000012,
-    ACTION_STATE_13                             = 0x00000011,
-    ACTION_STATE_14                             = 0x00000012,
+    ACTION_STATE_13                             = 0x00000013,
+    ACTION_STATE_14                             = 0x00000014,
     ACTION_STATE_HIT_FIRE                       = 0x00000015,  ///< Causes Mario to fly up and take damage. Used for fire bars.
     ACTION_STATE_KNOCKBACK                      = 0x00000016,  // some kind of knockback, does no damage
     ACTION_STATE_HIT_LAVA                       = 0x00000017,
@@ -1633,6 +1633,9 @@ enum NpcFlags {
 enum PlayerStatusFlags {
     PLAYER_STATUS_FLAGS_JUMPING                          = 0x00000002,
     PLAYER_STATUS_FLAGS_FALLING                          = 0x00000004,
+    PLAYER_STATUS_FLAGS_10                               = 0x00000010,
+    PLAYER_STATUS_FLAGS_20                               = 0x00000020,
+    PLAYER_STATUS_FLAGS_80                               = 0x00000080,
     PLAYER_STATUS_FLAGS_100                              = 0x00000100,
     PLAYER_STATUS_FLAGS_200                              = 0x00000200,
     PLAYER_STATUS_FLAGS_400                              = 0x00000400,