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

Document object_os (#1414)

Browse source
This commit is contained in:
Derek Hensley 2022-10-21 16:57:49 -07:00 • committed by GitHub
parent a715bf63d0
commit 2cb423d9ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1038,7 +1038,7 @@ void DemoEc_DrawPotionShopOwner(DemoEc* this, PlayState* play) {
void DemoEc_InitMaskShopOwner(DemoEc* this, PlayState* play) {
DemoEc_UseDrawObject(this, play);
DemoEc_InitSkelAnime(this, play, &object_os_Skel_004658);
DemoEc_InitSkelAnime(this, play, &gHappyMaskSalesmanSkel);
DemoEc_UseAnimationObject(this, play);
DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false);
func_8096D5D4(this, play);
@ -1054,7 +1054,7 @@ void DemoEc_UpdateMaskShopOwner(DemoEc* this, PlayState* play) {
}
void DemoEc_DrawMaskShopOwner(DemoEc* this, PlayState* play) {
DemoEc_DrawSkeleton(this, play, gOsEyeClosedTex, NULL, NULL, NULL);
DemoEc_DrawSkeleton(this, play, gHappyMaskSalesmanEyeClosedTex, NULL, NULL, NULL);
}
void DemoEc_InitFishingOwner(DemoEc* this, PlayState* play) {

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

@ -2023,7 +2023,7 @@ void EnOssan_InitPotionShopkeeper(EnOssan* this, PlayState* play) {
}
void EnOssan_InitHappyMaskShopkeeper(EnOssan* this, PlayState* play) {
SkelAnime_InitFlex(play, &this->skelAnime, &object_os_Skel_004658, &object_os_Anim_0002E4, NULL, NULL, 0);
SkelAnime_InitFlex(play, &this->skelAnime, &gHappyMaskSalesmanSkel, &gHappyMaskSalesmanIdleAnim, NULL, NULL, 0);
this->actor.draw = EnOssan_DrawHappyMaskShopkeeper;
this->obj3ToSeg6Func = NULL;
}
@ -2454,8 +2454,11 @@ void EnOssan_DrawZoraShopkeeper(Actor* thisx, PlayState* play) {
}
void EnOssan_DrawPotionShopkeeper(Actor* thisx, PlayState* play) {
static void* sPotionShopkeeperEyeTextures[] = { gPotionShopkeeperEyeOpenTex, gPotionShopkeeperEyeHalfTex,
gPotionShopkeeperEyeClosedTex };
static void* sPotionShopkeeperEyeTextures[] = {
gPotionShopkeeperEyeOpenTex,
gPotionShopkeeperEyeHalfTex,
gPotionShopkeeperEyeClosedTex,
};
EnOssan* this = (EnOssan*)thisx;
s32 pad;
@ -2472,7 +2475,7 @@ void EnOssan_DrawPotionShopkeeper(Actor* thisx, PlayState* play) {
}
void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, PlayState* play) {
static void* sHappyMaskShopkeeperEyeTextures[] = { gOsEyeClosedTex, gOsEyeOpenTex };
static void* sHappyMaskShopkeeperEyeTextures[] = { gHappyMaskSalesmanEyeClosedTex, gHappyMaskSalesmanEyeOpenTex };
EnOssan* this = (EnOssan*)thisx;
s32 pad;
@ -2491,8 +2494,11 @@ void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, PlayState* play) {
}
void EnOssan_DrawBombchuShopkeeper(Actor* thisx, PlayState* play) {
static void* sBombchuShopkeeperEyeTextures[] = { gBombchuShopkeeperEyeOpenTex, gBombchuShopkeeperEyeHalfTex,
gBombchuShopkeeperEyeClosedTex };
static void* sBombchuShopkeeperEyeTextures[] = {
gBombchuShopkeeperEyeOpenTex,
gBombchuShopkeeperEyeHalfTex,
gBombchuShopkeeperEyeClosedTex,
};
EnOssan* this = (EnOssan*)thisx;
s32 pad;