Had a wrong name for an animation

zeldaret · Sep 19, 2023 · 20483c2 · 20483c2
1 parent b4cf2f7
commit 20483c2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/include/player.h b/include/player.h
@@ -284,7 +284,7 @@ typedef enum {
 
 typedef enum {
     ANIM_DEFAULT = 0x100,
-    ANIM_DOOR = 0x104,
+    ANIM_WALK = 0x104,
     ANIM_BOUNCE = 0x114,
     ANIM_SHIELD = 0x160,
     ANIM_SHIELD_END = 0x164,
@@ -337,7 +337,7 @@ typedef enum {
     ANIM_EZLO_EYES_MIDDLE = 0x3cc,
     ANIM_EZLO_LEAVE_RIGHT = 0x3cd,
     ANIM_DEFAULT_NOCAP = 0x400,
-    ANIM_DOOR_NOCAP = 0x404,
+    ANIM_WALK_NOCAP = 0x404,
     ANIM_SHIELD_NOCAP = 0x410,
     ANIM_SHIELD_END_NOCAP = 0x414,
     ANIM_PORTAL_LEAVE_NOCAP = 0x41c,

diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
@@ -554,7 +554,7 @@ void sub_080262A8(ChuchuBossEntity* this) {
     super->timer = 1;
     sub_080276F4(super, 6, 1);
     if (super->type2 == 0) {
-        gPlayerState.animation = ANIM_DOOR;
+        gPlayerState.animation = ANIM_WALK;
         this->unk_84->unk_03 = 1;
     } else {
         this->unk_7c = 0;

diff --git a/src/player.c b/src/player.c
@@ -1461,7 +1461,7 @@ static void PlayerPushEnd(Entity* this) {
     // Final push?
     this->subtimer = 6;
     if ((gPlayerState.flags & PL_MINISH) == 0) {
-        gPlayerState.animation = ANIM_DOOR;
+        gPlayerState.animation = ANIM_WALK;
         this->spriteIndex = 3;
         InitAnimationForceUpdate(this, (this->animationState >> 1) + 0x3c);
     }
@@ -1790,9 +1790,9 @@ static void sub_08072100(Entity* this) {
         this->direction = DIR_NONE;
 
     if (gPlayerState.flags & PL_NO_CAP) {
-        gPlayerState.animation = ANIM_DOOR_NOCAP;
+        gPlayerState.animation = ANIM_WALK_NOCAP;
     } else {
-        gPlayerState.animation = ANIM_DOOR;
+        gPlayerState.animation = ANIM_WALK;
     }
     ResetActiveItems();
     sub_08072168(this);
@@ -1988,7 +1988,7 @@ static void sub_080724DC(Entity* this) {
             if (gPlayerState.flags & PL_MINISH) {
                 gPlayerState.animation = ANIM_BOUNCE_MINISH;
             } else {
-                gPlayerState.animation = ANIM_DOOR;
+                gPlayerState.animation = ANIM_WALK;
             }
             this->direction = Direction8FromAnimationState(this->animationState);
         }
@@ -2602,9 +2602,9 @@ static void sub_080731D8(Entity* this) {
         SetZeldaFollowTarget(this);
     }
     if (gPlayerState.flags & PL_NO_CAP) {
-        gPlayerState.animation = ANIM_DOOR_NOCAP;
+        gPlayerState.animation = ANIM_WALK_NOCAP;
     } else {
-        gPlayerState.animation = ANIM_DOOR;
+        gPlayerState.animation = ANIM_WALK;
     }
     gRoomControls.camera_target = NULL;
     DeleteClones();
@@ -3851,9 +3851,9 @@ void sub_08074D34(Entity* this, ScriptExecutionContext* ctx) {
                 break;
             case 0x2:
                 if (gPlayerState.flags & PL_NO_CAP)
-                    gPlayerState.animation = ANIM_DOOR_NOCAP;
+                    gPlayerState.animation = ANIM_WALK_NOCAP;
                 else
-                    gPlayerState.animation = ANIM_DOOR;
+                    gPlayerState.animation = ANIM_WALK;
                 break;
             case 0x4:
                 break;

diff --git a/src/playerUtils.c b/src/playerUtils.c
@@ -1578,8 +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_WALK ||
+                gPlayerState.animation == ANIM_WALK_NOCAP) {
                 sub_080790E4(this);
             }
         }
@@ -1881,7 +1881,7 @@ void sub_080797EC(void) {
                     if (gPlayerState.framestate == PL_STATE_IDLE) {
                         gPlayerState.framestate = PL_STATE_WALK;
                     }
-                    animation = ANIM_DOOR_NOCAP;
+                    animation = ANIM_WALK_NOCAP;
                 } else {
                     animation = ANIM_SWORD_CHARGE;
                     if (sub_080793E4(0)) {
@@ -1931,7 +1931,7 @@ void sub_080797EC(void) {
                     if ((gPlayerState.flags & PL_USE_LANTERN) != 0) {
                         animation = ANIM_LANTERN;
                     } else {
-                        animation = ANIM_DOOR;
+                        animation = ANIM_WALK;
                     }
                 }
             }