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

Various SFX fixes (#237)

Browse source 
* Various SFX fixes

* Fix sfx references in z_en_zl2.c
This commit is contained in:
Roman971 2020-07-05 05:30:21 +02:00 • committed by GitHub
parent a5aee3d691
commit 61544b873d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 362 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
View file

@ -647,18 +647,18 @@ void func_80B4FD90(EnZl2* this, GlobalContext* globalCtx) {
void func_80B4FDD4(EnZl2* this) {
if (func_800A56C8(&this->skelAnime, 14.0f)) {
func_80078914(&this->actor.projectedPos, 0x802);
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_CONCRETE);
}
}
void func_80B4FE10(GlobalContext* globalCtx) {
if ((globalCtx->csCtx.frames >= 830) && (globalCtx->csCtx.frames < 1081)) {
func_800788CC(0x2098);
func_800788CC(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
}
}
void func_80B4FE48(EnZl2* this) {
func_80078914(&this->actor.projectedPos, 0x2086);
func_80078914(&this->actor.projectedPos, NA_SE_EV_GOTO_HEAVEN - SFX_FLAG);
}
void func_80B4FE6C(EnZl2* this) {
@ -1493,7 +1493,7 @@ void func_80B51D24(EnZl2* this, GlobalContext* globalCtx) {
if ((func_800A56C8(skelAnime, 6.0f)) || (func_800A56C8(skelAnime, 0.0f))) {
if (this->actor.bgCheckFlags & 1) {
sfxId = 0x800;
sfxId = SFX_FLAG;
sfxId += func_80041F34(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource);
func_80078914(&this->actor.projectedPos, sfxId);
}