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

Fix Draw Callbacks, fix segmented address in z_en_bird

Browse source
This commit is contained in:
KrimtonZ 2020-03-25 11:43:11 -05:00
parent 095924d05a
commit 582b32d39c
7 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -712,36 +712,36 @@ void func_80B1D200(GlobalContext* globalCtx) {
func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190);
}
s32 func_80B1D278(s16 a0, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3, Vec3s* sp10, Actor* actor) {
s32 func_80B1D278(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) {
EnTk* tk = (EnTk*)actor;
switch (a1) {
switch (limbIndex) {
/* Limb 15 - Head */
case 15:
tk->h_21E = sp10->y;
tk->h_21E = rot->y;
break;
/* Limb 16 - Jaw */
case 16:
tk->h_21E += sp10->y;
sp10->y += tk->headRot;
tk->h_21E += rot->y;
rot->y += tk->headRot;
break;
}
return 0;
}
void func_80B1D2E4(GlobalContext* globalCtx, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3, Actor* actor) {
void func_80B1D2E4(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) {
EnTk* this = (EnTk*)actor;
Vec3f sp28 = { 0.f, 0.f, 4600.f };
Vec3f sp1C = { 0.f, 0.f, 0.f };
/* Limb 16 - Jaw */
if (a1 == 16) {
if (limbIndex == 16) {
Matrix_MultVec3f(&sp1C, &this->actor.posRot2.pos);
}
/* Limb 14 - Neck */
if (a1 == 14) {
if (limbIndex == 14) {
Matrix_MultVec3f(&sp28, &this->v3f_304);
func_80B1D200(globalCtx);
}