name ShowNPCDialogue

30 files changed, 41 insertions, 39 deletions

diff --git a/asm/brocco.s b/asm/brocco.s
index e357359c..43ac8ca7 100644
--- a/asm/brocco.s
+++ b/asm/brocco.s
@@ -238,7 +238,7 @@ sub_080636D8: @ 0x080636D8
 	lsls r1, r1, #3
 	ldr r2, _080636F0 @ =gUnk_0810CAAC
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _080636EC: .4byte gUnk_02002A40
diff --git a/asm/carpenter.s b/asm/carpenter.s
index 1e3b291e..b4b900c6 100644
--- a/asm/carpenter.s
+++ b/asm/carpenter.s
@@ -217,7 +217,7 @@ _08067300: .4byte gUnk_08110CE8
 sub_08067304: @ 0x08067304
 	push {lr}
 	ldr r1, _08067310 @ =gUnk_08110D00
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _08067310: .4byte gUnk_08110D00
diff --git a/asm/castleMaid.s b/asm/castleMaid.s
index d66f8729..9ba02461 100644
--- a/asm/castleMaid.s
+++ b/asm/castleMaid.s
@@ -217,7 +217,7 @@ sub_08064688: @ 0x08064688
 	lsls r1, r1, #3
 	ldr r2, _080646A0 @ =gUnk_0810F894
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806469C: .4byte gUnk_02002A40
diff --git a/asm/castorWildsStatue.s b/asm/castorWildsStatue.s
index 563508ba..8277d219 100644
--- a/asm/castorWildsStatue.s
+++ b/asm/castorWildsStatue.s
@@ -558,7 +558,7 @@ sub_08067790: @ 0x08067790
 	ldr r3, _080677B0 @ =gUnk_08110EF8
 	adds r2, r2, r3
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _080677AC: .4byte gUnk_02002A40
diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s
index bccabdd4..bf2a09af 100644
--- a/asm/code_0806ED78.s
+++ b/asm/code_0806ED78.s
@@ -610,8 +610,8 @@ _0806F1A0:
 _0806F1A4: .4byte gUnk_02002A40
 _0806F1A8: .4byte 0x000001C1
 
-	thumb_func_start sub_0806F1AC
-sub_0806F1AC: @ 0x0806F1AC
+	thumb_func_start ShowNPCDialogue
+ShowNPCDialogue: @ 0x0806F1AC
 	push {r4, r5, r6, r7, lr}
 	mov r7, r8
 	push {r7}
diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s
index 51d76c15..267cb22a 100644
--- a/asm/code_0807CC3C.s
+++ b/asm/code_0807CC3C.s
@@ -6085,7 +6085,7 @@ _0807F704: .4byte gLinkState
 sub_0807F708: @ 0x0807F708
 	push {lr}
 	ldr r1, [r1, #4]
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 
diff --git a/asm/dog.s b/asm/dog.s
index 64acf7d9..9d3633b4 100644
--- a/asm/dog.s
+++ b/asm/dog.s
@@ -733,7 +733,7 @@ sub_0806A080: @ 0x0806A080
 	ldr r3, _0806A0A0 @ =gUnk_08111E34
 	adds r2, r2, r3
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806A09C: .4byte gUnk_02002A40
diff --git a/asm/farmers.s b/asm/farmers.s
index 37db69dc..d7409d82 100644
--- a/asm/farmers.s
+++ b/asm/farmers.s
@@ -155,7 +155,7 @@ sub_0806BCE8: @ 0x0806BCE8
 	lsls r1, r1, #3
 	ldr r2, _0806BCF8 @ =gUnk_08113158
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806BCF8: .4byte gUnk_08113158
diff --git a/asm/forestMinish.s b/asm/forestMinish.s
index 2009ad27..48da8b55 100644
--- a/asm/forestMinish.s
+++ b/asm/forestMinish.s
@@ -306,7 +306,7 @@ sub_08060208: @ 0x08060208
 	lsls r1, r1, #5
 	ldr r2, _08060218 @ =gUnk_08109DC8
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _08060218: .4byte gUnk_08109DC8
@@ -339,7 +339,7 @@ _08060244:
 	adds r0, r0, r2
 	adds r1, r1, r0
 	adds r0, r5, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {r4, r5, pc}
 	.align 2, 0
 _08060258: .4byte gUnk_08109DC8
@@ -351,7 +351,7 @@ sub_0806025C: @ 0x0806025C
 	lsls r1, r1, #5
 	ldr r2, _0806026C @ =gUnk_08109DC8
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806026C: .4byte gUnk_08109DC8
diff --git a/asm/ghostBrothers.s b/asm/ghostBrothers.s
index ecbc304c..a78b9167 100644
--- a/asm/ghostBrothers.s
+++ b/asm/ghostBrothers.s
@@ -519,7 +519,7 @@ _08065F74:
 	adds r0, r0, r2
 	adds r1, r1, r0
 	adds r0, r3, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _08065F88: .4byte gUnk_02002A40
diff --git a/asm/goron.s b/asm/goron.s
index d28e89d5..2f2c4bc5 100644
--- a/asm/goron.s
+++ b/asm/goron.s
@@ -284,7 +284,7 @@ sub_080694D8: @ 0x080694D8
 	lsls r1, r1, #3
 	ldr r2, _080694E8 @ =gUnk_08111A94
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _080694E8: .4byte gUnk_08111A94
diff --git a/asm/guardWithSpear.s b/asm/guardWithSpear.s
index ddd199f1..858bedb4 100644
--- a/asm/guardWithSpear.s
+++ b/asm/guardWithSpear.s
@@ -995,7 +995,7 @@ _08064454:
 _08064460:
 	adds r1, r0, r1
 	adds r0, r3, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806446C: .4byte gUnk_0810D0A4
diff --git a/asm/hurdyGurdyMan.s b/asm/hurdyGurdyMan.s
index a75cc0a0..f130c1fd 100644
--- a/asm/hurdyGurdyMan.s
+++ b/asm/hurdyGurdyMan.s
@@ -152,7 +152,7 @@ _0806E428:
 	ldr r0, _0806E43C @ =gUnk_081144FC
 	adds r1, r1, r0
 	adds r0, r2, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806E438: .4byte gUnk_02002A40
diff --git a/asm/kid.s b/asm/kid.s
index ded40ea9..22487381 100644
--- a/asm/kid.s
+++ b/asm/kid.s
@@ -768,7 +768,7 @@ _08062678:
 	lsls r0, r0, #3
 	adds r1, r1, r0
 	adds r0, r2, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 _08062690:
 	pop {pc}
 	.align 2, 0
diff --git a/asm/mama.s b/asm/mama.s
index b47765ca..084a762f 100644
--- a/asm/mama.s
+++ b/asm/mama.s
@@ -177,7 +177,7 @@ sub_0806C4DC: @ 0x0806C4DC
 	lsls r1, r1, #3
 	ldr r2, _0806C4F4 @ =gUnk_08113760
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806C4F0: .4byte gUnk_02002A40
diff --git a/asm/mayorHagen.s b/asm/mayorHagen.s
index 73fc8768..5988631c 100644
--- a/asm/mayorHagen.s
+++ b/asm/mayorHagen.s
@@ -159,7 +159,7 @@ _0806CED6:
 	ldr r0, _0806CEE4 @ =gUnk_08113F48
 	adds r1, r1, r0
 	adds r0, r5, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {r4, r5, pc}
 	.align 2, 0
 _0806CEE4: .4byte gUnk_08113F48
diff --git a/asm/mutoh.s b/asm/mutoh.s
index f871cf7c..6aaf6e9a 100644
--- a/asm/mutoh.s
+++ b/asm/mutoh.s
@@ -148,7 +148,7 @@ sub_080670E4: @ 0x080670E4
 	lsls r1, r1, #3
 	ldr r2, _080670FC @ =gUnk_08110C10
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _080670F8: .4byte gUnk_02002A40
diff --git a/asm/percy.s b/asm/percy.s
index c201c4e5..c2a2d686 100644
--- a/asm/percy.s
+++ b/asm/percy.s
@@ -176,7 +176,7 @@ sub_0806B4F0: @ 0x0806B4F0
 	lsls r1, r1, #3
 	ldr r2, _0806B500 @ =gUnk_08112E2C
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806B500: .4byte gUnk_08112E2C
diff --git a/asm/pina.s b/asm/pina.s
index f8299efa..dce75f39 100644
--- a/asm/pina.s
+++ b/asm/pina.s
@@ -310,7 +310,7 @@ sub_08063C90: @ 0x08063C90
 	lsls r1, r1, #3
 	ldr r2, _08063CA8 @ =gUnk_0810CE04
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _08063CA4: .4byte gUnk_02002A40
diff --git a/asm/postman.s b/asm/postman.s
index 02c2b5a4..aff6f826 100644
--- a/asm/postman.s
+++ b/asm/postman.s
@@ -391,7 +391,7 @@ _080606E8:
 	ldr r0, _080606FC @ =gUnk_0810AA30
 	adds r1, r1, r0
 	adds r0, r2, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _080606F8: .4byte gUnk_02002A40
diff --git a/asm/sittingPerson.s b/asm/sittingPerson.s
index 8e6acead..e7902c50 100644
--- a/asm/sittingPerson.s
+++ b/asm/sittingPerson.s
@@ -289,7 +289,7 @@ _08063958:
 	adds r0, r0, r2
 	adds r1, r1, r0
 	adds r0, r3, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806396C: .4byte gUnk_02002A40
diff --git a/asm/smallTownMinish.s b/asm/smallTownMinish.s
index 34164701..28c66af2 100644
--- a/asm/smallTownMinish.s
+++ b/asm/smallTownMinish.s
@@ -75,7 +75,7 @@ _0806E2EC:
 	adds r0, r0, r2
 	adds r1, r1, r0
 	adds r0, r3, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806E300: .4byte gUnk_02002A40
diff --git a/asm/smith.s b/asm/smith.s
index 32d64c30..e90a8573 100644
--- a/asm/smith.s
+++ b/asm/smith.s
@@ -343,7 +343,7 @@ _0806623C:
 	ldr r0, _08066250 @ =gUnk_08110390
 	adds r1, r1, r0
 	adds r0, r2, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806624C: .4byte gUnk_02002A40
diff --git a/asm/teachers.s b/asm/teachers.s
index 73a88f4b..47f2519e 100644
--- a/asm/teachers.s
+++ b/asm/teachers.s
@@ -196,7 +196,7 @@ _0806C71C:
 	adds r0, r0, r2
 	adds r1, r1, r0
 	adds r0, r3, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806C730: .4byte gUnk_02002A40
diff --git a/asm/townMinish.s b/asm/townMinish.s
index cfac1130..5b4f4100 100644
--- a/asm/townMinish.s
+++ b/asm/townMinish.s
@@ -555,7 +555,7 @@ _0806AFCC:
 	adds r0, r0, r2
 	adds r1, r1, r0
 	adds r0, r3, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806AFE0: .4byte gUnk_02002A40
diff --git a/asm/townsperson.s b/asm/townsperson.s
index edfe63e9..7bf9340c 100644
--- a/asm/townsperson.s
+++ b/asm/townsperson.s
@@ -661,7 +661,7 @@ _0806205E:
 	adds r0, r0, r2
 	adds r1, r1, r0
 	adds r0, r3, #0
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	b _08062084
 	.align 2, 0
 _08062074: .4byte gUnk_02002A40
diff --git a/asm/windTribespeople.s b/asm/windTribespeople.s
index 922b48c6..054b7d0d 100644
--- a/asm/windTribespeople.s
+++ b/asm/windTribespeople.s
@@ -232,7 +232,7 @@ sub_0806C928: @ 0x0806C928
 	lsls r1, r1, #3
 	ldr r2, _0806C940 @ =gUnk_08113ABC
 	adds r1, r1, r2
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806C93C: .4byte gUnk_02002A40
@@ -376,7 +376,7 @@ _0806CA38: .4byte 0x00002527
 sub_0806CA3C: @ 0x0806CA3C
 	push {lr}
 	ldr r1, _0806CA48 @ =gUnk_08113B28
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806CA48: .4byte gUnk_08113B28
@@ -385,7 +385,7 @@ _0806CA48: .4byte gUnk_08113B28
 sub_0806CA4C: @ 0x0806CA4C
 	push {lr}
 	ldr r1, _0806CA58 @ =gUnk_08113B30
-	bl sub_0806F1AC
+	bl ShowNPCDialogue
 	pop {pc}
 	.align 2, 0
 _0806CA58: .4byte gUnk_08113B30
diff --git a/src/cow.c b/src/cow.c
index 7b3fa232..48d517ca 100644
--- a/src/cow.c
+++ b/src/cow.c
@@ -9,7 +9,7 @@ extern u32 sub_0805ACC0(Entity*);
 extern u32 sub_0801E99C(Entity*);
 extern void sub_0806924C(Entity*);
 extern void sub_080AEF88(Entity*);
-extern void sub_0806F1AC(Entity*, u32*);
+extern void ShowNPCDialogue(Entity*, u32*);
 extern void sub_08078778(Entity*);
 extern void sub_080787A8(Entity*, u32);
 extern void sub_0806F118(Entity*);
@@ -182,10 +182,11 @@ void sub_080691E0(Entity* ent) {
     }
 }
 
