Skip to content

Commit 85d360a

Browse files
committed
Fix presets
1 parent 007c2b9 commit 85d360a

3 files changed

Lines changed: 7 additions & 25 deletions

File tree

ASM/src/hacks.asm

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3655,24 +3655,6 @@ DemoEffect_DrawJewel_AfterHook:
36553655
jal chestgame_force_game_loss_right
36563656
nop
36573657

3658-
; Show a key in the unopened chest regardless of chest
3659-
; contents if the tcg_requires_lens setting is enabled.
3660-
; Left/right do the same check for the get item ID,
3661-
; but use different registers for the actor spawn branch
3662-
; and chest actor references for coordinates.
3663-
; Replaces:
3664-
; lwc1 $f0, 0x0024(v1)
3665-
; lwc1 $f2, 0x0028(v1)
3666-
.orga 0xE43964
3667-
jal chestgame_force_game_loss_left
3668-
nop
3669-
; Replaces:
3670-
; lwc1 $f0, 0x0024(v0)
3671-
; lwc1 $f2, 0x0028(v0)
3672-
.orga 0xE43A0C
3673-
jal chestgame_force_game_loss_right
3674-
nop
3675-
36763658
;==================================================================================================
36773659
; Bombchu Ticking Color
36783660
;==================================================================================================

Main.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ def build_world_graphs(settings: Settings) -> list[World]:
164164
if world.settings.shuffle_dungeon_rewards in ('vanilla', 'reward'):
165165
world.fill_bosses()
166166

167-
if settings.empty_dungeons_mode == 'rewards':
168-
world.set_empty_dungeon_rewards(settings.empty_dungeons_rewards)
169-
170167
if settings.triforce_hunt:
171168
settings.distribution.configure_triforce_hunt(worlds)
172169

data/presets_default.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,10 @@
313313
"shuffle_silver_rupees": "vanilla",
314314
"silver_rupee_pouches_choice": "off",
315315
"silver_rupee_pouches": [],
316-
"enhance_map_compass": [],
316+
"enhance_map_compass": [
317+
"map_dungeon_location",
318+
"compass_reward"
319+
],
317320
"add_bronze_scale": false,
318321
"logic_no_night_tokens_without_suns_song": false,
319322
"disabled_locations": [
@@ -456,7 +459,7 @@
456459
"bridge_hearts": 20,
457460
"trials_random": false,
458461
"trials": 0,
459-
"shuffle_ganon_bosskey": "medallions",
462+
"shuffle_ganon_bosskey": "remove",
460463
"ganon_bosskey_medallions": 6,
461464
"ganon_bosskey_stones": 3,
462465
"ganon_bosskey_rewards": 9,
@@ -536,7 +539,7 @@
536539
"key_rings_choice": "off",
537540
"key_rings": [],
538541
"keyring_give_bk": false,
539-
"shuffle_bosskeys": "dungeon",
542+
"shuffle_bosskeys": "vanilla",
540543
"shuffle_silver_rupees": "vanilla",
541544
"silver_rupee_pouches_choice": "off",
542545
"silver_rupee_pouches": [],
@@ -2246,7 +2249,7 @@
22462249
"special_deal_price_min": 0,
22472250
"special_deal_price_max": 200,
22482251
"tokensanity": "off",
2249-
"shuffle_scrubs": "low",
2252+
"shuffle_scrubs": "off",
22502253
"shuffle_child_trade": [],
22512254
"adult_trade_shuffle": false,
22522255
"adult_trade_start": [

0 commit comments

Comments
 (0)