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

Decompile z_oceff_wipe (#122)

Browse source 
* Decompile z_oceff_wipe

- z_oceff_wipe: OK
- z_oceff_wipe2: OK
- z_oceff_wipe3: OK
- z_oceff_wipe4: OK
- Add patched libmalloc to ido 7 to prevent segfaults
- Add CUR_CAM macro

* Rename CUR_CAM to ACTIVE_CAM

* Fixes in PR #122
This commit is contained in:
Random 2020-05-09 22:58:02 +02:00 • committed by GitHub
parent 4c68c61df5
commit 40836f5d82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 978 additions and 1670 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -517,15 +517,12 @@ void EnWallmas_Update(Actor* thisx, GlobalContext* globalCtx) {
EnWallmas_ColUpdate(this, globalCtx);
this->actionFunc(this, globalCtx);
if ((this->actionFunc == EnWallmas_WaitToDrop) ||
(this->actionFunc == EnWallmas_WaitForProximity) ||
(this->actionFunc == EnWallmas_TakePlayer) ||
(this->actionFunc == EnWallmas_WaitForSwitchFlag)) {
if ((this->actionFunc == EnWallmas_WaitToDrop) || (this->actionFunc == EnWallmas_WaitForProximity) ||
(this->actionFunc == EnWallmas_TakePlayer) || (this->actionFunc == EnWallmas_WaitForSwitchFlag)) {
return;
}
if ((this->actionFunc != EnWallmas_ReturnToCeiling) &&
(this->actionFunc != EnWallmas_TakePlayer)) {
if ((this->actionFunc != EnWallmas_ReturnToCeiling) && (this->actionFunc != EnWallmas_TakePlayer)) {
Actor_MoveForward(&this->actor);
}
@ -563,8 +560,7 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) {
f32 xzScale;
Gfx* dispRefs[3];
if ((this->actor.floorPoly == NULL) ||
((this->timer >= 0x51) && (this->actionFunc != EnWallmas_Stun))) {
if ((this->actor.floorPoly == NULL) || ((this->timer >= 0x51) && (this->actionFunc != EnWallmas_Stun))) {
return;
}
@ -578,10 +574,8 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) {
func_80038A28(this->actor.floorPoly, this->actor.posRot.pos.x, this->actor.unk_80, this->actor.posRot.pos.z, &mf);
Matrix_Mult(&mf, MTXMODE_NEW);
if ((this->actionFunc != EnWallmas_WaitToDrop) &&
(this->actionFunc != EnWallmas_ReturnToCeiling) &&
(this->actionFunc != EnWallmas_TakePlayer) &&
(this->actionFunc != EnWallmas_WaitForSwitchFlag)) {
if ((this->actionFunc != EnWallmas_WaitToDrop) && (this->actionFunc != EnWallmas_ReturnToCeiling) &&
(this->actionFunc != EnWallmas_TakePlayer) && (this->actionFunc != EnWallmas_WaitForSwitchFlag)) {
xzScale = this->actor.scale.x * 50.0f;
} else {
xzScale = ((0x50 - this->timer) >= 0x51 ? 0x50 : (0x50 - this->timer)) * TIMER_SCALE;