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

I did it (#888)

Browse source 
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2021-08-05 05:26:49 -05:00 • committed by GitHub
parent ee44798310
commit bb4babbe15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/code/z_eff_blure.c
View file

@ -189,8 +189,6 @@ void EffectBlure_Init2(void* thisx, void* initParamsx) {
void EffectBlure_Destroy(void* thisx) {
}
#ifdef NON_MATCHING
// single register swap (saved vs temp register)
s32 EffectBlure_Update(void* thisx) {
EffectBlure* this = (EffectBlure*)thisx;
s32 i;
@ -204,29 +202,29 @@ s32 EffectBlure_Update(void* thisx) {
}
while (true) {
if (this->elements[0].state != 0) {
if (this->elements[0].state == 0) {
for (i = 0; i < 15; i++) {
this->elements[i] = this->elements[i + 1];
}
this->elements[i].state = 2;
this->elements[i].p1.x = 0;
this->elements[i].p1.y = 0;
this->elements[i].p1.z = 0;
this->elements[i].p2.x = 0;
this->elements[i].p2.y = 0;
this->elements[i].p2.z = 0;
this->elements[i].flags = 0;
this->elements[i].timer = 0;
this->numElements--;
if (this->numElements <= 0) {
this->numElements = 0;
return 0;
}
} else {
break;
}
for (i = 0; i < 15; i++) {
this->elements[i] = this->elements[i + 1];
}
this->elements[i].state = 2;
this->elements[i].p1.x = 0;
this->elements[i].p1.y = 0;
this->elements[i].p1.z = 0;
this->elements[i].p2.x = 0;
this->elements[i].p2.y = 0;
this->elements[i].p2.z = 0;
this->elements[i].flags = 0;
this->elements[i].timer = 0;
this->numElements--;
if (this->numElements <= 0) {
this->numElements = 0;
return 0;
}
}
if (this->elements[0].state == 2) {
@ -263,9 +261,6 @@ s32 EffectBlure_Update(void* thisx) {
this->addAngle += this->addAngleChange;
return 0;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s")
#endif
void EffectBlure_UpdateFlags(EffectBlureElement* elem) {
Vec3f sp64;