More images, frame 3

19 files changed, 121 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index 0e1daa8..d959960 100644
--- a/Makefile
+++ b/Makefile
@@ -1,73 +1,96 @@
 STORY?=1
 
+TITLE_IMAGE=images/warface_logo.gif
+PAGODA=images/pagoda.gif
+MYATEJ=images/myatej2.gif
+GLAZA=images/glaza.gif
+RAYON4=images/rayon4_2.gif
+SPUTNIK=images/sputnik.gif
+SINDIKAT=images/sindikat.gif
+BUHANKA=images/buhanka.gif
+CHERNOBYL=images/chernobyl.gif
+SWORM=images/sworm_bw2.gif
+GORGONA=images/gorgona.gif
+DIRA=images/dira.gif
+SHKOLA=images/shkola.gif
+ZAPRAVKA=images/zapravka.gif
+TRAILER_PARK=images/trailer-park2.gif
+BELAYA_AKULA=images/belaya_akula.gif
+CREDITS_IMAGE=images/credits_date.png
+
 ifeq ($(STORY),1)
-	FRAME_0_IMAGE=images/pagoda.gif
-	FRAME_1_IMAGE=images/myatej.gif
-	FRAME_2_IMAGE=images/glaza.gif
+	FRAME_0_IMAGE=$(PAGODA)
+	FRAME_1_IMAGE=$(MYATEJ)
+	FRAME_2_IMAGE=$(GLAZA)
+	FRAME_3_IMAGE=$(TITLE_IMAGE)
 	TEXT_0=text/0_0.txt
 	TEXT_1=text/0_1.txt
 	TEXT_2=text/0_2.txt
 	TEXT_3=text/0_3.txt
 endif
 ifeq ($(STORY),2)
-	FRAME_0_IMAGE=images/rayon4.gif
-	FRAME_1_IMAGE=images/sputnik.gif
-	FRAME_2_IMAGE=images/sindikat.gif
+	FRAME_0_IMAGE=$(RAYON4)
+	FRAME_1_IMAGE=$(SPUTNIK)
+	FRAME_2_IMAGE=$(SINDIKAT)
+	FRAME_3_IMAGE=$(TITLE_IMAGE)
 	TEXT_0=text/1_0.txt
 	TEXT_1=text/1_1.txt
 	TEXT_2=text/1_2.txt
 	TEXT_3=text/1_3.txt
 endif
 ifeq ($(STORY),3)
-	FRAME_0_IMAGE=images/buhanka.gif 
-	FRAME_1_IMAGE=images/chernobyl.gif 
-	FRAME_2_IMAGE=images/sworm.gif
+	FRAME_0_IMAGE=$(BUHANKA)
+	FRAME_1_IMAGE=$(CHERNOBYL)
+	FRAME_2_IMAGE=$(SWORM)
+	FRAME_3_IMAGE=$(TITLE_IMAGE)
 	TEXT_0=text/2_0.txt
 	TEXT_1=text/2_1.txt
 	TEXT_2=text/2_2.txt
 	TEXT_3=text/2_3.txt
 endif
 ifeq ($(STORY),4)
-	FRAME_0_IMAGE=images/gorgona.gif
-	FRAME_1_IMAGE=images/dira.gif
-	FRAME_2_IMAGE=images/sworm.gif
+	FRAME_0_IMAGE=$(GORGONA)
+	FRAME_1_IMAGE=$(DIRA)
+	FRAME_2_IMAGE=$(SWORM)
+	FRAME_3_IMAGE=$(TITLE_IMAGE)
 	TEXT_0=text/3_0.txt
 	TEXT_1=text/3_1.txt
 	TEXT_2=text/3_2.txt
 	TEXT_3=text/3_3.txt
 endif
 ifeq ($(STORY),5)
