diff --git a/include/player.h b/include/player.h index eed2465d..cd7f57cd 100644 --- a/include/player.h +++ b/include/player.h @@ -277,122 +277,122 @@ typedef enum { } SwordMove; typedef enum { - ANIM_DEFAULT = 0x100, - ANIM_DOOR = 0x104, - ANIM_BOUNCE = 0x114, - ANIM_SHIELD = 0x160, - ANIM_SHIELD_END = 0x164, - ANIM_SWORD_CHARGE_END = 0x168, - ANIM_SWORD_CHARGE = 0x16c, - ANIM_SWORD_CHARGE_BUMP = 0x170, - ANIM_DOWN_THRUST = 0x174, - ANIM_FALL = 0x1b8, - ANIM_GET_ITEM_BIG = 0x1b9, - 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_ROCS_CAPE = 0x288, - ANIM_SWIM_END = 0x28c, - ANIM_SWIM = 0x290, - ANIM_FROZEN = 0x294, - ANIM_DASH = 0x298, - 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_DEFAULT = 0x100, + ANIM_DOOR = 0x104, + ANIM_BOUNCE = 0x114, + ANIM_SHIELD = 0x160, + ANIM_SHIELD_END = 0x164, + ANIM_SWORD_CHARGE_END = 0x168, + ANIM_SWORD_CHARGE = 0x16c, + ANIM_SWORD_CHARGE_BUMP = 0x170, + ANIM_DOWN_THRUST = 0x174, + ANIM_FALL = 0x1b8, + ANIM_GET_ITEM_BIG = 0x1b9, + 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_ROCS_CAPE = 0x288, + ANIM_SWIM_END = 0x28c, + ANIM_SWIM = 0x290, + ANIM_FROZEN = 0x294, + ANIM_DASH = 0x298, + ANIM_ROLL = 0x2ac, + ANIM_DIE2 = 0x2bd, + ANIM_DIVE = 0x2be, + ANIM_IN_LAVA = 0x2c1, + ANIM_PORTAL = 0x2c2, + ANIM_PORTAL_SHRINK = 0x2c3, + ANIM_DROWN_END = 0x2ce, // I literally can't tell the difference in the following - ANIM_CLIMB = 0x2cf, - ANIM_CLIMB2 = 0x2d0, - ANIM_CLIMB3 = 0x2d1, - ANIM_CLIMB4 = 0x2d2, - ANIM_CLIMB_FROM_TOP = 0x2d3, - ANIM_CLIMB_LEFT = 0x2d4, - ANIM_CLIMB_RIGHT = 0x2d5, - ANIM_CLIMB_TO_TOP = 0x2d6, - ANIM_BOTTLE_DRINK = 0x2df, - ANIM_GET_ITEM_SMALL = 0x2e0, - ANIM_PUSH = 0x33c, - ANIM_PULL = 0x34c, - ANIM_CARRY = 0x348, - ANIM_CARRY_END = 0x350, - ANIM_FALL_ON_BACK = 0x3a0, - ANIM_3C0 = 0x3c0, - ANIM_EZLO_SEARCH = 0x3c5, - ANIM_EZLO_APPEAR_LEFT = 0x3c6, - ANIM_EZLO_EYES_UP = 0x3c7, - ANIM_EZLO_HEAD_DOWN = 0x3c8, - ANIM_EZLO_LEAVE_LEFT = 0x3c9, - ANIM_EZLO_APPEAR_RIGHT = 0x3ca, - ANIM_EZLO_EYES_MIDDLE = 0x3cc, - ANIM_EZLO_LEAVE_RIGHT = 0x3cd, - ANIM_DEFAULT_NOCAP = 0x400, - ANIM_DOOR_NOCAP = 0x404, - ANIM_SHIELD_NOCAP = 0x410, - ANIM_SHIELD_END_NOCAP = 0x414, - ANIM_PORTAL_LEAVE_NOCAP = 0x41c, - ANIM_JUMP_NOCAP = 0x420, - ANIM_LAND_NOCAP = 0x424, - ANIM_ROLL_NOCAP = 0x438, - ANIM_DROWN_NOCAP = 0x44c, - ANIM_FALL_NOCAP = 0x458, - ANIM_DIE1_NOCAP = 0x459, - ANIM_DIE2_NOCAP = 0x45a, - ANIM_GET_ITEM_BIG_NOCAP = 0x45b, - ANIM_GET_ITEM_SMALL_NOCAP = 0x45e, - ANIM_GET_ITEM_SWORD = 0x45f, - ANIM_524 = 0x524, - ANIM_ENTER_POT = 0x52c, - ANIM_IN_POT = 0x530, - ANIM_LANTERN_END = 0x604, - ANIM_LANTERN = 0x608, - ANIM_BOTTLE_EMPTY = 0x610, - ANIM_BOTTLE_SWING = 0x614, - 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_MINECART = 0x710, - ANIM_DROWN = 0x72c, - ANIM_PARACHUTE_FALL = 0x730, - ANIM_PUT_ON_EZLO = 0x734, - ANIM_SLEEP = 0x736, - ANIM_WAKEUP = 0x737, - ANIM_PORTAL_ACTIVATE = 0x738, - ANIM_SLEEP_NOCAP = 0x73a, - ANIM_WAKEUP_NOCAP = 0x73b, - ANIM_73C = 0x73c, - ANIM_PORTAL_LEAVE = 0x80c, - ANIM_JUMP = 0x810, - ANIM_LAND = 0x820, - ANIM_MOLDWORM_CAPTURED = 0x8b0, - ANIM_GET_NEW_SWORD = 0x8bf, - ANIM_GET_LAST_SWORD = 0x8e3, - ANIM_GET_NEWCAP = 0x8e4, - ANIM_CARRY_END_NOCAP = 0x92c, - ANIM_CARRY_NOCAP = 0x934, - ANIM_PUSH_NOCAP = 0x93c, - ANIM_PULL_NOCAP = 0x944, - ANIM_FALL_IN_HOLE_NOCAP = 0x950, - ANIM_IN_HOLE_NOCAP = 0x954, - ANIM_SWORD_MINISH = 0xc00, - ANIM_WALK_MINISH = 0xc04, - ANIM_ROLL_MINISH = 0xc08, - ANIM_SWIM_MINISH = 0xc0c, - ANIM_C10 = 0xc10, - ANIM_C14 = 0xc14, - ANIM_BOUNCE_MINISH = 0xc18, - ANIM_DROWN_MINISH = 0xc19, - ANIM_DIE1_MINISH = 0xc1a, - ANIM_DIE2_MINISH = 0xc1b, - ANIM_C1C = 0xc1c, + ANIM_CLIMB = 0x2cf, + ANIM_CLIMB2 = 0x2d0, + ANIM_CLIMB3 = 0x2d1, + ANIM_CLIMB4 = 0x2d2, + ANIM_CLIMB_FROM_TOP = 0x2d3, + ANIM_CLIMB_LEFT = 0x2d4, + ANIM_CLIMB_RIGHT = 0x2d5, + ANIM_CLIMB_TO_TOP = 0x2d6, + ANIM_BOTTLE_DRINK = 0x2df, + ANIM_GET_ITEM_SMALL = 0x2e0, + ANIM_PUSH = 0x33c, + ANIM_PULL = 0x34c, + ANIM_CARRY = 0x348, + ANIM_CARRY_END = 0x350, + ANIM_FALL_ON_BACK = 0x3a0, + ANIM_3C0 = 0x3c0, + ANIM_EZLO_SEARCH = 0x3c5, + ANIM_EZLO_APPEAR_LEFT = 0x3c6, + ANIM_EZLO_EYES_UP = 0x3c7, + ANIM_EZLO_HEAD_DOWN = 0x3c8, + ANIM_EZLO_LEAVE_LEFT = 0x3c9, + ANIM_EZLO_APPEAR_RIGHT = 0x3ca, + ANIM_EZLO_EYES_MIDDLE = 0x3cc, + ANIM_EZLO_LEAVE_RIGHT = 0x3cd, + ANIM_DEFAULT_NOCAP = 0x400, + ANIM_DOOR_NOCAP = 0x404, + ANIM_SHIELD_NOCAP = 0x410, + ANIM_SHIELD_END_NOCAP = 0x414, + ANIM_PORTAL_LEAVE_NOCAP = 0x41c, + ANIM_JUMP_NOCAP = 0x420, + ANIM_LAND_NOCAP = 0x424, + ANIM_ROLL_NOCAP = 0x438, + ANIM_DROWN_NOCAP = 0x44c, + ANIM_FALL_NOCAP = 0x458, + ANIM_DIE1_NOCAP = 0x459, + ANIM_DIE2_NOCAP = 0x45a, + ANIM_GET_ITEM_BIG_NOCAP = 0x45b, + ANIM_GET_ITEM_SMALL_NOCAP = 0x45e, + ANIM_GET_ITEM_SWORD = 0x45f, + ANIM_524 = 0x524, + ANIM_ENTER_POT = 0x52c, + ANIM_IN_POT = 0x530, + ANIM_LANTERN_END = 0x604, + ANIM_LANTERN = 0x608, + ANIM_BOTTLE_EMPTY = 0x610, + ANIM_BOTTLE_SWING = 0x614, + 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_MINECART = 0x710, + ANIM_DROWN = 0x72c, + ANIM_PARACHUTE_FALL = 0x730, + ANIM_PUT_ON_EZLO = 0x734, + ANIM_SLEEP = 0x736, + ANIM_WAKEUP = 0x737, + ANIM_PORTAL_ACTIVATE = 0x738, + ANIM_SLEEP_NOCAP = 0x73a, + ANIM_WAKEUP_NOCAP = 0x73b, + ANIM_73C = 0x73c, + ANIM_PORTAL_LEAVE = 0x80c, + ANIM_JUMP = 0x810, + ANIM_LAND = 0x820, + ANIM_MOLDWORM_CAPTURED = 0x8b0, + ANIM_GET_NEW_SWORD = 0x8bf, + ANIM_GET_LAST_SWORD = 0x8e3, + ANIM_GET_NEWCAP = 0x8e4, + ANIM_CARRY_END_NOCAP = 0x92c, + ANIM_CARRY_NOCAP = 0x934, + ANIM_PUSH_NOCAP = 0x93c, + ANIM_PULL_NOCAP = 0x944, + ANIM_FALL_IN_HOLE_NOCAP = 0x950, + ANIM_IN_HOLE_NOCAP = 0x954, + ANIM_SWORD_MINISH = 0xc00, + ANIM_WALK_MINISH = 0xc04, + ANIM_ROLL_MINISH = 0xc08, + ANIM_SWIM_MINISH = 0xc0c, + ANIM_C10 = 0xc10, + ANIM_C14 = 0xc14, + ANIM_BOUNCE_MINISH = 0xc18, + ANIM_DROWN_MINISH = 0xc19, + ANIM_DIE1_MINISH = 0xc1a, + ANIM_DIE2_MINISH = 0xc1b, + ANIM_C1C = 0xc1c, } PlayerAnimation; typedef struct { diff --git a/src/playerUtils.c b/src/playerUtils.c index 4fb789f3..c2b7c8d8 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -1578,7 +1578,8 @@ void sub_08079064(Entity* this) { } else if ((gPlayerState.swim_state & 0x80) != 0) { gPlayerState.animation = ANIM_DIVE; } else { - if (gPlayerState.animation == ANIM_LANTERN || gPlayerState.animation == ANIM_DOOR || gPlayerState.animation == ANIM_DOOR_NOCAP) { + if (gPlayerState.animation == ANIM_LANTERN || gPlayerState.animation == ANIM_DOOR || + gPlayerState.animation == ANIM_DOOR_NOCAP) { sub_080790E4(this); } }