New images

5 files changed, 25 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index d2ea28f..1daf7ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 STORY?=1
 
 ifeq ($(STORY),1)
-	FRAME_0_IMAGE=images/pagoda.jpg
+	FRAME_0_IMAGE=images/pagoda.gif
 	FRAME_1_IMAGE=images/myatej.gif
 	FRAME_2_IMAGE=images/glaza.gif
 	TEXT_0=text/0_0.txt
@@ -38,7 +38,7 @@ ifeq ($(STORY),4)
 endif
 ifeq ($(STORY),5)
 	FRAME_0_IMAGE=images/shkola.gif
-	FRAME_1_IMAGE=images/zapravka.jpg
+	FRAME_1_IMAGE=images/zapravka.gif
 	FRAME_2_IMAGE=images/sputnik.jpg
 	TEXT_0=text/4_0.txt
 	TEXT_1=text/4_1.txt
@@ -47,7 +47,7 @@ ifeq ($(STORY),5)
 endif
 ifeq ($(STORY),6)
 	FRAME_0_IMAGE=images/trailer-park.jpg
-	FRAME_1_IMAGE=images/belaya_akula.jpg
+	FRAME_1_IMAGE=images/belaya_akula.gif
 	FRAME_2_IMAGE=images/sworm.gif
 	TEXT_0=text/5_0.txt
 	TEXT_1=text/5_1.txt
@@ -56,8 +56,8 @@ ifeq ($(STORY),6)
 endif
 ifeq ($(STORY),7)
 	FRAME_0_IMAGE=images/myatej.gif
-	FRAME_1_IMAGE=images/trailer-park.jpg
-	FRAME_2_IMAGE=images/zapravka.jpg
+	FRAME_1_IMAGE=images/trailer-park.gif
+	FRAME_2_IMAGE=images/zapravka.gif
 	TEXT_0=text/6_0.txt
 	TEXT_1=text/6_1.txt
 	TEXT_2=text/6_2.txt
@@ -240,7 +240,10 @@ run: $(EXECUTABLE)
 $(TITLE_IMAGE_0) $(TITLE_IMAGE_1) $(TITLE_IMAGE_2) $(TITLE_IMAGE_3): $(TITLE_IMAGE)
 	$(SPLITTER) $(TITLE_IMAGE) $(TITLE_IMAGE_0) $(TITLE_IMAGE_1) $(TITLE_IMAGE_2) $(TITLE_IMAGE_3)
 
-$(TITLE_PATTERN_0) $(TITLE_PATTERN_1) $(TITLE_PATTERN_2) $(TITLE_PATTERN_3) $(TITLE_NAME_TABLE_0) $(TITLE_NAME_TABLE_1) $(TITLE_NAME_TABLE_2) $(TITLE_NAME_TABLE_3) $(TITLE_ATTR_TABLE_0) $(TITLE_ATTR_TABLE_1) $(TITLE_ATTR_TABLE_2) $(TITLE_ATTR_TABLE_3) $(TITLE_PALETTE_0) $(TITLE_PALETTE_1) $(TITLE_PALETTE_2) $(TITLE_PALETTE_3): $(TITLE_IMAGE_0) $(TITLE_IMAGE_1) $(TITLE_IMAGE_2) $(TITLE_IMAGE_3)
+$(TITLE_PATTERN_0) $(TITLE_PATTERN_1) $(TITLE_PATTERN_2) $(TITLE_PATTERN_3) \
+$(TITLE_NAME_TABLE_0) $(TITLE_NAME_TABLE_1) $(TITLE_NAME_TABLE_2) $(TITLE_NAME_TABLE_3) \
+$(TITLE_ATTR_TABLE_0) $(TITLE_ATTR_TABLE_1) $(TITLE_ATTR_TABLE_2) $(TITLE_ATTR_TABLE_3) \
+$(TITLE_PALETTE_0) $(TITLE_PALETTE_1) $(TITLE_PALETTE_2) $(TITLE_PALETTE_3): $(TITLE_IMAGE_0) $(TITLE_IMAGE_1) $(TITLE_IMAGE_2) $(TITLE_IMAGE_3)
 	$(TILER) -i0 $(TITLE_IMAGE_0) -i1 $(TITLE_IMAGE_1) -i2 $(TITLE_IMAGE_2) -i3 $(TITLE_IMAGE_3) --enable-palettes 0,1,2,3 \
 	--out-pattern-table0 $(TITLE_PATTERN_0) --out-pattern-table1 $(TITLE_PATTERN_1) --out-pattern-table2 $(TITLE_PATTERN_2) --out-pattern-table3 $(TITLE_PATTERN_3) \
 	--out-name-table0 $(TITLE_NAME_TABLE_0) --out-name-table1 $(TITLE_NAME_TABLE_1) --out-name-table2 $(TITLE_NAME_TABLE_2) --out-name-table3 $(TITLE_NAME_TABLE_3) \
