W3SLAV/automicropython_nds
1
Fork 0
mirror of https://github.com/W3SLAV/automicropython_nds.git synced 2025-06-18 11:05:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
W3SLAV 2025-04-26 12:01:06 -05:00
parent 2eb5dc703d
commit e8b3fe995a
13 changed files with 2158 additions and 2369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4285
nds/.map
View File

File diff suppressed because it is too large Load Diff

2
nds/Makefile
View File

@ -79,7 +79,7 @@ endif
#LDFLAGS += -nostdlib -T stm32f405.ld --gc-sections
# Define the required source files.
SRC_C += font.s lib.c main.c system.c
SRC_C += lib.c main.c system.c
# Define the required object files.
OBJ += $(PY_CORE_O)

BIN
nds/build/firmware.elf Executable file
View File

Binary file not shown.

BIN
nds/build/firmware.nds Normal file
View File

Binary file not shown.

4
nds/build/genhdr/mpversion.h
View File

@ -1,4 +1,4 @@
// This file was generated by py/makeversionhdr.py
#define MICROPY_GIT_TAG "v1.24.0-preview"
#define MICROPY_GIT_HASH "<no hash>"
#define MICROPY_GIT_TAG "2eb5dc7-dirty"
#define MICROPY_GIT_HASH "2eb5dc7"
#define MICROPY_BUILD_DATE "2025-04-26"

12
nds/build/main.P
View File

@ -25,7 +25,7 @@ build/main.o: main.c \
/opt/devkitpro/devkitARM/arm-none-eabi/include/alloca.h ../py/qstr.h \
../py/misc.h \
/opt/devkitpro/devkitARM/lib/gcc/arm-none-eabi/14.2.0/include/stdbool.h \
/run/media/user/STEAM/projects/micropython-nds/nds/build/genhdr/qstrdefs.generated.h \
/run/media/user/STEAM/projects/automicropython_nds/nds/build/genhdr/qstrdefs.generated.h \
../py/reader.h ../py/obj.h \
/opt/devkitpro/devkitARM/arm-none-eabi/include/assert.h ../py/mpprint.h \
../py/runtime0.h ../py/parse.h ../py/emitglue.h ../py/bc.h \
@ -35,7 +35,7 @@ build/main.o: main.c \
/opt/devkitpro/devkitARM/arm-none-eabi/include/limits.h \
/opt/devkitpro/devkitARM/arm-none-eabi/include/sys/syslimits.h \
../py/objlist.h ../py/objexcept.h ../py/objtuple.h \
/run/media/user/STEAM/projects/micropython-nds/nds/build/genhdr/root_pointers.h \
/run/media/user/STEAM/projects/automicropython_nds/nds/build/genhdr/root_pointers.h \
../py/pystack.h ../py/stackctrl.h /opt/devkitpro/libnds/include/nds.h \
/opt/devkitpro/calico/include/calico.h \
/opt/devkitpro/calico/include/calico/types.h \
@ -154,7 +154,7 @@ build/main.o: main.c \
/opt/devkitpro/libnds/include/nds/arm9/sprite.h \
/opt/devkitpro/libnds/include/nds/arm9/trig_lut.h \
/opt/devkitpro/libnds/include/nds/arm9/video.h \
/opt/devkitpro/libnds/include/nds/arm9/videoGL.h code.c font.c font.h
/opt/devkitpro/libnds/include/nds/arm9/videoGL.h code.c
main.c :
/opt/devkitpro/devkitARM/arm-none-eabi/include/string.h :
/opt/devkitpro/devkitARM/arm-none-eabi/include/_ansi.h :
@ -182,7 +182,7 @@ main.c :
/opt/devkitpro/devkitARM/arm-none-eabi/include/alloca.h ../py/qstr.h :
../py/misc.h :
/opt/devkitpro/devkitARM/lib/gcc/arm-none-eabi/14.2.0/include/stdbool.h :
/run/media/user/STEAM/projects/micropython-nds/nds/build/genhdr/qstrdefs.generated.h :
/run/media/user/STEAM/projects/automicropython_nds/nds/build/genhdr/qstrdefs.generated.h :
../py/reader.h ../py/obj.h :
/opt/devkitpro/devkitARM/arm-none-eabi/include/assert.h ../py/mpprint.h :
../py/runtime0.h ../py/parse.h ../py/emitglue.h ../py/bc.h :
@ -192,7 +192,7 @@ main.c :
/opt/devkitpro/devkitARM/arm-none-eabi/include/limits.h :
/opt/devkitpro/devkitARM/arm-none-eabi/include/sys/syslimits.h :
../py/objlist.h ../py/objexcept.h ../py/objtuple.h :
/run/media/user/STEAM/projects/micropython-nds/nds/build/genhdr/root_pointers.h :
/run/media/user/STEAM/projects/automicropython_nds/nds/build/genhdr/root_pointers.h :
../py/pystack.h ../py/stackctrl.h /opt/devkitpro/libnds/include/nds.h :
/opt/devkitpro/calico/include/calico.h :
/opt/devkitpro/calico/include/calico/types.h :
@ -311,4 +311,4 @@ main.c :
/opt/devkitpro/libnds/include/nds/arm9/sprite.h :
/opt/devkitpro/libnds/include/nds/arm9/trig_lut.h :
/opt/devkitpro/libnds/include/nds/arm9/video.h :
/opt/devkitpro/libnds/include/nds/arm9/videoGL.h code.c font.c font.h :
/opt/devkitpro/libnds/include/nds/arm9/videoGL.h code.c :

