diff --git a/assets/xml/objects/object_pr.xml b/assets/xml/objects/object_pr.xml index b4f743fdef..cabdfa630b 100644 --- a/assets/xml/objects/object_pr.xml +++ b/assets/xml/objects/object_pr.xml @@ -31,6 +31,7 @@ + @@ -41,22 +42,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 9bb7d6f248..9c919c22d4 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -103,9 +103,9 @@ typedef enum EnPr2Animation { } EnPr2Animation; static AnimationHeader* sAnimations[ENPR2_ANIM_MAX] = { - &object_pr_Anim_004340, // PR2_ANIM_GENTLE_SWIM - &object_pr_Anim_004274, // PR2_ANIM_FAST_SWIM - &object_pr_Anim_003904, // PR2_ANIM_FLINCH + &gSkullFishSwimAnim, // PR2_ANIM_GENTLE_SWIM + &gSkullFishAttackAnim, // PR2_ANIM_FAST_SWIM + &gSkullFishDieAnim, // PR2_ANIM_FLINCH }; static u8 sAnimationModes[ENPR2_ANIM_MAX] = { @@ -128,7 +128,7 @@ void EnPr2_Init(Actor* thisx, PlayState* play) { this->actor.colChkInfo.health = 1; this->actor.colChkInfo.damageTable = &sDamageTable; - SkelAnime_InitFlex(play, &this->skelAnime, &object_pr_Skel_004188, &object_pr_Anim_004340, this->jointTable, + SkelAnime_InitFlex(play, &this->skelAnime, &gSkullFishSkel, &gSkullFishSwimAnim, this->jointTable, this->morphTable, OBJECT_PR_2_LIMB_MAX); this->type = ENPR2_GET_TYPE(&this->actor); this->actor.colChkInfo.mass = 10; @@ -550,8 +550,8 @@ void EnPr2_SetupDie(EnPr2* this) { if (this->type < PR2_TYPE_BROKEN) { EnPr2_ChangeAnim(this, PR2_ANIM_FLINCH); } else { - this->animEndFrame = Animation_GetLastFrame(&object_pr_Anim_003904); - Animation_Change(&this->skelAnime, &object_pr_Anim_003904, 1.0f, this->animEndFrame, this->animEndFrame, + this->animEndFrame = Animation_GetLastFrame(&gSkullFishDieAnim); + Animation_Change(&this->skelAnime, &gSkullFishDieAnim, 1.0f, this->animEndFrame, this->animEndFrame, ANIMMODE_ONCE, 0.0f); this->timer = Rand_S16Offset(20, 30); this->targetZRot = 0x4000; diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index eedc72bc16..40438ccc15 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -111,7 +111,7 @@ void EnPrz_Init(Actor* thisx, PlayState* play) { this->actor.colChkInfo.damageTable = &sDamageTable; this->actor.colChkInfo.health = 1; - SkelAnime_InitFlex(play, &this->skelAnime, &object_pr_Skel_004188, &object_pr_Anim_004340, this->jointTable, + SkelAnime_InitFlex(play, &this->skelAnime, &gSkullFishSkel, &gSkullFishSwimAnim, this->jointTable, this->morphTable, OBJECT_PR_2_LIMB_MAX); this->unk_1E6 = ENPRZ_GET(&this->actor); @@ -139,8 +139,8 @@ typedef enum EnPrzAnimation { } EnPrzAnimation; static AnimationHeader* sAnimations[ENPRZ_ANIM_MAX] = { - &object_pr_Anim_004340, // ENPRZ_ANIM_0 - &object_pr_Anim_004274, // ENPRZ_ANIM_1 + &gSkullFishSwimAnim, // ENPRZ_ANIM_0 + &gSkullFishAttackAnim, // ENPRZ_ANIM_1 }; static u8 sAnimationModes[ENPRZ_ANIM_MAX] = {