mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
LADX: Open Mabe Option (#3964)
* open mabe option swaps east mabe rocks for bushes * add open mabe to slot data * use upstream overworld option Instead of a standalone option, use upstream's "overworld" option, which we don't use yet but it leaves better space for the future * use ladxr_setting for consistency * newline
This commit is contained in:
@@ -58,7 +58,6 @@ from . import hints
|
||||
|
||||
from .patches import bank34
|
||||
from .utils import formatText
|
||||
from ..Options import TrendyGame, Palette, Warps
|
||||
from .roomEditor import RoomEditor, Object
|
||||
from .patches.aesthetics import rgb_to_bin, bin_to_rgb
|
||||
|
||||
@@ -66,7 +65,7 @@ from .locations.keyLocation import KeyLocation
|
||||
|
||||
from BaseClasses import ItemClassification
|
||||
from ..Locations import LinksAwakeningLocation
|
||||
from ..Options import TrendyGame, Palette, MusicChangeCondition, BootsControls
|
||||
from ..Options import TrendyGame, Palette, MusicChangeCondition, Warps
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from .. import LinksAwakeningWorld
|
||||
@@ -156,6 +155,8 @@ def generateRom(args, world: "LinksAwakeningWorld"):
|
||||
if not world.ladxr_settings.rooster:
|
||||
patches.maptweaks.tweakMap(rom)
|
||||
patches.maptweaks.tweakBirdKeyRoom(rom)
|
||||
if world.ladxr_settings.overworld == "openmabe":
|
||||
patches.maptweaks.openMabe(rom)
|
||||
patches.chest.fixChests(rom)
|
||||
patches.shop.fixShop(rom)
|
||||
patches.rooster.patchRooster(rom)
|
||||
@@ -247,7 +248,7 @@ def generateRom(args, world: "LinksAwakeningWorld"):
|
||||
patches.core.quickswap(rom, 1)
|
||||
elif world.ladxr_settings.quickswap == 'b':
|
||||
patches.core.quickswap(rom, 0)
|
||||
|
||||
|
||||
patches.core.addBootsControls(rom, world.options.boots_controls)
|
||||
|
||||
|
||||
@@ -397,7 +398,7 @@ def generateRom(args, world: "LinksAwakeningWorld"):
|
||||
# Then put new text in
|
||||
for bucket_idx, (orig_idx, data) in enumerate(bucket):
|
||||
rom.texts[shuffled[bucket_idx][0]] = data
|
||||
|
||||
|
||||
|
||||
if world.options.trendy_game != TrendyGame.option_normal:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user