Skip to content

Commit d6b8640

Browse files
committed
Fix MQ DC Staircase silver rupees shared flag
1 parent a2c87b2 commit d6b8640

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ASM/build/bundle.o

0 Bytes
Binary file not shown.

ASM/c/item_effects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void give_small_key_ring(z64_file_t* save, int16_t dungeon_id, int16_t arg2) {
109109

110110
silver_rupee_data_t silver_rupee_vars[0x16][2] = {
111111
//Vanilla, Master Quest
112-
{{-1, 0xFF, 0x00, 0x00, 0x00, 2}, { 5, 0x1F, 0xFF, 0xFF, 0xFF, 2}}, // Dodongos Cavern Staircase. Patched to use switch flag 0x1F
112+
{{-1, 0xFF, 0x00, 0x00, 0x00, 2}, { 5, 0x1C, 0xFF, 0xFF, 0xFF, 2}}, // Dodongos Cavern Staircase. Patched to use switch flag 0x1C
113113
{{ 5, 0x08, 0x00, 0xFF, 0xFF, 3}, {-1, 0xFF, 0x00, 0x00, 0x00, 3}}, // Ice Cavern Spinning Scythe
114114
{{ 5, 0x09, 0x00, 0x64, 0xFF, 5}, {-1, 0xFF, 0x00, 0x00, 0x00, 5}}, // Ice Cavern Push Block
115115
{{ 5, 0x1F, 0xFF, 0xFF, 0xFF, 1}, {-1, 0xFF, 0x00, 0x00, 0x00, 1}}, // Bottom of the Well Basement

Patches.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,8 +1264,8 @@ def calculate_traded_flags(world):
12641264
if world.settings.shuffle_silver_rupees != 'remove':
12651265
rom.write_byte(rom.sym('CFG_DUNGEON_INFO_SILVER_RUPEES'), 1)
12661266

1267-
if world.dungeon_mq['Dodongos Cavern']: # Patch DC MQ Staircase Transition Actor to use permanent switch flag 0x1F
1268-
rom.write_byte(0x1F12190 + 15, 0x9F)
1267+
if world.dungeon_mq['Dodongos Cavern']: # Patch DC MQ Staircase Transition Actor to use permanent switch flag 0x1C
1268+
rom.write_byte(0x1F12190 + 15, 0x9C)
12691269

12701270
if world.dungeon_mq['Spirit Temple']: # Patch Spirit MQ Lobby front right chest to use permanent switch flag 0x1F
12711271
rom.write_byte(0x2b08ce4 + 13, 0x1F)

data/generated/rom_patch.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)