From d409d1dc07b38eda3bed61cd14b958a9165a3f49 Mon Sep 17 00:00:00 2001
From: KiritoDv <kiritodev01@gmail.com>
Date: Tue, 2 Apr 2024 18:31:00 -0600
Subject: [PATCH] Fixed memory issues

---
 src/engine/fox_enmy.c        | 28 ++++------------------------
 src/overlays/ovl_i3/fox_zo.c |  2 +-
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/engine/fox_enmy.c b/src/engine/fox_enmy.c
index 938296e4..365ccac9 100644
--- a/src/engine/fox_enmy.c
+++ b/src/engine/fox_enmy.c
@@ -140,40 +140,20 @@ void Object_SetInfo(ObjectInfo* info, u32 objId) {
 }
 
 void Object_80_Initialize(Object_80* obj80) {
-    s32 i;
-    u8* ptr = (u8*) obj80;
-
-    for (i = 0; i < sizeof(Object_80); i++, ptr++) {
-        *ptr = 0;
-    }
+    memset(obj80, 0, sizeof(Object_80));
 }
 
 void Object_4C_Initialize(Object_4C* obj4C) {
-    s32 i;
-    u8* ptr = (u8*) obj4C;
-
-    for (i = 0; i < sizeof(Object_4C); i++, ptr++) {
-        *ptr = 0;
-    }
+    memset(obj4C, 0, sizeof(Object_4C));
 }
 
 void Actor_Initialize(Actor* actor) {
-    s32 i;
-    u8* ptr = (u8*) actor;
-
-    for (i = 0; i < sizeof(Actor); i++, ptr++) {
-        *ptr = 0;
-    }
+    memset(actor, 0, sizeof(Actor));
     actor->scale = 1.0f;
 }
 
 void Boss_Initialize(Boss* boss) {
-    s32 i;
-    u8* ptr = (u8*) boss;
-
-    for (i = 0; i < sizeof(Boss); i++, ptr++) {
-        *ptr = 0;
-    }
+    memset(boss, 0, sizeof(Boss));
     boss->unk_3F8 = 1.0f;
 }
 
diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c
index ae468da8..053bb1d6 100644
--- a/src/overlays/ovl_i3/fox_zo.c
+++ b/src/overlays/ovl_i3/fox_zo.c
@@ -3116,7 +3116,7 @@ void Zoness_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 y
             }
         }
     }
-    if (sp50 >= 60) {
+    if (sp50 >= 60 && newActor != NULL) {
         newActor->obj.status = OBJ_FREE;
     }
 }