diff options
| author | theo <arisstephenson2@gmail.com> | 2020-06-13 15:23:03 -0700 |
|---|---|---|
| committer | theo <arisstephenson2@gmail.com> | 2020-06-13 15:23:03 -0700 |
| commit | 8e1ca1936b4066fa252a14576cb5e4e79aff92b8 (patch) | |
| tree | 9967b730e2d23db9ea2c924bfd71228658ef7bb7 /src | |
| parent | b500126e76e16c5fdfde194288d6687968bbbd8b (diff) | |
name ShowNPCDialogue
Diffstat (limited to 'src')
| -rw-r--r-- | src/cow.c | 6 | ||||
| -rw-r--r-- | src/epona.c | 4 | ||||
| -rw-r--r-- | src/stamp.c | 6 |
3 files changed, 9 insertions, 7 deletions
@@ -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) |