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

[ntsc-1.0/1.1] Match actor changes introduced in PAL 1.0 (#2227)

Browse source
This commit is contained in:
cadmic 2024-09-25 20:11:38 -07:00 • committed by GitHub
parent 43c3971aaf
commit 19621c6a3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 202 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -847,6 +847,9 @@ void DemoEffect_UpdateTriforceSpot(DemoEffect* this, PlayState* play) {
*/
void DemoEffect_UpdateLightRingShrinking(DemoEffect* this, PlayState* play) {
if (this->lightRing.timer < this->lightRing.timerIncrement) {
#if OOT_VERSION < PAL_1_0
this->lightRing.timer = 0;
#endif
Actor_Kill(&this->actor);
this->lightRing.timer = 0;
} else {
@ -960,10 +963,18 @@ void DemoEffect_InitCreationFireball(DemoEffect* this, PlayState* play) {
Actor* parent = this->actor.parent;
this->actor.world.rot.y = parent->shape.rot.y;
this->fireBall.timer = FRAMERATE_CONST(50, 42);
this->actor.speed = FRAMERATE_CONST(1.5f, 1.8f);
#if OOT_VERSION < PAL_1_0
this->actor.gravity = -0.03f;
this->actor.minVelocityY = -1.5f;
#else
this->actor.minVelocityY = FRAMERATE_CONST(-1.5f, -2.5f);
this->actor.gravity = FRAMERATE_CONST(-0.03f, -0.05f);
#endif
this->updateFunc = DemoEffect_UpdateCreationFireball;
}