Document EnGo and EnGo2 functions, fields, and animations

assets/xml/objects/object_oF1d_map.xml

@@ -1,37 +1,78 @@
 <Root>
+    <!-- Goron -->
     <File Name="object_oF1d_map" Segment="6">
         <!-- animations -->
-        <Animation Name="gGoronAnim_000750" Offset="0x750"/>
-        <Animation Name="gGoronAnim_000D5C" Offset="0xD5C"/>
-        <Animation Name="gGoronAnim_00161C" Offset="0x161C"/>
-        <Animation Name="gGoronAnim_001A00" Offset="0x1A00"/>
-        <Animation Name="gGoronAnim_0021D0" Offset="0x21D0"/>
-        <Animation Name="gGoronAnim_0029A8" Offset="0x29A8"/>
-        <Animation Name="gGoronAnim_002D80" Offset="0x2D80"/>
-        <Animation Name="gGoronAnim_003768" Offset="0x3768"/>
-        <Animation Name="gGoronAnim_0038E4" Offset="0x38E4"/>
-        <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
-        <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
-
-        <DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
-        <DList Name="gGoronDL_00C140" Offset="0xC140"/>
-
-        <DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
-        <DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
+        <Animation Name="gGoronSobbingLoopAnim"    Offset="0x750"/>
+        <Animation Name="gGoronShakingLoopAnim"    Offset="0xD5C"/>
+        <Animation Name="gGoronUncurlToProneAnim"  Offset="0x161C"/>
+        <Animation Name="gGoronProneLoopAnim"      Offset="0x1A00"/>
+        <Animation Name="gGoronScratchingLoopAnim" Offset="0x21D0"/>
+        <Animation Name="gGoronWalkingLoopAnim"    Offset="0x29A8"/>
+        <Animation Name="gGoronEyedropsTakenAnim"  Offset="0x2D80"/>
+        <Animation Name="gGoronCryingLoopAnim"     Offset="0x3768"/>
+        <Animation Name="gGoronEyeropsLoopAnim"    Offset="0x38E4"/>
+        <Animation Name="gGoronUncurlSitStandAnim" Offset="0x4930"/>
+        <Animation Name="gGoronSidestepLoopAnim"   Offset="0x10590"/>
 
+        <!-- skeleton, limb none -->
         <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
 
+        <!-- limbs -->
+        <Limb Name="gGoronRootLimb"         LimbType="Standard" Offset="0xFDE0"/>
+        <Limb Name="gGoronWaistLimb"        LimbType="Standard" Offset="0xFDEC"/>
+        <Limb Name="gGoronLegsLimb"         LimbType="Standard" Offset="0xFDF8"/>
+        <Limb Name="gGoronLeftThighLimb"    LimbType="Standard" Offset="0xFE04"/>
+        <Limb Name="gGoronLeftShinLimb"     LimbType="Standard" Offset="0xFE10"/>
+        <Limb Name="gGoronLeftFootLimb"     LimbType="Standard" Offset="0xFE1C"/>
+        <Limb Name="gGoronRightThighLimb"   LimbType="Standard" Offset="0xFE28"/>
+        <Limb Name="gGoronRightShinLimb"    LimbType="Standard" Offset="0xFE34"/>
+        <Limb Name="gGoronRightFootLimb"    LimbType="Standard" Offset="0xFE40"/>
+        <Limb Name="gGoronTorsoLimb"        LimbType="Standard" Offset="0xFE4C"/>
+        <Limb Name="gGoronLeftArmLimb"      LimbType="Standard" Offset="0xFE58"/>
+        <Limb Name="gGoronLeftForearmLimb"  LimbType="Standard" Offset="0xFE64"/>
+        <Limb Name="gGoronLeftHandLimb"     LimbType="Standard" Offset="0xFE70"/>
+        <Limb Name="gGoronRightArmLimb"     LimbType="Standard" Offset="0xFE7C"/>
+        <Limb Name="gGoronRightForearmLimb" LimbType="Standard" Offset="0xFE88"/>
+        <Limb Name="gGoronRightHandLimb"    LimbType="Standard" Offset="0xFE94"/>
+        <Limb Name="gGoronHeadLimb"         LimbType="Standard" Offset="0xFEA0"/>
+
+        <!-- limb display lists -->
+        <DList Name="gGoronWaistDL"        Offset="0x8708"/>
+        <DList Name="gGoronLeftThighDL"    Offset="0x8C80"/>
+        <DList Name="gGoronLeftShinDL"     Offset="0x8D70"/>
+        <DList Name="gGoronLeftFootDL"     Offset="0x8EC0"/>
+        <DList Name="gGoronRightThighDL"   Offset="0x87D0"/>
+        <DList Name="gGoronRightShinDL"    Offset="0x88C0"/>
+        <DList Name="gGoronRightFootDL"    Offset="0x8A10"/>
+        <DList Name="gGoronTorsoDL"        Offset="0x6F90"/>
+        <DList Name="gGoronLeftArmDL"      Offset="0x8218"/>
+        <DList Name="gGoronLeftForearmDL"  Offset="0x83A0"/>
+        <DList Name="gGoronLeftHandDL"     Offset="0x84E0"/>
+        <DList Name="gGoronRightArmDL"     Offset="0x7D28"/>
+        <DList Name="gGoronRightForearmDL" Offset="0x7EB0"/>
+        <DList Name="gGoronRightHandDL"    Offset="0x7FF0"/>
+        <DList Name="gGoronHeadDL"         Offset="0x7458"/>
+
+        <!-- states display lists -->
+        <DList Name="gGoronCurledUpDL"         Offset="0xBD80"/>
+        <DList Name="gGoronRollingDL"          Offset="0xC140"/>
+
+        <!-- effects display lists -->
+        <DList Name="gGoronParticleMaterialDL" Offset="0xFD40"/>
+        <DList Name="gGoronParticleDL"         Offset="0xFD50"/>
+
+        <!-- palettes -->
         <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>
 
         <!-- Eye textures -->
