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

merge and change scene thing

Browse source
This commit is contained in:
fig02 2020-03-20 08:17:48 -04:00
commit aa603ca229
113 changed files with 1722 additions and 5879 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -231,7 +231,7 @@ static s8 EnDog_CanFollow(EnDog* this, GlobalContext* globalCtx)
gSaveContext.dogParams = (this->actor.params & 0x7FFF);
return 1;
}
return 0;
}
@ -331,8 +331,8 @@ static void EnDog_Init(EnDog* this, GlobalContext* globalCtx)
Actor_Kill(&this->actor);
}
break;
case SCENE_BACK_ALLEY:
// Richard's Home
case SCENE_IMPA:
if ((u32)(this->actor.params & 0x8000) == 0)
{
if (gSaveContext.richardIsLost == 0)

1
src/overlays/actors/ovl_En_Dog/z_en_dog.h
View file

@ -8,7 +8,6 @@ typedef struct
{
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x018C */ char unk_18C[0x4];
/* 0x0190 */ ActorFunc actionFunc;
/* 0x0194 */ ColliderCylinderMain collider;
/* 0x01E0 */ Path* path;