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

fix merge conflics

Browse source
This commit is contained in:
KrimtonZ 2020-03-22 20:57:25 -05:00
parent d136468ace
commit 6072055c85
6 changed files with 120 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -169,7 +169,7 @@ static void EnWallmas_StandStart(EnWallmas* this) {
}
static void EnWallmas_WalkStart(EnWallmas* this) {
func_800A529C(&this->skelAnime, &D_060041F4, 3.0f, &this->actor);
func_800A529C(&this->skelAnime, &D_060041F4, 3.0f);
this->actionFunc = (ActorFunc)&EnWallmas_Walk;
this->actor.speedXZ = 3.0f;
}