mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-24 23:22:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

name ShowNPCDialogue

Browse Source
This commit is contained in:
theo
2020-06-13 15:23:03 -07:00
parent b500126e76
commit 8e1ca1936b
30 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/brocco.s
+1 -1
View File
@@ -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
asm/carpenter.s
+1 -1
View File
@@ -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
asm/castleMaid.s
+1 -1
View File
@@ -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
asm/castorWildsStatue.s
+1 -1
View File
@@ -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
asm/code_0806ED78.s
+2 -2
View File
@@ -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}
asm/code_0807CC3C.s
+1 -1
View File
@@ -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
asm/dog.s
+1 -1
View File
@@ -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
asm/farmers.s
+1 -1
View File
@@ -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
asm/forestMinish.s
+3 -3
View File
@@ -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
asm/ghostBrothers.s
+1 -1
View File
@@ -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
asm/goron.s
+1 -1
View File
@@ -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
asm/guardWithSpear.s
+1 -1
View File
@@ -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
asm/hurdyGurdyMan.s
+1 -1
View File
@@ -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
asm/kid.s
+1 -1
View File
@@ -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
asm/mama.s
+1 -1
View File
@@ -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
asm/mayorHagen.s
+1 -1
View File
@@ -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
asm/mutoh.s
+1 -1
View File
@@ -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
asm/percy.s
+1 -1
View File
@@ -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
asm/pina.s
+1 -1
View File
@@ -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
asm/postman.s
+1 -1
View File
@@ -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
asm/sittingPerson.s
+1 -1
View File
@@ -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
asm/smallTownMinish.s
+1 -1
View File
@@ -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
asm/smith.s
+1 -1
View File
@@ -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
asm/teachers.s
+1 -1
View File
@@ -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
asm/townMinish.s
+1 -1
View File
@@ -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
asm/townsperson.s
+1 -1
View File
@@ -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
asm/windTribespeople.s
+3 -3
View File
@@ -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
src/cow.c
+4 -2
View File
@@ -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) {
src/epona.c
+2 -2
View File
@@ -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)
src/stamp.c
+3 -3
View File
@@ -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)