Update to main dev and address reviews

GSKirox · GSKirox · commit 6179a623923f · 2025-12-17T11:03:19.000+01:00
diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt
diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o
diff --git a/ASM/build/c_symbols.txt b/ASM/build/c_symbols.txt
diff --git a/ASM/c/file_icons.c b/ASM/c/file_icons.c
@@ -173,7 +173,7 @@ static const variable_tile_data_t variable_tile_positions[NUM_VARIABLE] = {
     {0, {0x4E, 0x2A}}, // Strength
     {0, {0x5A, 0x2A}}, // Scale
 };
-static uint8_t bronze_scale_marker = 0;
+static bool bronze_scale_marker = false;
 
 typedef struct {
     colorRGB8_t color;
@@ -946,9 +946,9 @@ static void populate_upgrade_equip(const z64_file_t* file, variable_tile_t* tile
 
 static void populate_upgrade_scale(const z64_file_t* file, variable_tile_t* tile, uint8_t value, uint8_t base_tile) {
     tile->tile_index = base_tile;
-    bronze_scale_marker = 0;
+    bronze_scale_marker = false;
     if (value == 0) {
-        bronze_scale_marker = 1;
+        bronze_scale_marker = true;
         tile->enabled = 0;
     }
     if (value == 1) {
diff --git a/ASM/c/item_draw_table.c b/ASM/c/item_draw_table.c
@@ -179,8 +179,7 @@ item_draw_table_entry_t item_draw_table[] = {
     [0xA1] = { draw_gi_deku_nut_with_flame, { 0x06000E90, 0xC0C0C0FF, 0xC0C0C0FF } }, // Deku Nut Upgrade w/ Smoke Effect
     [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
+    [0xA4] = { draw_bronze_scale,           { 0x06000AA0, 0x06000A40, 0x06000A80, 0x06000CC8 } }, // Bronze scale
 };
 
 void base_draw_gi_model(z64_game_t* game, uint32_t draw_id) {
diff --git a/ASM/c/item_effects.c b/ASM/c/item_effects.c
@@ -289,14 +289,13 @@ void give_progressive_scale(z64_file_t* save, int16_t arg1, int16_t arg2) {
         case 0: // Bronze scale
             extended_savectx.extended_scale = 1;
             break;
-        case 1:
+        case 1: // Silver scale
             extended_savectx.extended_scale = 2;
             save->diving_upgrade = 1;
             break;
-        case 2:
+        case 2: // Gold scale
             extended_savectx.extended_scale = 3;
             save->diving_upgrade = 2;
             break;
     }
-
 }
diff --git a/ASM/c/item_table.c b/ASM/c/item_table.c
@@ -84,8 +84,8 @@ item_row_t item_table[GI_RANDO_MAX] = {
     [GI_BOMB_BAG_40]                                            = ITEM_ROW(0x53,      GILDED_CHEST, 0x4F, -1, 0x005A, 0x00BF, 0x1A, no_upgrade, no_effect, -1, -1, NULL), // Biggest Bomb Bag
     [GI_SILVER_GAUNTLETS]                                       = ITEM_ROW(0x53,      GILDED_CHEST, 0x51, -1, 0x005B, 0x012D, 0x49, no_upgrade, no_effect, -1, -1, NULL), // Silver Gauntlets
     [GI_GOLD_GAUNTLETS]                                         = ITEM_ROW(0x53,      GILDED_CHEST, 0x52, -1, 0x005C, 0x012D, 0x4A, no_upgrade, no_effect, -1, -1, NULL), // Golden Gauntlets
-    [GI_SCALE_SILVER]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x53, -1, 0x00CD, 0x00DB, 0x2A, no_upgrade, no_effect, -1, -1, NULL), // Silver Scale
-    [GI_SCALE_GOLDEN]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x54, -1, 0x00CE, 0x00DB, 0x2B, no_upgrade, no_effect, -1, -1, NULL), // Golden Scale
+    [GI_SCALE_SILVER]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x53, -1, 0x00CD, 0x00DB, 0x2A, no_upgrade, give_progressive_scale, 1, -1, NULL), // Silver Scale
+    [GI_SCALE_GOLDEN]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x54, -1, 0x00CE, 0x00DB, 0x2B, no_upgrade, give_progressive_scale, 2, -1, NULL), // Golden Scale
     [GI_STONE_OF_AGONY]                                         = ITEM_ROW(0x53,      GILDED_CHEST, 0x6F, -1, 0x0068, 0x00C8, 0x21, no_upgrade, no_effect, -1, -1, NULL), // Stone of Agony
     [GI_GERUDOS_CARD]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x70, -1, 0x007B, 0x00D7, 0x24, no_upgrade, no_effect, -1, -1, NULL), // Gerudo Membership Card
 
@@ -347,7 +347,8 @@ item_row_t item_table[GI_RANDO_MAX] = {
     [GI_WATER_MEDALLION]                                        = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x003D, 0x01B1, 0x98, no_upgrade, give_quest_item,  2, -1, NULL), // Water Medallion
     [GI_SHADOW_MEDALLION]                                       = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x0041, 0x01B2, 0x99, no_upgrade, give_quest_item,  4, -1, NULL), // Shadow Medallion
     [GI_SPIRIT_MEDALLION]                                       = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x003F, 0x01B3, 0x9A, no_upgrade, give_quest_item,  3, -1, NULL), // Spirit Medallion
