LADX: combine warp options (#4325)

* combine warp options

* fix

* fix typo

* mark old options as removed
This commit is contained in:
threeandthreee
2024-12-03 00:59:55 -05:00
committed by GitHub
parent 6896d631db
commit ac8a206d46
2 changed files with 17 additions and 19 deletions

View File

@@ -58,7 +58,7 @@ from . import hints
from .patches import bank34
from .utils import formatText
from ..Options import TrendyGame, Palette
from ..Options import TrendyGame, Palette, Warps
from .roomEditor import RoomEditor, Object
from .patches.aesthetics import rgb_to_bin, bin_to_rgb
@@ -416,8 +416,8 @@ def generateRom(args, world: "LinksAwakeningWorld"):
for channel in range(3):
color[channel] = color[channel] * 31 // 0xbc
if world.options.warp_improvements:
patches.core.addWarpImprovements(rom, world.options.additional_warp_points)
if world.options.warps != Warps.option_vanilla:
patches.core.addWarpImprovements(rom, world.options.warps == Warps.option_improved_additional)
palette = world.options.palette
if palette != Palette.option_normal: