From 876a0a2a23657bf3fa65bbd08357822fba41e48d Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Sun, 3 Nov 2019 23:29:47 -0600
Subject: [PATCH] [nostalgia/player] Remove unused custom startup file

---
 src/nostalgia/player/main.cpp  |  2 +-
 src/nostalgia/player/startup.s | 39 ----------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 src/nostalgia/player/startup.s

diff --git a/src/nostalgia/player/main.cpp b/src/nostalgia/player/main.cpp
index 7ad0da2b..df6b6be6 100644
--- a/src/nostalgia/player/main.cpp
+++ b/src/nostalgia/player/main.cpp
@@ -22,7 +22,7 @@ ox::Error run(ox::FileSystem *fs) {
 	//oxReturnError(zone.init(&ctx, Bounds{0, 0, 40, 40}, "/TileSheets/Charset.ng", "/Palettes/Charset.npal"));
 	//zone.draw(&ctx);
 	oxReturnError(initConsole(&ctx));
-	puts(nullptr, 9 * 32 + 10, "DOPENESS!!!");
+	puts(&ctx, 9 * 32 + 10, "DOPENESS!!!");
 	oxReturnError(run());
 	oxReturnError(shutdownGfx());
 	return OxError(0);
diff --git a/src/nostalgia/player/startup.s b/src/nostalgia/player/startup.s
deleted file mode 100644
index cf91eb47..00000000
--- a/src/nostalgia/player/startup.s
+++ /dev/null
@@ -1,39 +0,0 @@
-	.section ".crt0","ax"
-	.global _start
-	.align
-
-	.arm
-	.cpu arm7tdmi
-
-_start:
-	// disable interrupts
-	//cpsid if
-	b _reset
-	.fill 156,1,0 // make room for Nintendo logo
-	.fill 16,1,0
-	.byte 0x30,0x31
-
-
-_initCpp:
-	// copy data
-	ldr r0,=__data_lma
-	ldr r1,=__data_start__
-	ldr r2,=__data_end__
-	// loop over data until copied
-data_copy_loop:
-	cmp r1,r2
-	ldmltia r0!,{r3}
-	stmltia r1!,{r3}
-	blt data_copy_loop
-
-_reset:
-	ldr r0,=_reset
-	ldr r1,=_initCpp
-	mov lr,r1
-	ldr sp,=__ewram_end
-	b _initCpp
-
-	.size _start, . - _start
-	.end
-
-// vim:ft=arm