Skip to content

Commit

Permalink
Merge pull request #87 from jsmolina/features/improve
Browse files Browse the repository at this point in the history 
improving game experience
  • Loading branch information
@jsmolina
jsmolina committed Jan 9, 2021
2 parents 7737019 + db39984 commit 122f2aa
Show file tree
Hide file tree
Showing 34 changed files with 2,210 additions and 2,208 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ prota:
png2sp1sprite ./sprites/cat_sprites.png -m ./sprites/cat_sprites_mask.png -i sprite_protar -f 24 > ./build/protar.asm

protaswim:
png2sp1sprite ./sprites/cat_swimsprites.png --bit -i sprite_swim -f 32 > ./build/protaswim.asm
png2sp1sprite ./sprites/cat_swimsprites.png --bit -i sprite_swim -f 24 > ./build/protaswim.asm

dogsprites:
png2sp1sprite ./sprites/dog_sprites.png -m ./sprites/dog_sprites_mask.png -i sprite_dog -f 24 > ./build/dogr.asm
Expand Down
Binary file added background/grosor_ventana.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified background/level1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion background/tilejoin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
'udg_clothes22',
'udg_boot',
'udg_boot2',
'j_valla_rota'
'j_valla_rota',
'grosor_ventana'
]

imgs = [i + '.png' for i in imgs]
Expand Down
Binary file modified background/udg_win1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified background/udg_win2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions build/auxiliar.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SECTION rodata_user
defb @11111111, @00000000
defb @11111111, @00000000
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _auxiliar1
._auxiliar1
Expand Down
1 change: 1 addition & 0 deletions build/bincat.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SECTION rodata_user
defb @11111111, @00000000
defb @11111111, @00000000
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_bincat1
._sprite_bincat1
Expand Down
193 changes: 103 additions & 90 deletions build/dogr.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,29 @@ SECTION rodata_user
defb @11111111, @00000000
defb @11111111, @00000000
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog1
._sprite_dog1

PUBLIC _sprite_dog1_f1
._sprite_dog1_f1
defb @11111111, @00000000
defb @11111111, @00000000
defb @11111111, @00000000
defb @11110000, @00000000
defb @11100000, @00001111
defb @11000000, @00010000
defb @10000000, @00100001
defb @10000000, @00101100
defb @00000000, @01011000
defb @11111111, @00000000
defb @11110000, @00001111
defb @11100000, @00010000
defb @11000000, @00100001
defb @11000000, @00101101
defb @10000000, @01010100
defb @00000000, @10000000
defb @00000000, @10000000
defb @00000000, @01101000
defb @00000000, @01010100
defb @00000000, @01000110
defb @10000000, @00100011
defb @11000000, @00111100
defb @10000000, @01101000
defb @10000000, @01010100
defb @10000000, @01000110
defb @11000000, @00100011
defb @11100011, @00011100

defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -41,23 +43,24 @@ PUBLIC _sprite_dog1
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog1_f2
._sprite_dog1_f2
defb @11000000, @00011110
defb @10000000, @00100000
defb @00000000, @01000000
defb @00000000, @01011001
defb @00000000, @10110000
defb @00000000, @00000000
defb @00000000, @00000000
defb @00000000, @11010000
defb @00000000, @11111000
defb @00000000, @10101111
defb @00000000, @10000111
defb @00000000, @01001100
defb @10000000, @00110000
defb @11000000, @00010011
defb @11100000, @00001100
defb @11110011, @00000000
defb @11111111, @00000000
defb @11111111, @00000000
defb @11110000, @00001111
defb @11100000, @00010000
defb @11000000, @00100000
defb @11000000, @00101100
defb @10000000, @01010100
defb @00000000, @10000000
defb @00000000, @10000000
defb @10000000, @01101000
defb @11000000, @00111100
defb @10000000, @01010111
defb @10000000, @01000011
defb @11000000, @00100110
defb @11100000, @00011110
defb @11111100, @00000011

defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -68,11 +71,12 @@ PUBLIC _sprite_dog1
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog1_f3
._sprite_dog1_f3
defb @11111111, @00000000
defb @11111111, @00000000
defb @11110011, @00001100
defb @11100000, @00010011
defb @11110001, @00001110
defb @11100000, @00010001
defb @11000000, @00100000
defb @10000000, @01000000
defb @10000000, @01000010
Expand All @@ -95,6 +99,7 @@ PUBLIC _sprite_dog1
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog1_f4
._sprite_dog1_f4
defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -106,8 +111,8 @@ PUBLIC _sprite_dog1
defb @11110000, @00001000
defb @11100000, @00010001
defb @11100000, @00010010
defb @11110000, @00001001
defb @11111000, @00000110
defb @11100000, @00011001
defb @11110000, @00001110
defb @11111100, @00000010
defb @11111110, @00000001
defb @11111111, @00000000
Expand All @@ -125,23 +130,24 @@ PUBLIC _sprite_dog1
PUBLIC _sprite_dog2
._sprite_dog2

PUBLIC _sprite_dog2_f1
._sprite_dog2_f1
defb @11100000, @00000000
defb @10000000, @00011111
defb @00000000, @01100000
defb @11111111, @00000000
defb @11111111, @00000000
defb @11100000, @00011111
defb @10000000, @01100000
defb @00000000, @10000000
defb @00000000, @11000000
defb @00000000, @01100000
defb @00000000, @01000000
defb @00000000, @00100000
defb @00000000, @00100000
defb @00000000, @10110000
defb @00000000, @11110000
defb @00000000, @00110000
defb @00000000, @00110010
defb @00000000, @00110001
defb @00000000, @00110111
defb @00000000, @00101001
defb @00000000, @01111000
defb @00000000, @10000100
defb @01111000, @00000011
defb @00000000, @00110011
defb @00000000, @01100010
defb @01100000, @10011010
defb @11111000, @00000111

defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -152,23 +158,24 @@ PUBLIC _sprite_dog2
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog2_f2
._sprite_dog2_f2
defb @00000011, @01000000
defb @00000000, @01111100
defb @00000000, @10000011
defb @00000000, @11000000
defb @00000000, @11000000
defb @00000000, @01000000
defb @00000000, @01000000
defb @00000000, @11000000
defb @00000000, @11000000
defb @00000000, @10000000
defb @00000000, @00010001
defb @00000000, @00100010
defb @00000001, @01111100
defb @00000011, @10000000
defb @01111111, @00000000
defb @11111111, @00000000
defb @00111111, @11000000
defb @00011111, @00100000
defb @00000011, @00111100
defb @00000000, @01000011
defb @00000000, @11100000
defb @00000000, @01100000
defb @00000000, @00100000
defb @00000000, @00100000
defb @00000000, @01100000
defb @00000000, @01100000
defb @00000000, @11000000
defb @00000000, @10001000
defb @00000000, @00010000
defb @00000000, @01111111
defb @01111111, @10000000

defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -179,9 +186,10 @@ PUBLIC _sprite_dog2
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog2_f3
._sprite_dog2_f3
defb @11100011, @00011100
defb @10000001, @01100010
defb @11000011, @00111100
defb @10000001, @01000010
defb @00000000, @10000001
defb @00000000, @00001010
defb @00000000, @10010101
Expand All @@ -190,11 +198,11 @@ PUBLIC _sprite_dog2
defb @00000000, @00000010
defb @00000000, @00010100
defb @00000000, @00101010
defb @00000000, @00010100
defb @00000000, @10010100
defb @00000000, @00000000
defb @00000000, @10000001
defb @00000000, @01001010
defb @01000000, @10110101
defb @00000000, @11100101
defb @11100001, @00011110

defb @11111111, @00000000
Expand All @@ -206,6 +214,7 @@ PUBLIC _sprite_dog2
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog2_f4
._sprite_dog2_f4
defb @11111111, @00000000
defb @11111111, @00000000
Expand Down Expand Up @@ -236,23 +245,24 @@ PUBLIC _sprite_dog2
PUBLIC _sprite_dog3
._sprite_dog3

PUBLIC _sprite_dog3_f1
._sprite_dog3_f1
defb @11111111, @00000000
defb @00111111, @00000000
defb @00011111, @11000000
defb @00001111, @00100000
defb @00000111, @00010000
defb @00000011, @00001000
defb @00000001, @00000100
defb @00000000, @00000010
defb @11111111, @00000000
defb @11111111, @00000000
defb @00111111, @11000000
defb @00011111, @00100000
defb @00001111, @00010000
defb @00000111, @00001000
defb @00000011, @00000100
defb @00000001, @00000010
defb @00000000, @10000001
defb @00000000, @10000111
defb @00000000, @00001000
defb @00000111, @00110000
defb @00000011, @01001000
defb @00000001, @01000100
defb @00000001, @10100100
defb @01000001, @00011100
defb @00000111, @00001000
defb @00001111, @00010000
defb @00011111, @01100000
defb @00111111, @01000000
defb @01111111, @10000000

defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -263,23 +273,24 @@ PUBLIC _sprite_dog3
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog3_f2
._sprite_dog3_f2
defb @11111111, @00000000
defb @11111111, @00000000
defb @00001111, @00000000
defb @00000000, @11110000
defb @11111111, @00000000
defb @11111111, @00000000
defb @11111111, @00000000
defb @00001111, @11110000
defb @00000000, @00001111
defb @00000000, @00000001
defb @00000000, @00000010
defb @00000000, @00000010
defb @00000001, @10000100
defb @00000000, @01000010
defb @00000000, @11100001
defb @00000000, @00011100
defb @11100000, @00000100
defb @11111000, @00000011
defb @11111100, @00000000
defb @11111111, @00000000
defb @00000001, @00000010
defb @00000001, @00000010
defb @00000011, @01000100
defb @00000011, @01000100
defb @00000001, @00100010
defb @00100000, @11011001
defb @11110000, @00001001
defb @11111000, @00000111

defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -290,6 +301,7 @@ PUBLIC _sprite_dog3
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog3_f3
._sprite_dog3_f3
defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -300,13 +312,13 @@ PUBLIC _sprite_dog3
defb @00000000, @00000001
defb @00000000, @00010101
defb @00000001, @00101010
defb @00000011, @10010100
defb @00000001, @10010110
defb @00000001, @01111010
defb @00000000, @00100001
defb @00000000, @01000011
defb @00000000, @10010101
defb @10000000, @01001011
defb @11000001, @00111110
defb @00000001, @11001010
defb @11000011, @00111100

defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -317,6 +329,7 @@ PUBLIC _sprite_dog3
defb @11111111, @00000000
defb @11111111, @00000000

PUBLIC _sprite_dog3_f4
._sprite_dog3_f4
defb @11111111, @00000000
defb @11111111, @00000000
Expand All @@ -331,7 +344,7 @@ PUBLIC _sprite_dog3
defb @00000011, @10000100
defb @00000011, @00010100
defb @00000111, @10101000
defb @10001111, @01110000
defb @00001111, @11110000
defb @11111111, @00000000
defb @11111111, @00000000

Expand Down
Loading

0 comments on commit 122f2aa

Please sign in to comment.