From 097a3ff550f24a8d56e0332438889724a99cc691 Mon Sep 17 00:00:00 2001
From: MegaMech <7255464+MegaMech@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:50:36 -0700
Subject: [PATCH] Remove asserts

---
 src/engine/courses/Course.cpp | 5 ++++-
 src/racing/collision.c        | 5 -----
 src/racing/memory.c           | 4 ----
 src/racing/render_courses.c   | 1 -
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/engine/courses/Course.cpp b/src/engine/courses/Course.cpp
index bdec26404..a3c107f1a 100644
--- a/src/engine/courses/Course.cpp
+++ b/src/engine/courses/Course.cpp
@@ -117,7 +117,10 @@ void Course::Load() {
     // Extract packed DLs
     u8* packed = reinterpret_cast<u8*>(LOAD_ASSET_RAW(this->gfx));
     Gfx* gfx = (Gfx*) allocate_memory(sizeof(Gfx) * this->gfxSize); // Size of unpacked DLs
-    assert(gfx != NULL);
+    if (gfx == NULL) {
+        printf("Failed to allocate course displaylist memory\n");
+    }
+
     gSegmentTable[7] = reinterpret_cast<uintptr_t>(&gfx[0]);
     displaylist_unpack(reinterpret_cast<uintptr_t *>(gfx), reinterpret_cast<uintptr_t>(packed), 0);
 
diff --git a/src/racing/collision.c b/src/racing/collision.c
index de308584a..c3e210c9a 100644
--- a/src/racing/collision.c
+++ b/src/racing/collision.c
@@ -9,7 +9,6 @@
 #include "collision.h"
 #include "math_util.h"
 #include "code_800029B0.h"
-#include <assert.h>
 #include <defines.h>
 #include "port/Game.h"
 
@@ -1818,10 +1817,6 @@ void set_vtx_buffer(uintptr_t addr, u32 numVertices, u32 bufferIndex) {
     u32 i;
     Vtx* vtx = (Vtx*) addr;
     for (i = 0; i < numVertices; i++) {
-        // printf("VTX: 0x%llX",vtx);
-        if (vtx == 0) {
-            assert(false);
-        }
         vtxBuffer[bufferIndex] = vtx;
         vtx++;
         bufferIndex++;
diff --git a/src/racing/memory.c b/src/racing/memory.c
index c51686e38..2bf09b7f5 100644
--- a/src/racing/memory.c
+++ b/src/racing/memory.c
@@ -19,7 +19,6 @@
 #include "courses/all_course_offsets.h"
 #include "defines.h"
 
-#include <assert.h>
 #include <course_offsets.h>
 
 #include "engine/courses/Course.h"
@@ -63,7 +62,6 @@ void* get_next_available_memory_addr(uintptr_t size) {
     if (gNextFreeMemoryAddress > sPoolEnd) {
         printf("[memory.c] get_next_available_memory_addr(): Memory Pool Out of Bounds! Out of memory!\n");
         PRINT_MEMPOOL;
-        assert(true);
     }
 
     return (void*) freeSpace;
@@ -199,7 +197,6 @@ void* allocate_memory(size_t size) {
         printf("[memory.c] allocate_memory(): gFreeMemorySize below zero!\n");
         printf("gFreeMemorySize: 0x%X", gFreeMemorySize);
         PRINT_MEMPOOL;
-        assert(false);
     }
 
     freeSpace = (uintptr_t) gNextFreeMemoryAddress;
@@ -208,7 +205,6 @@ void* allocate_memory(size_t size) {
     if (gNextFreeMemoryAddress > sPoolEnd) {
         printf("[memory.c] allocate_memory(): Memory Pool Out of Bounds! Out of memory!\n");
         PRINT_MEMPOOL;
-        assert(false);
     }
 
     return (void*) freeSpace;
diff --git a/src/racing/render_courses.c b/src/racing/render_courses.c
index 31f952276..5976041d7 100644
--- a/src/racing/render_courses.c
+++ b/src/racing/render_courses.c
@@ -20,7 +20,6 @@
 #include "courses/all_course_data.h"
 #include "courses/all_course_packed.h"
 #include "courses/all_course_offsets.h"
-#include <assert.h>
 #include "port/Game.h"
 
 #include "enhancements/collision_viewer.h"