From 07c828cab04a05b7c76d86646e544c88998bb5f7 Mon Sep 17 00:00:00 2001 From: bryanthaboi Date: Mon, 24 Aug 2026 10:10:59 -0400 Subject: [PATCH] fixerino --- src/ui/gen2/OptionsMenu.lua | 14 -------------- tests/crystal_import_test.lua | 12 +++++++----- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/ui/gen2/OptionsMenu.lua b/src/ui/gen2/OptionsMenu.lua index e21f2b8a..42218d21 100644 --- a/src/ui/gen2/OptionsMenu.lua +++ b/src/ui/gen2/OptionsMenu.lua @@ -204,20 +204,6 @@ local ROWS = { text = function(options) return require("src.render.GbcPalette").modeLabel(options.color or "gbc") end }, - { label = Strings.source("GBC FX"), key = "gbcfx", port = true, - cycle = function(options, delta) - local GBCFX = require("src.render.GBCFX") - if not GBCFX.isSupported() then - options.gbcfx = 0 - return - end - local level = ((options.gbcfx or 0) + delta) % 5 - options.gbcfx = level - GBCFX.setLevel(level) - end, - text = function(options) - return require("src.render.GBCFX").levelLabel(options.gbcfx or 0) - end }, -- SHADER FX reaches Gen 2 too, not just Gen 1. Same "activate" shape as -- CONTROLS/TOUCH LAYOUT below (a pushed screen, not a `cycle` ladder) -- -- ShaderFXScreen is the shared list screen both generations push, `id` diff --git a/tests/crystal_import_test.lua b/tests/crystal_import_test.lua index 915d732b..00d82379 100644 --- a/tests/crystal_import_test.lua +++ b/tests/crystal_import_test.lua @@ -147,9 +147,12 @@ eq(#unexplained, 0, -- ------- 7. the Crystal-only assets the completeness gate pins -local importerSource = assert(io.open("src/import/RomImporter.lua", "r")) -local importerText = importerSource:read("*a") -importerSource:close() +local CacheContract = require("src.import.CacheContract") +local requiredFiles, isOverride = CacheContract.requiredFilesFor("crystal") +check(isOverride, "crystal has its own required-file list") + +local required = {} +for _, path in ipairs(requiredFiles) do required[path] = true end for _, path in ipairs({ "assets/generated/title/crystal_logo.png", "assets/generated/title/crystal_wordmark.png", @@ -158,8 +161,7 @@ for _, path in ipairs({ "assets/generated/intro/chris.png", "assets/generated/intro/kris.png", }) do - check(importerText:find(path, 1, true) ~= nil, - "RomImporter still requires " .. path) + check(required[path], "the crystal cache contract still requires " .. path) end S.finish()