From 4e7f0283ed667351c4eb86d4c582437f03e4b67a Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 24 Aug 2025 10:58:37 -0700 Subject: [PATCH] move remaining rom_header/crt0 stuff to src --- ld_script.ld | 3 ++- ld_script_modern.ld | 3 ++- {asm => src}/crt0.s | 8 -------- asm/rom_header.inc => src/rom_header.s | 7 ++++++- 4 files changed, 10 insertions(+), 11 deletions(-) rename {asm => src}/crt0.s (96%) rename asm/rom_header.inc => src/rom_header.s (84%) diff --git a/ld_script.ld b/ld_script.ld index 3205a5c34..76e068f3e 100755 --- a/ld_script.ld +++ b/ld_script.ld @@ -45,7 +45,8 @@ SECTIONS { .text : ALIGN(4) { - asm/crt0.o(.text); + src/rom_header.o(.text); + src/crt0.o(.text); src/code_80001DC.o(.text); src/arm_funcs.o(.text); src/main_loops.o(.text); diff --git a/ld_script_modern.ld b/ld_script_modern.ld index 7ec57d5ea..fbc3255a1 100644 --- a/ld_script_modern.ld +++ b/ld_script_modern.ld @@ -39,7 +39,8 @@ SECTIONS { .text : ALIGN(4) { - asm/crt0.o(.text); + src/rom_header.o(.text); + src/crt0.o(.text); src/code_80001DC.o(.text); src/main_loops.o(.text); src/*.o(.text*); diff --git a/asm/crt0.s b/src/crt0.s similarity index 96% rename from asm/crt0.s rename to src/crt0.s index ac6b51509..2099d2d50 100644 --- a/asm/crt0.s +++ b/src/crt0.s @@ -2,18 +2,10 @@ .syntax unified - .global Start .text .arm - -Start: @ 8000000 - b Init - - #include "rom_header.inc" - - .arm .align 2, 0 .global Init Init: @ 80000C0 diff --git a/asm/rom_header.inc b/src/rom_header.s similarity index 84% rename from asm/rom_header.inc rename to src/rom_header.s index 6730efae2..5f482503f 100644 --- a/asm/rom_header.inc +++ b/src/rom_header.s @@ -1,4 +1,9 @@ - .global RomHeaderNintendoLogo + + .global Start +Start: @ 8000000 + b Init + + .global RomHeaderNintendoLogo RomHeaderNintendoLogo: .space 156