mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 19:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Child Ruto Part 2: Rename resurfacing animation (#2569)

Browse source
This commit is contained in:
Jordan Longstaff 2025-06-02 12:15:29 -04:00 • committed by GitHub
parent d2ef102802
commit 1627f8415b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/xml/objects/object_ru1.xml
View file

@ -18,7 +18,7 @@
<Animation Name="gRutoChildWalkAnim" Offset="0x78E4"/>
<Animation Name="gRutoChildTransitionFromSwimOnBackAnim" Offset="0x8100"/>
<Animation Name="gRutoChildTransitionToSwimOnBackAnim" Offset="0x8AA8"/>
<Animation Name="gRutoChildAnim_009060" Offset="0x9060"/>
<Animation Name="gRutoChildResurfaceAnim" Offset="0x9060"/>
<Animation Name="gRutoChildWait2Anim" Offset="0x97B8"/>
<Animation Name="gRutoChildSwimOnBackAnim" Offset="0x12E94"/>
<Animation Name="gRutoChildTreadWaterAnim" Offset="0x13A64"/>

4
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -645,10 +645,10 @@ void func_80AEBD94(EnRu1* this, PlayState* play) {
f32 frameCount;
if (func_80AEB480(play, 3)) {
frameCount = Animation_GetLastFrame(&gRutoChildAnim_009060);
frameCount = Animation_GetLastFrame(&gRutoChildResurfaceAnim);
func_80AEB934(this, play);
func_80AEB738(this, play);
Animation_Change(&this->skelAnime, &gRutoChildAnim_009060, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f);
Animation_Change(&this->skelAnime, &gRutoChildResurfaceAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f);
this->action = 2;
this->drawConfig = 1;
}