From c695b373cdb1ae0ca0b0e033fb3657fea7411116 Mon Sep 17 00:00:00 2001 From: Alexey 'Cluster' Avdyukhin Date: Fri, 11 Nov 2022 22:35:17 +0400 Subject: Precompiled footer --- Makefile | 10 ++++------ footer.nt | 1 + footer.pt | Bin 0 -> 416 bytes images/menu_footer.png | Bin 2008 -> 0 bytes menu.asm | 6 ++++-- tools_sources/CoolgirlCombiner.sln | 37 ------------------------------------- tools_sources/NesTiler | 2 +- 7 files changed, 10 insertions(+), 46 deletions(-) create mode 100644 footer.nt create mode 100644 footer.pt delete mode 100644 images/menu_footer.png delete mode 100644 tools_sources/CoolgirlCombiner.sln diff --git a/Makefile b/Makefile index 0487c27..73e3594 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ MENU_HEADER_BG_PALETTE_2 = bg_palette2_$(MENU_IMAGE).bin HEADER_FILES = $(MENU_HEADER_PATTERN_TABLE_BIN) $(MENU_HEADER_NAME_TABLE_BIN) \ $(MENU_HEADER_ATTRIBUTE_TABLE_BIN) $(MENU_HEADER_BG_PALETTE_0) \ $(MENU_HEADER_BG_PALETTE_1) $(MENU_HEADER_BG_PALETTE_2) -FOOTER_FILES = menu_footer_pattern_table.bin menu_footer_name_table.bin bg_palette3.bin +FOOTER_FILES = footer.pt footer.nt SYMBOL_FILES = menu_symbols.bin SPRITE_FILES = menu_sprites.bin sprites_palette.bin @@ -192,17 +192,15 @@ $(HEADER_FILES): $(IMAGES_DIR)/$(MENU_IMAGE) --out-palette2 $(MENU_HEADER_BG_PALETTE_2) \ --bg-color \#000000 -$(SYMBOL_FILES) $(FOOTER_FILES): $(IMAGES_DIR)/menu_symbols.png $(IMAGES_DIR)/menu_footer.png +$(SYMBOL_FILES): $(IMAGES_DIR)/menu_symbols.png $(TILER) --colors $(COLORS) \ --i0 $(IMAGES_DIR)/menu_symbols.png \ - --i1 $(IMAGES_DIR)/menu_footer.png \ --enable-palettes 3 \ --pattern-offset0 128 \ --pattern-offset1 224 \ --out-pattern-table0 menu_symbols.bin \ - --out-pattern-table1 menu_footer_pattern_table.bin \ - --out-name-table1 menu_footer_name_table.bin \ - --out-palette3 bg_palette3.bin --bg-color \#000000 + --out-palette3 bg_palette3.bin \ + --bg-color \#000000 $(SPRITE_FILES): $(IMAGES_DIR)/menu_sprites.png $(TILER) --colors $(COLORS) \ diff --git a/footer.nt b/footer.nt new file mode 100644 index 0000000..3f75ae9 --- /dev/null +++ b/footer.nt @@ -0,0 +1 @@ +àààààààààààààààààààààààààààààààààààààààààáâãäåæçèèéáêëìàààààààààààààààààíîïðñòóôõõöî÷øùààààààààààààààààààààààààààààààààààààààààà \ No newline at end of file diff --git a/footer.pt b/footer.pt new file mode 100644 index 0000000..248000f Binary files /dev/null and b/footer.pt differ diff --git a/images/menu_footer.png b/images/menu_footer.png deleted file mode 100644 index 3bf1200..0000000 Binary files a/images/menu_footer.png and /dev/null differ diff --git a/menu.asm b/menu.asm index 674d95a..819d1e9 100644 --- a/menu.asm +++ b/menu.asm @@ -351,7 +351,7 @@ IRQ: ; not used chr_data: .incbin MENU_HEADER_PATTERN_TABLE_BIN .org $8000 + 224 * 16 - .incbin "menu_footer_pattern_table.bin" + .incbin "footer.pt" .org $8800 .incbin "menu_symbols.bin" .org $9000 @@ -363,13 +363,15 @@ chr_data: nametable_header: .incbin MENU_HEADER_NAME_TABLE_BIN nametable_footer: - .incbin "menu_footer_name_table.bin" + .incbin "footer.nt" tilepal: ; palette for background .incbin MENU_HEADER_BG_PALETTE_0 .incbin MENU_HEADER_BG_PALETTE_1 .incbin MENU_HEADER_BG_PALETTE_2 .incbin "bg_palette3.bin" + .org tilepal+$0F ; footer color + .db $21 .incbin "sprites_palette.bin" ; palette for sprites .org tilepal+$14 ; custom palette for stars .db $00, $22, $00, $00 diff --git a/tools_sources/CoolgirlCombiner.sln b/tools_sources/CoolgirlCombiner.sln deleted file mode 100644 index 40222f0..0000000 --- a/tools_sources/CoolgirlCombiner.sln +++ /dev/null @@ -1,37 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.3.32825.248 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoolgirlCombiner", "CoolgirlCombiner\CoolgirlCombiner.csproj", "{3BD5CDFF-02F6-4D2A-B95C-CC82EB73785E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NesTiler", "..\..\..\C#\NesTiler\NesTiler\NesTiler.csproj", "{BA88B483-D314-4D20-9787-DE0666EED7AD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks", "Benchmarks\Benchmarks.csproj", "{54C8CB51-CE57-4E22-B54A-52CD7D32AD9D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3BD5CDFF-02F6-4D2A-B95C-CC82EB73785E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BD5CDFF-02F6-4D2A-B95C-CC82EB73785E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BD5CDFF-02F6-4D2A-B95C-CC82EB73785E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BD5CDFF-02F6-4D2A-B95C-CC82EB73785E}.Release|Any CPU.Build.0 = Release|Any CPU - {BA88B483-D314-4D20-9787-DE0666EED7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA88B483-D314-4D20-9787-DE0666EED7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA88B483-D314-4D20-9787-DE0666EED7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA88B483-D314-4D20-9787-DE0666EED7AD}.Release|Any CPU.Build.0 = Release|Any CPU - {54C8CB51-CE57-4E22-B54A-52CD7D32AD9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54C8CB51-CE57-4E22-B54A-52CD7D32AD9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54C8CB51-CE57-4E22-B54A-52CD7D32AD9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54C8CB51-CE57-4E22-B54A-52CD7D32AD9D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {CE4F1A64-529A-44EF-830F-810E532C7CB8} - EndGlobalSection -EndGlobal diff --git a/tools_sources/NesTiler b/tools_sources/NesTiler index 833a627..aa8a568 160000 --- a/tools_sources/NesTiler +++ b/tools_sources/NesTiler @@ -1 +1 @@ -Subproject commit 833a6276be95ee1f7de115ffc89d3d92d11aa30e +Subproject commit aa8a5681e82e3262a629492bdd0803444d8ec9c1 -- cgit v1.2.3