mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-29 16:45:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #277 from nonmatch/patch-11

Browse Source 
Match sub_08068190
This commit is contained in:
notyourav
2022-01-11 19:44:31 -08:00
committed by GitHub
parent a33338a5bc d37e3df116
commit 22caeae4ba
2 changed files with 2 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/kid.c
+2 -3
View File
@@ -68,7 +68,7 @@ void sub_08062194(Entity* this) {
this->interactType = 0;
}
NONMATCH("asm/non_matching/kid/sub_080621AC.inc", void sub_080621AC(Entity* this)) {
void sub_080621AC(Entity* this) {
u32 tmp;
switch (this->action) {
@@ -115,8 +115,8 @@ NONMATCH("asm/non_matching/kid/sub_080621AC.inc", void sub_080621AC(Entity* this
}
}
sub_0806265C(this, *(ScriptExecutionContext**)&this->cutsceneBeh);
tmp = this->animIndex;
}
// TODO this needs to be moved up somehow?
this->field_0x6a.HALF.HI = this->animIndex;
if (this->animIndex < 8) {
InitializeAnimation(this, (this->animIndex & 0xfffffffc) +
@@ -138,7 +138,6 @@ NONMATCH("asm/non_matching/kid/sub_080621AC.inc", void sub_080621AC(Entity* this
break;
}
}
END_NONMATCH
ASM_FUNC("asm/non_matching/kid/sub_080622F4.inc", void sub_080622F4(Entity* this))