morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

apply sprite to rom last, to overwrite palette shuffler changes

Browse Source
This commit is contained in:
Fabian Dill
2020-12-29 08:03:56 +01:00
parent 41fd85e8be
commit b9457f3da2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Rom.py
View File

@@ -1601,8 +1601,6 @@ def hud_format_text(text):
def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, sprite: str, palettes_options, def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, sprite: str, palettes_options,
world=None, player=1, allow_random_on_event=False): world=None, player=1, allow_random_on_event=False):
local_random = random if not world else world.rom_seeds[player] local_random = random if not world else world.rom_seeds[player]
apply_random_sprite_on_event(rom, sprite, local_random, allow_random_on_event,
world.sprite_pool[player] if world else [])
# enable instant item menu # enable instant item menu
if fastmenu == 'instant': if fastmenu == 'instant':
@@ -1707,6 +1705,9 @@ def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, spr
blackout_uw_palettes(rom) blackout_uw_palettes(rom)
elif palettes_options['dungeon'] == 'random': elif palettes_options['dungeon'] == 'random':
randomize_uw_palettes(rom, local_random) randomize_uw_palettes(rom, local_random)
apply_random_sprite_on_event(rom, sprite, local_random, allow_random_on_event,
world.sprite_pool[player] if world else [])
if isinstance(rom, LocalRom): if isinstance(rom, LocalRom):
rom.write_crc() rom.write_crc()