mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

fix mistake in z_bg_hidan_hamstep (#771)

Browse source 
if you're just going to close this pr just wait a week and review it then.
This commit is contained in:
Zelllll 2021-04-20 01:25:14 -05:00 committed by GitHub
parent 7b2b88d552
commit 098dc00f31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
View file

@ -263,7 +263,7 @@ void func_80888694(BgHidanHamstep* this, BgHidanHamstep* parent) {
void func_80888734(BgHidanHamstep* this) { void func_80888734(BgHidanHamstep* this) {
BgHidanHamstep* parent = (BgHidanHamstep*)this->dyna.actor.parent; BgHidanHamstep* parent = (BgHidanHamstep*)this->dyna.actor.parent;
f32 factor = SREG(30) * 0.5f; f32 frameDivisor = R_UPDATE_RATE * 0.5f;
if (parent != NULL) { if (parent != NULL) {
this->dyna.actor.velocity.y = parent->dyna.actor.velocity.y; this->dyna.actor.velocity.y = parent->dyna.actor.velocity.y;
@ -271,7 +271,7 @@ void func_80888734(BgHidanHamstep* this) {
if ((this->dyna.actor.params & 0xFF) == 1) { if ((this->dyna.actor.params & 0xFF) == 1) {
this->dyna.actor.world.pos.y = parent->dyna.actor.world.pos.y - 100.0f; this->dyna.actor.world.pos.y = parent->dyna.actor.world.pos.y - 100.0f;
} else { } else {
this->dyna.actor.world.pos.y += (this->dyna.actor.velocity.y * factor); this->dyna.actor.world.pos.y += (this->dyna.actor.velocity.y * frameDivisor);
} }
func_80888694(this, parent); func_80888694(this, parent);