mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into skelanime

Browse source
This commit is contained in:
KrimtonZ 2020-03-24 11:56:37 -05:00
commit 8bbac143cd
505 changed files with 1437 additions and 2808 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -335,7 +335,7 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) {
}
path = &globalCtx->setupPathList[0];
point = SEGMENTED_TO_VIRTUAL(path->path);
point = SEGMENTED_TO_VIRTUAL(path->points);
point += this->currentWaypoint;
dx = point->x - this->actor.posRot.pos.x;
@ -359,7 +359,7 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) {
u16 func_80B1C54C(GlobalContext* globalCtx, Actor* a1) {
u16 ret;
ret = func_8006C360(globalCtx, 14);
ret = Text_GetFaceReaction(globalCtx, 14);
if (ret != 0) {
return ret;
}