From a6ab6cdcf1c24f70e7fb9fad2288af8742edf92b Mon Sep 17 00:00:00 2001 From: LLCoolDave Date: Fri, 14 Jul 2017 23:32:40 +0200 Subject: [PATCH] Add Ether Tablet and Bombos Tablet texts. Fix position of hash array table. --- Rom.py | 9 ++++++++- Text.py | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 9d05f2c0..8496179a 100644 --- a/Rom.py +++ b/Rom.py @@ -362,7 +362,7 @@ def patch_rom(world, rom, hashtable, quickswap=False, beep='normal', sprite=None rom.write_byte(0x180033, {'off': 0x00, 'half': 0x40, 'quarter': 0x80, 'normal': 0x20}[beep]) # store hash table for main menu hash - rom.write_bytes(0x181000, hashtable) + rom.write_bytes(0x187F00, hashtable) # write link sprite if required if sprite is not None: @@ -431,6 +431,13 @@ def write_strings(rom, world): altar_credit_text = 'and the Hot Air' if altaritem is None else altaritem.altar_credit_text if altaritem.altar_credit_text is not None else ' and the Unknown Item.' write_credits_string_to_rom(rom, 'Altar', altar_credit_text) + etheritem = world.get_location('Ether Tablet').item + ether_text = 'Some Hot Air' if etheritem is None else etheritem.altar_hint_text if etheritem.altar_hint_text is not None else 'Unknown Item.' + write_string_to_rom(rom, 'EtherTablet', ether_text) + bombositem = world.get_location('Bombos Tablet').item + bombos_text = 'Some Hot Air' if bombositem is None else bombositem.altar_hint_text if bombositem.altar_hint_text is not None else 'Unknown Item.' + write_string_to_rom(rom, 'BombosTablet', bombos_text) + write_credits_string_to_rom(rom, 'KingsReturn', KingsReturn_texts[random.randint(0, len(KingsReturn_texts) - 1)]) write_credits_string_to_rom(rom, 'Sanctuary', Sanctuary_texts[random.randint(0, len(Sanctuary_texts) - 1)]) write_credits_string_to_rom(rom, 'Kakariko', Kakariko_texts[random.randint(0, len(Kakariko_texts) - 1)]) diff --git a/Text.py b/Text.py index 2db8e68e..6b23f4e4 100644 --- a/Text.py +++ b/Text.py @@ -9,7 +9,9 @@ text_addresses = {'Altar': (0x180300, 256), 'Sahasrahla2': (0x180B00, 256), 'BombShop1': (0x180E00, 256), 'BombShop2': (0x180D00, 256), - 'PyramidFairy': (0x180900, 256)} + 'PyramidFairy': (0x180900, 256), + 'EtherTablet': (0x180F00, 256), + 'BombosTablet': (0x181000, 256)} credits_addresses = {'KingsReturn': (0x76928, 22), 'Sanctuary': (0x76964, 16),