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

z_scene_table, z_view, and z_fbdemo_fade OK (#561)

Browse source 
* fbdemo

* the view is clear

* more matchings

* scene table doesn't want to be nice

* small thing in view

* can do

* accidentally a value
This commit is contained in:
petrie911 2020-12-25 15:19:52 -06:00 • committed by GitHub
parent 09ddf4f71e
commit a8ae9f48b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 49 additions and 898 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -381,7 +381,6 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
temp_a0 += phi_v0;
phi_v1 = (s16)(temp_a0 - phi_a1);
if (((this->unk_25C[idx] * phi_v0) <= 0) && (phi_v1 > -100) && (phi_v1 < 100)) {
temp_a0 = phi_a1;
phi_v0 = 0;
@ -430,7 +429,8 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
if (animCurrentFrame <= 42.0f) {
phi_v1_2 = phi_a1 - 2000;
} else {
phi_v1_2 = (s32)((((animCurrentFrame - 42.0f) * 6200.0f) / (unk_3F4 - 42.0f)) + -2000.0f) + phi_a1;
phi_v1_2 =
(s32)((((animCurrentFrame - 42.0f) * 6200.0f) / (unk_3F4 - 42.0f)) + -2000.0f) + phi_a1;
}
if (phi_v1_2 >= temp_a0) {