From 2c04fb92e9ff34b4108ba49fdeda1f969da3fba7 Mon Sep 17 00:00:00 2001
From: Angie <angheloalf95@gmail.com>
Date: Mon, 9 Oct 2023 13:42:04 -0300
Subject: [PATCH] func_80B57B48

---
 spec                                    |  2 +-
 src/overlays/actors/ovl_En_An/z_en_an.c | 29 +++++++++++--------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/spec b/spec
index 62cc64d0e..792162949 100644
--- a/spec
+++ b/spec
@@ -3773,7 +3773,7 @@ beginseg
     name "ovl_En_An"
     compress
     include "build/src/overlays/actors/ovl_En_An/z_en_an.o"
-    include "build/data/ovl_En_An/ovl_En_An.reloc.o"
+    include "build/src/overlays/actors/ovl_En_An/ovl_En_An_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c
index eba7eaef2..215c971b5 100644
--- a/src/overlays/actors/ovl_En_An/z_en_an.c
+++ b/src/overlays/actors/ovl_En_An/z_en_an.c
@@ -2989,31 +2989,33 @@ void func_80B57A44(EnAn* this, PlayState* play) {
     }
 }
 
-#ifdef NON_EQUIVALENT
 void func_80B57B48(EnAn* this, PlayState* play) {
     s32 sp30[] = { ENAN_ANIM_0, ENAN_ANIM_11, ENAN_ANIM_34, ENAN_ANIM_25, ENAN_ANIM_26, ENAN_ANIM_28, ENAN_ANIM_30, ENAN_ANIM_32, ENAN_ANIM_33, ENAN_ANIM_0 };
-    s32 temp_v0; // sp28
     u16 temp_v1;
-    u8 var_v0;
+    s32 temp_v0; // sp28
 
-    if (Cutscene_IsCueInChannel(play, 0x22DU) != 0) {
+    if(0) {}
+
+    if (Cutscene_IsCueInChannel(play, 0x22DU)) {
         temp_v0 = Cutscene_GetCueChannel(play, 0x22DU);
         temp_v1 = play->csCtx.actorCues[temp_v0]->id;
-        var_v0 = temp_v1 & 0xFF;
-        if ((temp_v1 & 0xFF) != this->unk_364) {
-            this->unk_364 = (u8) temp_v1;
-            if (var_v0 == 3) {
+
+        if (this->unk_364 != (temp_v1 & 0xFF)) {
+            this->unk_364 = temp_v1;
+            if (this->unk_364 == 3) {
                 SET_WEEKEVENTREG(WEEKEVENTREG_87_02);
-                var_v0 = this->unk_364;
                 this->unk_3B4 = 1;
             }
-            if (var_v0 == 9) {
+            if (this->unk_364 == 9) {
                 this->unk_3B4 = 0;
             }
             EnAn_ChangeAnim(this, play, sp30[temp_v1]);
         }
 
-        if ((this->animIndex == ENAN_ANIM_26) || (this->animIndex == ENAN_ANIM_28) || (this->animIndex == ENAN_ANIM_30) || (this->animIndex == ENAN_ANIM_34)) {
+        if ((this->animIndex == ENAN_ANIM_26) ||
+            (this->animIndex == ENAN_ANIM_28) ||
+            (this->animIndex == ENAN_ANIM_30) ||
+            (this->animIndex == ENAN_ANIM_34)) {
             if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
                 EnAn_ChangeAnim(this, play, this->animIndex + 1);
             }
@@ -3021,11 +3023,6 @@ void func_80B57B48(EnAn* this, PlayState* play) {
         Cutscene_ActorTranslateAndYaw(&this->actor, play, temp_v0);
     }
 }
-#else
-s32 D_80B58EAC[] = { ENAN_ANIM_0, ENAN_ANIM_11, ENAN_ANIM_34, ENAN_ANIM_25, ENAN_ANIM_26, ENAN_ANIM_28, ENAN_ANIM_30, ENAN_ANIM_32, ENAN_ANIM_33, ENAN_ANIM_0 };
-void func_80B57B48(EnAn* this, PlayState* play);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_An/func_80B57B48.s")
-#endif
 
 void EnAn_Init(Actor* thisx, PlayState* play) {
     s32 pad;