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

Cleanup pad's in z_scene_table.c (#1215)

Browse source 
* cleanup

* More cleanup
This commit is contained in:
engineer124 2022-05-08 00:10:06 +10:00 • committed by GitHub
parent ca77b26c90
commit 5cc5cf5a7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/code/z_fbdemo_wipe1.c
View file

@ -39,7 +39,7 @@ Gfx sWipeSyncDList[] = {
void TransitionWipe_Start(void* thisx) {
TransitionWipe* this = (TransitionWipe*)thisx;
this->isDone = 0;
this->isDone = false;
if (this->direction) {
this->texY = 0x14D;
@ -63,21 +63,18 @@ void TransitionWipe_Destroy(void* thisx) {
void TransitionWipe_Update(void* thisx, s32 updateRate) {
TransitionWipe* this = (TransitionWipe*)thisx;
u8 speed;
if (this->direction != 0) {
speed = gSaveContext.transWipeSpeed;
this->texY += (speed * 3) / updateRate;
this->texY += (((void)0, gSaveContext.transWipeSpeed) * 3) / updateRate;
if (this->texY >= 0x264) {
this->texY = 0x264;
this->isDone = 1;
this->isDone = true;
}
} else {
speed = gSaveContext.transWipeSpeed;
this->texY -= (speed * 3) / updateRate;
if (this->texY < 0x14E) {
this->texY -= (((void)0, gSaveContext.transWipeSpeed) * 3) / updateRate;
if (this->texY <= 0x14D) {
this->texY = 0x14D;
this->isDone = 1;
this->isDone = true;
}
}
}