Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/font numbers #46

Merged
merged 2 commits into from
Aug 4, 2019
Merged

Feature/font numbers #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93a59ef
adding font loading
jsmolina Aug 4, 2019
0b9461c
add abecedary
jsmolina Aug 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ compile:
png2udg ./build/door.png -a > ./build/door.asm
png2udg ./build/ghostpill.png -a > ./build/ghostpill.asm
png2udg ./build/vidas.png -a > ./build/vidas.asm
png2udg ./font/numbers.png -a > ./font/numbers.asm
png2udg ./font/abecedary.png -a > ./font/abecedary.asm
png2sp1sprite ./build/puntos.png -b -i puntos -f 16 -s rodata_user > ./build/puntos.asm
png2sp1sprite ./build/prota_sprites.png -b -i sprite_protar -f 16 -s rodata_user > ./build/prota.asm
png2sp1sprite ./build/prota_dead.png -b -i sprite_protar_dead -f 16 -s rodata_user > ./build/prota_dead.asm
Expand Down
4 changes: 4 additions & 0 deletions font/abecedary.asm
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added font/abecedary.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions font/font.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
numbers
abecedary
4 changes: 4 additions & 0 deletions font/numbers.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
SECTION rodata_user
PUBLIC _numbers
._numbers
defb @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000, @00011100, @00100110, @01100011, @01100011, @01100011, @00110010, @00011100, @00000000, @00011000, @00111000, @00011000, @00011000, @00011000, @00011000, @01111110, @00000000, @01111100, @11000110, @00001110, @00111100, @01111000, @11100000, @11111110, @00000000, @01111110, @00001100, @00011000, @00111100, @00000110, @11000110, @01111100, @00000000, @00011100, @00111100, @01101100, @11001100, @11111110, @00001100, @00001100, @00000000, @11111100, @11000000, @11111100, @00000110, @00000110, @11000110, @01111100, @00000000, @00111100, @01100000, @11000000, @11111100, @11000110, @11000110, @01111100, @00000000, @11111110, @11000110, @00001100, @00011000, @00110000, @00110000, @00110000, @00000000, @01111000, @11000100, @11100100, @01111000, @10011110, @10000110, @01111100, @00000000, @01111100, @11000110, @11000110, @01111110, @00000110, @00001100, @01111000, @00000000
Binary file added font/numbers.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ extern uint8_t letterboxes8[];
extern uint8_t letterboxes9[];

extern uint8_t vidas[];
extern uint8_t numbers[];
extern uint8_t abecedary[];
extern uint8_t * currentmap;

#endif
Expand Down
8 changes: 8 additions & 0 deletions msnampac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ int main()
sp1_Initialize( SP1_IFLAG_MAKE_ROTTBL | SP1_IFLAG_OVERWRITE_TILES | SP1_IFLAG_OVERWRITE_DFILE,
INK_BLACK | PAPER_BLACK,
' ' );
// numbers
for (idx=0; idx != 10; idx++) {
sp1_TileEntry(48+idx, numbers+idx*8);
}
// abecedary
for (idx=0; idx != 25; idx++) {
sp1_TileEntry(65+idx, abecedary+idx*8);
}

sp1_TileEntry('a', horizontal);
sp1_TileEntry('b', vertical);
Expand Down
1 change: 1 addition & 0 deletions zproject.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@build/binaries.lst
@fx/fx.lst
@font/font.lst
game_zx.c
logic.c
sprites.c
Expand Down