+//Show dialogue
 void sub_080691F8(Entity* ent) {
     u32 var0 = ent->entityType.parameter1;
     u32* var1 = gUnk_08111938 + (var0 * 2);
-    sub_0806F1AC(ent, var1);
+    ShowNPCDialogue(ent, var1);
 }
 
 void sub_0806920C(Entity* ent) {
@@ -204,6 +205,7 @@ void sub_0806920C(Entity* ent) {
     ent->field_0x6d = var1;
 }
 
+//Check if player interacting
 void sub_0806924C(Entity* ent) {
     s8 itype = ent->interactType;
     if (itype != 0) {
diff --git a/src/epona.c b/src/epona.c
index 33d9d1d1..044dd37d 100644
--- a/src/epona.c
+++ b/src/epona.c
@@ -9,7 +9,7 @@ extern void LoadAnimation(Entity*, u32);
 extern void sub_080042B8(Entity*);
 extern void sub_08065AA4(Entity*);
 extern u32 UpdateFuseInteraction(void);
-extern void sub_0806F1AC(Entity*, u64*);
+extern void ShowNPCDialogue(Entity*, u64*);
 extern void sub_08078778(Entity*);
 extern void sub_080787A8(Entity*, u32);
 extern void sub_0806F118(Entity*);
@@ -77,7 +77,7 @@ void sub_08065A34(Entity* ent)
 
 void sub_08065A50(Entity* ent)
 {
-    sub_0806F1AC(ent, &gUnk_08110080[ent->entityType.parameter1]);
+    ShowNPCDialogue(ent, &gUnk_08110080[ent->entityType.parameter1]);
 }
 
 void sub_08065A64(Entity* ent)
diff --git a/src/stamp.c b/src/stamp.c
index dae01efd..6f8ae194 100644
--- a/src/stamp.c
+++ b/src/stamp.c
@@ -15,7 +15,7 @@ extern void sub_08062CA4();
 extern void sub_0807DDAC();
 extern void sub_0807DDE4();
 extern u32 sub_0801E7F4();
-extern void sub_0806F1AC();
+extern void ShowNPCDialogue();
 
 
 extern void (*gStampBehaviors1[4])(Entity*);
@@ -37,7 +37,7 @@ extern void sub_08062CA4();
 extern void sub_0807DDAC();
 extern void sub_0807DDE4();
 extern u32 sub_0801E7F4();
-extern void sub_0806F1AC();
+extern void ShowNPCDialogue();
 
 
 extern void (*gStampBehaviors1[4])(Entity*);
@@ -115,7 +115,7 @@ void sub_08062CBC(Entity *ent)
     u32 uVar1;
     
     uVar1 = sub_0801E7F4(44);
-    sub_0806F1AC(ent, &gUnk_0810C2E4 + ((-uVar1 | uVar1) >> 31) * 2);
+    ShowNPCDialogue(ent, &gUnk_0810C2E4 + ((-uVar1 | uVar1) >> 31) * 2);
 }
 
 void sub_08062CE0(Entity *ent)