drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[nostalgia/player] Remove unused custom startup file

Browse Source
This commit is contained in:
Gary Talent
2019-11-03 23:29:47 -06:00
parent 0d0ebc8437
commit 876a0a2a23
2 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/player/main.cpp
View File

@@ -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")); //oxReturnError(zone.init(&ctx, Bounds{0, 0, 40, 40}, "/TileSheets/Charset.ng", "/Palettes/Charset.npal"));
//zone.draw(&ctx); //zone.draw(&ctx);
oxReturnError(initConsole(&ctx)); oxReturnError(initConsole(&ctx));
puts(nullptr, 9 * 32 + 10, "DOPENESS!!!"); puts(&ctx, 9 * 32 + 10, "DOPENESS!!!");
oxReturnError(run()); oxReturnError(run());
oxReturnError(shutdownGfx()); oxReturnError(shutdownGfx());
return OxError(0); return OxError(0);

39
src/nostalgia/player/startup.s
View File

@@ -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