-	FRAME_0_IMAGE=images/shkola.gif
-	FRAME_1_IMAGE=images/zapravka.gif
-	FRAME_2_IMAGE=images/sputnik.gif
+	FRAME_0_IMAGE=$(SHKOLA)
+	FRAME_1_IMAGE=$(ZAPRAVKA)
+	FRAME_2_IMAGE=$(SPUTNIK)
+	FRAME_3_IMAGE=$(TITLE_IMAGE)
 	TEXT_0=text/4_0.txt
 	TEXT_1=text/4_1.txt
 	TEXT_2=text/4_2.txt
 	TEXT_3=text/4_3.txt
 endif
 ifeq ($(STORY),6)
-	FRAME_0_IMAGE=images/trailer-park.gif
-	FRAME_1_IMAGE=images/belaya_akula.gif
-	FRAME_2_IMAGE=images/sworm.gif
+	FRAME_0_IMAGE=$(TRAILER_PARK)
+	FRAME_1_IMAGE=$(BELAYA_AKULA)
+	FRAME_2_IMAGE=$(SWORM)
+	FRAME_3_IMAGE=$(TITLE_IMAGE)
 	TEXT_0=text/5_0.txt
 	TEXT_1=text/5_1.txt
 	TEXT_2=text/5_2.txt
 	TEXT_3=text/5_3.txt
 endif
 ifeq ($(STORY),7)
-	FRAME_0_IMAGE=images/myatej.gif
-	FRAME_1_IMAGE=images/trailer-park.gif
-	FRAME_2_IMAGE=images/zapravka.gif
+	FRAME_0_IMAGE=$(MYATEJ)
+	FRAME_1_IMAGE=$(TRAILER_PARK)
+	FRAME_2_IMAGE=$(ZAPRAVKA)
+	FRAME_3_IMAGE=$(SWORM)
 	TEXT_0=text/6_0.txt
 	TEXT_1=text/6_1.txt
 	TEXT_2=text/6_2.txt
 	TEXT_3=text/6_3.txt
 endif
 
-TITLE_IMAGE=images/warface_logo.gif
-CREDITS_IMAGE=images/credits.png
-SYMBOLS_IMAGE=images/symbols.png
 LOGO_IMAGE=images/warface_logo_small.gif
+SYMBOLS_IMAGE=images/symbols.png
 
 NESASM=tools/NESASM.EXE 
 EMU=fceux
@@ -166,6 +189,27 @@ FRAME_2_PALETTE_1=frame_2_palette_1.bin
 FRAME_2_PALETTE_2=frame_2_palette_2.bin
 FRAME_2_PALETTE_3=frame_2_palette_3.bin
 
+FRAME_3_IMAGE_0=frame_3_0.png
+FRAME_3_IMAGE_1=frame_3_1.png
+FRAME_3_IMAGE_2=frame_3_2.png
+FRAME_3_IMAGE_3=frame_3_3.png
+FRAME_3_PATTERN_0=frame_3_pattern_0.bin
+FRAME_3_PATTERN_1=frame_3_pattern_1.bin
+FRAME_3_PATTERN_2=frame_3_pattern_2.bin
+FRAME_3_PATTERN_3=frame_3_pattern_3.bin
+FRAME_3_NAME_TABLE_0=frame_3_name_table_0.bin
+FRAME_3_NAME_TABLE_1=frame_3_name_table_1.bin
+FRAME_3_NAME_TABLE_2=frame_3_name_table_2.bin
+FRAME_3_NAME_TABLE_3=frame_3_name_table_3.bin
+FRAME_3_ATTR_TABLE_0=frame_3_attr_table_0.bin
+FRAME_3_ATTR_TABLE_1=frame_3_attr_table_1.bin
+FRAME_3_ATTR_TABLE_2=frame_3_attr_table_2.bin
+FRAME_3_ATTR_TABLE_3=frame_3_attr_table_3.bin
+FRAME_3_PALETTE_0=frame_3_palette_0.bin
+FRAME_3_PALETTE_1=frame_3_palette_1.bin
+FRAME_3_PALETTE_2=frame_3_palette_2.bin
+FRAME_3_PALETTE_3=frame_3_palette_3.bin
+
 CREDITS_IMAGE_0=credits_0.png
 CREDITS_IMAGE_1=credits_1.png
 CREDITS_IMAGE_2=credits_2.png
