diff --git a/data/Vortex86MX-eng/3d/3dsheart b/data/Vortex86MX-eng/3d/3dsheart deleted file mode 100644 index 451432efc9..0000000000 Binary files a/data/Vortex86MX-eng/3d/3dsheart and /dev/null differ diff --git a/data/Vortex86MX-eng/Makefile b/data/Vortex86MX-eng/Makefile index c2a6440b1a..b0b6ddfd3e 100644 --- a/data/Vortex86MX-eng/Makefile +++ b/data/Vortex86MX-eng/Makefile @@ -77,8 +77,8 @@ FASM_PROGRAMS:=\ tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \ zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \ 3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \ + 3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \ 3d/3dwav:3D/3DWAV:$(PROGS)/demos/3dwav/trunk/3dwav.asm \ - 3d/3dtcub10:3D/3DTCUB10:$(PROGS)/demos/3dtcub10/trunk/3DTCUB10.ASM \ 3d/crownscr:3D/CROWNSCR:$(PROGS)/demos/crownscr/trunk/crownscr.asm \ 3d/flatwav:3D/FLATWAV:$(PROGS)/demos/flatwav/trunk/FLATWAV.ASM \ 3d/free3d04:3D/FREE3D04:$(PROGS)/demos/free3d04/trunk/free3d04.asm \ @@ -123,7 +123,6 @@ FASM_PROGRAMS:=\ fonts/bgitest:FONTS/BGITEST:$(PROGS)/demos/bgitest/trunk/bgitest.asm \ games/15:GAMES/15:$(PROGS)/games/15/trunk/15.ASM \ games/arcanii:GAMES/ARCANII:$(PROGS)/games/arcanii/trunk/arcanii.asm \ - games/bnc:GAMES/BNC:$(PROGS)/games/bnc/trunk/bnc.asm \ games/freecell:GAMES/FREECELL:$(PROGS)/games/freecell/freecell.asm \ games/gomoku:GAMES/GOMOKU:$(PROGS)/games/gomoku/trunk/gomoku.asm \ games/invaders:GAMES/INVADERS:$(PROGS)/games/invaders/invaders.asm \ diff --git a/data/Vortex86MX-eng/menu.dat b/data/Vortex86MX-eng/menu.dat index ad2dc6cd48..eb9d33df17 100644 --- a/data/Vortex86MX-eng/menu.dat +++ b/data/Vortex86MX-eng/menu.dat @@ -31,7 +31,6 @@ SQ_GAME /rd/1/games/sq_game Color Lines /rd/1/games/lines Lights /rd/1/games/lights Criss-Cross /rd/1/games/kox -Bulls and cows /rd/1/games/bnc MegaMaze /rd/1/games/megamaze Sea Fight /rd/1/games/sw Sudoku /rd/1/games/sudoku @@ -65,14 +64,12 @@ UnvWater /rd/1/demos/unvwater ScreenSaver /rd/1/3d/crownscr 3D-cube /rd/1/3d/3dcube2 3D-labyrinth /rd/1/3d/free3d04 -3D-textured cube /rd/1/3d/3dtcub10 3DSHeart /rd/1/3d/3dsheart View3DS /rd/1/3d/view3ds CubeLine /rd/1/3d/cubeline -3D-textured cube 2 /rd/1/3d/cubetext Gears /rd/1/3d/gears FlatWave /rd/1/3d/flatwav -3D-spiral /rd/1/3d/3dspiral +3D-waved area /rd/1/3d/3dwav #6 **** GRAPHICS **** Image viewer /rd/1/media/kiv Animage /rd/1/media/animage diff --git a/data/eng/3d/3dsheart b/data/eng/3d/3dsheart deleted file mode 100644 index 451432efc9..0000000000 Binary files a/data/eng/3d/3dsheart and /dev/null differ diff --git a/data/eng/Makefile b/data/eng/Makefile index e272296595..f50d23ce39 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -77,8 +77,8 @@ FASM_PROGRAMS:=\ tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \ zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \ 3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \ - 3d/3dwav:3D/3DWAV:$(PROGS)/demos/3dwav/trunk/3dwav.asm \ - 3d/3dtcub10:3D/3DTCUB10:$(PROGS)/demos/3dtcub10/trunk/3DTCUB10.ASM \ + 3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \ + 3d/3dwav:3D/3DWAV:$(PROGS)/demos/3dwav/trunk/3dwav.asm \ 3d/crownscr:3D/CROWNSCR:$(PROGS)/demos/crownscr/trunk/crownscr.asm \ 3d/flatwav:3D/FLATWAV:$(PROGS)/demos/flatwav/trunk/FLATWAV.ASM \ 3d/free3d04:3D/FREE3D04:$(PROGS)/demos/free3d04/trunk/free3d04.asm \ @@ -124,7 +124,6 @@ FASM_PROGRAMS:=\ fonts/bgitest:FONTS/BGITEST:$(PROGS)/demos/bgitest/trunk/bgitest.asm \ games/15:GAMES/15:$(PROGS)/games/15/trunk/15.ASM \ games/arcanii:GAMES/ARCANII:$(PROGS)/games/arcanii/trunk/arcanii.asm \ - games/bnc:GAMES/BNC:$(PROGS)/games/bnc/trunk/bnc.asm \ games/freecell:GAMES/FREECELL:$(PROGS)/games/freecell/freecell.asm \ games/gomoku:GAMES/GOMOKU:$(PROGS)/games/gomoku/trunk/gomoku.asm \ games/invaders:GAMES/INVADERS:$(PROGS)/games/invaders/invaders.asm \ diff --git a/data/eng/menu.dat b/data/eng/menu.dat index 4dcf071b40..e81275bf75 100644 --- a/data/eng/menu.dat +++ b/data/eng/menu.dat @@ -31,7 +31,6 @@ SQ_GAME /rd/1/games/sq_game Color Lines /rd/1/games/lines Lights /rd/1/games/lights Criss-Cross /rd/1/games/kox -Bulls and cows /rd/1/games/bnc MegaMaze /rd/1/games/megamaze Sea Fight /rd/1/games/sw Sudoku /rd/1/games/sudoku @@ -65,14 +64,13 @@ UnvWater /rd/1/demos/unvwater ScreenSaver /rd/1/3d/crownscr 3D-cube /rd/1/3d/3dcube2 3D-labyrinth /rd/1/3d/free3d04 -3D-textured cube /rd/1/3d/3dtcub10 3DSHeart /rd/1/3d/3dsheart View3DS /rd/1/3d/view3ds CubeLine /rd/1/3d/cubeline 3D-textured cube 2 /rd/1/3d/cubetext Gears /rd/1/3d/gears FlatWave /rd/1/3d/flatwav -3D-spiral /rd/1/3d/3dspiral +3D-waved area /rd/1/3d/3dwav #6 **** GRAPHICS **** Image viewer /rd/1/media/kiv Animage /rd/1/media/animage diff --git a/data/rus/3d/3dsheart b/data/rus/3d/3dsheart deleted file mode 100644 index 451432efc9..0000000000 Binary files a/data/rus/3d/3dsheart and /dev/null differ diff --git a/data/rus/Makefile b/data/rus/Makefile index be0e3c229f..77677910ee 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -77,8 +77,8 @@ FASM_PROGRAMS:=\ tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \ zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \ 3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \ + 3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \ 3d/3dwav:3D/3DWAV:$(PROGS)/demos/3dwav/trunk/3dwav.asm \ - 3d/3dtcub10:3D/3DTCUB10:$(PROGS)/demos/3dtcub10/trunk/3DTCUB10.ASM \ 3d/crownscr:3D/CROWNSCR:$(PROGS)/demos/crownscr/trunk/crownscr.asm \ 3d/flatwav:3D/FLATWAV:$(PROGS)/demos/flatwav/trunk/FLATWAV.ASM \ 3d/free3d04:3D/FREE3D04:$(PROGS)/demos/free3d04/trunk/free3d04.asm \ @@ -124,7 +124,6 @@ FASM_PROGRAMS:=\ fonts/bgitest:FONTS/BGITEST:$(PROGS)/demos/bgitest/trunk/bgitest.asm \ games/15:GAMES/15:$(PROGS)/games/15/trunk/15.ASM \ games/arcanii:GAMES/ARCANII:$(PROGS)/games/arcanii/trunk/arcanii.asm \ - games/bnc:GAMES/BNC:$(PROGS)/games/bnc/trunk/bnc.asm \ games/freecell:GAMES/FREECELL:$(PROGS)/games/freecell/freecell.asm \ games/gomoku:GAMES/GOMOKU:$(PROGS)/games/gomoku/trunk/gomoku.asm \ games/invaders:GAMES/INVADERS:$(PROGS)/games/invaders/invaders.asm \ diff --git a/data/rus/menu.dat b/data/rus/menu.dat index 610cf69954..0bbfbdd209 100644 --- a/data/rus/menu.dat +++ b/data/rus/menu.dat @@ -32,7 +32,6 @@ SQ_Game /rd/1/games/sq_game Цветные линии /rd/1/games/lines Lights /rd/1/games/lights Крестики-нолики /rd/1/games/kox -Быки и Коровы /rd/1/games/bnc Миллионер /rd/1/games/whowtbam Лабиринт /rd/1/games/megamaze Морской бой /rd/1/games/sw @@ -68,13 +67,12 @@ UnvWater /rd/1/demos/unvwater Скринсейвер /rd/1/3d/crownscr 3D-Куб /rd/1/3d/3dcube2 3D-Лабиринт /rd/1/3d/free3d04 -3D-Textured Cube /rd/1/3d/3dtcub10 -3DSHeart /rd/1/3d/3dsheart +Сердце /rd/1/3d/3dsheart Просмотрщик 3DS /rd/1/3d/view3ds CubeLine /rd/1/3d/cubeline Шестерёнки /rd/1/3d/gears FlatWave /rd/1/3d/flatwav -3D-Спираль /rd/1/3d/3dspiral +3D-Волны /rd/1/3d/3dwav #6 **** GRAPHICS **** Просмотр изображений /rd/1/media/kiv Редактор Animage /rd/1/media/animage