Public_Skunkworks/rickjr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rickjr: import credit screen data, update the mapper function to use the f256lib to map in high memory

Browse source
This commit is contained in:
Jason Andersen 2024-01-28 11:57:03 -05:00
parent 630f52167f
commit 0279da40c1
6 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -29,7 +29,7 @@ F256 = $(HOME)/code/f256
#SYSLIBDIR = $(SYSTEM)/lib #SYSLIBDIR = $(SYSTEM)/lib
#SYSINCDIR = $(SYSTEM)/include #SYSINCDIR = $(SYSTEM)/include
TMPFLAGS = -D F256=1 -include src/mapper.h -Wno-unknown-pragmas TMPFLAGS = -D F256=1 -include src/mapper.h -include blocks.h -Wno-unknown-pragmas
INCCMD = -I$(SYSINCDIR) INCCMD = -I$(SYSINCDIR)

BIN
data/credits.256 Normal file
View file

Binary file not shown.

BIN
data/credits.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

15
src/dat_spritesJR.c
View file

@ -18,12 +18,6 @@
#define STR2(x) #x #define STR2(x) #x
#define STR(x) STR2(x) #define STR(x) STR2(x)
//#ifdef _WIN32
//#define INCBIN_SECTION ".rdata, \"dr\""
//#else
//#define INCBIN_SECTION ".rodata"
//#endif
// this aligns start address to 16 and terminates byte array with explict 0 // this aligns start address to 16 and terminates byte array with explict 0
// which is not really needed, feel free to change it to whatever you want/need // which is not really needed, feel free to change it to whatever you want/need
#define INCBIN(INCBIN_SECTION, name, file) \ #define INCBIN(INCBIN_SECTION, name, file) \
@ -41,9 +35,18 @@
extern __attribute__((aligned(16))) const char incbin_ ## name ## _start[]; \ extern __attribute__((aligned(16))) const char incbin_ ## name ## _start[]; \
extern const char incbin_ ## name ## _end[] extern const char incbin_ ## name ## _end[]
// Credits/Jr Title
INCBIN(".binarydata.credits", credits_256, "data/credits.256");
// Title Page
INCBIN(".binarydata.splash", splash_256, "data/splash.256"); INCBIN(".binarydata.splash", splash_256, "data/splash.256");
// Map Tiles
INCBIN(".binarydata.tiles", tiles_256, "data/tiles_data.256"); INCBIN(".binarydata.tiles", tiles_256, "data/tiles_data.256");
// Sprite Frames (32x32 sprites)
INCBIN(".binarydata.sprites", sprites_256, "data/sprites_data.256"); INCBIN(".binarydata.sprites", sprites_256, "data/sprites_data.256");
// Hall of Fame
INCBIN(".binarydata.haf", haf_256, "data/haf.256");
// Congrats
INCBIN(".binarydata.haf", congrats_256, "data/congrats.256");
#endif /* GFXF256 */ #endif /* GFXF256 */

4
src/mapper.h
View file

@ -17,9 +17,13 @@ $$JGA TODO, sort out how to mark an entire file
#define CODE_BLOCK(index) __attribute__((noinline, section(".block"#index))) #define CODE_BLOCK(index) __attribute__((noinline, section(".block"#index)))
#define DATA_BLOCK(index) __attribute__((section(".block"#index))) #define DATA_BLOCK(index) __attribute__((section(".block"#index)))
#define PAGEIN(_function_BLOCK) POKE(SWAP_SLOT, _function_BLOCK)
#else #else
#define CODE_BLOCK(index) #define CODE_BLOCK(index)
#define DATA_BLOCK(index) #define DATA_BLOCK(index)
#define PAGEIN(_function_)
#endif #endif

2
src/scr_credit.c
View file

@ -25,7 +25,7 @@ CODE_BLOCK(8) void scr_credit()
//$$JGA TODO - fix this //$$JGA TODO - fix this
*((char*)0x200) = (char)(((long)(&incbin_sprites_256_start))); *((char*)0x200) = (char)(((long)(&incbin_sprites_256_start)));
*((char*)0x201) = (char)(((long)(&incbin_sprites_256_start))>>8); *((char*)0x201) = (char)(((long)(&incbin_sprites_256_start))>>8);
// *((char*)0x202) = (char)(((long)(&incbin_sprites_256_start_high))>>16); *((char*)0x202) = incbin_sprites_256_start_high;
*((char*)0x203) = scr_credit_BLOCK; *((char*)0x203) = scr_credit_BLOCK;
// *((char*)0x203) = (char)(((long)(__block23_lma_high))>>8); // *((char*)0x203) = (char)(((long)(__block23_lma_high))>>8);
#endif #endif