@@ -217,6 +261,10 @@ $(FRAME_2_PATTERN_0) $(FRAME_2_PATTERN_1) $(FRAME_2_PATTERN_2) $(FRAME_2_PATTERN
 $(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_3_PATTERN_0) $(FRAME_3_PATTERN_1) $(FRAME_3_PATTERN_2) $(FRAME_3_PATTERN_3) \
+$(FRAME_3_NAME_TABLE_0) $(FRAME_3_NAME_TABLE_1) $(FRAME_3_NAME_TABLE_2) $(FRAME_3_NAME_TABLE_3) \
+$(FRAME_3_ATTR_TABLE_0) $(FRAME_3_ATTR_TABLE_1) $(FRAME_3_ATTR_TABLE_2) $(FRAME_3_ATTR_TABLE_3) \
+$(FRAME_3_PALETTE_0) $(FRAME_3_PALETTE_1) $(FRAME_3_PALETTE_2) $(FRAME_3_PALETTE_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) \
@@ -289,6 +337,19 @@ $(FRAME_2_PALETTE_0) $(FRAME_2_PALETTE_1) $(FRAME_2_PALETTE_2) $(FRAME_2_PALETTE
 	--out-attribute-table0 $(FRAME_2_ATTR_TABLE_0) --out-attribute-table1 $(FRAME_2_ATTR_TABLE_1) --out-attribute-table2 $(FRAME_2_ATTR_TABLE_2) --out-attribute-table3 $(FRAME_2_ATTR_TABLE_3) \
 	--out-palette0 $(FRAME_2_PALETTE_0) --out-palette1 $(FRAME_2_PALETTE_1) --out-palette2 $(FRAME_2_PALETTE_2) --out-palette3 $(FRAME_2_PALETTE_3)
 
+$(FRAME_3_IMAGE_0) $(FRAME_3_IMAGE_1) $(FRAME_3_IMAGE_2) $(FRAME_3_IMAGE_3): $(FRAME_3_IMAGE)
+	$(SPLITTER) $(FRAME_3_IMAGE) $(FRAME_3_IMAGE_0) $(FRAME_3_IMAGE_1) $(FRAME_3_IMAGE_2) $(FRAME_3_IMAGE_3)
+
+$(FRAME_3_PATTERN_0) $(FRAME_3_PATTERN_1) $(FRAME_3_PATTERN_2) $(FRAME_3_PATTERN_3) \
+$(FRAME_3_NAME_TABLE_0) $(FRAME_3_NAME_TABLE_1) $(FRAME_3_NAME_TABLE_2) $(FRAME_3_NAME_TABLE_3) \
+$(FRAME_3_ATTR_TABLE_0) $(FRAME_3_ATTR_TABLE_1) $(FRAME_3_ATTR_TABLE_2) $(FRAME_3_ATTR_TABLE_3) \
+$(FRAME_3_PALETTE_0) $(FRAME_3_PALETTE_1) $(FRAME_3_PALETTE_2) $(FRAME_3_PALETTE_3): $(FRAME_3_IMAGE_0) $(FRAME_3_IMAGE_1) $(FRAME_3_IMAGE_2) $(FRAME_3_IMAGE_3)
+	$(TILER) -i0 $(FRAME_3_IMAGE_0) -i1 $(FRAME_3_IMAGE_1) -i2 $(FRAME_3_IMAGE_2) -i3 $(FRAME_3_IMAGE_3) --enable-palettes 0,1,2,3 \
+	--out-pattern-table0 $(FRAME_3_PATTERN_0) --out-pattern-table1 $(FRAME_3_PATTERN_1) --out-pattern-table2 $(FRAME_3_PATTERN_2) --out-pattern-table3 $(FRAME_3_PATTERN_3) \
+	--out-name-table0 $(FRAME_3_NAME_TABLE_0) --out-name-table1 $(FRAME_3_NAME_TABLE_1) --out-name-table2 $(FRAME_3_NAME_TABLE_2) --out-name-table3 $(FRAME_3_NAME_TABLE_3) \
+	--out-attribute-table0 $(FRAME_3_ATTR_TABLE_0) --out-attribute-table1 $(FRAME_3_ATTR_TABLE_1) --out-attribute-table2 $(FRAME_3_ATTR_TABLE_2) --out-attribute-table3 $(FRAME_3_ATTR_TABLE_3) \
+	--out-palette0 $(FRAME_3_PALETTE_0) --out-palette1 $(FRAME_3_PALETTE_1) --out-palette2 $(FRAME_3_PALETTE_2) --out-palette3 $(FRAME_3_PALETTE_3)
+
 $(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)
 
diff --git a/images/credits_date.png b/images/credits_date.png
new file mode 100644
index 0000000..cd7f1ea
--- /dev/null
+++ b/images/credits_date.png
diff --git a/images/myatej2.gif b/images/myatej2.gif
new file mode 100644
index 0000000..0a14b46
--- /dev/null
+++ b/images/myatej2.gif
diff --git a/images/pngtest.png b/images/pngtest.png
new file mode 100644
index 0000000..9de7660
--- /dev/null
+++ b/images/pngtest.png
diff --git a/images/rayon4_2.gif b/images/rayon4_2.gif
new file mode 100644
index 0000000..3249495
--- /dev/null
+++ b/images/rayon4_2.gif
diff --git a/images/rayon4_bw.gif b/images/rayon4_bw.gif
new file mode 100644
index 0000000..da18916
--- /dev/null
+++ b/images/rayon4_bw.gif
diff --git a/images/sworm_bw.gif b/images/sworm_bw.gif
new file mode 100644
index 0000000..ee664ee
--- /dev/null
+++ b/images/sworm_bw.gif
diff --git a/images/sworm_bw2.gif b/images/sworm_bw2.gif
new file mode 100644
index 0000000..35484d6
--- /dev/null
+++ b/images/sworm_bw2.gif
diff --git a/images/sworm_bw3.gif b/images/sworm_bw3.gif
new file mode 100644
index 0000000..910fc95
--- /dev/null
+++ b/images/sworm_bw3.gif
diff --git a/images/trailer-park2.gif b/images/trailer-park2.gif
new file mode 100644
index 0000000..4b5bf25
--- /dev/null
+++ b/images/trailer-park2.gif
diff --git a/images/trailer-park_bw.gif b/images/trailer-park_bw.gif
new file mode 100644
index 0000000..ef68127
--- /dev/null
+++ b/images/trailer-park_bw.gif
diff --git a/images/trailer-park_bw2.gif b/images/trailer-park_bw2.gif
new file mode 100644
index 0000000..b2170cc
--- /dev/null
+++ b/images/trailer-park_bw2.gif
diff --git a/images/zapravka_bw.gif b/images/zapravka_bw.gif
new file mode 100644
index 0000000..f5821af
--- /dev/null
+++ b/images/zapravka_bw.gif
diff --git a/images/zapravka_bw2.gif b/images/zapravka_bw2.gif
new file mode 100644
index 0000000..9358969
--- /dev/null
+++ b/images/zapravka_bw2.gif
diff --git a/main.asm b/main.asm
index 0456ad4..d358044 100644
--- a/main.asm
+++ b/main.asm
@@ -224,21 +224,21 @@ console_detect_end:
   ; обнуляем скроллинг

   jsr reset_scroll

   ; загружаем nametable

-  lda #LOW(title_name_table)

+  lda #LOW(frame_3_name_table)

   sta <COPY_SOURCE_ADDR

-  lda #HIGH(title_name_table)

+  lda #HIGH(frame_3_name_table)

   sta <COPY_SOURCE_ADDR+1

-  lda #BANK(title_name_table)/2

+  lda #BANK(frame_3_name_table)/2

   jsr load_name_table

   ; выбираем CHR банк с автопереключением

-  lda #(BANK(title_pattern)-16)*2

+  lda #(BANK(frame_3_pattern)-16)*2

   jsr select_chr_auto_bank

   ; включаем PPU

   jsr enable_ppu

   ; загружаем палитру

-  lda #LOW(title_palette)

+  lda #LOW(frame_3_palette)

   sta <PAL_SOURCE_ADDR

-  lda #HIGH(title_palette)

+  lda #HIGH(frame_3_palette)

   sta <PAL_SOURCE_ADDR+1

   ; плавно прибавляем яркость

   jsr dim_in

diff --git a/nametables.asm b/nametables.asm
index c7c9b8b..58e6f40 100644
--- a/nametables.asm
+++ b/nametables.asm
@@ -38,6 +38,16 @@ frame_2_name_table:
   .incbin "frame_2_attr_table_2.bin"

   .incbin "frame_2_attr_table_3.bin"

 

+frame_3_name_table:

+  .incbin "frame_3_name_table_0.bin"

+  .incbin "frame_3_name_table_1.bin"

+  .incbin "frame_3_name_table_2.bin"

+  .incbin "frame_3_name_table_3.bin"

+  .incbin "frame_3_attr_table_0.bin"

+  .incbin "frame_3_attr_table_1.bin"

+  .incbin "frame_3_attr_table_2.bin"

+  .incbin "frame_3_attr_table_3.bin"

+

 credits_name_table:

   .incbin "credits_name_table_0.bin"

   .incbin "credits_name_table_1.bin"

diff --git a/patterns.asm b/patterns.asm
index f48d624..31570d7 100644
--- a/patterns.asm
+++ b/patterns.asm
@@ -48,11 +48,23 @@ frame_2_pattern:
 

   .bank 24

   .org $0000

+frame_3_pattern:

+  .incbin "frame_3_pattern_0.bin"

+  .org $1000

+  .incbin "frame_3_pattern_1.bin"  

+  .bank 25

+  .org $0000

+  .incbin "frame_3_pattern_2.bin"

+  .org $1000

+  .incbin "frame_3_pattern_3.bin"

+

+  .bank 26

+  .org $0000

 credits_pattern:

   .incbin "credits_pattern_0.bin"

   .org $1000

   .incbin "credits_pattern_1.bin"  

-  .bank 25

+  .bank 27

   .org $0000

   .incbin "credits_pattern_2.bin"

   .org $1000

diff --git a/text/5_3.txt b/text/5_3.txt
index adba9c4..2144f75 100644
--- a/text/5_3.txt
+++ b/text/5_3.txt
@@ -8,4 +8,4 @@
 

 

 

-Доступ разрешен. Для получения данных для дальнейших исследований, введите в главный мэйнфрейм год *BEETLE*.

+Доступ разрешен. Для получения данных для дальнейших исследований, введите в главный мэйнфрейм код *BEETLE*.

diff --git a/warface.asm b/warface.asm
index 8d23b92..8584276 100644
--- a/warface.asm
+++ b/warface.asm
@@ -340,6 +340,12 @@ frame_2_palette:
   .incbin "frame_2_palette_2.bin"

   .incbin "frame_2_palette_3.bin"

 

+frame_3_palette:

+  .incbin "frame_3_palette_0.bin"

+  .incbin "frame_3_palette_1.bin"

+  .incbin "frame_3_palette_2.bin"

+  .incbin "frame_3_palette_3.bin"

+

 credits_palette:

   .incbin "credits_palette_0.bin"

   .incbin "credits_palette_1.bin"