Skip to content

Fix MQ DC Staircase silver rupees shared flag #2504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rrealmuto wants to merge 1 commit into
base: Dev
Choose a base branch
from
Open

Fix MQ DC Staircase silver rupees shared flag #2504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ASM/build/bundle.o
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ASM/c/item_effects.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void give_small_key_ring(z64_file_t* save, int16_t dungeon_id, int16_t arg2) {

silver_rupee_data_t silver_rupee_vars[0x16][2] = {
//Vanilla, Master Quest
{{-1, 0xFF, 0x00, 0x00, 0x00, 2}, { 5, 0x1F, 0xFF, 0xFF, 0xFF, 2}}, // Dodongos Cavern Staircase. Patched to use switch flag 0x1F
{{-1, 0xFF, 0x00, 0x00, 0x00, 2}, { 5, 0x1C, 0xFF, 0xFF, 0xFF, 2}}, // Dodongos Cavern Staircase. Patched to use switch flag 0x1C
{{ 5, 0x08, 0x00, 0xFF, 0xFF, 3}, {-1, 0xFF, 0x00, 0x00, 0x00, 3}}, // Ice Cavern Spinning Scythe
{{ 5, 0x09, 0x00, 0x64, 0xFF, 5}, {-1, 0xFF, 0x00, 0x00, 0x00, 5}}, // Ice Cavern Push Block
{{ 5, 0x1F, 0xFF, 0xFF, 0xFF, 1}, {-1, 0xFF, 0x00, 0x00, 0x00, 1}}, // Bottom of the Well Basement
Expand Down
4 changes: 2 additions & 2 deletions Patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,8 +1264,8 @@ def calculate_traded_flags(world):
if world.settings.shuffle_silver_rupees != 'remove':
rom.write_byte(rom.sym('CFG_DUNGEON_INFO_SILVER_RUPEES'), 1)

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

if world.dungeon_mq['Spirit Temple']: # Patch Spirit MQ Lobby front right chest to use permanent switch flag 0x1F
rom.write_byte(0x2b08ce4 + 13, 0x1F)
Expand Down
2 changes: 1 addition & 1 deletion data/generated/rom_patch.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.