From 3de0c8569e9176cf8feb1429ed371cca4773aede Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Fri, 6 Nov 2020 21:52:52 +0300
Subject: Minor tuning

---
 clean.asm           |  1 +
 text.asm            |  3 ++-
 tools/EraseCheck.cs |  2 +-
 warface.asm         | 29 +++++++++++++++--------------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/clean.asm b/clean.asm
index bd29fca..e928e31 100644
--- a/clean.asm
+++ b/clean.asm
@@ -40,6 +40,7 @@ init:
   ; определяем тип консоли
   lda #%00000000 ; отключаем NMI
   sta PPUCTRL
+  bit PPUSTATUS
 console_detect_init:
   bit PPUSTATUS
   bpl console_detect_init
diff --git a/text.asm b/text.asm
index 89abdd0..970e9d7 100644
--- a/text.asm
+++ b/text.asm
@@ -1,5 +1,5 @@
 print_text_s:
-  jsr wait_blank
+  jsr wait_blank_simple
   ; выключаем PPU
   jsr disable_ppu
   ; выбираем последний CHR банк
@@ -13,6 +13,7 @@ print_text_s:
   lda #HIGH(symbols_palette)
   sta <PAL_SOURCE_ADDR+1
   jsr preload_palette
+  jsr wait_blank_simple
   jsr load_palette
   lda #3
   sta <TEXT_LINE
diff --git a/tools/EraseCheck.cs b/tools/EraseCheck.cs
index bc70dc9..90dafde 100644
--- a/tools/EraseCheck.cs
+++ b/tools/EraseCheck.cs
@@ -4,7 +4,7 @@
     {
         void Run(IFamicomDumperConnection dumper)
         {
-s            const int prgBankSize = 0x4000;
+            const int prgBankSize = 0x4000;
             const int chrBankSize = 0x1000;
             int problems = 0;
             
diff --git a/warface.asm b/warface.asm
index f22ae6c..ce99687 100644
--- a/warface.asm
+++ b/warface.asm
@@ -355,19 +355,6 @@ select_chr_bank:
   sta $6001
 
 enable_ppu:
-  bit PPUSTATUS
-  lda #0
-  sta PPUSCROLL
-  lda <SCROLL_POS
-  sta PPUSCROLL
-  lda <SCROLL_NT
-  bne .second_nt
-  lda #%10000000
-  jmp .write_ppuctrl
-.second_nt:
-  lda #%10000010
-.write_ppuctrl
-  sta PPUCTRL
   lda #%00001110
   ldx <SPRITES_ENABLED
   beq .sprites_disabled
@@ -418,7 +405,21 @@ wait_blank:
   sta <SCROLL_NT  
 .end_scroll:
 
-  jsr enable_ppu
+  bit PPUSTATUS
+  lda #0
+  sta PPUSCROLL
+  lda <SCROLL_POS
+  sta PPUSCROLL
+  lda <SCROLL_NT
+  bne .second_nt
+  lda #%10000000
+  jmp .write_ppuctrl
+.second_nt:
+  lda #%10000010
+.write_ppuctrl
+  sta PPUCTRL
+
+  jsr wait_blank_simple
 
   pla
   tax
-- 
cgit v1.2.3