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

Decompile ovl_Door_Warp1 (#949)

Browse source 
* Initial progress on Door_Warp1

* Fix merge

* More work on Door_Warp1

* Decompile most of Door_Warp1

* 2 more functions OK

* All decompiled, 3 nonmatching

* Tiny improvements, fix several warnings

* Remove commented GLOBAL_ASM lines

* Fix

* Fix merge

* Two more matches

* Some docs

* More docs

* Use generated reloc under NON_MATCHING

* Fix accesses in ru1

* Add break and add limbs and dlists for the skeleton to the object xml

* Comment values for enums

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* boolean returns for flag checking functions

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* Named more loop variables i and named DoorWarp1_FloatPlayer

* Last function matched thanks to Roman

* Some further suggestions

* Fix

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
This commit is contained in:
Tharo 2021-09-12 16:10:10 +01:00 • committed by GitHub
parent e31e35658d
commit eccfd2efbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 1139 additions and 4711 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

@ -786,7 +786,7 @@ void func_80B54F18(EnZl3* this, GlobalContext* globalCtx) {
f32 posZ = this->actor.world.pos.z;
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0x4000,
0, 3);
0, WARP_PURPLE_CRYSTAL);
this->unk_2F8 = 1;
}
}
@ -813,7 +813,7 @@ void func_80B55054(EnZl3* this) {
f32* temp_v0 = &this->unk_2EC;
if (*temp_v0 < 19.0f) {
((DoorWarp1*)child)->alpha = (20.0f - *temp_v0) * 12.75f;
((DoorWarp1*)child)->crystalAlpha = (20.0f - *temp_v0) * 12.75f;
*temp_v0 += 1.0f;
} else {
Actor_Kill(child);