-    [0x0130] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x90B4, 0x00DB, 0x95, no_upgrade, give_progressive_scale, 0, -1, NULL), // Bronze Scale
+
+    [GI_SCALE_BRONZE]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x54, -1, 0x90B6, 0x00DB, 0xA5, no_upgrade, give_progressive_scale, 0, -1, NULL), // Golden Scale
 };
 
 /*  Determine which message to display based on the number of silver rupees collected.
diff --git a/ASM/c/item_table.h b/ASM/c/item_table.h
@@ -341,10 +341,12 @@ typedef enum GetItemID {
     /* 0x012E */ GI_SHADOW_MEDALLION,
     /* 0x012F */ GI_SPIRIT_MEDALLION,
 
-    /* 0x0130 */ GI_RANDO_MAX
+    /* 0x0130 */ GI_SCALE_BRONZE, // Bronze Scale
+
+    /* 0x0131 */ GI_RANDO_MAX
 } GetItemId;
 
-_Static_assert(GI_RANDO_MAX == 0x0130, "Remember to update the comment and the assert for the value of GI_RANDO_MAX when adding new items");
+_Static_assert(GI_RANDO_MAX == 0x0131, "Remember to update the comment and the assert for the value of GI_RANDO_MAX when adding new items");
 
 typedef enum {
     /*  0 */ BROWN_CHEST,            // big default chest
diff --git a/ASM/src/coop_state.asm b/ASM/src/coop_state.asm
@@ -1,7 +1,7 @@
 COOP_CONTEXT:
 
 COOP_VERSION:
-.word 7 ; Increment this if layout of co-op state changes
+.word 8 ; Increment this if layout of co-op state changes
 
 PLAYER_ID:
 .byte 0x00 ; Written by frontend
diff --git a/ItemList.py b/ItemList.py
@@ -320,7 +320,9 @@ class GetItemId(IntEnum):
     GI_SHADOW_MEDALLION = 0x012E
     GI_SPIRIT_MEDALLION = 0x012F
 
-    GI_RANDO_MAX = 0x0130
+    GI_SCALE_BRONZE = 0x0130
+
+    GI_RANDO_MAX = 0x0131
 
 # Progressive: True  -> Advancement
 #              False -> Priority
@@ -423,7 +425,7 @@ class GetItemId(IntEnum):
     'Bow':                                             ('Item',     True,  GetItemId.GI_PROGRESSIVE_BOW, None),
     'Slingshot':                                       ('Item',     True,  GetItemId.GI_PROGRESSIVE_SLINGSHOT, None),
     'Progressive Wallet':                              ('Item',     True,  GetItemId.GI_PROGRESSIVE_WALLET, {'progressive': 3}),
-    'Progressive Scale':                               ('Item',     True,  GetItemId.GI_PROGRESSIVE_SCALE, {'progressive': 2}),
+    'Progressive Scale':                               ('Item',     True,  GetItemId.GI_PROGRESSIVE_SCALE, {'progressive': 3}),
     'Deku Nut Capacity':                               ('Item',     None,  GetItemId.GI_PROGRESSIVE_NUT_CAPACITY, None),
     'Deku Stick Capacity':                             ('Item',     None,  GetItemId.GI_PROGRESSIVE_STICK_CAPACITY, None),
     'Bombchus':                                        ('Item',     True,  GetItemId.GI_PROGRESSIVE_BOMBCHUS, None),
diff --git a/ItemPool.py b/ItemPool.py
@@ -1017,6 +1017,9 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:
         for ocarina_button in ocarina_buttons:
             world.state.collect(ItemFactory(ocarina_button, world))
 
+    if not world.settings.add_bronze_scale:
+        world.state.collect(ItemFactory('Progressive Scale', world))
+
     for _ in range(world.settings.random_starting_items_count):
         random_starting_items_pool = configure_random_starting_items_pool(world, pool)
         selected_item = random.choice(random_starting_items_pool)
diff --git a/Messages.py b/Messages.py
@@ -290,7 +290,7 @@
     (0x90B3, "\x08\x13\x58You got \x05\x41Deku Seeds\x05\x40!\x01Use these as bullets\x01for your Slingshot."),
     (0x90B4, "\x08You found a \x05\x41fairy\x05\x40!\x01Your health has been restored!"),
     (0x90B5, "\x08You found \x05\x43literally nothing\x05\x40!"),
-    (0x90B4, "\x08You got the \x05\x43Bronze Scale\x05\x40!\x01You learned how\x01to swim on surface!"),
+    (0x90B6, "\x08You got the \x05\x43Bronze Scale\x05\x40!\x01You learned how\x01to swim on surface!"),
 ]
 
 IMPORTANT_ITEM_MESSAGES: list[tuple[int, str]] = [
diff --git a/Notes/coop-ctx.md b/Notes/coop-ctx.md
@@ -31,7 +31,7 @@ The starting address of the co-op context is listed at address `0x8040_0000` (at
 |`0x0814`|`CFG_FILE_SELECT_HASH`|4|`0x0005`|The 5 icons displayed at the top of the file select screen, represented as indices into the `HASH_ICONS` list in Spoiler.py.|
 |`0x081C`|`MW_PROGRESSIVE_ITEMS_STATE`|5|`0x0400`|The multiworld plugin can store data representing the state of progressive items of all players here. If `MW_PROGRESSIVE_ITEMS_ENABLE` is set to `1`, the game will use this to render outgoing progressive items instead of basing them on the sender's inventory. The data is an array of 256 bitfields, each 4 bytes long, with the entry at index 0 unused. For documentation of the bitflags, see `mw_progressive_items_state_t` in `item_upgrades.c`. Note that the `chu_bag` flag only has any effect in versions 6+ of the co-op context.|
 
-# Version 7
+# Version 7-8
 
 |Offset|Name|Min version|Size|Description|
 |--:|---|--:|--:|---|
diff --git a/SaveContext.py b/SaveContext.py
@@ -1293,7 +1293,7 @@ def get_save_context_addresses() -> AddressesDict:
         "Spirit Medallion"       : {'quest.medallions.spirit'        : True},
         "Shadow Medallion"       : {'quest.medallions.shadow'        : True},
         "Progressive Strength Upgrade" : {'upgrades.strength_upgrade' : None},
-        "Progressive Scale"            : {'extented_scale.medal'   : None},
+        "Progressive Scale"            : {'extented_scale.medal'      : None},
         "Progressive Wallet"           : {'upgrades.wallet'           : None},
         "Gold Skulltula Token" : {
             'quest.gold_skulltula'  : True,
diff --git a/SettingsList.py b/SettingsList.py
@@ -3669,28 +3669,6 @@ class SettingInfos:
         shared          = True,
     )
 
-    enhance_map_compass = Checkbutton(
-        gui_text       = 'Maps and Compasses Give Information',
-        gui_tooltip    = '''\
-            Gives the Map and Compass extra functionality.
-            Map will tell if a dungeon is vanilla or Master Quest.
-            Compass will tell what medallion or stone is within.
-            The Temple of Time Altar will no longer provide
-            information on the location of medallions and stones.
-
-            'Maps/Compasses: Remove': The dungeon information is
-            not available anywhere in the game.
-
-            'Maps/Compasses: Start With': The dungeon information
-            is available immediately from the dungeon menu.
-        ''',
-        default        = False,
-        shared         = True,
-        gui_params     = {
-            'randomize_key': 'randomize_settings',
-        },
-    )
-
     # Detailed Logic (except "Guarantee Reachable Locations")
 
     logic_no_night_tokens_without_suns_song = Checkbutton(
diff --git a/data/Hints/league.json b/data/Hints/league.json
@@ -4,8 +4,7 @@
     "description":           "Hint Distribution for the S9 of League. 6 Always, 5 Path, 3 Important Checks, 3 Sometimes, 2 Dual Hints, 30/40/50 skull hints in house of skulltula",
     "add_locations":         [
         { "location": "Deku Theater Skull Mask", "types": ["always"] },
-        { "location": "Sheik in Kakariko", "types": ["always"] },
-        { "location": "DMC Deku Scrub", "types": ["always"] }
+        { "location": "Sheik in Kakariko", "types": ["always"] }
     ],
     "remove_locations":      [
         { "location": "Sheik in Crater", "types": ["sometimes"] },
diff --git a/data/Hints/weekly.json b/data/Hints/weekly.json
@@ -13,7 +13,6 @@
         { "location": "Sheik in Forest", "types": ["sometimes"] },
         { "location": "Sheik at Temple", "types": ["sometimes"] },
         { "location": "Sheik in Crater", "types": ["sometimes"] },
-        { "location": "Sheik in Ice Cavern", "types": ["sometimes"] },
         { "location": "Sheik at Colossus", "types": ["sometimes"] },
         { "location": "GF HBA 1500 Points", "types": ["sometimes"] },
         { "location": "GC Maze Left Chest", "types": ["sometimes"] },
@@ -26,9 +25,8 @@
     ],
     "add_items":             [],
     "remove_items":          [
-        { "item": "Zeldas Lullaby", "types": ["woth"] }
+        { "item": "Zeldas Lullaby", "types": ["goal"] }
     ],
-    "dungeons_woth_limit":   2,
     "dungeons_barren_limit": 1,
     "one_hint_per_goal":     true,
     "named_items_required":  true,
diff --git a/data/generated/patch_symbols.json b/data/generated/patch_symbols.json
diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt
diff --git a/data/generated/symbols.json b/data/generated/symbols.json
diff --git a/data/presets_default.json b/data/presets_default.json
