mirror of
https://github.com/bryanthaboi/gen1recomp.git
synced 2026-08-12 08:21:02 +02:00
spiritsnails
aedc63c40d
Ports from a downstream fork, hand-surgered hunk-by-hunk to exclude the fork's randomizer/pokescript work and to skip a FixedStep jitter-tolerance attempt that never fixed the stutter it targeted. - src/core/Timing.lua: hardware-accurate frame-delay catalog ported from pret/pokered, feeding BattleState:waitNext, EffectRegistry's miss/crit beats, TextBox/ChoiceBox scroll and prompt holds, and the battle silhouette slide/shake/blink/faint timings. - Seamless battle transitions: Renderer:drawBattleWipe replaces the old 160x144-only cascade with one wipe drawn over the whole surface at any zoom or window size; BattleTransition's per-style frame lengths are corrected against pokered-c's derivation; Transition.battleReturn adds the post-battle GBFadeInFromWhite the port never had. - BATTLE SIZE / BATTLE BG options (BattleState:wantsFillScale/bgMode, Game.fillScaleInStack/worldBgBattleDim): battle surface can fill the window instead of the fixed integer letterbox, and the area around it can show white/black/the dimmed overworld instead of only white. - src/core/FaithfulRes.lua: locks the window to an exact 160x144 multiple. - Zoom-aware UI anchoring: Renderer:uiScale steps the UI down with survey zoom (gated to worldActive so the title/intro never shrink); Renderer:setUIAnchor lets TextBox, ChoiceBox, and an opted-in Menu (the START menu) pin themselves to a screen edge instead of the zoomed-out letterbox.
51 lines
2.3 KiB
Lua
51 lines
2.3 KiB
Lua
-- The title screen and the intro fill the window (aspect preserved, bars on
|
|
-- the long axis) instead of sitting at the fixed integer scale, and the
|
|
-- overworld's survey zoom does not shrink them.
|
|
--
|
|
-- Both halves shipped broken together. Renderer:uiScale steps the UI down one
|
|
-- whole integer per zoom-out step, which is right for the overworld -- a
|
|
-- full-size dialogue box over a shrunken map looks wrong -- but it was applied
|
|
-- unconditionally, so a saved zoom of -2 also drew the TITLE SCREEN at a
|
|
-- reduced scale, in a window showing no map at all. The fix gates the
|
|
-- step-down on a world actually being on screen, and opts these two states
|
|
-- into the fill scale the battle "fill" size already uses.
|
|
package.path = "./?.lua;./?/init.lua;" .. package.path
|
|
|
|
local T = require("tests.modkit")
|
|
local Game = require("src.core.Game")
|
|
local TitleState = require("src.ui.TitleState")
|
|
local IntroMovie = require("src.ui.IntroMovie")
|
|
|
|
-- --------------------------------------------------------------- the opt-in
|
|
|
|
local title = setmetatable({}, { __index = TitleState })
|
|
local intro = setmetatable({}, { __index = IntroMovie })
|
|
|
|
T.eq(title:wantsFillScale(), true, "the title screen asks for the fill scale")
|
|
T.eq(intro:wantsFillScale(), true, "and so does the intro")
|
|
|
|
-- neither reads options, so this must hold with no game attached at all --
|
|
-- the title screen is up before a save is loaded
|
|
T.eq(TitleState.wantsFillScale(nil), true,
|
|
"the title screen fills with no game or save behind it")
|
|
T.eq(IntroMovie.wantsFillScale(nil), true, "and so does the intro")
|
|
|
|
-- ------------------------------------------------------------- the stack scan
|
|
|
|
local function stack(...) return { states = { ... } } end
|
|
local overworld = {} -- no wantsFillScale at all, like every other state
|
|
|
|
T.eq(Game.fillScaleInStack(stack(title)), true,
|
|
"the shared scan picks the title screen up")
|
|
T.eq(Game.fillScaleInStack(stack(intro)), true, "and the intro")
|
|
T.eq(Game.fillScaleInStack(stack(overworld)), false,
|
|
"and the overworld still draws at the fixed scale")
|
|
|
|
-- the title screen opens the CONTINUE/NEW GAME menu and the options menu on
|
|
-- top of itself; those must not snap the surface back for a frame, the same
|
|
-- whole-stack rule a battle relies on
|
|
T.eq(Game.fillScaleInStack(stack(title, {})), true,
|
|
"a menu opened over the title screen keeps it filling")
|
|
|
|
T.finish("title fill scale")
|