From e691d516e7136b56178b08659afe9ce467e94357 Mon Sep 17 00:00:00 2001
From: a <a>
Date: Sun, 22 Jun 2025 13:56:54 -0400
Subject: [PATCH] game boots and runs with engine code load

---
 sm64.ld                       | 11 +++--------
 src/{engine => game}/libgcc.c |  0
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename src/{engine => game}/libgcc.c (100%)

diff --git a/sm64.ld b/sm64.ld
index 680ed7af..1d3748a5 100755
--- a/sm64.ld
+++ b/sm64.ld
@@ -98,17 +98,12 @@ SECTIONS
         BUILD_DIR/src/engine*.o(.text);
         BUILD_DIR/src/engine*.o(.data*);
         BUILD_DIR/src/engine*.o(.rodata*);
-        . = ALIGN(0x10);
-    }
-    END_SEG(engine)
-    BEGIN_NOLOAD(engine)
-    {
         BUILD_DIR/src/engine*.o(.bss*);
         . = ALIGN(0x40);
     }
-    END_NOLOAD(engine)
+    END_SEG(engine)
 
-    . = _engineSegmentNoloadEnd;
+    . = _engineSegmentEnd;
 
     BEGIN_NOLOAD(framebuffers)
     {
@@ -343,6 +338,6 @@ SECTIONS
 
     ASSERT((_goddardSegmentNoloadEnd <= SEG_POOL_START + POOL_SIZE), "Error: menu segment extended past pool end")
     ASSERT((_mainSegmentNoloadEnd <= _engineSegmentStart), "Error: main segment extended into engine.")
-    ASSERT((_engineSegmentNoloadEnd <= _framebuffersSegmentNoloadStart), "Error: engine segment extended into framebuffers.")
+    ASSERT((_engineSegmentEnd <= _framebuffersSegmentNoloadStart), "Error: engine segment extended into framebuffers.")
     ASSERT((_framebuffersSegmentNoloadEnd <= RAM_END), "Error: framebuffers segment extended past RDRAM end")
 }
diff --git a/src/engine/libgcc.c b/src/game/libgcc.c
similarity index 100%
rename from src/engine/libgcc.c
rename to src/game/libgcc.c