From 196f9dba522aa519e6464766b60ccc2ac70de11d Mon Sep 17 00:00:00 2001
From: StickyThwomp <89738536+StickyThwomp@users.noreply.github.com>
Date: Mon, 12 Jun 2023 11:57:33 -0500
Subject: [PATCH] EnSw OK (#1283)

* EnSw OK

Decompiled the last remaining function.

* Update src/overlays/actors/ovl_En_Sw/z_en_sw.c

Add FAKE comment.

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

---------

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
---
 spec                                    | 6 +-----
 src/overlays/actors/ovl_En_Sw/z_en_sw.c | 9 +++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/spec b/spec
index 6cbde939c..a7b3ee5dc 100644
--- a/spec
+++ b/spec
@@ -1107,11 +1107,7 @@ beginseg
     name "ovl_En_Sw"
     compress
     include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o"
-    #ifdef NON_MATCHING
-        include "build/src/overlays/actors/ovl_En_Sw/ovl_En_Sw_reloc.o"
-    #else
-        include "build/data/ovl_En_Sw/ovl_En_Sw.reloc.o"
-    #endif
+    include "build/src/overlays/actors/ovl_En_Sw/ovl_En_Sw_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c
index ca15e4864..2f32734a4 100644
--- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c
+++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c
@@ -358,7 +358,6 @@ s32 func_808D9440(PlayState* play, Vec3f* posA, Vec3f* posB, Vec3f* posResult, C
     return ret;
 }
 
-#ifdef NON_MATCHING
 void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) {
     CollisionPoly* spA4;
     CollisionPoly* spA0;
@@ -412,7 +411,6 @@ void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) {
 
         for (i = 0; i < 3; i++) {
             if (i == 0) {
-                if (this && this && this) {}
                 sp84.x = sp90.x - (this->unk_350.x * temp_f20);
                 sp84.y = sp90.y - (this->unk_350.y * temp_f20);
                 sp84.z = sp90.z - (this->unk_350.z * temp_f20);
@@ -433,6 +431,9 @@ void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) {
                 break;
             }
         }
+
+        //! FAKE
+        if (i == 3) {}
     }
 
     func_808D93BC(this);
@@ -448,10 +449,6 @@ void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) {
         Actor_MoveWithoutGravity(&this->actor);
     }
 }
-#else
-void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sw/func_808D94D0.s")
-#endif
 
 void func_808D9894(EnSw* this, Vec3f* vec) {
     Vec3f sp5C;