Images fix, nametables moved to another bank

21 files changed, 33 insertions, 29 deletions

diff --git a/Makefile b/Makefile
index 609e0d0..0e1daa8 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ endif
 ifeq ($(STORY),5)
 	FRAME_0_IMAGE=images/shkola.gif
 	FRAME_1_IMAGE=images/zapravka.gif
-	FRAME_2_IMAGE=images/sputnik.jpg
+	FRAME_2_IMAGE=images/sputnik.gif
 	TEXT_0=text/4_0.txt
 	TEXT_1=text/4_1.txt
 	TEXT_2=text/4_2.txt
@@ -67,7 +67,7 @@ endif
 TITLE_IMAGE=images/warface_logo.gif
 CREDITS_IMAGE=images/credits.png
 SYMBOLS_IMAGE=images/symbols.png
-LOGO_IMAGE=images/warface_logo_small.png
+LOGO_IMAGE=images/warface_logo_small.gif
 
 NESASM=tools/NESASM.EXE 
 EMU=fceux
diff --git a/images/belaya_akula.jpg b/images/belaya_akula.jpg
deleted file mode 100644
index f8d8173..0000000
--- a/images/belaya_akula.jpg
+++ /dev/null
diff --git a/images/buhanka.jpg b/images/buhanka.jpg
deleted file mode 100644
index be69d4f..0000000
--- a/images/buhanka.jpg
+++ /dev/null
diff --git a/images/chernobyl.jpg b/images/chernobyl.jpg
deleted file mode 100644
index 5566ff9..0000000
--- a/images/chernobyl.jpg
+++ /dev/null
diff --git a/images/dira.jpg b/images/dira.jpg
deleted file mode 100644
index ad7f976..0000000
--- a/images/dira.jpg
+++ /dev/null
diff --git a/images/glaza.jpg b/images/glaza.jpg
deleted file mode 100644
index f00b82d..0000000
--- a/images/glaza.jpg
+++ /dev/null
diff --git a/images/gorgona.jpg b/images/gorgona.jpg
deleted file mode 100644
index a0ad81b..0000000
--- a/images/gorgona.jpg
+++ /dev/null
diff --git a/images/myatej.jpg b/images/myatej.jpg
deleted file mode 100644
index f5236da..0000000
--- a/images/myatej.jpg
+++ /dev/null
diff --git a/images/pagoda.jpg b/images/pagoda.jpg
deleted file mode 100644
index bd4601f..0000000
--- a/images/pagoda.jpg
+++ /dev/null
diff --git a/images/rayon4.jpg b/images/rayon4.jpg
deleted file mode 100644
index b125dfd..0000000
--- a/images/rayon4.jpg
+++ /dev/null
diff --git a/images/shkola.jpg b/images/shkola.jpg
deleted file mode 100644
index d53d045..0000000
--- a/images/shkola.jpg
+++ /dev/null
diff --git a/images/sindikat.jpg b/images/sindikat.jpg
deleted file mode 100644
index 606868f..0000000
--- a/images/sindikat.jpg
+++ /dev/null
diff --git a/images/sputnik.jpg b/images/sputnik.jpg
deleted file mode 100644
index 9558605..0000000
--- a/images/sputnik.jpg
+++ /dev/null
diff --git a/images/sputnik2.gif b/images/sputnik2.gif
new file mode 100644
index 0000000..002e79f
--- /dev/null
+++ b/images/sputnik2.gif
diff --git a/images/sworm.jpg b/images/sworm.jpg
deleted file mode 100644
index 3c5969d..0000000
--- a/images/sworm.jpg
+++ /dev/null
diff --git a/images/trailer-park.jpg b/images/trailer-park.jpg
deleted file mode 100644
index a789442..0000000
--- a/images/trailer-park.jpg
+++ /dev/null
diff --git a/images/warface_logo.jpg b/images/warface_logo.jpg
deleted file mode 100644
index 80dc597..0000000
--- a/images/warface_logo.jpg
+++ /dev/null
diff --git a/images/warface_logo_small.gif b/images/warface_logo_small.gif
new file mode 100644
index 0000000..331d079
--- /dev/null
+++ b/images/warface_logo_small.gif
diff --git a/images/warface_logo_small.png b/images/warface_logo_small.png
deleted file mode 100644
index 4f30cc7..0000000
--- a/images/warface_logo_small.png
+++ /dev/null
diff --git a/images/zapravka.jpg b/images/zapravka.jpg
deleted file mode 100644
index 820ad1e..0000000
--- a/images/zapravka.jpg
+++ /dev/null
diff --git a/warface.asm b/warface.asm
index 7d3f465..8d23b92 100644
--- a/warface.asm
+++ b/warface.asm
@@ -164,6 +164,33 @@ init_music:
   jsr select_prg_bank

   rts

 

+  ; загружаем nametable в $2000

+  ; в A номер банка

+  ; в COPY_SOURCE_ADDR - адрес данных

+load_name_table:

+  tax

+  lda ACTIVE_BANK

+  pha

+  txa

+  jsr select_prg_bank

+  lda #$20

+  sta $2006

+  lda #$00

+  sta $2006

+  ldy #$00

+  ldx #$04

+.loop:

+  lda [COPY_SOURCE_ADDR], y

+  sta $2007

+  iny

+  bne .loop

+  inc <COPY_SOURCE_ADDR+1

+  dex

+  bne .loop

+  pla

+  jsr select_prg_bank

+  rts

+

   ; далее пихаем код в нулевой банк

   .bank 0

   .org $8000

@@ -249,33 +276,6 @@ wait_blank_x:
   bne .loop

   rts

 

-  ; загружаем nametable в $2000

-  ; в A номер банка

-  ; в COPY_SOURCE_ADDR - адрес данных

-load_name_table:

-  tax

-  lda ACTIVE_BANK

-  pha

-  txa

-  jsr select_prg_bank

-  lda #$20

-  sta $2006

-  lda #$00

-  sta $2006

-  ldy #$00

-  ldx #$04

-.loop:

-  lda [COPY_SOURCE_ADDR], y

-  sta $2007

-  iny

-  bne .loop

-  inc <COPY_SOURCE_ADDR+1

-  dex

-  bne .loop

-  pla

-  jsr select_prg_bank

-  rts

-

 reset_scroll:

   lda #0

   sta <SCROLL_POS

@@ -365,5 +365,9 @@ text_3:
   .incbin "text_3.bin"

 

   .include "sprites.asm"

+

+  .bank 2

+  .org $8000

+

   .include "nametables.asm"

   .include "patterns.asm"