@@ -250,7 +253,10 @@ $(TITLE_PATTERN_0) $(TITLE_PATTERN_1) $(TITLE_PATTERN_2) $(TITLE_PATTERN_3) $(TI
 $(FRAME_0_IMAGE_0) $(FRAME_0_IMAGE_1) $(FRAME_0_IMAGE_2) $(FRAME_0_IMAGE_3): $(FRAME_0_IMAGE)
 	$(SPLITTER) $(FRAME_0_IMAGE) $(FRAME_0_IMAGE_0) $(FRAME_0_IMAGE_1) $(FRAME_0_IMAGE_2) $(FRAME_0_IMAGE_3)
 
-$(FRAME_0_PATTERN_0) $(FRAME_0_PATTERN_1) $(FRAME_0_PATTERN_2) $(FRAME_0_PATTERN_3) $(FRAME_0_NAME_TABLE_0) $(FRAME_0_NAME_TABLE_1) $(FRAME_0_NAME_TABLE_2) $(FRAME_0_NAME_TABLE_3) $(FRAME_0_ATTR_TABLE_0) $(FRAME_0_ATTR_TABLE_1) $(FRAME_0_ATTR_TABLE_2) $(FRAME_0_ATTR_TABLE_3) $(FRAME_0_PALETTE_0) $(FRAME_0_PALETTE_1) $(FRAME_0_PALETTE_2) $(FRAME_0_PALETTE_3): $(FRAME_0_IMAGE_0) $(FRAME_0_IMAGE_1) $(FRAME_0_IMAGE_2) $(FRAME_0_IMAGE_3)
+$(FRAME_0_PATTERN_0) $(FRAME_0_PATTERN_1) $(FRAME_0_PATTERN_2) $(FRAME_0_PATTERN_3) \
+$(FRAME_0_NAME_TABLE_0) $(FRAME_0_NAME_TABLE_1) $(FRAME_0_NAME_TABLE_2) $(FRAME_0_NAME_TABLE_3) \
+$(FRAME_0_ATTR_TABLE_0) $(FRAME_0_ATTR_TABLE_1) $(FRAME_0_ATTR_TABLE_2) $(FRAME_0_ATTR_TABLE_3) \
+$(FRAME_0_PALETTE_0) $(FRAME_0_PALETTE_1) $(FRAME_0_PALETTE_2) $(FRAME_0_PALETTE_3): $(FRAME_0_IMAGE_0) $(FRAME_0_IMAGE_1) $(FRAME_0_IMAGE_2) $(FRAME_0_IMAGE_3)
 	$(TILER) -i0 $(FRAME_0_IMAGE_0) -i1 $(FRAME_0_IMAGE_1) -i2 $(FRAME_0_IMAGE_2) -i3 $(FRAME_0_IMAGE_3) --enable-palettes 0,1,2,3 \
 	--out-pattern-table0 $(FRAME_0_PATTERN_0) --out-pattern-table1 $(FRAME_0_PATTERN_1) --out-pattern-table2 $(FRAME_0_PATTERN_2) --out-pattern-table3 $(FRAME_0_PATTERN_3) \
 	--out-name-table0 $(FRAME_0_NAME_TABLE_0) --out-name-table1 $(FRAME_0_NAME_TABLE_1) --out-name-table2 $(FRAME_0_NAME_TABLE_2) --out-name-table3 $(FRAME_0_NAME_TABLE_3) \
@@ -260,7 +266,10 @@ $(FRAME_0_PATTERN_0) $(FRAME_0_PATTERN_1) $(FRAME_0_PATTERN_2) $(FRAME_0_PATTERN
 $(FRAME_1_IMAGE_0) $(FRAME_1_IMAGE_1) $(FRAME_1_IMAGE_2) $(FRAME_1_IMAGE_3): $(FRAME_1_IMAGE)
 	$(SPLITTER) $(FRAME_1_IMAGE) $(FRAME_1_IMAGE_0) $(FRAME_1_IMAGE_1) $(FRAME_1_IMAGE_2) $(FRAME_1_IMAGE_3)
 
-$(FRAME_1_PATTERN_0) $(FRAME_1_PATTERN_1) $(FRAME_1_PATTERN_2) $(FRAME_1_PATTERN_3) $(FRAME_1_NAME_TABLE_0) $(FRAME_1_NAME_TABLE_1) $(FRAME_1_NAME_TABLE_2) $(FRAME_1_NAME_TABLE_3) $(FRAME_1_ATTR_TABLE_0) $(FRAME_1_ATTR_TABLE_1) $(FRAME_1_ATTR_TABLE_2) $(FRAME_1_ATTR_TABLE_3) $(FRAME_1_PALETTE_0) $(FRAME_1_PALETTE_1) $(FRAME_1_PALETTE_2) $(FRAME_1_PALETTE_3): $(FRAME_1_IMAGE_0) $(FRAME_1_IMAGE_1) $(FRAME_1_IMAGE_2) $(FRAME_1_IMAGE_3)
+$(FRAME_1_PATTERN_0) $(FRAME_1_PATTERN_1) $(FRAME_1_PATTERN_2) $(FRAME_1_PATTERN_3) \
+$(FRAME_1_NAME_TABLE_0) $(FRAME_1_NAME_TABLE_1) $(FRAME_1_NAME_TABLE_2) $(FRAME_1_NAME_TABLE_3) \
+$(FRAME_1_ATTR_TABLE_0) $(FRAME_1_ATTR_TABLE_1) $(FRAME_1_ATTR_TABLE_2) $(FRAME_1_ATTR_TABLE_3) \
+$(FRAME_1_PALETTE_0) $(FRAME_1_PALETTE_1) $(FRAME_1_PALETTE_2) $(FRAME_1_PALETTE_3): $(FRAME_1_IMAGE_0) $(FRAME_1_IMAGE_1) $(FRAME_1_IMAGE_2) $(FRAME_1_IMAGE_3)
 	$(TILER) -i0 $(FRAME_1_IMAGE_0) -i1 $(FRAME_1_IMAGE_1) -i2 $(FRAME_1_IMAGE_2) -i3 $(FRAME_1_IMAGE_3) --enable-palettes 0,1,2,3 \
 	--out-pattern-table0 $(FRAME_1_PATTERN_0) --out-pattern-table1 $(FRAME_1_PATTERN_1) --out-pattern-table2 $(FRAME_1_PATTERN_2) --out-pattern-table3 $(FRAME_1_PATTERN_3) \
 	--out-name-table0 $(FRAME_1_NAME_TABLE_0) --out-name-table1 $(FRAME_1_NAME_TABLE_1) --out-name-table2 $(FRAME_1_NAME_TABLE_2) --out-name-table3 $(FRAME_1_NAME_TABLE_3) \
@@ -270,7 +279,10 @@ $(FRAME_1_PATTERN_0) $(FRAME_1_PATTERN_1) $(FRAME_1_PATTERN_2) $(FRAME_1_PATTERN
 $(FRAME_2_IMAGE_0) $(FRAME_2_IMAGE_1) $(FRAME_2_IMAGE_2) $(FRAME_2_IMAGE_3): $(FRAME_2_IMAGE)
 	$(SPLITTER) $(FRAME_2_IMAGE) $(FRAME_2_IMAGE_0) $(FRAME_2_IMAGE_1) $(FRAME_2_IMAGE_2) $(FRAME_2_IMAGE_3)
 
-$(FRAME_2_PATTERN_0) $(FRAME_2_PATTERN_1) $(FRAME_2_PATTERN_2) $(FRAME_2_PATTERN_3) $(FRAME_2_NAME_TABLE_0) $(FRAME_2_NAME_TABLE_1) $(FRAME_2_NAME_TABLE_2) $(FRAME_2_NAME_TABLE_3) $(FRAME_2_ATTR_TABLE_0) $(FRAME_2_ATTR_TABLE_1) $(FRAME_2_ATTR_TABLE_2) $(FRAME_2_ATTR_TABLE_3) $(FRAME_2_PALETTE_0) $(FRAME_2_PALETTE_1) $(FRAME_2_PALETTE_2) $(FRAME_2_PALETTE_3): $(FRAME_2_IMAGE_0) $(FRAME_2_IMAGE_1) $(FRAME_2_IMAGE_2) $(FRAME_2_IMAGE_3)
+$(FRAME_2_PATTERN_0) $(FRAME_2_PATTERN_1) $(FRAME_2_PATTERN_2) $(FRAME_2_PATTERN_3) \
+$(FRAME_2_NAME_TABLE_0) $(FRAME_2_NAME_TABLE_1) $(FRAME_2_NAME_TABLE_2) $(FRAME_2_NAME_TABLE_3) \
+$(FRAME_2_ATTR_TABLE_0) $(FRAME_2_ATTR_TABLE_1) $(FRAME_2_ATTR_TABLE_2) $(FRAME_2_ATTR_TABLE_3) \
+$(FRAME_2_PALETTE_0) $(FRAME_2_PALETTE_1) $(FRAME_2_PALETTE_2) $(FRAME_2_PALETTE_3): $(FRAME_2_IMAGE_0) $(FRAME_2_IMAGE_1) $(FRAME_2_IMAGE_2) $(FRAME_2_IMAGE_3)
 	$(TILER) -i0 $(FRAME_2_IMAGE_0) -i1 $(FRAME_2_IMAGE_1) -i2 $(FRAME_2_IMAGE_2) -i3 $(FRAME_2_IMAGE_3) --enable-palettes 0,1,2,3 \
 	--out-pattern-table0 $(FRAME_2_PATTERN_0) --out-pattern-table1 $(FRAME_2_PATTERN_1) --out-pattern-table2 $(FRAME_2_PATTERN_2) --out-pattern-table3 $(FRAME_2_PATTERN_3) \
 	--out-name-table0 $(FRAME_2_NAME_TABLE_0) --out-name-table1 $(FRAME_2_NAME_TABLE_1) --out-name-table2 $(FRAME_2_NAME_TABLE_2) --out-name-table3 $(FRAME_2_NAME_TABLE_3) \
@@ -280,7 +292,10 @@ $(FRAME_2_PATTERN_0) $(FRAME_2_PATTERN_1) $(FRAME_2_PATTERN_2) $(FRAME_2_PATTERN
 $(CREDITS_IMAGE_0) $(CREDITS_IMAGE_1) $(CREDITS_IMAGE_2) $(CREDITS_IMAGE_3): $(CREDITS_IMAGE)
 	$(SPLITTER) $(CREDITS_IMAGE) $(CREDITS_IMAGE_0) $(CREDITS_IMAGE_1) $(CREDITS_IMAGE_2) $(CREDITS_IMAGE_3)
 
-$(CREDITS_PATTERN_0) $(CREDITS_PATTERN_1) $(CREDITS_PATTERN_2) $(CREDITS_PATTERN_3) $(CREDITS_NAME_TABLE_0) $(CREDITS_NAME_TABLE_1) $(CREDITS_NAME_TABLE_2) $(CREDITS_NAME_TABLE_3) $(CREDITS_ATTR_TABLE_0) $(CREDITS_ATTR_TABLE_1) $(CREDITS_ATTR_TABLE_2) $(CREDITS_ATTR_TABLE_3) $(CREDITS_PALETTE_0) $(CREDITS_PALETTE_1) $(CREDITS_PALETTE_2) $(CREDITS_PALETTE_3): $(CREDITS_IMAGE_0) $(CREDITS_IMAGE_1) $(CREDITS_IMAGE_2) $(CREDITS_IMAGE_3)
+$(CREDITS_PATTERN_0) $(CREDITS_PATTERN_1) $(CREDITS_PATTERN_2) $(CREDITS_PATTERN_3) \
+$(CREDITS_NAME_TABLE_0) $(CREDITS_NAME_TABLE_1) $(CREDITS_NAME_TABLE_2) $(CREDITS_NAME_TABLE_3) \
+$(CREDITS_ATTR_TABLE_0) $(CREDITS_ATTR_TABLE_1) $(CREDITS_ATTR_TABLE_2) $(CREDITS_ATTR_TABLE_3) \
+$(CREDITS_PALETTE_0) $(CREDITS_PALETTE_1) $(CREDITS_PALETTE_2) $(CREDITS_PALETTE_3): $(CREDITS_IMAGE_0) $(CREDITS_IMAGE_1) $(CREDITS_IMAGE_2) $(CREDITS_IMAGE_3)
 	$(TILER) -i0 $(CREDITS_IMAGE_0) -i1 $(CREDITS_IMAGE_1) -i2 $(CREDITS_IMAGE_2) -i3 $(CREDITS_IMAGE_3) --enable-palettes 0,1,2,3 \
 	--out-pattern-table0 $(CREDITS_PATTERN_0) --out-pattern-table1 $(CREDITS_PATTERN_1) --out-pattern-table2 $(CREDITS_PATTERN_2) --out-pattern-table3 $(CREDITS_PATTERN_3) \
 	--out-name-table0 $(CREDITS_NAME_TABLE_0) --out-name-table1 $(CREDITS_NAME_TABLE_1) --out-name-table2 $(CREDITS_NAME_TABLE_2) --out-name-table3 $(CREDITS_NAME_TABLE_3) \
diff --git a/images/belaya_akula.gif b/images/belaya_akula.gif
new file mode 100644
index 0000000..2062e50
--- /dev/null
+++ b/images/belaya_akula.gif
diff --git a/images/pagoda.gif b/images/pagoda.gif
new file mode 100644
index 0000000..8826286
--- /dev/null
+++ b/images/pagoda.gif
diff --git a/images/trailer-park.gif b/images/trailer-park.gif
new file mode 100644
index 0000000..85041b5
--- /dev/null
+++ b/images/trailer-park.gif
diff --git a/images/zapravka.gif b/images/zapravka.gif
new file mode 100644
index 0000000..a22da48
--- /dev/null
+++ b/images/zapravka.gif