-        <Texture Name="gGoronCsEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
-        <Texture Name="gGoronCsEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
-        <Texture Name="gGoronCsEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeOpenTex"    OutName="eye_open"    Format="ci8" Width="32" Height="32" Offset="0xCE80" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeHalfTex"    OutName="eye_half"    Format="ci8" Width="32" Height="32" Offset="0xD280" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsEyeClosedTex"  OutName="eye_closed"  Format="ci8" Width="32" Height="32" Offset="0xD680" TlutOffset="0xC640"/>
         <Texture Name="gGoronCsEyeClosed2Tex" OutName="eye_closed2" Format="ci8" Width="32" Height="32" Offset="0xDA80" TlutOffset="0xC640"/>
 
         <!-- Mouth textures -->
         <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
-        <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
+        <Texture Name="gGoronCsMouthSmileTex"   OutName="mouth_smile"   Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
 
     </File>
 </Root>

include/z64actor.h

@@ -837,7 +837,7 @@ s32 Actor_OfferTalkExchangeEquiCylinder(Actor* actor, struct PlayState* play, f3
 s32 Actor_OfferTalk(Actor* actor, struct PlayState* play, f32 radius);
 s32 Actor_OfferTalkNearColChkInfoCylinder(Actor* actor, struct PlayState* play);
 u32 Actor_TextboxIsClosing(Actor* actor, struct PlayState* play);
-s8 func_8002F368(struct PlayState* play);
+s8 Player_GetExchangeItemId(struct PlayState* play);
 void Actor_GetScreenPos(struct PlayState* play, Actor* actor, s16* x, s16* y);
 u32 Actor_HasParent(Actor* actor, struct PlayState* play);
 s32 Actor_OfferGetItem(Actor* actor, struct PlayState* play, s32 getItemId, f32 xzRange, f32 yRange);

src/code/z_actor.c

@@ -1759,7 +1759,7 @@ u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play) {
     }
 }
 
-s8 func_8002F368(PlayState* play) {
+s8 Player_GetExchangeItemId(PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     return player->exchangeItemId;

src/overlays/actors/ovl_Demo_Go/z_demo_go.c

@@ -254,7 +254,7 @@ void func_8097CEEC(DemoGo* this, PlayState* play) {
 }
 
 void func_8097CF20(DemoGo* this, PlayState* play, s32 arg2) {
-    AnimationHeader* animation = &gGoronAnim_0029A8;
+    AnimationHeader* animation = &gGoronWalkingLoopAnim;
     if (arg2 != 0) {
         Animation_Change(&this->skelAnime, animation, 1.0f, 0.0f, Animation_GetLastFrame(animation), ANIMMODE_LOOP,
                          -8.0f);
@@ -328,7 +328,7 @@ void DemoGo_Update(Actor* thisx, PlayState* play) {
 
 void DemoGo_Init(Actor* thisx, PlayState* play) {
     DemoGo* this = (DemoGo*)thisx;
-    AnimationHeader* animation = &gGoronAnim_004930;
+    AnimationHeader* animation = &gGoronUncurlSitStandAnim;
 
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
     SkelAnime_InitFlex(play, &this->skelAnime, &gGoronSkel, NULL, NULL, NULL, 0);

src/overlays/actors/ovl_En_Ds/z_en_ds.c

@@ -206,7 +206,7 @@ void EnDs_Wait(EnDs* this, PlayState* play) {
     s16 yawDiff;
 
     if (Actor_TalkOfferAccepted(&this->actor, play)) {
-        if (func_8002F368(play) == EXCH_ITEM_ODD_MUSHROOM) {
+        if (Player_GetExchangeItemId(play) == EXCH_ITEM_ODD_MUSHROOM) {
             Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
                                  &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
             player->actor.textId = 0x504A;

src/overlays/actors/ovl_En_Gb/z_en_gb.c

@@ -284,7 +284,7 @@ void func_80A2F83C(EnGb* this, PlayState* play) {
     if (Actor_TalkOfferAccepted(&this->dyna.actor, play)) {
         s32 pad;
 
-        switch (func_8002F368(play)) {
+        switch (Player_GetExchangeItemId(play)) {
             case EXCH_ITEM_NONE:
                 func_80A2F180(this);
                 this->actionFunc = func_80A2F94C;