Merge Dev

Author: fenhl

ASM/c/item_draw_table.c

@@ -180,6 +180,7 @@ item_draw_table_entry_t item_draw_table[] = {
     [0xA2] = { draw_gi_magic_meter,         { 0x06000000, 0x06000CC0, 0x06000F08, 0x060014E8, 0x286428FF, 0x000000FF } },  // Magic Meter Scroll 2
     [0xA3] = { draw_ice_trap,               { 0x04034380 } }, // Ice trap
     [0x94] = { draw_bronze_scale,              { 0x06000AA0, 0x06000A40, 0x06000A80, 0x06000CC8 } }, // Bronze scale
+    [0xA0] = { draw_bronze_scale,           { 0x06000AA0, 0x06000A40, 0x06000A80, 0x06000CC8 } }, // Bronze scale
 };
 
 void base_draw_gi_model(z64_game_t* game, uint32_t draw_id) {

ASM/c/item_upgrades.c

@@ -86,9 +86,9 @@ uint16_t wallet_upgrade(z64_file_t* save, override_t override) {
 
 uint16_t scale_upgrade(z64_file_t* save, override_t override) {
     switch ((override.value.base.player == PLAYER_ID || !MW_PROGRESSIVE_ITEMS_ENABLE) ? extended_savectx.extended_scale : MW_PROGRESSIVE_ITEMS_STATE[override.value.base.player].scale) {
-        case 0: return 0x130; // Bronze Scale
-        case 1: return 0x37; // Silver Scale
-        default: return 0x38; // Gold Scale
+        case 0: return GI_SCALE_BRONZE; // Bronze Scale
+        case 1: return GI_SCALE_SILVER; // Silver Scale
+        default: return GI_SCALE_GOLDEN; // Gold Scale
     }
 }
 

ASM/c/save.h

@@ -10,7 +10,6 @@ typedef struct {
     override_t incoming_queue[3];
     uint8_t password[6];
     uint8_t extended_scale;
-    uint8_t pad;
 } extended_savecontext_static_t __attribute__ ((aligned (8)));
 
 

ASM/src/hacks.asm

@@ -3655,6 +3655,24 @@ DemoEffect_DrawJewel_AfterHook:
     jal chestgame_force_game_loss_right
     nop
 
+; Show a key in the unopened chest regardless of chest
+; contents if the tcg_requires_lens setting is enabled.
+; Left/right do the same check for the get item ID,
+; but use different registers for the actor spawn branch
+; and chest actor references for coordinates.
+; Replaces:
+;   lwc1    $f0, 0x0024(v1)
+;   lwc1    $f2, 0x0028(v1)
+.orga 0xE43964
+    jal chestgame_force_game_loss_left
+    nop
+; Replaces:
+;   lwc1    $f0, 0x0024(v0)
+;   lwc1    $f2, 0x0028(v0)
+.orga 0xE43A0C
+    jal chestgame_force_game_loss_right
+    nop
+
 ;==================================================================================================
 ; Bombchu Ticking Color
 ;==================================================================================================

Main.py

@@ -164,6 +164,9 @@ def build_world_graphs(settings: Settings) -> list[World]:
         if world.settings.shuffle_dungeon_rewards in ('vanilla', 'reward'):
             world.fill_bosses()
 
+        if settings.empty_dungeons_mode == 'rewards':
+            world.set_empty_dungeon_rewards(settings.empty_dungeons_rewards)
+
     if settings.triforce_hunt:
         settings.distribution.configure_triforce_hunt(worlds)