Skip to content

Add native Gen2 menu chrome with shared font and palette ownership #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Roxas2712 wants to merge 1 commit into from
Closed

Add native Gen2 menu chrome with shared font and palette ownership #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/ModCompat.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
-- hook, not one module
-- src.world.gen2.Follower PikachuFollower is Yellow's, not a general
-- party follower
-- src.ui.gen2.Chrome no shared window-chrome module
-- src.ui.gen2.SaveMenu the save flow is part of StartMenu here
-- src.ui.gen2.BattleAnimView Gen2AnimPlayer is a player, not a view
-- src.battle.UIVisibility no equivalent
Expand Down Expand Up @@ -80,6 +79,7 @@ ModCompat.ALIASES = {
["src.battle.gen2.Effects"] = "src.battle.MoveEffects",
["src.battle.gen2.Mon"] = "src.pokemon.Pokemon",
["src.ui.gen2.BattleState"] = "src.battle.BattleState",
["src.ui.gen2.Chrome"] = "src.ui.Gen2Chrome",

-- menus. The Gold port names two of these differently rather than
-- namespacing them, so both spellings land on the one implementation.
Expand Down
6 changes: 5 additions & 1 deletion src/render/PaletteFX.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,7 @@ function PaletteFX.paperShade(data)
return c[1] / 255, c[2] / 255, c[3] / 255
end

function PaletteFX.effectiveColors(c)
function PaletteFX.effectiveColors(c, invert)
if not c then return nil end
local mode = PaletteFX.mode or "gbc"
local out = c
Expand All @@ -1176,6 +1176,10 @@ function PaletteFX.effectiveColors(c)
-- cave has to read dark in CLASSIC's pea greens and in plain DMG grays too
-- (#322). permute() is the identity (and returns `out` itself, which the
-- mod-graphics parity check leans on) while nothing has armed one.
-- An inverted font page reverses its settled display ramp before the
-- hardware shade register permutes it. Keep this on the native path so
-- Gen2 menu chrome cannot carry a second palette mode/register state.
if invert then out = { out[4], out[3], out[2], out[1] } end
return PaletteFX.permute(out, shadeMap)
end

Expand Down
Loading