Cleanup

asm/entry_point.s

@@ -1,5 +1,11 @@
+.include "macro.inc"
+
+# assembler directives
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
+.set gp=64     # allow use of 64-bit general purpose registers
+
+.section .text, "ax"
 
 glabel entry_point
 /* 1000 80025C00 3C08800A */  lui       $t0, %hi(D_8009A5B0)

src/code_1000_len_60.c

@@ -1,3 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "code_1000_len_60", entry_point);

src/code_1060_len_310.c

@@ -1,6 +1,8 @@
 #include "common.h"
 #include "stdlib/stdarg.h"
 
+extern const char D_80097D30[];
+
 u32 func_80025D74(void* arg0, const unsigned char* str, s32 count);
 
 void func_80025C60(void) {
@@ -79,8 +81,6 @@ u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) {
     return 1;
 }
 
-extern const char D_80097D30[];
-
 void func_80025F44(char* arg0, char* file, s32 line, char* arg3) {
     func_80025CFC(&D_80097D30, file, line, arg0);
     PANIC();

src/os/code_39cb0_len_100.c

@@ -6,7 +6,7 @@
 // TODO: create src/os/nusys/nuSched.h?
 extern u64 nuScStack[NU_SC_STACK_SIZE / sizeof(u64)];
 
-//void (*nuIdleFunc)(void) = NULL;
+static void (*nuIdleFunc)(void);
 
 void nuBoot(void) {
     osInitialize(); // __osInitialize_common

tools/splat.yaml

@@ -31,7 +31,7 @@ segments:
     vram: 0x80025C00
     subalign: 8
     subsections:
-    - [0x1000, c, code_1000_len_60]
+    - [0x1000, hasm, entry_point]
     - [0x1060, c, code_1060_len_310]
     - [0x1370, c, code_1370_len_7d0]
     - [0x1b40, c, code_1b40_len_20b0]
@@ -92,7 +92,7 @@ segments:
     - [0x3aa10, c, os/nusys/nuContInit]
     - [0x3aa50, c, os/nusys/nuContDataGet]
     - [0x3aab0, c, os/nusys/nuContPakMgr]
-    - [0x3af10, c, os/nusys/nuContRmbMgr]
+    - [0x3AD20, c, os/nusys/nuContRmbMgr]
     - [0x3b290, c, os/nusys/nuContRmbStart]
     - [0x3b2f0, c, os/nusys/nuContRmbCheck]
     - [0x3b390, c, os/nusys/nuContRmbModeSet]
@@ -250,6 +250,8 @@ segments:
     - [0x73DA0, .rodata, world/world]
     - [0x74EA0, rodata]
     - [0x75240, .rodata, battle/battle] # ram 80099E40
+    # bss starts at 0x8009A5B0
+    - [0x75240, .bss, os/code_39cb0_len_100, 0x800] # we need at least this much bss space until this file
   - type: code
     start: 0x759B0
     vram: 0x800DC500
@@ -2061,7 +2063,7 @@ segments:
     - [0x6DDDC0, c]
     - [0x6DDE90, c]
     - [0x6DE000, c]
-    - [0x6DE060, c]
+    - [0x6DE0D0, c]
     - [0x6DE1A0, c]
     - [0x6DE1F0, c]
     - [0x6DE3A0, c]