more function naming

src/overlays/actors/ovl_En_An/z_en_an.h

@@ -7,7 +7,7 @@
 struct EnAn;
 
 typedef void (*EnAnActionFunc)(struct EnAn*, PlayState*);
-typedef void (*EnAnUnkFunc)(struct EnAn*, PlayState*);
+typedef void (*EnAnDialogueFunc)(struct EnAn*, PlayState*);
 typedef s32 (*MsgEventFunc)(Actor*, PlayState*);
 
 #define ENAN_GET_PATH_INDEX(thisx) ((thisx)->params & 0xFF)
@@ -21,8 +21,8 @@ typedef s32 (*MsgEventFunc)(Actor*, PlayState*);
 #define ENAN_STATE_80               (1 << 7)
 #define ENAN_STATE_100              (1 << 8)
 #define ENAN_STATE_200              (1 << 9)
-#define ENAN_STATE_400              (1 << 10)
-#define ENAN_STATE_DRAW_FOOD_TRAY   (1 << 11)
+#define ENAN_STATE_TALKING          (1 << 10)
+#define ENAN_STATE_DRAW_TRAY        (1 << 11)
 #define ENAN_STATE_DRAW_UMBRELLA    (1 << 12)
 #define ENAN_STATE_DRAW_BROOM       (1 << 13)
 #define ENAN_STATE_DRAW_KAFEI_MASK  (1 << 14)
@@ -32,7 +32,7 @@ typedef struct EnAn {
     /* 0x000 */ Actor actor;
     /* 0x144 */ SkelAnime skelAnime;
     /* 0x188 */ EnAnActionFunc actionFunc;
-    /* 0x18C */ EnAnUnkFunc unk_18C;
+    /* 0x18C */ EnAnDialogueFunc dialogueFunc;
     /* 0x190 */ ColliderCylinder collider;
     /* 0x1DC */ Path* timePath;
     /* 0x1E0 */ Vec3f timePathTargetPos;
@@ -49,7 +49,7 @@ typedef struct EnAn {
     /* 0x20B */ s8 an4ObjectSlot;
     /* 0x20C */ s8 msmoObjectSlot;
     /* 0x210 */ s32 msgScriptResumePos;
-    /* 0x214 */ s8 unk_214; // curRoom.num
+    /* 0x214 */ s8 roomNum;
     /* 0x215 */ s8 unk_215;
     /* 0x218 */ Actor* lookAtActor;
     /* 0x21C */ UNK_TYPE1 unk_21C[0xC];
@@ -81,7 +81,7 @@ typedef struct EnAn {
     /* 0x390 */ s16 eyeTexIndex;
     /* 0x392 */ s16 mouthTexIndex;
     /* 0x394 */ s16 unk_394;
-    /* 0x396 */ s16 unk_396;
+    /* 0x396 */ s16 dialogueFuncState;
     /* 0x398 */ MsgEventFunc msgEventFunc;
     /* 0x39C */ s32 animIndex;
     /* 0x3A0 */ UNK_TYPE1 unk_3A0[0x8];
@@ -89,7 +89,7 @@ typedef struct EnAn {
     /* 0x3AC */ u32 unk_3AC;
     /* 0x3B0 */ s32 forceDraw;
     /* 0x3B4 */ s32 drawMoonMask;
-    /* 0x3B8 */ s32 unk_3B8;
+    /* 0x3B8 */ s32 slotsInitialized;
     /* 0x3BC */ s32 unk_3BC;
     /* 0x3C0 */ s32 unk_3C0;
     /* 0x3C4 */ s32 unk_3C4; // set but not read

src/overlays/actors/ovl_En_Go/z_en_go.c

@@ -12,6 +12,7 @@
  *     one outside the shop, not all Gorons in the Goron Shrine are covered by this actor).
  * - Medigoron: The Powder Keg making Medigoron in Goron Village.
  */
+
 #include "z_en_go.h"
 #include "z64quake.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"

tools/disasm/functions.txt

@@ -14007,8 +14007,8 @@
     0x80B52AF0:("EnGk_PostLimbDraw",),
     0x80B52D8C:("EnGk_TransformLimbDraw",),
     0x80B52F74:("EnGk_Draw",),
-    0x80B53840:("func_80B53840",),
-    0x80B539CC:("func_80B539CC",),
+    0x80B53840:("EnAn_InitializeObjectSlots",),
+    0x80B539CC:("EnAn_FindActor",),
     0x80B53A7C:("func_80B53A7C",),
     0x80B53B3C:("EnAn_FindDoor",),
     0x80B53BA8:("func_80B53BA8",),
@@ -14025,8 +14025,8 @@
     0x80B54BC4:("func_80B54BC4",),
     0x80B54C5C:("func_80B54C5C",),
     0x80B54D18:("func_80B54D18",),
-    0x80B54DF4:("func_80B54DF4",),
-    0x80B55180:("func_80B55180",),
+    0x80B54DF4:("EnAn_GetMsgEventScript",),
+    0x80B55180:("EnAn_CheckTalk",),
     0x80B552E4:("func_80B552E4",),
     0x80B553AC:("EnAn_UpdateHeadRot",),
     0x80B554E8:("func_80B554E8",),
@@ -14034,8 +14034,8 @@
     0x80B556F8:("func_80B556F8",),
     0x80B557AC:("func_80B557AC",),
     0x80B55860:("func_80B55860",),
-    0x80B55914:("func_80B55914",),
-    0x80B55D20:("func_80B55D20",),
+    0x80B55914:("EnAn_HandleDialog",),
+    0x80B55D20:("EnAn_FindLookAtActor",),
     0x80B55D98:("func_80B55D98",),
     0x80B55ECC:("func_80B55ECC",),
     0x80B55F8C:("func_80B55F8C",),
@@ -14058,9 +14058,9 @@
     0x80B575BC:("func_80B575BC",),
     0x80B57674:("func_80B57674",),
     0x80B57718:("func_80B57718",),
-    0x80B577F0:("func_80B577F0",),
-    0x80B578F8:("func_80B578F8",),
-    0x80B57A44:("func_80B57A44",),
+    0x80B577F0:("EnAn_Initialize",),
+    0x80B578F8:("EnAn_FollowSchedule",),
+    0x80B57A44:("EnAn_Talk",),
     0x80B57B48:("func_80B57B48",),
     0x80B57C9C:("EnAn_Init",),
     0x80B57D70:("EnAn_Destroy",),

tools/disasm/variables.txt

@@ -14472,8 +14472,8 @@
     0x80B58B88:("D_80B58B88","UNK_TYPE1","",0x1),
     0x80B58B90:("D_80B58B90","UNK_TYPE1","",0x1),
     0x80B58B9C:("En_An_InitVars","UNK_TYPE1","",0x1),
-    0x80B58BBC:("D_80B58BBC","UNK_TYPE1","",0x1),
-    0x80B58BE8:("D_80B58BE8","UNK_TYPE1","",0x1),
+    0x80B58BBC:("sCylinderInit","UNK_TYPE1","",0x1),
+    0x80B58BE8:("sColChkInfoInit","UNK_TYPE1","",0x1),
     0x80B58BF4:("sAnimationInfo","UNK_TYPE1","",0x1),
     0x80B58E34:("D_80B58E34","UNK_TYPE1","",0x1),
     0x80B58E40:("sMouthIndices","UNK_TYPE1","",0x1),