BIN
nds/build/main.o
View File

Binary file not shown.

32
nds/font.c
View File

@ -1,32 +0,0 @@
#include "font.h"
static PrintConsole topScreen;
//static PrintConsole bottomScreen;
void buildFont()
{
const int tile_base = 0;
const int map_base = 20;
videoSetMode(MODE_0_2D);
videoSetModeSub(MODE_0_2D);
vramSetBankA(VRAM_A_MAIN_BG);
vramSetBankC(VRAM_C_SUB_BG);
PrintConsole *console = consoleInit(&topScreen,0, BgType_Text4bpp, BgSize_T_256x256, map_base, tile_base, false, false);
//PrintConsoleLower *console = consoleInit(&topScreen,0, BgType_Text4bpp, BgSize_T_256x256, map_base, tile_base, false, false);
ConsoleFont font;
font.gfx = (u16*)fontTiles;
font.pal = (u16*)fontPal;
font.numChars = 95;
font.numColors = fontPalLen / 2;
font.bpp = 4;
font.asciiOffset = 32;
font.convertSingleColor = false;
consoleSetFont(console, &font);
}

28
nds/font.h
View File

@ -1,28 +0,0 @@
//{{BLOCK(font)
//======================================================================
//
// font, 8x768@4,
// + palette 16 entries, not compressed
// + 96 tiles not compressed
// Total size: 32 + 3072 = 3104
//
// Time-stamp: 2025-03-27, 19:20:41
// Exported by Cearn's GBA Image Transmogrifier, v0.9.2
// ( http://www.coranac.com/projects/#grit )
//
//======================================================================
#ifndef GRIT_FONT_H
#define GRIT_FONT_H
#define fontTilesLen 3072
extern const unsigned int fontTiles[768];
#define fontPalLen 32
extern const unsigned short fontPal[16];
#endif // GRIT_FONT_H
//}}BLOCK(font)

138
nds/font.s
View File

