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

Rename culling related variables (#225)

Browse source 
* rename some things

* reword one comment

* rename vars

* fix bgjyalift
This commit is contained in:
fig02 2020-06-24 21:20:31 -04:00 • committed by GitHub
parent 6b2a013cca
commit d77dbe0465
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 189 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -582,14 +582,14 @@ void func_80AEBA2C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEBAFC(EnRu1* this) {
if (this->unk_298 == 0) {
func_80078914(&this->actor.unk_E4, NA_SE_EV_DIVE_INTO_WATER);
func_80078914(&this->actor.projectedPos, NA_SE_EV_DIVE_INTO_WATER);
this->unk_298 = 1;
}
}
void func_80AEBB3C(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 5.0f)) {
func_80078914(&this->actor.unk_E4, 0x863);
func_80078914(&this->actor.projectedPos, 0x863);
}
}
@ -599,13 +599,13 @@ void func_80AEBB78(EnRu1* this) {
if ((((func_800A56C8(skelAnime, 4.0f)) || (func_800A56C8(skelAnime, 13.0f))) ||
(func_800A56C8(skelAnime, 22.0f))) ||
(func_800A56C8(skelAnime, 31.0f))) {
func_80078914(&this->actor.unk_E4, 0x839);
func_80078914(&this->actor.projectedPos, 0x839);
}
}
void func_80AEBBF4(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 8.0f)) {
func_80078914(&this->actor.unk_E4, 0x873);
func_80078914(&this->actor.projectedPos, 0x873);
}
}
@ -614,14 +614,14 @@ void func_80AEBC30(GlobalContext* globalCtx) {
if (globalCtx->csCtx.frames == 0xCD) {
player = PLAYER;
Audio_PlaySoundGeneral(NA_SE_EV_DIVE_INTO_WATER, &player->actor.unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_EV_DIVE_INTO_WATER, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
}
}
void func_80AEBC84(EnRu1* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.frames == 0x82) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LAUGH_0);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0);
}
}
@ -861,14 +861,14 @@ void func_80AEC650(EnRu1* this) {
s32 pad[2];
if (this->unk_280 == 0) {
if ((func_800A56C8(&this->skelAnime, 2.0f)) || (func_800A56C8(&this->skelAnime, 7.0f))) {
func_80078914(&this->actor.unk_E4, 0x803);
func_80078914(&this->actor.projectedPos, 0x803);
}
}
}
void func_80AEC6B0(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_EV_FALL_DOWN_DIRT);
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_FALL);
func_80078914(&this->actor.projectedPos, NA_SE_EV_FALL_DOWN_DIRT);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_FALL);
}
void func_80AEC6E4(EnRu1* this, GlobalContext* globalCtx) {
@ -1221,32 +1221,32 @@ void func_80AED44C(EnRu1* this, GlobalContext* globalCtx) {
}
void func_80AED4FC(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_EV_LAND_DIRT);
func_80078914(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT);
}
func_80AED520(EnRu1* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Audio_PlaySoundGeneral(0x883, &player->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LIFT);
Audio_PlaySoundGeneral(0x883, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LIFT);
}
void func_80AED57C(EnRu1* this) {
if (this->actor.speedXZ != 0.0f) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_THROW);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_THROW);
}
}
void func_80AED5B8(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_CRASH);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_CRASH);
}
void func_80AED5DC(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_UNBALLANCE);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_UNBALLANCE);
}
void func_80AED600(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_DISCOVER);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_DISCOVER);
}
s32 func_80AED624(EnRu1* this, GlobalContext* globalCtx) {
@ -1845,7 +1845,7 @@ void func_80AEEFEC(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEF080(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 11.0f)) {
func_80078914(&this->actor.unk_E4, NA_SE_EV_LAND_DIRT);
func_80078914(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT);
}
}
@ -1937,22 +1937,22 @@ void func_80AEF40C(EnRu1* this) {
if ((func_800A56C8(skelAnime, 2.0f)) || (func_800A56C8(skelAnime, 7.0f)) || (func_800A56C8(skelAnime, 12.0f)) ||
(func_800A56C8(skelAnime, 18.0f)) || (func_800A56C8(skelAnime, 25.0f)) || (func_800A56C8(skelAnime, 33.0f))) {
func_80078914(&this->actor.unk_E4, 0x803);
func_80078914(&this->actor.projectedPos, 0x803);
}
}
void func_80AEF4A8(EnRu1* this, GlobalContext* globalCtx) {
Audio_PlaySoundAtPosition(globalCtx, &this->actor.unk_E4, 20, NA_SE_VO_RT_FALL);
Audio_PlaySoundAtPosition(globalCtx, &this->actor.projectedPos, 20, NA_SE_VO_RT_FALL);
}
void func_80AEF4E0(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 5.0f)) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LAUGH_0);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0);
}
}
void func_80AEF51C(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_THROW);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_THROW);
}
void func_80AEF540(EnRu1* this) {