diff --git a/assets/xml/objects/object_an2.xml b/assets/xml/objects/object_an2.xml index 8a169b92e..9bc6796f4 100644 --- a/assets/xml/objects/object_an2.xml +++ b/assets/xml/objects/object_an2.xml @@ -1,13 +1,17 @@  + + + + + + - - - + - + diff --git a/assets/xml/objects/object_an3.xml b/assets/xml/objects/object_an3.xml index e0f114035..f7510d0e0 100644 --- a/assets/xml/objects/object_an3.xml +++ b/assets/xml/objects/object_an3.xml @@ -1,12 +1,16 @@  + + + + + + + - - - - + diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index dda3d0d2c..b4238e5b1 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -942,7 +942,7 @@ typedef enum EnAnAnimation { /* 16 */ ENAN_ANIM_WALKING_WITH_TRAY, /* 17 */ ENAN_ANIMOBJ_AN2, - /* 17 */ ENAN_ANIM_17 = ENAN_ANIMOBJ_AN2, + /* 17 */ ENAN_ANIM_UMBRELLA_IDLE = ENAN_ANIMOBJ_AN2, /* 18 */ ENAN_ANIM_UMBRELLA_WALK, /* 19 */ ENAN_ANIM_UMBRELLA_SIT, /* 20 */ ENAN_ANIM_UMBRELLA_CRYING, @@ -988,7 +988,7 @@ static AnimationInfoS sAnimationInfo[ENAN_ANIM_MAX] = { { &gAnju1WalkingWithTrayAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WALKING_WITH_TRAY // ENAN_ANIMOBJ_AN2 - { &object_an2_Anim_0028DC, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_17 + { &gAnju2UmbrellaIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_UMBRELLA_IDLE { &gAnju2UmbrellaWalkAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_UMBRELLA_WALK { &gAnju2UmbrellaSitAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_UMBRELLA_SIT { &gAnju2UmbrellaCryingAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_UMBRELLA_CRYING @@ -1890,7 +1890,7 @@ s32 EnAn_ChooseAnimAfterTalking(EnAn* this, PlayState* play) { if (this->animIndex == ENAN_ANIM_WAITING_WITH_TRAY) { EnAn_ChangeAnim(this, play, ENAN_ANIM_WALKING_WITH_TRAY); } - if (this->animIndex == ENAN_ANIM_17) { + if (this->animIndex == ENAN_ANIM_UMBRELLA_IDLE) { EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_WALK); } if ((this->animIndex == ENAN_ANIM_IDLE) || (this->animIndex == ENAN_ANIM_IDLE_MORPH)) { @@ -2091,7 +2091,7 @@ s32 EnAn_HandleDialogue(EnAn* this, PlayState* play) { EnAn_ChangeAnim(this, play, ENAN_ANIM_WAITING_WITH_TRAY); } if (this->animIndex == ENAN_ANIM_UMBRELLA_WALK) { - EnAn_ChangeAnim(this, play, ENAN_ANIM_17); + EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_IDLE); } if ((this->animIndex == ENAN_ANIM_BROOM_WALK) || (this->animIndex == ENAN_ANIM_BROOM_SWEEP)) { EnAn_ChangeAnim(this, play, ENAN_ANIM_BROOM_IDLE);