From 70ff19ac8c5b637794527a69b34364f63d44c16c Mon Sep 17 00:00:00 2001 From: zig-for Date: Tue, 11 Apr 2023 00:18:33 -0700 Subject: [PATCH] LADX: AP egg title screen (#1683) --- worlds/ladx/LADXR/generator.py | 20 ++--- worlds/ladx/LADXR/patches/aesthetics.py | 12 +++ worlds/ladx/LADXR/patches/endscreen.py | 2 +- worlds/ladx/LADXR/patches/titleScreen.py | 73 ++++++++++++++++-- worlds/ladx/LADXR/patches/title_screen.bdiff4 | Bin 0 -> 990 bytes worlds/ladx/LADXR/rom.py | 9 ++- worlds/ladx/LADXR/romTables.py | 4 +- worlds/ladx/Options.py | 9 ++- worlds/ladx/__init__.py | 17 ++-- worlds/ladx/docs/en_Links Awakening DX.md | 4 +- 10 files changed, 119 insertions(+), 31 deletions(-) create mode 100644 worlds/ladx/LADXR/patches/title_screen.bdiff4 diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py index cb9de281..08552081 100644 --- a/worlds/ladx/LADXR/generator.py +++ b/worlds/ladx/LADXR/generator.py @@ -2,6 +2,7 @@ import binascii import importlib.util import importlib.machinery import os +import pkgutil from .romTables import ROMWithTables from . import assembler @@ -61,7 +62,12 @@ from ..Options import TrendyGame, Palette, MusicChangeCondition # Function to generate a final rom, this patches the rom with all required patches def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, multiworld=None, player_name=None, player_names=[], player_id = 0): - rom = ROMWithTables(args.input_filename) + rom_patches = [] + + if ap_settings["ap_title_screen"]: + rom_patches.append(pkgutil.get_data(__name__, "patches/title_screen.bdiff4")) + + rom = ROMWithTables(args.input_filename, rom_patches) rom.player_names = player_names pymods = [] if args.pymod: @@ -271,6 +277,8 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m patches.core.warpHome(rom) # Needs to be done after setting the start location. patches.titleScreen.setRomInfo(rom, auth, seed_name, settings, player_name, player_id) + if ap_settings["ap_title_screen"]: + patches.titleScreen.setTitleGraphics(rom) patches.endscreen.updateEndScreen(rom) patches.aesthetics.updateSpriteData(rom) if args.doubletrouble: @@ -363,15 +371,7 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m if x > max: return max return x - def bin_to_rgb(word): - red = word & 0b11111 - word >>= 5 - green = word & 0b11111 - word >>= 5 - blue = word & 0b11111 - return (red, green, blue) - def rgb_to_bin(r, g, b): - return (b << 10) | (g << 5) | r + from patches.aesthetics import rgb_to_bin, bin_to_rgb for address in range(start, end, 2): packed = (rom.banks[bank][address + 1] << 8) | rom.banks[bank][address] diff --git a/worlds/ladx/LADXR/patches/aesthetics.py b/worlds/ladx/LADXR/patches/aesthetics.py index ff8cd5d8..2975c804 100644 --- a/worlds/ladx/LADXR/patches/aesthetics.py +++ b/worlds/ladx/LADXR/patches/aesthetics.py @@ -434,3 +434,15 @@ noChange: rom.room_sprite_data_overworld[room_nr] = data else: rom.room_sprite_data_indoor[room_nr - 0x100] = data + + +def bin_to_rgb(word): + red = word & 0b11111 + word >>= 5 + green = word & 0b11111 + word >>= 5 + blue = word & 0b11111 + return (red, green, blue) + +def rgb_to_bin(r, g, b): + return (b << 10) | (g << 5) | r diff --git a/worlds/ladx/LADXR/patches/endscreen.py b/worlds/ladx/LADXR/patches/endscreen.py index 3a8b4c2d..94a03fc6 100644 --- a/worlds/ladx/LADXR/patches/endscreen.py +++ b/worlds/ladx/LADXR/patches/endscreen.py @@ -136,4 +136,4 @@ loadLoop2: addr = 0x1000 data = pkgutil.get_data(__name__, "nyan.bin") rom.banks[0x3F][addr : addr + len(data)] = data - + diff --git a/worlds/ladx/LADXR/patches/titleScreen.py b/worlds/ladx/LADXR/patches/titleScreen.py index b81f1460..3a4dade2 100644 --- a/worlds/ladx/LADXR/patches/titleScreen.py +++ b/worlds/ladx/LADXR/patches/titleScreen.py @@ -1,11 +1,9 @@ from ..backgroundEditor import BackgroundEditor -import subprocess -import binascii - - +from .aesthetics import rgb_to_bin, bin_to_rgb, prepatch +import copy +import pkgutil CHAR_MAP = {'z': 0x3E, '-': 0x3F, '.': 0x39, ':': 0x42, '?': 0x3C, '!': 0x3D} - def _encode(s): result = bytearray() for char in s: @@ -82,3 +80,68 @@ def setRomInfo(rom, seed, seed_name, settings, player_name, player_id): ba.tiles[0x9820 + n] = 0x08 | pal be.store(rom) ba.store(rom) + +def setTitleGraphics(rom): + BASE = 0x9800 + ROW_SIZE = 0x20 + + be = BackgroundEditor(rom, 0x11, attributes=True) + for tile in be.tiles: + if be.tiles[tile] == 7: + be.tiles[tile] = 3 + + be.tiles[BASE + 10 * ROW_SIZE + 8] = 7 + be.tiles[BASE + 10 * ROW_SIZE + 10] = 2 + be.tiles[BASE + 10 * ROW_SIZE + 11] = 5 + be.tiles[BASE + 11 * ROW_SIZE + 10] = 6 + be.tiles[BASE + 11 * ROW_SIZE + 11] = 6 + be.tiles[BASE + 12 * ROW_SIZE + 11] = 6 + be.tiles[BASE + 11 * ROW_SIZE + 9] = 1 + be.tiles[BASE + 12 * ROW_SIZE + 9] = 1 + be.tiles[BASE + 12 * ROW_SIZE + 10] = 1 + be.tiles[BASE + 13 * ROW_SIZE + 9] = 1 + be.tiles[BASE + 13 * ROW_SIZE + 10] = 1 + + be.store(rom) + + SKIP_INTRO = True + if SKIP_INTRO: + # Skip intro as it's causing problems + rom.banks[1][0x2F5B : 0x2F5B + 3] = [0xC3, 0x39, 0x6E] + # Disable initial music + rom.banks[1][0x2F03 : 0x2F03 + 5] = [0] * 5 + # Disable music fade on reset + rom.banks[1][0x3436 : 0x3436 + 3] = [0] * 3 + + + # Set egg palette + BASE = 0x3DEE + palettes = [] + BANK = 0x21 + for i in range(8): + palette = [] + for c in range(4): + address = BASE + i * 8 + c * 2 + packed = (rom.banks[BANK][address + 1] << 8) | rom.banks[BANK][address] + r,g,b = bin_to_rgb(packed) + palette.append([r, g, b]) + palettes.append(palette) + + for i in [1, 2, 5, 6, 7]: + palettes[i] = copy.copy(palettes[3]) + + def to_5_bit(r, g, b): + return [r >> 3, g >> 3, b >> 3] + + palettes[1][3] = to_5_bit(0xFF, 0x80, 145) + palettes[2][2] = to_5_bit(119, 198, 155) + palettes[5][3] = to_5_bit(119, 198, 155) + palettes[6][3] = to_5_bit(192, 139, 215) + palettes[7][3] = to_5_bit(229, 196, 139) + + for i in range(8): + for c in range(4): + address = BASE + i * 8 + c * 2 + packed = rgb_to_bin(*palettes[i][c]) + rom.banks[BANK][address] = packed & 0xFF + rom.banks[BANK][address + 1] = packed >> 8 diff --git a/worlds/ladx/LADXR/patches/title_screen.bdiff4 b/worlds/ladx/LADXR/patches/title_screen.bdiff4 new file mode 100644 index 0000000000000000000000000000000000000000..89e9d64482aa27c5ec815aceaafa927f5a01bfac GIT binary patch literal 990 zcmV<410noEQ$$HdMl>)>000000000(0ssI20000001yBG0000&T4*^jL0KkKSv&;q>;mZ>u4$_WxMG3 zyOJrwgn{MYZ^%MgXgM)KSte6iH6agJ00tL-|NrmUY467TQ&t>fG<^{k@qI+9dty&0^Nuy0njDQB30NOwR42>R;4Lwa71|S1KGzLt7G{|}r1}H^O z)IijFn2j_ZlNl3CfHcvekOL-zMw$Zz4Lu+OL7-`nXaMydpcyHtqy~Tu0MHs5X`?^@ z000^q000dd000000NLzh^Qo%Iw`^iVW=y{Bo&~32Rwe2JK?IT)LIE#O5D6s1t_fy@ ze4>y503ZMaM)If_uI{WjYSo=Ae|v}i!4GFtB#4~kPGqFTz<>0^059t6G)!z1Y5;Oe z-#v1{(murkHp&Wwfqq58%Ccy_cTdcvtowJsK>z>%{+}%pkxF1GkQJA1pzLliWL+!$ zD%QJ2f^tU=1g!;*y!IAZm=I&5k(gA{F_ArT1u;dl#RB)eSbBuh-B^rvi&rO70sQIW zjd}+^e@YN&KCknX!Od_|kf9GqBw*0tk{}owGG7pPwB9f5+IyL5|7O^ zuw@}>h*}*P)H?R@W@z26O({fyt&I^Q5ZseOi1kh#i@9{s)J1%e-NqKabaM}odmhsP zukE_X1yuWuSplX(2B$TGNaF z9_}G&Cv_k*gy^6K5feV`)8G<6ei(X&2ga!lTWGovF@UoTQG~fgU*32pr znM~}1!4wXGoFOT}0y5wr*0~w#!aA+A#bbvLocations