Merge pull request #1371 from ogamespec/master

ogamespec · web-flow · commit 2c7e8b687398 · 2025-11-30T13:42:36.000+03:00
OAM Evaluation -&gt; Object Evaluation
diff --git a/BreakingNESWiki/PPU/contents.md b/BreakingNESWiki/PPU/contents.md
@@ -10,7 +10,7 @@
 - [Палитра](cram.md)
 - [Видеосигнал NTSC](tv.md)
 - [Генератор видеосигнала](video_out.md)
-- [Сравнение спрайтов](sprite_eval.md)
+- [Сравнение спрайтов](obj_eval.md)
 - [Мультиплексор](mux.md)
 - [Спрайтовая память (OAM)](oam.md)
 - [Object FIFO](fifo.md)
diff --git a/BreakingNESWiki/PPU/fsm.md b/BreakingNESWiki/PPU/fsm.md
@@ -54,7 +54,7 @@
 |E/EV|Sprite Logic|"End Sprite Evaluation"|
 |I/OAM2|Sprite Logic|"Init OAM2". Инициализировать дополнительную [OAM](oam.md)|
 |PAR/O|All|"PAR for Object". Выборка тайла для объекта (спрайта).|
-|/VIS|Sprite Logic|"Not Visible". Невидимая часть сигнала (использует [спрайтовая логика](sprite_eval.md))|
+|/VIS|Sprite Logic|"Not Visible". Невидимая часть сигнала (использует [схема сравнения спрайтов](obj_eval.md))|
 |#F/NT|Data Reader, OAM Eval|0: "Fetch Name Table"|
 |F/TB|Data Reader|"Fetch Tile B"|
 |F/TA|Data Reader|"Fetch Tile A"|
diff --git a/BreakingNESWiki/PPU/mux.md b/BreakingNESWiki/PPU/mux.md
@@ -77,7 +77,7 @@ Sprite 0 Hit - это алиенская особенность работы PPU
 
 Контрольный выход `STRIKE` равен 1 только когда BGC0=1 или BGC1=1, при этом все остальные входы равны 0.
 
-Контрольный сигнал `/SPR0HIT` приходит со схемы контроля приоритетов спрайтов (см. [Obj FIFO](fifo.md)), а контрольный сигнал `/SPR0_EV` со [схемы сравнения спрайтов](sprite_eval.md).
+Контрольный сигнал `/SPR0HIT` приходит со схемы контроля приоритетов спрайтов (см. [Obj FIFO](fifo.md)), а контрольный сигнал `/SPR0_EV` со [схемы сравнения спрайтов](obj_eval.md).
 
 ## Трюки с мультиплексором
 
diff --git a/BreakingNESWiki/PPU/obj_eval.md b/BreakingNESWiki/PPU/obj_eval.md
@@ -1,6 +1,6 @@
-# Сравнение спрайтов (OAM Evaluation)
+# Сравнение спрайтов (Object Evaluation)
 
-![ppu_locator_sprite_eval](/BreakingNESWiki/imgstore/ppu/ppu_locator_sprite_eval.jpg)
+![ppu_locator_obj_eval](/BreakingNESWiki/imgstore/ppu/ppu_locator_obj_eval.jpg)
 
 Схема сравнения спрайтов занимается сравнением всех 64 спрайтов и выборкой первых 8 спрайтов, которые встречаются раньше всех на текущей строке (V). То что PPU умеет рисовать только первые 8 спрайтов строки - широко известный факт, который приходится учитывать при программировании NES. Обычно программисты применяют перемешивание спрайтов, но даже при этом возникает эффект "мерцания" спрайтов.
 
diff --git a/BreakingNESWiki/imgstore/ppu/ppu_locator_obj_eval.jpg b/BreakingNESWiki/imgstore/ppu/ppu_locator_obj_eval.jpg
diff --git a/BreakingNESWiki_DeepL/PPU/contents.md b/BreakingNESWiki_DeepL/PPU/contents.md
@@ -10,7 +10,7 @@
 - [Color RAM](cram.md)
 - [NTSC Video Signal](tv.md)
 - [Video Signal Generator](video_out.md)
-- [OAM Evaluation](sprite_eval.md)
+- [Object Evaluation (Sprite Comparison)](obj_eval.md)
 - [Multiplexer](mux.md)
 - [Object Attribute Memory (OAM)](oam.md)
 - [Object FIFO](fifo.md)
diff --git a/BreakingNESWiki_DeepL/PPU/fsm.md b/BreakingNESWiki_DeepL/PPU/fsm.md
@@ -54,7 +54,7 @@ Outputs:
 |E/EV|Sprite Logic|"End Sprite Evaluation"|
 |I/OAM2|Sprite Logic|"Init OAM2". Initialize an extra [OAM](oam.md)|
 |PAR/O|All|"PAR for Object". Selecting a tile for an object (sprite)|
