mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-01 17:59:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #278 from nonmatch/patch-12

Browse Source 
Match sub_0806265C
This commit is contained in:
notyourav
2022-01-11 19:44:51 -08:00
committed by GitHub
parent 22caeae4ba 24b87e8d1e
commit 5c3dc144ab
2 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/kid.c
+4 -3
View File
@@ -198,14 +198,15 @@ void sub_08062634(Entity* this) {
MessageNoOverlap(gUnk_0810BDE8[a][b], this);
}
NONMATCH("asm/non_matching/kid/sub_0806265C.inc", void sub_0806265C(Entity* this, ScriptExecutionContext* context)) {
void sub_0806265C(Entity* this, ScriptExecutionContext* context) {
if (gSave.global_progress == 0) {
MessageNoOverlap(0, this);
} else {
ShowNPCDialogue(this, &gUnk_0810BE10[this->type * 9 + gSave.global_progress]);
Dialog* pDialog = &gUnk_0810BE10[this->type * 9];
pDialog += gSave.global_progress;
ShowNPCDialogue(this, pDialog);
}
}
END_NONMATCH
void sub_08062698(Entity* this) {
this->speed = (Random() & 0x3f) + 0xc0;