mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Document En_Ko Animations (#1306)

Browse source 
* Document Kokiri Children animations

* Remove BOY, GIRL, and FADO prefixes

* Formatting

* Further prefix removal

* more fixups

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
Charles Averill 2022-11-21 15:30:27 -06:00 committed by GitHub
parent 83c3b64b1c
commit 9bdf6ded2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 145 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
assets/xml/objects/object_os_anime.xml
View file

@ -35,34 +35,34 @@
<Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/> <Animation Name="gObjOsAnim_4CF4" Offset="0x4CF4"/>
<Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/> <Animation Name="gObjOsAnim_4E90" Offset="0x4E90"/>
<Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/> <Animation Name="gObjOsAnim_4F28" Offset="0x4F28"/>
<Animation Name="gObjOsAnim_5808" Offset="0x5808"/> <Animation Name="gKokiriLaughingAnim" Offset="0x5808"/>
<Animation Name="gObjOsAnim_62DC" Offset="0x62DC"/> <Animation Name="gKokiriIdleAnim" Offset="0x62DC"/>
<Animation Name="gObjOsAnim_6458" Offset="0x6458"/> <Animation Name="gObjOsAnim_6458" Offset="0x6458"/>
<Animation Name="gObjOsAnim_6518" Offset="0x6518"/> <Animation Name="gObjOsAnim_6518" Offset="0x6518"/>
<Animation Name="gObjOsAnim_65E0" Offset="0x65E0"/> <Animation Name="gKokiriRecliningSittingUpAnim" Offset="0x65E0"/>
<Animation Name="gObjOsAnim_6A60" Offset="0x6A60"/> <Animation Name="gKokiriWipingForeheadAnim" Offset="0x6A60"/>
<Animation Name="gObjOsAnim_6EE0" Offset="0x6EE0"/> <Animation Name="gKokiriBackflipAnim" Offset="0x6EE0"/>
<Animation Name="gObjOsAnim_6F9C" Offset="0x6F9C"/> <Animation Name="gKokiriSittingCrossedArmsLegsAnim" Offset="0x6F9C"/>
<Animation Name="gObjOsAnim_7064" Offset="0x7064"/> <Animation Name="gKokiriStandingApprehensiveAnim" Offset="0x7064"/>
<Animation Name="gObjOsAnim_7120" Offset="0x7120"/> <Animation Name="gKokiriLeaningOnArmsAnim" Offset="0x7120"/>
<Animation Name="gObjOsAnim_7454" Offset="0x7454"/> <Animation Name="gKokiriSittingDiggingAnim" Offset="0x7454"/> <!-- unused -->
<Animation Name="gObjOsAnim_7830" Offset="0x7830"/> <Animation Name="gKokiriLiftingRockAnim" Offset="0x7830"/>
<Animation Name="gObjOsAnim_7D94" Offset="0x7D94"/> <Animation Name="gKokiriCuttingGrassAnim" Offset="0x7D94"/>
<Animation Name="gObjOsAnim_7E64" Offset="0x7E64"/> <Animation Name="gKokiriSittingHeadOnHandAnim" Offset="0x7E64"/>
<Animation Name="gObjOsAnim_7F38" Offset="0x7F38"/> <Animation Name="gKokiriRecliningLeaningBackAnim" Offset="0x7F38"/>
<Animation Name="gObjOsAnim_7FFC" Offset="0x7FFC"/> <Animation Name="gKokiriStandingHandOnChestAnim" Offset="0x7FFC"/>
<Animation Name="gObjOsAnim_80B4" Offset="0x80B4"/> <Animation Name="gKokiriStandingHandsOnHipsAnim" Offset="0x80B4"/>
<Animation Name="gObjOsAnim_8178" Offset="0x8178"/> <Animation Name="gKokiriRecliningStandingAnim" Offset="0x8178"/>
<Animation Name="gObjOsAnim_879C" Offset="0x879C"/> <Animation Name="gKokiriPunchingAnim" Offset="0x879C"/>
<Animation Name="gObjOsAnim_8F6C" Offset="0x8F6C"/> <Animation Name="gKokiriBlockingAnim" Offset="0x8F6C"/>
<Animation Name="gObjOsAnim_9028" Offset="0x9028"/> <Animation Name="gKokiriSittingArmsUpAnim" Offset="0x9028"/>
<Animation Name="gObjOsAnim_90EC" Offset="0x90EC"/> <Animation Name="gKokiriStandingRightArmUpAnim" Offset="0x90EC"/>
<Animation Name="gObjOsAnim_91AC" Offset="0x91AC"/> <Animation Name="gKokiriSittingAnim" Offset="0x91AC"/>
<Animation Name="gObjOsAnim_9274" Offset="0x9274"/> <Animation Name="gKokiriStandingAnim" Offset="0x9274"/>
<Animation Name="gObjOsAnim_982C" Offset="0x982C"/> <Animation Name="gKokiriStandingArmsBehindBackAnim" Offset="0x982C"/>
<Animation Name="gObjOsAnim_98EC" Offset="0x98EC"/> <Animation Name="gKokiriLeaningForwardAnim" Offset="0x98EC"/> <!-- unused -->
<Animation Name="gObjOsAnim_99A4" Offset="0x99A4"/> <Animation Name="gKokiriSittingCrossedLegsAnim" Offset="0x99A4"/>
<Animation Name="gObjOsAnim_9B64" Offset="0x9B64"/> <Animation Name="gKokiriStandUpAnim" Offset="0x9B64"/>
<Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/> <Animation Name="gObjOsAnim_9F94" Offset="0x9F94"/>
<Animation Name="gObjOsAnim_A630" Offset="0xA630"/> <Animation Name="gObjOsAnim_A630" Offset="0xA630"/>
</File> </File>

215
src/overlays/actors/ovl_En_Ko/z_en_ko.c
View file

@ -90,93 +90,116 @@ static EnKoSkeleton sSkeleton[2] = {
}; };
typedef enum { typedef enum {
/* 0 */ ENKO_ANIM_0, /* 0 */ ENKO_ANIM_BLOCKING_NOMORPH,
/* 1 */ ENKO_ANIM_1, /* 1 */ ENKO_ANIM_BLOCKING_NOMORPH_STATIC,
/* 2 */ ENKO_ANIM_2, /* 2 */ ENKO_ANIM_STANDUP_1,
/* 3 */ ENKO_ANIM_3, /* 3 */ ENKO_ANIM_STANDUP_2,
/* 4 */ ENKO_ANIM_4, /* 4 */ ENKO_ANIM_STANDUP_3,
/* 5 */ ENKO_ANIM_5, /* 5 */ ENKO_ANIM_IDLE_NOMORPH,
/* 6 */ ENKO_ANIM_6, /* 6 */ ENKO_ANIM_IDLE,
/* 7 */ ENKO_ANIM_7, /* 7 */ ENKO_ANIM_LAUGHING,
/* 8 */ ENKO_ANIM_8, /* 8 */ ENKO_ANIM_LIFTING_ROCK_NOMORPH,
/* 9 */ ENKO_ANIM_9, /* 9 */ ENKO_ANIM_RECLINED_STANDING,
/* 10 */ ENKO_ANIM_10, /* 10 */ ENKO_ANIM_RECLINED_SITTING_UP,
/* 11 */ ENKO_ANIM_11, /* 11 */ ENKO_ANIM_PUNCHING_NOMORPH,
/* 12 */ ENKO_ANIM_12, /* 12 */ ENKO_ANIM_STANDING_HAND_ON_CHEST,
/* 13 */ ENKO_ANIM_13, /* 13 */ ENKO_ANIM_STANDING_HANDS_ON_HIPS,
/* 14 */ ENKO_ANIM_14, /* 14 */ ENKO_ANIM_SITTING,
/* 15 */ ENKO_ANIM_15, /* 15 */ ENKO_ANIM_SITTING_CROSSED_ARMS_LEGS,
/* 16 */ ENKO_ANIM_16, /* 16 */ ENKO_ANIM_STANDING_APPREHENSIVE,
/* 17 */ ENKO_ANIM_17, /* 17 */ ENKO_ANIM_LEANING_ON_ARMS,
/* 18 */ ENKO_ANIM_18, /* 18 */ ENKO_ANIM_RECLINED_LEANING_BACK,
/* 19 */ ENKO_ANIM_19, /* 19 */ ENKO_ANIM_CUTTING_GRASS_NOMORPH,
/* 20 */ ENKO_ANIM_20, /* 20 */ ENKO_ANIM_BACKFLIP,
/* 21 */ ENKO_ANIM_21, /* 21 */ ENKO_ANIM_LEANING_FORWARD,
/* 22 */ ENKO_ANIM_22, /* 22 */ ENKO_ANIM_STANDING_RIGHT_ARM_UP,
/* 23 */ ENKO_ANIM_23, /* 23 */ ENKO_ANIM_STANDING_ARMS_BEHIND_BACK,
/* 24 */ ENKO_ANIM_24, /* 24 */ ENKO_ANIM_STANDING,
/* 25 */ ENKO_ANIM_25, /* 25 */ ENKO_ANIM_SITTING_CROSSED_LEGS,
/* 26 */ ENKO_ANIM_26, /* 26 */ ENKO_ANIM_SITTING_ARMS_UP,
/* 27 */ ENKO_ANIM_27, /* 27 */ ENKO_ANIM_SITTING_HEAD_ON_HAND,
/* 28 */ ENKO_ANIM_28, /* 28 */ ENKO_ANIM_SITTING_DIGGING,
/* 29 */ ENKO_ANIM_29, /* 29 */ ENKO_ANIM_BLOCKING_STATIC,
/* 30 */ ENKO_ANIM_30, /* 30 */ ENKO_ANIM_CUTTING_GRASS,
/* 31 */ ENKO_ANIM_31, /* 31 */ ENKO_ANIM_PUNCHING,
/* 32 */ ENKO_ANIM_32, /* 32 */ ENKO_ANIM_WIPING_FOREHEAD,
/* 33 */ ENKO_ANIM_33 /* 33 */ ENKO_ANIM_LIFTING_ROCK
} EnKoAnimation; } EnKoAnimation;
static AnimationInfo sAnimationInfo[] = { static AnimationInfo sAnimationInfo[] = {
{ &gObjOsAnim_8F6C, 1.0f, 2.0f, 14.0f, ANIMMODE_LOOP_PARTIAL, 0.0f }, { &gKokiriBlockingAnim, 1.0f, 2.0f, 14.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
{ &gObjOsAnim_8F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, 0.0f }, { &gKokiriBlockingAnim, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
{ &gObjOsAnim_9B64, 0.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f }, { &gKokiriStandUpAnim, 0.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f },
{ &gObjOsAnim_9B64, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f }, { &gKokiriStandUpAnim, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gObjOsAnim_9B64, 0.0f, 2.0f, 2.0f, ANIMMODE_ONCE, 0.0f }, { &gKokiriStandUpAnim, 0.0f, 2.0f, 2.0f, ANIMMODE_ONCE, 0.0f },
{ &gObjOsAnim_62DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriIdleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_62DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, { &gKokiriIdleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
{ &gObjOsAnim_5808, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, { &gKokiriLaughingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
{ &gObjOsAnim_7830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriLiftingRockAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_8178, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriRecliningStandingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_65E0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriRecliningSittingUpAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriPunchingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7FFC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriStandingHandOnChestAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_80B4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriStandingHandsOnHipsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_91AC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriSittingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_6F9C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriSittingCrossedArmsLegsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7064, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriStandingApprehensiveAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7120, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriLeaningOnArmsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7F38, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriRecliningLeaningBackAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriCuttingGrassAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_6EE0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriBackflipAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_98EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriLeaningForwardAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_90EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriStandingRightArmUpAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_982C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriStandingArmsBehindBackAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_9274, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriStandingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_99A4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriSittingCrossedLegsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_9028, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriSittingArmsUpAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7E64, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriSittingHeadOnHandAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7454, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, { &gKokiriSittingDiggingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_8F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, -8.0f }, { &gKokiriBlockingAnim, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, -8.0f },
{ &gObjOsAnim_7D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { &gKokiriCuttingGrassAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ &gObjOsAnim_879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { &gKokiriPunchingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ &gObjOsAnim_6A60, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { &gKokiriWipingForeheadAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ &gObjOsAnim_7830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f }, { &gKokiriLiftingRockAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
}; };
static u8 sOsAnimeLookup[13][5] = { static u8 sOsAnimeLookup[13][5] = {
/* ENKO_TYPE_CHILD_0 */ { ENKO_ANIM_8, ENKO_ANIM_9, ENKO_ANIM_9, ENKO_ANIM_14, ENKO_ANIM_11 }, /* ENKO_TYPE_CHILD_0 */ { ENKO_ANIM_LIFTING_ROCK_NOMORPH, ENKO_ANIM_RECLINED_STANDING,
/* ENKO_TYPE_CHILD_1 */ { ENKO_ANIM_2, ENKO_ANIM_12, ENKO_ANIM_2, ENKO_ANIM_13, ENKO_ANIM_13 }, ENKO_ANIM_RECLINED_STANDING, ENKO_ANIM_SITTING, ENKO_ANIM_PUNCHING_NOMORPH },
/* ENKO_TYPE_CHILD_2 */ { ENKO_ANIM_11, ENKO_ANIM_11, ENKO_ANIM_11, ENKO_ANIM_15, ENKO_ANIM_9 }, /* ENKO_TYPE_CHILD_1 */
/* ENKO_TYPE_CHILD_3 */ { ENKO_ANIM_0, ENKO_ANIM_16, ENKO_ANIM_16, ENKO_ANIM_17, ENKO_ANIM_18 }, { ENKO_ANIM_STANDUP_1, ENKO_ANIM_STANDING_HAND_ON_CHEST, ENKO_ANIM_STANDUP_1, ENKO_ANIM_STANDING_HANDS_ON_HIPS,
/* ENKO_TYPE_CHILD_4 */ { ENKO_ANIM_19, ENKO_ANIM_19, ENKO_ANIM_20, ENKO_ANIM_10, ENKO_ANIM_9 }, ENKO_ANIM_STANDING_HANDS_ON_HIPS },
/* ENKO_TYPE_CHILD_5 */ { ENKO_ANIM_3, ENKO_ANIM_3, ENKO_ANIM_3, ENKO_ANIM_3, ENKO_ANIM_3 }, /* ENKO_TYPE_CHILD_2 */
/* ENKO_TYPE_CHILD_6 */ { ENKO_ANIM_4, ENKO_ANIM_22, ENKO_ANIM_22, ENKO_ANIM_4, ENKO_ANIM_23 }, { ENKO_ANIM_PUNCHING_NOMORPH, ENKO_ANIM_PUNCHING_NOMORPH, ENKO_ANIM_PUNCHING_NOMORPH,
/* ENKO_TYPE_CHILD_7 */ { ENKO_ANIM_24, ENKO_ANIM_16, ENKO_ANIM_16, ENKO_ANIM_25, ENKO_ANIM_16 }, ENKO_ANIM_SITTING_CROSSED_ARMS_LEGS, ENKO_ANIM_RECLINED_STANDING },
/* ENKO_TYPE_CHILD_8 */ { ENKO_ANIM_26, ENKO_ANIM_15, ENKO_ANIM_15, ENKO_ANIM_26, ENKO_ANIM_15 }, /* ENKO_TYPE_CHILD_3 */
/* ENKO_TYPE_CHILD_9 */ { ENKO_ANIM_3, ENKO_ANIM_3, ENKO_ANIM_3, ENKO_ANIM_27, ENKO_ANIM_27 }, { ENKO_ANIM_BLOCKING_NOMORPH, ENKO_ANIM_STANDING_APPREHENSIVE, ENKO_ANIM_STANDING_APPREHENSIVE,
/* ENKO_TYPE_CHILD_10 */ { ENKO_ANIM_2, ENKO_ANIM_2, ENKO_ANIM_2, ENKO_ANIM_2, ENKO_ANIM_22 }, ENKO_ANIM_LEANING_ON_ARMS, ENKO_ANIM_RECLINED_LEANING_BACK },
/* ENKO_TYPE_CHILD_11 */ { ENKO_ANIM_14, ENKO_ANIM_14, ENKO_ANIM_14, ENKO_ANIM_14, ENKO_ANIM_14 }, /* ENKO_TYPE_CHILD_4 */
/* ENKO_TYPE_CHILD_FADO */ { ENKO_ANIM_5, ENKO_ANIM_5, ENKO_ANIM_5, ENKO_ANIM_5, ENKO_ANIM_5 }, { ENKO_ANIM_CUTTING_GRASS_NOMORPH, ENKO_ANIM_CUTTING_GRASS_NOMORPH, ENKO_ANIM_BACKFLIP,
ENKO_ANIM_RECLINED_SITTING_UP, ENKO_ANIM_RECLINED_STANDING },
/* ENKO_TYPE_CHILD_5 */
{ ENKO_ANIM_STANDUP_2, ENKO_ANIM_STANDUP_2, ENKO_ANIM_STANDUP_2, ENKO_ANIM_STANDUP_2, ENKO_ANIM_STANDUP_2 },
/* ENKO_TYPE_CHILD_6 */
{ ENKO_ANIM_STANDUP_3, ENKO_ANIM_STANDING_RIGHT_ARM_UP, ENKO_ANIM_STANDING_RIGHT_ARM_UP, ENKO_ANIM_STANDUP_3,
ENKO_ANIM_STANDING_ARMS_BEHIND_BACK },
/* ENKO_TYPE_CHILD_7 */
{ ENKO_ANIM_STANDING, ENKO_ANIM_STANDING_APPREHENSIVE, ENKO_ANIM_STANDING_APPREHENSIVE,
ENKO_ANIM_SITTING_CROSSED_LEGS, ENKO_ANIM_STANDING_APPREHENSIVE },
/* ENKO_TYPE_CHILD_8 */
{ ENKO_ANIM_SITTING_ARMS_UP, ENKO_ANIM_SITTING_CROSSED_ARMS_LEGS, ENKO_ANIM_SITTING_CROSSED_ARMS_LEGS,
ENKO_ANIM_SITTING_ARMS_UP, ENKO_ANIM_SITTING_CROSSED_ARMS_LEGS },
/* ENKO_TYPE_CHILD_9 */
{ ENKO_ANIM_STANDUP_2, ENKO_ANIM_STANDUP_2, ENKO_ANIM_STANDUP_2, ENKO_ANIM_SITTING_HEAD_ON_HAND,
ENKO_ANIM_SITTING_HEAD_ON_HAND },
/* ENKO_TYPE_CHILD_10 */
{ ENKO_ANIM_STANDUP_1, ENKO_ANIM_STANDUP_1, ENKO_ANIM_STANDUP_1, ENKO_ANIM_STANDUP_1,
ENKO_ANIM_STANDING_RIGHT_ARM_UP },
/* ENKO_TYPE_CHILD_11 */
{ ENKO_ANIM_SITTING, ENKO_ANIM_SITTING, ENKO_ANIM_SITTING, ENKO_ANIM_SITTING, ENKO_ANIM_SITTING },
/* ENKO_TYPE_CHILD_FADO */
{ ENKO_ANIM_IDLE_NOMORPH, ENKO_ANIM_IDLE_NOMORPH, ENKO_ANIM_IDLE_NOMORPH, ENKO_ANIM_IDLE_NOMORPH,
ENKO_ANIM_IDLE_NOMORPH },
}; };
typedef struct { typedef struct {
@ -664,13 +687,13 @@ s32 func_80A97D68(EnKo* this, PlayState* play) {
s16 arg3; s16 arg3;
if (this->unk_1E8.unk_00 != 0) { if (this->unk_1E8.unk_00 != 0) {
if ((this->skelAnime.animation == &gObjOsAnim_6A60) == false) { if ((this->skelAnime.animation == &gKokiriWipingForeheadAnim) == false) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_32); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_WIPING_FOREHEAD);
} }
arg3 = 2; arg3 = 2;
} else { } else {
if ((this->skelAnime.animation == &gObjOsAnim_7830) == false) { if ((this->skelAnime.animation == &gKokiriLiftingRockAnim) == false) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_33); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_LIFTING_ROCK);
} }
arg3 = 1; arg3 = 1;
} }
@ -717,14 +740,14 @@ s32 func_80A97F70(EnKo* this, PlayState* play) {
s16 arg3; s16 arg3;
if (this->unk_1E8.unk_00 != 0) { if (this->unk_1E8.unk_00 != 0) {
if ((this->skelAnime.animation == &gObjOsAnim_8F6C) == false) { if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_29); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_BLOCKING_STATIC);
} }
func_80034F54(play, this->unk_2E4, this->unk_304, 16); func_80034F54(play, this->unk_2E4, this->unk_304, 16);
arg3 = 2; arg3 = 2;
} else { } else {
if ((this->skelAnime.animation == &gObjOsAnim_7D94) == false) { if ((this->skelAnime.animation == &gKokiriCuttingGrassAnim) == false) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_30); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_CUTTING_GRASS);
} }
arg3 = 1; arg3 = 1;
} }
@ -737,15 +760,15 @@ s32 func_80A98034(EnKo* this, PlayState* play) {
s32 result; s32 result;
if (this->unk_1E8.unk_00 != 0) { if (this->unk_1E8.unk_00 != 0) {
if ((this->skelAnime.animation == &gObjOsAnim_8F6C) == false) { if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_29); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_BLOCKING_STATIC);
} }
func_80034F54(play, this->unk_2E4, this->unk_304, 16); func_80034F54(play, this->unk_2E4, this->unk_304, 16);
result = EnKo_IsWithinTalkAngle(this); result = EnKo_IsWithinTalkAngle(this);
arg3 = (result == true) ? 2 : 1; arg3 = (result == true) ? 2 : 1;
} else { } else {
if ((this->skelAnime.animation == &gObjOsAnim_879C) == false) { if ((this->skelAnime.animation == &gKokiriPunchingAnim) == false) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_31); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_PUNCHING);
} }
arg3 = 1; arg3 = 1;
result = EnKo_IsWithinTalkAngle(this); result = EnKo_IsWithinTalkAngle(this);
@ -1172,7 +1195,7 @@ void func_80A99048(EnKo* this, PlayState* play) {
void func_80A99384(EnKo* this, PlayState* play) { void func_80A99384(EnKo* this, PlayState* play) {
if (ENKO_TYPE == ENKO_TYPE_CHILD_FADO && this->unk_1E8.unk_00 != 0 && this->actor.textId == 0x10B9) { if (ENKO_TYPE == ENKO_TYPE_CHILD_FADO && this->unk_1E8.unk_00 != 0 && this->actor.textId == 0x10B9) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_7); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_LAUGHING);
this->actionFunc = func_80A99438; this->actionFunc = func_80A99438;
} else if (ENKO_TYPE == ENKO_TYPE_CHILD_FADO && this->unk_1E8.unk_00 == 2) { } else if (ENKO_TYPE == ENKO_TYPE_CHILD_FADO && this->unk_1E8.unk_00 == 2) {
this->actionFunc = func_80A99504; this->actionFunc = func_80A99504;
@ -1183,12 +1206,12 @@ void func_80A99384(EnKo* this, PlayState* play) {
void func_80A99438(EnKo* this, PlayState* play) { void func_80A99438(EnKo* this, PlayState* play) {
if (ENKO_TYPE == ENKO_TYPE_CHILD_FADO && this->unk_1E8.unk_00 == 2) { if (ENKO_TYPE == ENKO_TYPE_CHILD_FADO && this->unk_1E8.unk_00 == 2) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_6); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_IDLE);
this->actionFunc = func_80A99504; this->actionFunc = func_80A99504;
play->msgCtx.stateTimer = 4; play->msgCtx.stateTimer = 4;
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
} else if (this->unk_1E8.unk_00 == 0 || this->actor.textId != 0x10B9) { } else if (this->unk_1E8.unk_00 == 0 || this->actor.textId != 0x10B9) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_6); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_IDLE);
this->actionFunc = func_80A99384; this->actionFunc = func_80A99384;
} }
} }