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

Doc object_rs (#1439)

Browse source
This commit is contained in:
Derek Hensley 2022-11-21 03:12:54 -08:00 • committed by GitHub
parent 9cdd1678e2
commit 83c3b64b1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View file

@ -1097,7 +1097,7 @@ void DemoEc_DrawFishingOwner(DemoEc* this, PlayState* play) {
void DemoEc_InitBombchuShopOwner(DemoEc* this, PlayState* play) {
DemoEc_UseDrawObject(this, play);
DemoEc_InitSkelAnime(this, play, &object_rs_Skel_004868);
DemoEc_InitSkelAnime(this, play, &gBombchuShopkeeperSkel);
DemoEc_UseAnimationObject(this, play);
DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false);
func_8096D5D4(this, play);

2
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -2029,7 +2029,7 @@ void EnOssan_InitHappyMaskShopkeeper(EnOssan* this, PlayState* play) {
}
void EnOssan_InitBombchuShopkeeper(EnOssan* this, PlayState* play) {
SkelAnime_InitFlex(play, &this->skelAnime, &object_rs_Skel_004868, &object_rs_Anim_00065C, NULL, NULL, 0);
SkelAnime_InitFlex(play, &this->skelAnime, &gBombchuShopkeeperSkel, &gBombchuShopkeeperIdleAnim, NULL, NULL, 0);
this->actor.draw = EnOssan_DrawBombchuShopkeeper;
this->obj3ToSeg6Func = NULL;
}