-|/VIS|Sprite Logic|"Not Visible". The invisible part of the signal (used by [sprite logic](sprite_eval.md))|
+|/VIS|Sprite Logic|"Not Visible". The invisible part of the signal (used by [sprite comparison](obj_eval.md))|
 |#F/NT|Data Reader, OAM Eval|"Fetch Name Table"|
 |F/TB|Data Reader|"Fetch Tile B"|
 |F/TA|Data Reader|"Fetch Tile A"|
diff --git a/BreakingNESWiki_DeepL/PPU/mux.md b/BreakingNESWiki_DeepL/PPU/mux.md
@@ -77,7 +77,7 @@ Sprite 0 Hit circuit:
 
 The control output `STRIKE` is 1 only when BGC0=1 or BGC1=1 with all other inputs set to 0.
 
-The control signal `/SPR0HIT` comes from the sprite priority control circuit (see [Obj FIFO](fifo.md)) and the control signal `/SPR0_EV` from [sprite comparison circuit](sprite_eval.md).
+The control signal `/SPR0HIT` comes from the sprite priority control circuit (see [Obj FIFO](fifo.md)) and the control signal `/SPR0_EV` from [sprite comparison circuit](obj_eval.md).
 
 ## Multiplexer Tricks
 
diff --git a/BreakingNESWiki_DeepL/PPU/obj_eval.md b/BreakingNESWiki_DeepL/PPU/obj_eval.md
@@ -1,6 +1,6 @@
-# Sprite Comparison (OAM Evaluation)
+# Sprite Comparison (Object Evaluation)
 
-![ppu_locator_sprite_eval](/BreakingNESWiki/imgstore/ppu/ppu_locator_sprite_eval.jpg)
+![ppu_locator_obj_eval](/BreakingNESWiki/imgstore/ppu/ppu_locator_obj_eval.jpg)
 
 The sprite comparison circuit compares all 64 sprites and selects the first 8 sprites that occur first on the current line (V). The fact that the PPU can only draw the first 8 sprites of a line is a well-known fact that has to be taken into account when programming NES. Usually programmers use sprite shuffling, but even this has the effect of "flickering" sprites.
 
diff --git a/BreakingNESWiki_DeepL/all_ppu.md b/BreakingNESWiki_DeepL/all_ppu.md
@@ -16,7 +16,7 @@ TODO: Duplicate all image in ASCII art so that they are understood by LLMs which
 - [Color RAM](#color-ram)
 - [NTSC Video Signal](#ntsc-video)
 - [Video Signal Generator](#video-signal-generator)
-- [OAM Evaluation](#sprite-comparison-oam-evaluation)
+- [Object Evaluation (Sprite Comparison)](#sprite-comparison-object-evaluation)
 - [Multiplexer](#multiplexer)
 - [Object Attribute Memory (OAM)](#oam)
 - [Object FIFO](#object-fifo)
@@ -696,7 +696,7 @@ Outputs:
 |E/EV|Sprite Logic|"End Sprite Evaluation"|
 |I/OAM2|Sprite Logic|"Init OAM2". Initialize an extra [OAM](#oam)|
 |PAR/O|All|"PAR for Object". Selecting a tile for an object (sprite)|
-|/VIS|Sprite Logic|"Not Visible". The invisible part of the signal (used by [sprite logic](#sprite-comparison-oam-evaluation))|
+|/VIS|Sprite Logic|"Not Visible". The invisible part of the signal (used by [sprite comparison](#sprite-comparison-object-evaluation))|
 |#F/NT|Data Reader, OAM Eval|"Fetch Name Table"|
 |F/TB|Data Reader|"Fetch Tile B"|
 |F/TA|Data Reader|"Fetch Tile A"|
@@ -1141,9 +1141,9 @@ Level values of the unloaded video signal:
 
 If the `TINT` signal value is 1, the voltage is multiplied by approx. 0.746f.
 
-# Sprite Comparison (OAM Evaluation)
+# Sprite Comparison (Object Evaluation)
 
-![ppu_locator_sprite_eval](/BreakingNESWiki/imgstore/ppu/ppu_locator_sprite_eval.jpg)
+![ppu_locator_obj_eval](/BreakingNESWiki/imgstore/ppu/ppu_locator_obj_eval.jpg)
 
 The sprite comparison circuit compares all 64 sprites and selects the first 8 sprites that occur first on the current line (V). The fact that the PPU can only draw the first 8 sprites of a line is a well-known fact that has to be taken into account when programming NES. Usually programmers use sprite shuffling, but even this has the effect of "flickering" sprites.
 
@@ -1387,7 +1387,7 @@ Sprite 0 Hit circuit:
 
 The control output `STRIKE` is 1 only when BGC0=1 or BGC1=1 with all other inputs set to 0.
 
-The control signal `/SPR0HIT` comes from the sprite priority control circuit (see [Obj FIFO](#object-fifo)) and the control signal `/SPR0_EV` from [sprite comparison circuit](#sprite-comparison-oam-evaluation).
+The control signal `/SPR0HIT` comes from the sprite priority control circuit (see [Obj FIFO](#object-fifo)) and the control signal `/SPR0_EV` from [sprite comparison circuit](#sprite-comparison-object-evaluation).
 
 ## Multiplexer Tricks
 
