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

Match retail En actors V-Z (#1825)

Browse source 
* Entity actors starting with Z

* Use CS_STATE_IDLE

* z -> playerPosZ

* Remove comment
This commit is contained in:
cadmic 2024-02-26 18:29:40 -08:00 • committed by GitHub
parent 769986874c
commit cdd24f2ac6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 184 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
View file

@ -337,7 +337,11 @@ void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) {
}
if (arg2 == 2) {
s32 pad;
if ((this->action == 5) || (this->action == 30)) {
s32 temp_t0;
curFrame = this->skelAnime.curFrame;
unk_278 = this->unk_278;
temp_t0 = (s32)((3500.0f * curFrame) / unk_278) + phi_a0;
@ -346,13 +350,15 @@ void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) {
phi_v0 /= -2;
}
} else if ((this->action == 6) || (this->action == 31)) {
temp_t0 = phi_a0 + 0xDAC;
s32 temp_t0 = phi_a0 + 0xDAC;
if (temp_t0 >= temp_v1) {
temp_v1 = temp_t0;
phi_v0 /= -2;
}
} else if (this->action == 20) {
temp_t0 = phi_a0 - 0x3E8;
s32 temp_t0 = phi_a0 - 0x3E8;
if (temp_t0 >= temp_v1) {
temp_v1 = temp_t0;
phi_v0 /= -2;
@ -1566,9 +1572,11 @@ void func_80B52114(EnZl2* this, PlayState* play) {
case 4:
func_80B51D0C(this, play);
break;
#if OOT_DEBUG
case 0:
func_80B4FD90(this, play);
break;
#endif
default:
PRINTF(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
func_80B4FD90(this, play);
@ -1581,10 +1589,12 @@ void func_80B521A0(EnZl2* this, PlayState* play) {
s32 objectSlot = Object_GetSlot(objectCtx, OBJECT_ZL2_ANIME1);
s32 pad2;
#if OOT_DEBUG
if (objectSlot < 0) {
PRINTF(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST);
return;
}
#endif
if (Object_IsLoaded(objectCtx, objectSlot)) {
this->zl2Anime1ObjectSlot = objectSlot;