Merge pull request #52 from jsmolina/feature/bookshelf

bookshelf level
jsmolina · Jan 3, 2019 · 8a962ec · 8a962ec
2 parents 5467430 + f22587f
commit 8a962ec
Show file tree

Hide file tree

Showing 28 changed files with 1,533 additions and 1,514 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,8 @@ compile:
 	echo "Done!"
 
 develop:
-	zcc +zx -v -m -startup=31 -DWFRAMES=3 -clib=sdcc_iy -O3 --max-allocs-per-node200000 @zproject.lst -pragma-include:zpragma.inc -o misifu -lay/vt_sound_6.lib
+# -DWFRAMES=3
+	sudo nice -n -20 su jordism -c "zcc +zx -v -m -startup=31 -clib=sdcc_iy -SO3 --opt-code-size -zopt --max-allocs-per-node200000 @zproject.lst -pragma-include:zpragma.inc -o misifu -lay/vt_sound_6.lib"
 	ls *.bin
 	appmake +zx -b screen.scr --org 16384 --noloader --blockname screen -o screen.tap
 	appmake +zx -b misifu_CODE.bin --org 24500 --noloader --blockname code -o code.tap
@@ -32,7 +33,7 @@ dogsprites:
 	png2sp1sprite ./sprites/dog_sprites.png -i sprite_dog -f 32 > ./build/dogr.asm
 
 bincat:
-	png2sp1sprite ./sprites/bincat_sprites.png --bit -i sprite_bincat > ./build/bincat.asm
+	png2sp1sprite ./sprites/bincat_sprites.png --bit -i sprite_bincat -f 24 > ./build/bincat.asm
 
 clothes:
 	png2sp1sprite ./sprites/clothes_sprites.png --bit -i sprite_clothes  -f 64 > ./build/clothes.asm
@@ -131,3 +132,14 @@ water:
 	@png2udg ./background/udg_fish.png
 	@png2udg ./background/udg_fishL.png
 	@png2udg ./background/udg_eel.png
+
+spider:
+	@png2udg ./background/udg_spiderplant11.png
+	@png2udg ./background/udg_spiderplant12.png
+	@png2udg ./background/udg_spiderplant21.png
+	@png2udg ./background/udg_spiderplant22.png
+	@png2udg ./background/udg_spidershelfleft.png
+	@png2udg ./background/udg_spidershelfright.png
+	@png2udg ./background/udg_spiderempty.png
+	@png2udg ./background/udg_spiderbook.png
+	@png2udg ./background/udg_spiderbook2.png
diff --git a/background/udg_spiderbook.png b/background/udg_spiderbook.png
diff --git a/background/udg_spiderbook2.png b/background/udg_spiderbook2.png
diff --git a/background/udg_spiderempty.png b/background/udg_spiderempty.png
diff --git a/background/udg_spiderplant.png b/background/udg_spiderplant.png
diff --git a/background/udg_spiderplant11.png b/background/udg_spiderplant11.png
diff --git a/background/udg_spiderplant12.png b/background/udg_spiderplant12.png
diff --git a/background/udg_spiderplant21.png b/background/udg_spiderplant21.png
diff --git a/background/udg_spiderplant22.png b/background/udg_spiderplant22.png
diff --git a/background/udg_spidershelfleft.png b/background/udg_spidershelfleft.png
diff --git a/background/udg_spidershelfright.png b/background/udg_spidershelfright.png
diff --git a/build/bincat.asm b/build/bincat.asm
@@ -1,6 +1,6 @@
 SECTION rodata_user
 
-; Original: 24, 16 (=3 x 2 chars)
+; Original: 48, 16 (=6 x 2 chars)
 ; Blocks: 3
  defb @00000000
  defb @00000000
@@ -39,6 +39,33 @@ PUBLIC _sprite_bincat1
  defb @00000000
  defb @00000000
 
+._sprite_bincat1_f2
+ defb @00000111
+ defb @00001111
+ defb @00001111
+ defb @00001100
+ defb @00000000
+ defb @00000000
+ defb @00011110
+ defb @00111111
+ defb @00111011
+ defb @00000001
+ defb @00000000
+ defb @00000111
+ defb @00001111
+ defb @00011110
+ defb @00011100
+ defb @00011100
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
 PUBLIC _sprite_bincat2
 ._sprite_bincat2
 
@@ -68,6 +95,33 @@ PUBLIC _sprite_bincat2
  defb @00000000
  defb @00000000
 
+._sprite_bincat2_f2
+ defb @00000000
+ defb @11000000
+ defb @11100001
+ defb @11101101
+ defb @11111111
+ defb @01111111
+ defb @00111111
+ defb @01111111
+ defb @11111111
+ defb @11111111
+ defb @01111111
+ defb @11011110
+ defb @10111111
+ defb @00111111
+ defb @00111111
+ defb @00001100
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+
 PUBLIC _sprite_bincat3
 ._sprite_bincat3
 
@@ -97,3 +151,30 @@ PUBLIC _sprite_bincat3
  defb @00000000
  defb @00000000
 
+._sprite_bincat3_f2
+ defb @00111000
+ defb @11111100
+ defb @11111100
+ defb @11001100
+ defb @11000000
+ defb @10000000
+ defb @00011110
+ defb @10111111
+ defb @11110111
+ defb @11100000
+ defb @10000000
+ defb @11111000
+ defb @01111100
+ defb @00011110
+ defb @00001110
+ defb @00001110
+
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+ defb @00000000
+