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

Rename struct variables

Browse source
This commit is contained in:
JordanLongstaff 2025-06-05 08:47:28 -04:00
parent b351f21804
commit f4bffa6c48
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -245,24 +245,24 @@ void EnRu1_Destroy(Actor* thisx, PlayState* play) {
void EnRu1_UpdateEyes(EnRu1* this) {
s32 pad[3];
s16* blinkTimer = &this->blinkTimer;
s16* eyeIndex = &this->eyeIndex;
s16* eyes = &this->eyes;
if (DECR(*blinkTimer) == 0) {
*blinkTimer = Rand_S16Offset(60, 60);
}
*eyeIndex = *blinkTimer;
if (*eyeIndex >= ENRU1_EYES_UP) {
*eyeIndex = ENRU1_EYES_OPEN;
*eyes = *blinkTimer;
if (*eyes >= ENRU1_EYES_UP) {
*eyes = ENRU1_EYES_OPEN;
}
}
void EnRu1_SetEyes(EnRu1* this, s16 eyeIndex) {
this->eyeIndex = eyeIndex;
void EnRu1_SetEyes(EnRu1* this, s16 eyes) {
this->eyes = eyes;
}
void EnRu1_SetMouth(EnRu1* this, s16 mouthIndex) {
this->mouthIndex = mouthIndex;
void EnRu1_SetMouth(EnRu1* this, s16 mouth) {
this->mouth = mouth;
}
void func_80AEAECC(EnRu1* this, PlayState* play) {
@ -2386,11 +2386,11 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play) {
void EnRu1_DrawOpa(EnRu1* this, PlayState* play) {
s32 pad[2];
s16 eyeIndex = this->eyeIndex;
void* eyeTex = sEyeTextures[eyeIndex];
s16 mouthIndex = this->mouthIndex;
s16 eyes = this->eyes;
void* eyeTex = sEyeTextures[eyes];
s16 mouth = this->mouth;
SkelAnime* skelAnime = &this->skelAnime;
void* mouthTex = sMouthTextures[mouthIndex];
void* mouthTex = sMouthTextures[mouth];
s32 pad1;
OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1282);
@ -2411,11 +2411,11 @@ void EnRu1_DrawOpa(EnRu1* this, PlayState* play) {
void EnRu1_DrawXlu(EnRu1* this, PlayState* play) {
s32 pad[2];
s16 eyeIndex = this->eyeIndex;
void* eyeTex = sEyeTextures[eyeIndex];
s16 mouthIndex = this->mouthIndex;
s16 eyes = this->eyes;
void* eyeTex = sEyeTextures[eyes];
s16 mouth = this->mouth;
SkelAnime* skelAnime = &this->skelAnime;
void* mouthTex = sMouthTextures[mouthIndex];
void* mouthTex = sMouthTextures[mouth];
s32 pad1;
OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1324);

4
src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
View file

@ -18,9 +18,9 @@ typedef struct EnRu1 {
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s jointTable[17];
/* 0x01F6 */ Vec3s morphTable[17];
/* 0x025C */ s16 eyeIndex;
/* 0x025C */ s16 eyes;
/* 0x025E */ s16 blinkTimer;
/* 0x0260 */ s16 mouthIndex;
/* 0x0260 */ s16 mouth;
/* 0x0264 */ s32 action;
/* 0x0268 */ s32 drawConfig;
/* 0x026C */ f32 unk_26C;