Skip to content

Commit

Permalink
Merge pull request #85 from jsmolina/feature/dog_masked
Browse files Browse the repository at this point in the history
curtain and floor textures
  • Loading branch information
jsmolina committed Jun 18, 2020
2 parents d6569a5 + a0a4216 commit 056c5b8
Show file tree
Hide file tree
Showing 6 changed files with 936 additions and 922 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ windows:
@png2udg ./background/udg_win1.png
@png2udg ./background/udg_win2.png
@png2udg ./background/udg_win3.png
@png2udg ./background/q_barra_cortina.png

mouse:
@png2udg ./background/hole_empty.png
Expand Down
Binary file modified background/q_barra_cortina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions defines.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const uint8_t heart2[] = {0x66, 0xef, 0xff, 0xff, 0x7e, 0x3c, 0x18, 0x0};

const uint8_t queso_textura[] = {0x0, 0x0, 0x80, 0x4, 0x0, 0x8, 0x40, 0x1};
const uint8_t queso_diagonal[] = {0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff};
const uint8_t q_barra_cortina[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xc};

extern uint8_t sprite_protar1[];
extern uint8_t sprite_protar2[];
Expand Down Expand Up @@ -313,6 +314,7 @@ void print_room_walls(uint8_t initial_window, uint8_t paper_color, uint8_t ink_c

sp1_TileEntry('J', curtain);
sp1_TileEntry('N', udg_win2); // full square
sp1_TileEntry(144, q_barra_cortina);

for(idx = 0; idx != 3; ++idx) {
// upper left
Expand All @@ -337,6 +339,10 @@ void print_room_walls(uint8_t initial_window, uint8_t paper_color, uint8_t ink_c
sp1_PrintAt( 17, idx, INK_BLACK | paper_color, 'G');
}

for (idx = initial_window; idx != initial_window + 8; ++idx) {
sp1_PrintAt( 7, idx, PAPER_RED | INK_GREEN, 144);
}

for (idx = 8; idx != 11; ++idx) {
sp1_PrintAt( idx, initial_window, ink_color | paper_color, 'J');
sp1_PrintAt( idx, initial_window + 1, ink_color | paper_color, 'J');
Expand Down
7 changes: 7 additions & 0 deletions level1.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ void print_background_lvl1() {

sp1_Invalidate(&full_screen);
sp1_TileEntry('$', j_ladrillos);
sp1_TileEntry(144, queso_textura);
sp1_TileEntry('%', j_piedras);
sp1_TileEntry('V', udg_valla2); // middle of fence
sp1_TileEntry('W', udg_valla1); // top of fence
Expand Down Expand Up @@ -231,6 +232,12 @@ void print_background_lvl1() {
}
frame += 4;
}
sp1_PrintAt(21,12,color, 144);
sp1_PrintAt(21,27,color, 144);
sp1_PrintAt(22,0,color, 144);
sp1_PrintAt(23,2,color, 144);
sp1_PrintAt(23,7,color, 144);
sp1_PrintAt(23,15,color, 144);

idx_j = 4;
idx = 2;
Expand Down
4 changes: 1 addition & 3 deletions level2.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// level 2 cheese
const uint8_t hole_empty[] = {0x3c, 0x46, 0x9f, 0xbf, 0xbf, 0xbf, 0x5e, 0x3c};
const uint8_t hole_mouse[] = {0x3c, 0x7e, 0x99, 0x81, 0xd5, 0xc3, 0x66, 0x3c};
const uint8_t cheese2[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};


void define_cheese_holes_pos() {
Expand Down Expand Up @@ -153,7 +152,6 @@ void print_background_level2() {

sp1_TileEntry('A', hole_empty);
sp1_TileEntry('B', hole_mouse);
sp1_TileEntry('C', cheese2);
sp1_TileEntry('Z', hole_empty);
sp1_TileEntry('D', queso_textura);
sp1_TileEntry('E', queso_diagonal);
Expand All @@ -177,7 +175,7 @@ void print_background_level2() {
for (idx = 3; idx != 20; ++idx) {

for (idx_j = idx + 1; idx_j != 21; ++idx_j) {
sp1_PrintAt( idx_j - 1, idx, PAPER_GREEN, 'C');
sp1_PrintAt( idx_j - 1, idx, PAPER_GREEN, 'N');
}
}

Expand Down
Loading

0 comments on commit 056c5b8

Please sign in to comment.