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

Matched EnMb and EnDoor (#510)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* new matches

* format

* again

* Update src/overlays/actors/ovl_En_Door/z_en_door.c

* Update src/overlays/actors/ovl_En_Mb/z_en_mb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
petrie911 2020-12-04 12:47:50 -06:00 • committed by GitHub
parent e455a24876
commit 4beeedd116
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 30 additions and 720 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_En_Door/z_en_door.c
View file

@ -182,15 +182,11 @@ void EnDoor_SetupType(EnDoor* this, GlobalContext* globalCtx) {
}
}
#ifdef NON_MATCHING
// Regalloc only
void EnDoor_Idle(EnDoor* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
s32 doorType;
Vec3f sp2C;
s8 numKeys;
s16 phi_v0;
s16 temp_v0;
doorType = this->actor.params >> 7 & 7;
func_8002DBD0(&this->actor, &sp2C, &player->actor.posRot.pos);
@ -211,9 +207,10 @@ void EnDoor_Idle(EnDoor* this, GlobalContext* globalCtx) {
}
if (ABS(phi_v0) < 0x3000) {
if (this->lockTimer != 0) {
numKeys = gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex];
if (numKeys <= 0) {
PLAYER->naviTextId = -0x203;
if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] <= 0) {
Player* player2 = PLAYER;
player2->naviTextId = -0x203;
return;
} else {
player->doorTimer = 10;
@ -228,9 +225,6 @@ void EnDoor_Idle(EnDoor* this, GlobalContext* globalCtx) {
}
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Idle.s")
#endif
void EnDoor_WaitForCheck(EnDoor* this, GlobalContext* globalCtx) {
if (func_8002F194(&this->actor, globalCtx)) {

49
src/overlays/actors/ovl_En_Mb/z_en_mb.c
View file

@ -576,14 +576,11 @@ void func_80AA7478(EnMb* this, GlobalContext* globalCtx) {
}
}
#ifdef NON_MATCHING
// stack
void func_80AA74BC(EnMb* this, GlobalContext* globalCtx) {
Player* player;
Player* player = PLAYER;
f32 lastFrame;
s16 yawDiff;
s16 pad;
player = PLAYER;
if ((player->stateFlags2 & 0x80) && (&this->actor == player->actor.parent)) {
player->stateFlags2 &= ~0x80;
player->actor.parent = NULL;
@ -604,8 +601,8 @@ void func_80AA74BC(EnMb* this, GlobalContext* globalCtx) {
(ABS(yawDiff) <= 0x4000) && (this->actor.xzDistFromLink <= 200.0f)) {
func_80AA6AC8(this);
} else {
SkelAnime_ChangeAnim(&this->skelAnime, &D_06002C10, -1.0f, SkelAnime_GetFrameCount(&D_06002C10),
0.0f, 2, 0.0f);
lastFrame = SkelAnime_GetFrameCount(&D_06002C10);
SkelAnime_ChangeAnim(&this->skelAnime, &D_06002C10, -1.0f, lastFrame, 0.0f, 2, 0.0f);
this->actor.speedXZ = 0.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_SPEAR_NORM);
}
@ -618,24 +615,21 @@ void func_80AA74BC(EnMb* this, GlobalContext* globalCtx) {
}
if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) {
if (this->unk_32A == 0) {
SkelAnime_ChangeAnim(&this->skelAnime, &D_06002F10, 0.5f, 0.0f, SkelAnime_GetFrameCount(&D_06002F10), 1,
0.0f);
lastFrame = SkelAnime_GetFrameCount(&D_06002F10);
SkelAnime_ChangeAnim(&this->skelAnime, &D_06002F10, 0.5f, 0.0f, lastFrame, 1, 0.0f);
this->unk_32A = 1;
return;
}
yawDiff = (Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->waypointPos) - this->actor.yawTowardsLink);
} else {
yawDiff = (Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->waypointPos) - this->actor.yawTowardsLink);
if (ABS(yawDiff) <= 0x4000) {
func_80AA68FC(this, globalCtx);
return;
if (ABS(yawDiff) <= 0x4000) {
func_80AA68FC(this, globalCtx);
} else {
func_80AA6A18(this);
}
}
func_80AA6A18(this);
}
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s")
#endif
void func_80AA77D0(EnMb* this, GlobalContext* globalCtx) {
s32 currentFrame;
@ -957,7 +951,6 @@ void func_80AA8514(EnMb* this, GlobalContext* globalCtx) {
}
}
#ifdef NON_MATCHING
void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) {
s32 currentFrame;
s32 sp48;
@ -965,6 +958,7 @@ void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) {
s32 pad;
Player* player = PLAYER;
s16 yawDiff;
s16 yaw;
f32 playbackSpeedABS;
yawDiff = (this->actor.yawTowardsLink - this->actor.shape.rot.y);
@ -982,7 +976,7 @@ void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) {
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, 750, 0);
this->actor.flags |= 1;
if (this->actor.xzDistFromLink < 500.0f) {
if (yawDiff <= 0x1387) {
if (yawDiff < 0x1388) {
func_80AA6AC8(this);
}
}
@ -990,8 +984,8 @@ void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) {
this->actor.flags &= ~1;
if ((this->unk_360 < Math_Vec3f_DistXZ(&this->actor.posRot.pos, &this->actor.initPosRot.pos)) ||
(this->soundTimer != 0)) {
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y,
Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot), 1, 750, 0);
yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot);
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, yaw, 1, 750, 0);
} else {
}
if (this->soundTimer != 0) {
@ -1007,23 +1001,20 @@ void func_80AA87D8(EnMb* this, GlobalContext* globalCtx) {
if (this->unk_32A == 0) {
if (Math_Rand_ZeroOne() > 0.7f) {
this->unk_32A = Math_Rand_S16Offset(50, 70);
this->soundTimer = Math_Rand_S16Offset(26, 40) & 0xFFFF;
this->soundTimer = Math_Rand_S16Offset(15, 40);
} else {
func_80AA6830(this);
}
}
}
if (currentFrame != (s32)this->skelAnime.animCurrentFrame) {
if (!((sp48 >= 2) || (((s32)playbackSpeedABS + (s32)this->skelAnime.animCurrentFrame) <= 0)) ||
((sp48 < 21) && (((s32)playbackSpeedABS + currentFrame >= 20)))) {
if (((sp48 <= 1) && ((s32)playbackSpeedABS + currentFrame >= 1)) ||
((sp48 <= 20) && (((s32)playbackSpeedABS + currentFrame >= 20)))) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK);
}
}
this->actor.shape.rot.y = this->actor.posRot.rot.y;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA87D8.s")
#endif
void func_80AA8AEC(EnMb* this, GlobalContext* globalCtx) {
s32 currentFrame;