renamed and added a bunch of animations to enum

2 files changed, 64 insertions, 28 deletions

diff --git a/include/player.h b/include/player.h
index 683aac2d..d4dd3923 100644
--- a/include/player.h
+++ b/include/player.h
@@ -285,11 +285,18 @@ typedef enum {
 typedef enum {
     ANIM_DEFAULT = 0x100,
     ANIM_WALK = 0x104,
+    ANIM_SWORD = 0x108,
     ANIM_BOUNCE = 0x114,
-    ANIM_SHIELD = 0x160,
-    ANIM_SHIELD_END = 0x164,
-    ANIM_SWORD_CHARGE_END = 0x168,
-    ANIM_SWORD_CHARGE = 0x16c,
+    ANIM_SPINATTACK = 0x124,
+    ANIM_GREATSPIN = 0x128,
+    ANIM_ROLLATTACK_SPIN = 0x12c,
+    ANIM_ROLLATTACK_SLIDE = 0x130,
+    ANIM_ROLLATTACK_END = 0x134,
+    ANIM_SHIELD_PULLOUT = 0x158,
+    ANIM_SHIELD_WALK = 0x160,
+    ANIM_SHIELD = 0x164,
+    ANIM_SWORD_CHARGE = 0x168,
+    ANIM_SWORD_CHARGE_WALK = 0x16c,
     ANIM_SWORD_CHARGE_BUMP = 0x170,
     ANIM_DOWN_THRUST = 0x174,
     ANIM_FALL = 0x1b8,
@@ -297,21 +304,24 @@ typedef enum {
     ANIM_FALL_MINISH = 0x1ba,
     ANIM_DIE1 = 0x1bc,
     ANIM_GET_WHITE_SWORD = 0x1e2,
-    ANIM_TRAPPED_BY_GHINI = 0x25c,
-    ANIM_BOW_END = 0x280,
-    ANIM_BOW = 0x284,
+    ANIM_BOW_PULLOUT = 0x21c,
+    ANIM_TRAPPED = 0x25c,
+    ANIM_BOW_SHOOT = 0x27c,
+    ANIM_BOW_CHARGE = 0x280,
+    ANIM_BOW_WALK = 0x284,
     ANIM_ROCS_CAPE = 0x288,
-    ANIM_SWIM_END = 0x28c,
-    ANIM_SWIM = 0x290,
+    ANIM_SWIM_STILL = 0x28c,
+    ANIM_SWIM_MOVE = 0x290,
     ANIM_FROZEN = 0x294,
     ANIM_DASH = 0x298,
+    ANIM_ELECTROCUTED = 0x29c,
     ANIM_ROLL = 0x2ac,
     ANIM_DIE2 = 0x2bd,
     ANIM_DIVE = 0x2be,
     ANIM_IN_LAVA = 0x2c1,
     ANIM_PORTAL = 0x2c2,
     ANIM_PORTAL_SHRINK = 0x2c3,
-    ANIM_DROWN_END = 0x2ce,
+    ANIM_DROWN_RESPAWN = 0x2ce,
     ANIM_CLIMB1_UP = 0x2cf,
     ANIM_CLIMB2_UP = 0x2d0,
     ANIM_CLIMB1_DOWN = 0x2d1,
@@ -322,12 +332,16 @@ typedef enum {
     ANIM_CLIMB_TO_TOP = 0x2d6,
     ANIM_BOTTLE_DRINK = 0x2df,
     ANIM_GET_ITEM_SMALL = 0x2e0,
+    ANIM_PICKUP = 0x338,
     ANIM_PUSH = 0x33c,
-    ANIM_PULL = 0x34c,
+    ANIM_PULL = 0x340,
+    ANIM_THROW = 0x344,
     ANIM_CARRY = 0x348,
-    ANIM_CARRY_END = 0x350,
+    ANIM_PULL2 = 0x34c,
+    ANIM_CARRY_STAND = 0x350,
+    ANIM_GRAB = 0x378,
     ANIM_FALL_ON_BACK = 0x3a0,
-    ANIM_3C0 = 0x3c0,
+    ANIM_LAUNCHED = 0x3c0,
     ANIM_EZLO_SEARCH = 0x3c5,
     ANIM_EZLO_APPEAR_LEFT = 0x3c6,
     ANIM_EZLO_EYES_UP = 0x3c7,
@@ -338,9 +352,12 @@ typedef enum {
     ANIM_EZLO_LEAVE_RIGHT = 0x3cd,
     ANIM_DEFAULT_NOCAP = 0x400,
     ANIM_WALK_NOCAP = 0x404,
-    ANIM_SHIELD_NOCAP = 0x410,
-    ANIM_SHIELD_END_NOCAP = 0x414,
-    ANIM_PORTAL_LEAVE_NOCAP = 0x41c,
+    ANIM_SWORD_NOCAP = 0x408,
+    ANIM_SHIELD_PULLOUT_NOCAP = 0x40c,
+    ANIM_SHIELD_WALK_NOCAP = 0x410,
+    ANIM_SHIELD_NOCAP = 0x414,
+    ANIM_BOUNCE_NOCAP = 0x418,
+    ANIM_HOP_NOCAP = 0x41c,
     ANIM_JUMP_NOCAP = 0x420,
     ANIM_LAND_NOCAP = 0x424,
     ANIM_ROLL_NOCAP = 0x438,
@@ -351,19 +368,33 @@ typedef enum {
     ANIM_GET_ITEM_BIG_NOCAP = 0x45b,
     ANIM_GET_ITEM_SMALL_NOCAP = 0x45e,
     ANIM_GET_ITEM_SWORD = 0x45f,
-    ANIM_524 = 0x524,
+    ANIM_GUSTJAR_PULLOUT = 0x500,
+    ANIM_GUSTJAR_SUCK = 0x504,
+    ANIM_MOLEMITTS_FLOOR = 0x508,
+    ANIM_MOLEMITTS_DIG = 0x50c,
+    ANIM_GUSTJAR_END = 0x510,
+    ANIM_GUSTJAR_BLOW = 0x514,
+    ANIM_GUSTJAR_WALK = 0x518,
+    ANIM_MOLEMITTS_CLANG = 0x51c,
+    ANIM_MOLEMITTS_MISS = 0x520,
+    ANIM_GUSTJAR_524 = 0x524,
     ANIM_ENTER_POT = 0x52c,
     ANIM_IN_POT = 0x530,
-    ANIM_LANTERN_END = 0x604,
+    ANIM_LANTERN_LIGHT = 0x600,
+    ANIM_LANTERN_ON = 0x604,
     ANIM_LANTERN = 0x608,
-    ANIM_BOTTLE_EMPTY = 0x610,
+    ANIM_LANTERN_BURN = 0x60c,
+    ANIM_BOTTLE_POUR = 0x610,
     ANIM_BOTTLE_SWING = 0x614,
+    ANIM_BOTTLE_SWING_END = 0x618,
     ANIM_FALL_IN_HOLE = 0x61c,
     ANIM_IN_HOLE = 0x620,
-    ANIM_ROLL_IN_HOLE = 0x624,
-    ANIM_PARACHUTE = 0x700,
-    ANIM_PARACHUTE2 = 0x708,
-    ANIM_MINECART_END = 0x70c,
+    ANIM_SPRING_JUMP = 0x624,
+    ANIM_CANE = 0x628,
+    ANIM_PARACHUTE_ACTIVATE = 0x700,
+    ANIM_BOOMERANG_MAGIC = 0x704,
+    ANIM_PARACHUTE = 0x708,
+    ANIM_MINECART_PAUSE = 0x70c,
     ANIM_MINECART = 0x710,
     ANIM_DROWN = 0x72c,
     ANIM_PARACHUTE_FALL = 0x730,
@@ -373,18 +404,23 @@ typedef enum {
     ANIM_PORTAL_ACTIVATE = 0x738,
     ANIM_SLEEP_NOCAP = 0x73a,
     ANIM_WAKEUP_NOCAP = 0x73b,
-    ANIM_73C = 0x73c,
-    ANIM_PORTAL_LEAVE = 0x80c,
+    ANIM_GROW = 0x73c,
+    ANIM_HOP = 0x80c,
     ANIM_JUMP = 0x810,
+    ANIM_BOOMERANG = 0x818,
     ANIM_LAND = 0x820,
     ANIM_MOLDWORM_CAPTURED = 0x8b0,
     ANIM_GET_NEW_SWORD = 0x8bf,
+    ANIM_OCARINA = 0x8e1,
     ANIM_GET_LAST_SWORD = 0x8e3,
     ANIM_GET_NEWCAP = 0x8e4,
-    ANIM_CARRY_END_NOCAP = 0x92c,
+    ANIM_PICKUP_NOCAP = 0x928,
+    ANIM_CARRY_STAND_NOCAP = 0x92c,
+    ANIM_THROW_NOCAP = 0x930,
     ANIM_CARRY_NOCAP = 0x934,
     ANIM_PUSH_NOCAP = 0x93c,
     ANIM_PULL_NOCAP = 0x944,
+    ANIM_GRAB_NOCAP = 0x948,
     ANIM_FALL_IN_HOLE_NOCAP = 0x950,
     ANIM_IN_HOLE_NOCAP = 0x954,
     ANIM_SWORD_MINISH = 0xc00,
diff --git a/include/sound.h b/include/sound.h
index f62768ad..749a1268 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -168,7 +168,7 @@ typedef enum {
     SFX_FALL_HOLE,
     SFX_86,
     SFX_PLY_DIE,
-    SFX_88,
+    SFX_GRAB,
     SFX_BARREL_RELEASE,
     SFX_BARREL_ENTER,
     SFX_BARREL_ROLL,
@@ -295,7 +295,7 @@ typedef enum {
     SFX_PLACE_OBJ,
     SFX_105,
     SFX_106,
-    SFX_107,
+    SFX_ITEM_GLOVES_AIR,
     SFX_108,
     SFX_ITEM_GET,
     SFX_10A,