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

[ntsc-1.0/1.1] Match audio and loose ends (#2293)

Browse source 
* Match ntsc-1.0/1.1 loose ends

* Revert audioseq_padding

* Fix spelling
This commit is contained in:
cadmic 2024-11-11 14:50:56 -08:00 • committed by GitHub
parent 0d04f51e8e
commit d886ebe711
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
View file

@ -5,6 +5,7 @@
*/
#include "z_eff_ss_en_ice.h"
#include "versions.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#define rLifespan regs[0]
@ -133,9 +134,9 @@ void EffectSsEnIce_Draw(PlayState* play, u32 index, EffectSs* this) {
}
void EffectSsEnIce_UpdateFlying(PlayState* play, u32 index, EffectSs* this) {
s16 rand;
#if OOT_VERSION >= NTSC_1_1
if ((this->actor != NULL) && (this->actor->update != NULL)) {
#endif
if ((this->life >= 9) && (this->actor->colorFilterTimer != 0) && !(this->actor->colorFilterParams & 0xC000)) {
this->pos.x = this->actor->world.pos.x + this->vec.x;
this->pos.y = this->actor->world.pos.y + this->vec.y;
@ -147,9 +148,11 @@ void EffectSsEnIce_UpdateFlying(PlayState* play, u32 index, EffectSs* this) {
this->accel.y = -1.5f;
this->velocity.y = 5.0f;
}
#if OOT_VERSION >= NTSC_1_1
} else {
if (this->life >= 9) {
rand = Rand_CenteredFloat(65535.0f);
s16 rand = Rand_CenteredFloat(65535.0f);
this->accel.x = Math_SinS(rand) * (Rand_ZeroOne() + 1.0f);
this->accel.z = Math_CosS(rand) * (Rand_ZeroOne() + 1.0f);
this->life = 8;
@ -157,6 +160,7 @@ void EffectSsEnIce_UpdateFlying(PlayState* play, u32 index, EffectSs* this) {
this->velocity.y = 5.0f;
}
}
#endif
}
void EffectSsEnIce_Update(PlayState* play, u32 index, EffectSs* this) {

5
src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
View file

@ -5,6 +5,7 @@
*/
#include "z_eff_ss_kakera.h"
#include "versions.h"
#define rReg0 regs[0]
#define rGravity regs[1]
@ -54,7 +55,11 @@ u32 EffectSsKakera_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
} else {
PRINTF("shape_modelがNULL\n");
#if OOT_VERSION < NTSC_1_1
LogUtils_HungupThread("../z_eff_kakera.c", 175);
#else
LogUtils_HungupThread("../z_eff_kakera.c", 178);
#endif
}
this->draw = EffectSsKakera_Draw;