diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-11 19:44:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-11 19:44:31 -0800 |
| commit | 22caeae4bad024c040e10c2cdc896362d2a59b87 (patch) | |
| tree | 0eb92f80808f89d00c1bc68c6f1b42aae2d75e9e /src | |
| parent | a33338a5bcec2fc5a6dfe404b8be04621b597ae8 (diff) | |
| parent | d37e3df1168382f2983c72a37df48228ada40880 (diff) | |
Merge pull request #277 from nonmatch/patch-11
Match sub_08068190
Diffstat (limited to 'src')
| -rw-r--r-- | src/npc/kid.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/npc/kid.c b/src/npc/kid.c index 9b116b0a..4ad6c8d2 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -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)) |