From 3bb0d82cab1aa2b2fe710e37c73918fa5325c463 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sun, 1 Feb 2026 21:42:11 -0600 Subject: [PATCH] Start of pikit mode --- ItemList.py | 8 ++++---- Regions.py | 6 +++--- Rom.py | 8 ++++---- Text.py | 4 ++-- data/base2current.bps | Bin 156418 -> 156737 bytes source/dungeon/EnemyList.py | 2 +- source/enemizer/SpriteSheets.py | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ItemList.py b/ItemList.py index 662b1b61..b528a2a7 100644 --- a/ItemList.py +++ b/ItemList.py @@ -1159,10 +1159,10 @@ def get_pool_core(world, player, progressive, shuffle, difficulty, treasure_hunt thisbottle = random.choice(diff.bottles) pool.append(thisbottle) - if want_progressives(): - pool.extend(diff.progressiveshield) - else: - pool.extend(diff.basicshield) + # if want_progressives(): + # pool.extend(diff.progressiveshield) + # else: + # pool.extend(diff.basicshield) if want_progressives(): pool.extend(diff.progressivearmor) diff --git a/Regions.py b/Regions.py index dc94fdf1..48be1c22 100644 --- a/Regions.py +++ b/Regions.py @@ -1178,7 +1178,7 @@ def create_shops(world, player): if (world.is_tile_swapped(0x35, player) and region_name == 'Dark Lake Hylia Shop') \ or (not world.is_tile_swapped(0x35, player) and region_name == 'Lake Hylia Shop'): locked = True - inventory = [('Blue Potion', 160), ('Blue Shield', 50), ('Bombs (10)', 50)] + inventory = [('Blue Potion', 160), ('Small Heart', 10), ('Bombs (10)', 50)] custom = True region = world.get_region(region_name, player) shop = Shop(region, room_id, type, shopkeeper, custom, locked, sram) @@ -1366,11 +1366,11 @@ bonk_table_by_location = {y: x for x, y in bonk_table_by_location_id.items()} # (room_id, type, shopkeeper, custom, locked, [items]) # item = (item, price, max=0, replacement=None, replacement_price=0) _basic_shop_defaults = [('Red Potion', 150), ('Small Heart', 10), ('Bombs (10)', 50)] -_dark_world_shop_defaults = [('Red Potion', 150), ('Blue Shield', 50), ('Bombs (10)', 50)] +_dark_world_shop_defaults = [('Red Potion', 150), ('Small Heart', 10), ('Bombs (10)', 50)] shop_table = { 'Dark Death Mountain Shop': (0x0112, ShopType.Shop, 0xC1, False, False, _basic_shop_defaults, 0), 'Red Shield Shop': (0x0110, ShopType.Shop, 0xC1, False, False, - [('Red Shield', 500), ('Bee', 10), ('Arrows (10)', 30)], 3), + [('Bombs (10)', 50), ('Bee', 10), ('Arrows (10)', 30)], 3), 'Dark Lake Hylia Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults, 6), 'Dark Lumberjack Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults, 9), 'Village of Outcasts Shop': (0x010F, ShopType.Shop, 0xC1, False, False, _dark_world_shop_defaults, 12), diff --git a/Rom.py b/Rom.py index 2c09b5eb..ab4513e1 100644 --- a/Rom.py +++ b/Rom.py @@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc from Versions import DRVersion, GKVersion, ORVersion JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'a746c6916c3ca8e89df7d7ac79d354dd' +RANDOMIZERBASEHASH = '7ab93fa81cc8599f7025bc2d09a661a0' class JsonRom(object): @@ -2970,9 +2970,9 @@ def text_for_item(item, world, player, team): def init_open_mode_sram(rom): rom.initial_sram.pre_open_castle_gate() - rom.initial_sram.set_progress_indicator(0x02) - rom.initial_sram.set_progress_flags(0x14) - rom.initial_sram.set_starting_entrance(0x01) + rom.initial_sram.set_progress_indicator(0x00) + rom.initial_sram.set_progress_flags(0x04) + rom.initial_sram.set_starting_entrance(0x00) def init_standard_mode_sram(rom): rom.initial_sram.set_progress_indicator(0x00) diff --git a/Text.py b/Text.py index c8cccada..fc32d8da 100644 --- a/Text.py +++ b/Text.py @@ -1567,7 +1567,6 @@ class TextTable(object): 'hylian_text_2', 'desert_entry_translated', 'uncle_dying_sewer', - 'telepathic_intro', 'desert_thief_sitting', 'desert_thief_following', 'desert_thief_question', @@ -1611,7 +1610,7 @@ class TextTable(object): text['zelda_save_sewers'] = CompressedTextMapper.convert("You saved me!") text['priest_info'] = CompressedTextMapper.convert("So, I'm the dude that will protect Zelda. Don't worry, I got this covered.") text['zelda_sanctuary_before_leave'] = CompressedTextMapper.convert("Be careful!") - text['telepathic_intro'] = CompressedTextMapper.convert("{NOBORDER}\n{SPEED6}\nHey, come find me and help me!") + text['telepathic_intro'] = CompressedTextMapper.convert("{NOBORDER}\n{SPEED6}\n\nBring me shields...") # 20 text['telepathic_reminder'] = CompressedTextMapper.convert("{NOBORDER}\n{SPEED6}\nI'm in the castle basement.") text['zelda_go_to_throne'] = CompressedTextMapper.convert("Go north to the throne.") @@ -2058,5 +2057,6 @@ class TextTable(object): text['ganon_phase_3_silvers'] = CompressedTextMapper.convert("Oh no! Silver! My one true weakness!") text['murahdahla'] = CompressedTextMapper.convert("Hello @. I\nam Murahdahla, brother of\nSahasrahla and Aginah. Behold the power of\ninvisibility.\n{PAUSE3}\n… … …\nWait! You can see me? I knew I should have\nhidden in a hollow tree.") text['mastersword_pedestal_goal'] = CompressedTextMapper.convert("To claim thy reward, you must present all 3 Pendants of Virtue.") + text['already_have_shield'] = CompressedTextMapper.convert("You already have a shield...") text['end_pad_data'] = bytearray([0xfb]) text['terminator'] = bytearray([0xFF, 0xFF]) diff --git a/data/base2current.bps b/data/base2current.bps index 81536eaf004e4096728e192f7e3e9b10fa681616..c29ed2d2d05b2e3acc551a08f2f3544d0327a9f5 100644 GIT binary patch delta 5400 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 rM67&Mqz~CltZ7OrTx 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 V>en2dNO@RW&n!_*$~O30{txzcY-j)g diff --git a/source/dungeon/EnemyList.py b/source/dungeon/EnemyList.py index f86f5f53..5a0b5e1b 100644 --- a/source/dungeon/EnemyList.py +++ b/source/dungeon/EnemyList.py @@ -1998,7 +1998,7 @@ def init_vanilla_sprites(): create_sprite(0x0103, EnemySprite.Drunkard, 0x00, 0, 0x06, 0x15) create_sprite(0x0103, EnemySprite.AdultNpc, 0x00, 0, 0x0a, 0x1b) create_sprite(0x0103, EnemySprite.Innkeeper, 0x00, 0, 0x17, 0x17) - create_sprite(0x0104, EnemySprite.UnclePriest, 0x00, 0, 0x1a, 0x17) + create_sprite(0x0104, EnemySprite.Pikit, 0x00, 0, 0x1a, 0x18) create_sprite(0x0105, EnemySprite.Wiseman, 0x00, 0, 0x07, 0x18) create_sprite(0x0106, EnemySprite.Shopkeeper, 0x00, 0, 0x08, 0x1b) create_sprite(0x0107, EnemySprite.BonkItem, 0x00, 0, 0x03, 0x15) diff --git a/source/enemizer/SpriteSheets.py b/source/enemizer/SpriteSheets.py index 0cb77433..f2a10e75 100644 --- a/source/enemizer/SpriteSheets.py +++ b/source/enemizer/SpriteSheets.py @@ -456,7 +456,7 @@ vanilla_sheets = [ (0x47, 0x49, 0x2B, 0x2D), (0x46, 0x49, 0x1C, 0x52), (0x00, 0x49, 0x1C, 0x52), (0x5D, 0x49, 0x00, 0x52), (0x46, 0x49, 0x13, 0x52), (0x4B, 0x4D, 0x4A, 0x5A), (0x47, 0x49, 0x1C, 0x52), (0x4B, 0x4D, 0x39, 0x36), (0x1F, 0x2C, 0x2E, 0x52), (0x1F, 0x2C, 0x2E, 0x1D), (0x2F, 0x2C, 0x2E, 0x52), (0x2F, 0x2C, 0x2E, 0x31), - (0x1F, 0x1E, 0x30, 0x52), (0x51, 0x49, 0x13, 0x00), (0x4F, 0x49, 0x13, 0x50), (0x4F, 0x4D, 0x4A, 0x50), + (0x1F, 0x1E, 0x30, 0x52), (0x51, 0x49, 0x13, 0x1B), (0x4F, 0x49, 0x13, 0x50), (0x4F, 0x4D, 0x4A, 0x50), (0x4B, 0x49, 0x4C, 0x2B), (0x1F, 0x20, 0x22, 0x53), (0x55, 0x3D, 0x42, 0x43), (0x1F, 0x1E, 0x23, 0x52), (0x1F, 0x1E, 0x39, 0x3A), (0x1F, 0x1E, 0x3A, 0x3E), (0x1F, 0x1E, 0x3C, 0x3D), (0x40, 0x1E, 0x27, 0x3F),