Skip to content

Commit 5a7bbe1

Browse files
committed
Move item ID to 0x130
1 parent b54b795 commit 5a7bbe1

4 files changed

Lines changed: 750 additions & 711 deletions

File tree

ASM/c/item_table.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ item_row_t item_table[GI_RANDO_MAX] = {
347347
[GI_WATER_MEDALLION] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x003D, 0x01B1, 0x98, no_upgrade, give_quest_item, 2, -1, NULL), // Water Medallion
348348
[GI_SHADOW_MEDALLION] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x0041, 0x01B2, 0x99, no_upgrade, give_quest_item, 4, -1, NULL), // Shadow Medallion
349349
[GI_SPIRIT_MEDALLION] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x003F, 0x01B3, 0x9A, no_upgrade, give_quest_item, 3, -1, NULL), // Spirit Medallion
350+
[0x0130] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x90B4, 0x00DB, 0x95, no_upgrade, give_progressive_scale, 0, -1, NULL), // Bronze Scale
350351
};
351352

352353
/* Determine which message to display based on the number of silver rupees collected.

ASM/c/item_upgrades.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ uint16_t wallet_upgrade(z64_file_t* save, override_t override) {
8686

8787
uint16_t scale_upgrade(z64_file_t* save, override_t override) {
8888
switch ((override.value.base.player == PLAYER_ID || !MW_PROGRESSIVE_ITEMS_ENABLE) ? extended_savectx.extended_scale : MW_PROGRESSIVE_ITEMS_STATE[override.value.base.player].scale) {
89-
case 0: return 0x119; // Bronze Scale
89+
case 0: return 0x130; // Bronze Scale
9090
case 1: return 0x37; // Silver Scale
9191
default: return 0x38; // Gold Scale
9292
}

0 commit comments

Comments
 (0)