@ -1,138 +0,0 @@
@{{BLOCK(font)
@=======================================================================
@
@ font, 8x768@4,
@ + palette 16 entries, not compressed
@ + 96 tiles not compressed
@ Total size: 32 + 3072 = 3104
@
@ Time-stamp: 2025-03-27, 19:20:41
@ Exported by Cearn's GBA Image Transmogrifier, v0.9.2
@ ( http://www.coranac.com/projects/#grit )
@
@=======================================================================
.section .rodata
.align 2
.global fontTiles @ 3072 unsigned chars
.hidden fontTiles
fontTiles:
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00079900,0x00071900,0x00071300,0x00072800,0x00077700,0x00074400,0x0007AA00,0x00077700
.word 0x00797900,0x00797900,0x00717100,0x00777700,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x07907900,0x73333330,0x77877870,0x07107100,0x74444440,0x77477470,0x07707700
.word 0x00079000,0x00999990,0x73673763,0x77758A80,0x001A1500,0x74274724,0x75444447,0x07774770
.word 0x00000000,0x59007990,0x76307110,0x07287770,0x00721000,0x74472400,0x7AA07240,0x77700750
.word 0x00006900,0x00769090,0x00776350,0x58078280,0x72A10721,0x074A0074,0x5472A447,0x77077770
.word 0x07699000,0x07690000,0x00763000,0x00077000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x07690000,0x00763000,0x00078000,0x00071000,0x00054000,0x07247000,0x07770000
.word 0x00000000,0x00069000,0x00737000,0x00780000,0x00710000,0x00740000,0x00724000,0x00077000
.word 0x00079000,0x05979790,0x07531370,0x00758700,0x0051A100,0x05474540,0x07774770,0x00077000
.word 0x00071000,0x00079000,0x00073000,0x7A888888,0x77771777,0x00074000,0x00074000,0x00077000
.word 0x00000000,0x00000000,0x00000000,0x005AA000,0x00511000,0x00747000,0x00724000,0x00077000
.word 0x00000000,0x00000000,0x00000000,0x7A888888,0x77777777,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00744000,0x007AA000,0x00777000
.word 0x00000000,0x00000000,0x05300000,0x07280000,0x00721000,0x00072400,0x00007240,0x00000770
.word 0x00199990,0x71967769,0x73300073,0x78800078,0x71100071,0x7A420024,0x75A44447,0x07777770
.word 0x00791000,0x00799100,0x00733000,0x00788000,0x00711000,0x00744000,0x00744000,0x00777000
.word 0x00199990,0x71967769,0x71300077,0x75A8A000,0x0775A1A0,0x0007724A,0x74444444,0x77777777
.word 0x00199990,0x71967769,0x73300077,0x77888800,0x71157000,0x7A420024,0x75A44447,0x07777770
.word 0x07990000,0x07999000,0x07336300,0x07887280,0x07110721,0x74444444,0x77447777,0x07770000
.word 0x07999991,0x07777791,0x00133333,0x7A8275A8,0x71100777,0x7A400024,0x75A44447,0x07777770
.word 0x00799100,0x00776990,0x00133331,0x7A857288,0x71A007A1,0x7A40024A,0x77A444A7,0x07777770
.word 0x79999999,0x79957777,0x76330000,0x0728A000,0x00511000,0x00744000,0x00744000,0x00777000
.word 0x00199910,0x01957691,0x71300531,0x77A888A0,0x01177511,0x74400244,0x77444447,0x07777770
.word 0x00199910,0x01957691,0x73100713,0x7880728A,0x7A1111A0,0x72442700,0x075A4400,0x00777700
.word 0x00000000,0x00799000,0x00711000,0x00777000,0x00711000,0x007AA000,0x00777000,0x00000000
.word 0x00000000,0x00511000,0x00533000,0x00780000,0x00721000,0x00777000,0x00000000,0x00000000
.word 0x05900000,0x07690000,0x00763000,0x00072800,0x00051700,0x00547000,0x05470000,0x07700000
.word 0x00000000,0x00000000,0x71333333,0x77777777,0x7A111111,0x77777777,0x00000000,0x00000000
.word 0x00059000,0x00597000,0x05370000,0x58700000,0x72100000,0x07240000,0x00724000,0x00075000
.word 0x00099900,0x00957690,0x07300730,0x07280700,0x00721000,0x00070000,0x00054000,0x00070000
.word 0x00999900,0x09677690,0x36733763,0x80772878,0x10002171,0x40744724,0x24777247,0x72444470
.word 0x07699960,0x07916190,0x05367630,0x76850586,0x7A11111A,0x74477744,0x74A007A4,0x77700777
.word 0x00199999,0x71967799,0x73900733,0x75888888,0x71177711,0x7A450744,0x75A44444,0x07777777
.word 0x05999960,0x59675996,0x70007533,0x00000788,0x00000511,0x54207442,0x72444427,0x07777770
.word 0x00619999,0x06995799,0x73370733,0x78800788,0x71100711,0x72445744,0x072A4444,0x00777777
.word 0x79999999,0x77777799,0x00000733,0x07A88888,0x07777711,0x00000744,0x04444444,0x77777777
.word 0x79999999,0x77777799,0x00000733,0x07A88888,0x07777711,0x00000744,0x00000744,0x00000777
.word 0x05999960,0x59675996,0x70007533,0x78880788,0x71170511,0x74407442,0x72444427,0x07777770
.word 0x79900799,0x79900799,0x73900733,0x78888888,0x71177711,0x74400744,0x7AA00744,0x77700777
.word 0x00079900,0x00079900,0x00073300,0x00078800,0x00071100,0x00074400,0x0007AA00,0x00077700
.word 0x79900000,0x79900000,0x73300000,0x78800000,0x71100000,0x7A4A0000,0x77A44447,0x07777770
.word 0x06900799,0x07190799,0x00713733,0x0007A888,0x005A1711,0x05A47744,0x5A4707AA,0x77700777
.word 0x00000799,0x00000799,0x00000733,0x00000788,0x00000711,0x00000744,0x7A444444,0x77777777
.word 0x79600769,0x79967699,0x73331333,0x788A8A88,0x71A515A1,0x74A777A4,0x7AA007A4,0x77700777
.word 0x79900099,0x79900999,0x73303133,0x7888A588,0x711A7711,0x74470744,0x7AA00744,0x77000777
.word 0x05199915,0x71957591,0x73370733,0x78800788,0x71100711,0x7A45754A,0x75A444A5,0x07777770
.word 0x06999999,0x79977799,0x73300733,0x72888888,0x07777711,0x00000744,0x00000744,0x00000777
.word 0x05199915,0x71957591,0x73370733,0x78800788,0x7A154711,0x7544754A,0x745A44A5,0x07777770
.word 0x06999999,0x79977799,0x73300733,0x72888888,0x071A7711,0x7A470744,0x7A400744,0x77700777
.word 0x00999996,0x79677599,0x77000733,0x02888882,0x71157770,0x744002A4,0x72444447,0x07777770
.word 0x19999999,0x77799777,0x00733000,0x00788000,0x00711000,0x00744000,0x00744000,0x00777000
.word 0x71100799,0x79900799,0x73300733,0x78800788,0x71100711,0x7A42724A,0x75A444A7,0x07777770
.word 0x79100769,0x79900719,0x76300731,0x07887A87,0x072171A0,0x00744470,0x00724A00,0x00077700
.word 0x79100719,0x79100719,0x73103713,0x78A8A8A8,0x711A5111,0x74A77544,0x7A700754,0x77000077
.word 0x19000019,0x71900197,0x07131370,0x007A8700,0x00A1A100,0x0A477A40,0xA47007A4,0x77000075
.word 0x90000091,0x69000917,0x76363170,0x07288700,0x00711000,0x00744000,0x00744000,0x00777000
.word 0x71999999,0x77197777,0x07713000,0x0077A800,0x00077A10,0x000077A4,0x74444444,0x77777777
.word 0x07199900,0x07771900,0x00071300,0x0007A800,0x0007A100,0x0007A400,0x07A44400,0x07777700
.word 0x00000059,0x00000697,0x00006370,0x00028700,0x00217000,0x02470000,0x54700000,0x77000000
.word 0x07199900,0x07197700,0x07130000,0x07A80000,0x07A10000,0x07A40000,0x07A44400,0x07777700
.word 0x00000000,0x00059000,0x00536300,0x05877280,0x07700770,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x7A444444,0x77777777
.word 0x00699000,0x00779000,0x00736000,0x00770000,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00133300,0x0A877000,0x7A111100,0x7A477A40,0x74444400,0x77777000
.word 0x00000990,0x00007990,0x00333330,0x08A77880,0x71007110,0x74207440,0x72444440,0x07777700
.word 0x00000000,0x00000000,0x05333100,0x782758A0,0x77007110,0x740054A0,0x72444A70,0x07777700
.word 0x79900000,0x79900000,0x73333300,0x78877A80,0x71100710,0x74400240,0x74444450,0x77777700
.word 0x00000000,0x00000000,0x00133100,0x7A7778A0,0x71111110,0x777774A0,0x07444A50,0x07777700
.word 0x71915000,0x77791000,0x71333330,0x77788770,0x00711000,0x00744000,0x00744000,0x00777000
.word 0x00000000,0x00000000,0x07133300,0x7A877280,0x71100210,0x74444470,0x7A477700,0x72A44400
.word 0x00007990,0x00007990,0x00333330,0x78A77880,0x71007110,0x74007440,0x74007440,0x77007770
.word 0x00799000,0x00755000,0x00711000,0x00788000,0x00711000,0x00744000,0x00744000,0x00777000
.word 0x00799000,0x00755000,0x00711000,0x00788000,0x00711000,0x00744000,0x007A4000,0x00754A40
.word 0x00007990,0x00007990,0x71307330,0x77A87880,0x077A1110,0x00A47440,0x0A477440,0x77707770
.word 0x00719900,0x00799000,0x00733000,0x00788000,0x00711000,0x00744000,0x00744000,0x00777000
.word 0x00000000,0x00000000,0x05353630,0x78A8A880,0x71717A10,0x74747A40,0x74747A40,0x77777770
.word 0x00000000,0x00000000,0x00333130,0x78A77880,0x71707A10,0x74007A40,0x74007A40,0x77007770
.word 0x00000000,0x00000000,0x00333100,0x782728A0,0x71007110,0x740024A0,0x72444A70,0x07777700
.word 0x00000000,0x00000000,0x06333330,0x78277880,0x71207110,0x72444440,0x07777440,0x00007440
.word 0x00000000,0x00000000,0x73333360,0x78877280,0x71100210,0x74444420,0x74477700,0x74400000
.word 0x00000000,0x00000000,0x73361300,0x77288800,0x0077A100,0x0007A400,0x0007A400,0x00077700
.word 0x00000000,0x00000000,0x07333100,0x077778A0,0x02111A00,0x74477000,0x72444440,0x07777770
.word 0x00000000,0x00799000,0x73333330,0x77788770,0x00711000,0x0074A000,0x044A5000,0x77770000
.word 0x00000000,0x00000000,0x73300730,0x78800780,0x71100710,0x7A400A40,0x72A44470,0x77777700
.word 0x00000000,0x00000000,0x73300730,0x7A8005A0,0x72117120,0x77A45A00,0x07244200,0x00777000
.word 0x00000000,0x00000000,0x73007130,0x78787A80,0x717171A0,0x7A242420,0x77424270,0x07777700
.word 0x00000000,0x00000000,0x76300630,0x77A82870,0x077A1700,0x0024A400,0x02477240,0x77707770
.word 0x00000000,0x00000000,0x73300730,0x78800780,0x7A100A10,0x7A444470,0x724A7700,0x772A4440
.word 0x00000000,0x00000000,0x71333330,0x77A87770,0x077A1000,0x0077A400,0x74444440,0x77777770
.word 0x00796000,0x00759000,0x00073000,0x00072800,0x00001700,0x00054000,0x00742000,0x00770000
.word 0x00071000,0x00079000,0x00073000,0x00078000,0x00071000,0x00074000,0x00074000,0x00077000
.word 0x00006900,0x00079700,0x00073000,0x00782000,0x00721000,0x00074000,0x00072400,0x00007700
.word 0x00000000,0x79079900,0x76317630,0x07770770,0x00000000,0x00000000,0x00000000,0x00000000
.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
.section .rodata
.align 2
.global fontPal @ 32 unsigned chars
.hidden fontPal
fontPal:
.hword 0x0000,0x6673,0x3CE5,0x779C,0x5D49,0x2C63,0x4926,0x1420
.hword 0x6E92,0x7BFF,0x4CC6,0x0000,0x4000,0x0000,0x0000,0x0000
@}}BLOCK(font)

21
nds/main.c
View File

@ -34,7 +34,7 @@
//#include "soundbank_bin.h"
//osprey
#include "code.c"
#include "font.c"
//#include "font.c"
@ -62,21 +62,18 @@ static void do_str(const char *src, mp_parse_input_kind_t input_kind) {
int main(void) {
consoleDemoInit();
// Initialize the console for printing to the screen.
buildFont();
//superceeded by font engine in "font.c"
PrintConsole topScreen;
PrintConsole bottomScreen;
//videoSetMode(MODE_0_2D);
//videoSetModeSub(MODE_0_2D);
videoSetMode(MODE_0_2D);
videoSetModeSub(MODE_0_2D);
//vramSetBankA(VRAM_A_MAIN_BG);
//vramSetBankA(VRAM_A_MAIN_SPRITE);
//vramSetBankB(VRAM_B_MAIN_BG);
//vramSetBankC(VRAM_C_SUB_BG);
//vramSetBankD(VRAM_D_SUB_SPRITE);
vramSetBankA(VRAM_A_MAIN_BG);
vramSetBankC(VRAM_C_SUB_BG);
//consoleInit(&topScreen, 3,BgType_Text4bpp, BgSize_T_256x256, 31, 0, true, true);
//consoleInit(&bottomScreen, 3,BgType_Text4bpp, BgSize_T_256x256, 31, 0, false, true);
consoleInit(&topScreen, 3,BgType_Text4bpp, BgSize_T_256x256, 31, 0, true, true);
consoleInit(&bottomScreen, 3,BgType_Text4bpp, BgSize_T_256x256, 31, 0, false, true);
consoleSelect(&topScreen);

BIN
nds/soundbank.bin
View File

Binary file not shown.

5
nds/soundbank.h
View File

@ -1,5 +0,0 @@
#define SFX_BOOM 0
#define MOD_FLATOUTLIES 0
#define MSL_NSONGS 1
#define MSL_NSAMPS 32
#define MSL_BANKSIZE 33