Option to allow progressive items to give all the upgrades at once

ASM/c/actor.c

@@ -107,7 +107,6 @@ void Actor_StoreChestType(z64_actor_t* actor, z64_game_t* game) {
         if (POTCRATE_TEXTURES_MATCH_CONTENTS == PTMC_UNCHECKED && override.key.all > 0) { // For "unchecked" PTMC setting: Check if we have an override which means it wasn't collected.
             *pChestType = GILDED_CHEST;
         } else if(POTCRATE_TEXTURES_MATCH_CONTENTS == PTMC_CONTENTS) {
-            uint16_t item_id = resolve_upgrades(override);
             item_row_t *row = get_item_row(override.value.looks_like_item_id);
             if (row == NULL) {
                 row = get_item_row(override.value.base.item_id);

ASM/c/item_effects.c

@@ -267,3 +267,21 @@ void unlock_ocarina_note(z64_file_t *save, int16_t arg1, int16_t arg2) {
             break;
     }
 }
+
+void give_max_upgrade_bomb_bag(z64_file_t *save, int16_t arg1, int16_t arg2) {
+    z64_Inventory_ChangeUpgrade(UPG_BOMB_BAG, 3);
+    INV_CONTENT(ITEM_BOMB) = ITEM_BOMB;
+    AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 3);
+}
+
+void give_max_upgrade_bow(z64_file_t *save, int16_t arg1, int16_t arg2) {
+    z64_Inventory_ChangeUpgrade(UPG_QUIVER, 3);
+    INV_CONTENT(ITEM_BOW) = ITEM_BOW;
+    AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 3);
+}
+
+void give_max_upgrade_slingshot(z64_file_t *save, int16_t arg1, int16_t arg2) {
+    z64_Inventory_ChangeUpgrade(UPG_BULLET_BAG, 3);
+    INV_CONTENT(ITEM_SLINGSHOT) = ITEM_SLINGSHOT;
+    AMMO(ITEM_SLINGSHOT) = CAPACITY(UPG_BULLET_BAG, 3);
+}

ASM/c/item_effects.h

@@ -31,6 +31,9 @@ void give_bombchus(z64_file_t *save, int16_t arg1, int16_t arg2);
 void trade_quest_upgrade(z64_file_t *save, int16_t item_id, int16_t arg2);
 extern uint8_t KEYRING_BOSSKEY_CONDITION;
 void unlock_ocarina_note(z64_file_t *save, int16_t arg1, int16_t arg2);
+void give_max_upgrade_bomb_bag(z64_file_t *save, int16_t arg1, int16_t arg2);
+void give_max_upgrade_bow(z64_file_t *save, int16_t arg1, int16_t arg2);
+void give_max_upgrade_slingshot(z64_file_t *save, int16_t arg1, int16_t arg2);
 
 typedef enum dungeon {
     DEKU_ID       = 0,

ASM/c/item_table.c

@@ -156,18 +156,18 @@ item_row_t item_table[] = {
     [0x007E] = ITEM_ROW(0x3E, HEART_CHEST_SMALL, 0x41, -1, 0x90C6, 0x00BD, 0x13, no_upgrade, full_heal, -1, -1, NULL), // Capped Heart Container
     [0x007F] = ITEM_ROW(0x53, HEART_CHEST_SMALL, 0x41, -1, 0x90FA, 0x00BD, 0x14, no_upgrade, full_heal, -1, -1, NULL), // Capped Piece of Heart (Chest Game)
 
-    [0x0080] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x00DD, 0x2D, hookshot_upgrade,  no_effect, -1, -1, NULL), // Progressive Hookshot
-    [0x0081] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x0147, 0x58, strength_upgrade,  no_effect, -1, -1, NULL), // Progressive Strength
-    [0x0082] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x00BF, 0x18, bomb_bag_upgrade,  no_effect, -1, -1, NULL), // Progressive Bomb Bag
-    [0x0083] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x00E9, 0x35, bow_upgrade,       no_effect, -1, -1, NULL), // Progressive Bow
-    [0x0084] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x00E7, 0x33, slingshot_upgrade, no_effect, -1, -1, NULL), // Progressive Slingshot
-    [0x0085] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x00D1, 0x22, wallet_upgrade,    no_effect, -1, -1, NULL), // Progressive Wallet
-    [0x0086] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x00DB, 0x2A, scale_upgrade,     no_effect, -1, -1, NULL), // Progressive Scale
-    [0x0087] = ITEM_ROW(  -1,       BROWN_CHEST,   -1, -1,    -1, 0x00BB, 0x12, nut_upgrade,       no_effect, -1, -1, NULL), // Progressive Nut Capacity
-    [0x0088] = ITEM_ROW(  -1,       BROWN_CHEST,   -1, -1,    -1, 0x00C7, 0x1B, stick_upgrade,     no_effect, -1, -1, NULL), // Progressive Stick Capacity
-    [0x0089] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x00D9, 0x28, bombchu_upgrade,   no_effect, -1, -1, NULL), // Progressive Bombchus
-    [0x008A] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x00CD, 0x1E, magic_upgrade,     no_effect, -1, -1, NULL), // Progressive Magic Meter
-    [0x008B] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,    -1, 0x010E, 0x46, ocarina_upgrade,   no_effect, -1, -1, NULL), // Progressive Ocarina
+    [0x0080] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00DD, 0x2D, hookshot_upgrade,  no_effect, -1, -1, NULL), // Progressive Hookshot
+    [0x0081] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x0147, 0x58, strength_upgrade,  no_effect, -1, -1, NULL), // Progressive Strength
+    [0x0082] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00BF, 0x18, bomb_bag_upgrade,  no_effect, -1, -1, NULL), // Progressive Bomb Bag
+    [0x0083] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00E9, 0x35, bow_upgrade,       no_effect, -1, -1, NULL), // Progressive Bow
+    [0x0084] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00E7, 0x33, slingshot_upgrade, no_effect, -1, -1, NULL), // Progressive Slingshot
+    [0x0085] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00D1, 0x22, wallet_upgrade,    no_effect, -1, -1, NULL), // Progressive Wallet
+    [0x0086] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00DB, 0x2A, scale_upgrade,     no_effect, -1, -1, NULL), // Progressive Scale
+    [0x0087] = ITEM_ROW(  -1,       BROWN_CHEST,   -1, -1,     -1, 0x00BB, 0x12, nut_upgrade,       no_effect, -1, -1, NULL), // Progressive Nut Capacity
+    [0x0088] = ITEM_ROW(  -1,       BROWN_CHEST,   -1, -1,     -1, 0x00C7, 0x1B, stick_upgrade,     no_effect, -1, -1, NULL), // Progressive Stick Capacity
+    [0x0089] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00D9, 0x28, bombchu_upgrade,   no_effect, -1, -1, NULL), // Progressive Bombchus
+    [0x008A] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00CD, 0x1E, magic_upgrade,     no_effect, -1, -1, NULL), // Progressive Magic Meter
+    [0x008B] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x010E, 0x46, ocarina_upgrade,   no_effect, -1, -1, NULL), // Progressive Ocarina
 
     [0x008C] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x90A0, 0x00C6, 0x01, no_upgrade, give_bottle, 0x15, -1, NULL), // Bottle with Red Potion
     [0x008D] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x90A1, 0x00C6, 0x01, no_upgrade, give_bottle, 0x16, -1, NULL), // Bottle with Green Potion
@@ -328,6 +328,19 @@ item_row_t item_table[] = {
     [0x0117] = ITEM_ROW(0x53,      SILVER_CHEST, 0x41, -1, 0x00A1, 0x01A1, 0x88, no_upgrade, give_small_key, CASTLE_ID, -1, resolve_text_small_keys), // Ganon's Castle Small Key
     [0x0118] = ITEM_ROW(0x53,      SILVER_CHEST, 0x41, -1, 0x913E, 0x01A2, 0x89, no_upgrade, give_small_key, TCG_ID,    -1, resolve_text_small_keys_cmg), // Small Key (Chest Game)
 
+    [0x0119] = ITEM_ROW(0x53,      GILDED_CHEST, 0x0B, -1, 0x004F, 0x00DD, 0x2E, no_upgrade, no_effect, -1, -1, NULL), // Max Upgrade Hookshot
+    [0x011A] = ITEM_ROW(0x53,      GILDED_CHEST, 0x52, -1, 0x005C, 0x012D, 0x4A, no_upgrade, no_effect, -1, -1, NULL), // Max Upgrade Strength
+    [0x011B] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x90B4, 0x00BF, 0x18, no_upgrade, give_max_upgrade_bomb_bag, -1, -1, NULL), // Max Upgrade Bomb Bag
+    [0x011C] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x90B5, 0x00E9, 0x35, no_upgrade, give_max_upgrade_bow, -1, -1, NULL), // Max Upgrade Bow
+    [0x011D] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x90B6, 0x00E7, 0x33, no_upgrade, give_max_upgrade_slingshot, -1, -1, NULL), // Max Upgrade Slingshot
+    [0x011E] = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00D1, 0x22, max_upgrade_wallet_upgrade, no_effect, 3, -1, NULL), // Max Upgrade Wallet
+    [0x011F] = ITEM_ROW(0x53,      GILDED_CHEST, 0x54, -1, 0x00CE, 0x00DB, 0x2B, no_upgrade, no_effect, -1, -1, NULL), // Max Upgrade Scale
+    [0x0120] = ITEM_ROW(0x53,       BROWN_CHEST, 0x9B, -1, 0x00A8, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1, NULL), // Max Upgrade Nut
+    [0x0121] = ITEM_ROW(0x53,       BROWN_CHEST, 0x99, -1, 0x0091, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1, NULL), // Max Upgrade Stick
+    [0x0122] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x9019, 0x0197, 0x7E, no_upgrade, give_bombchus, 20, -1, NULL), // Max Upgrade Bombchu
+    [0x0123] = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x00E8, 0x00CD, 0x1F, no_upgrade, give_double_magic, -1, -1, NULL), // Max Upgrade Magic
+    [0x0124] = ITEM_ROW(0x53,      GILDED_CHEST, 0x08, -1, 0x003A, 0x00DE, 0x2F, no_upgrade, no_effect, -1, -1, NULL), // Max Upgrade Ocarina
+
 };
 
 /*  Determine which message to display based on the number of silver rupees collected.

ASM/c/item_upgrades.c

@@ -2,6 +2,7 @@
 
 #include "get_items.h"
 #include "z64.h"
+#include "shop.h"
 
 extern uint32_t FREE_BOMBCHU_DROPS;
 
@@ -29,7 +30,6 @@ extern uint8_t PLAYER_ID;
 extern uint8_t MW_PROGRESSIVE_ITEMS_ENABLE;
 extern mw_progressive_items_state_t MW_PROGRESSIVE_ITEMS_STATE[256];
 
-
 uint16_t no_upgrade(z64_file_t *save, override_t override) {
     return override.value.base.item_id;
 }
@@ -112,10 +112,10 @@ uint16_t magic_upgrade(z64_file_t *save, override_t override) {
 }
 
 uint16_t bombchu_upgrade(z64_file_t *save, override_t override) {
-    if (save->items[Z64_SLOT_BOMBCHU] == -1) {
+    if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
         return 0x6B; // Bombchu 20 pack
     }
-    if (save->ammo[8] <= 5) {
+    if (AMMO(ITEM_BOMBCHU) <= 5) {
         return 0x03; // Bombchu 10 pack
     }
     return 0x6A; // Bombchu 5 pack
@@ -128,6 +128,13 @@ uint16_t ocarina_upgrade(z64_file_t *save, override_t override) {
     }
 }
 
+uint16_t max_upgrade_wallet_upgrade(z64_file_t *save, override_t override) {
+    if (CFG_SHOPSANITY_ENABLED) {
+        return 0xC7; // Tycoon's Wallet
+    }
+    return 0x46; // Giant's Wallet
+}
+
 uint16_t arrows_to_rupee(z64_file_t *save, override_t override) {
     return ((override.value.base.player == PLAYER_ID || !MW_PROGRESSIVE_ITEMS_ENABLE) ? save->quiver : MW_PROGRESSIVE_ITEMS_STATE[override.value.base.player].bow) ? override.value.base.item_id : 0x4D; // Blue Rupee
 }

ASM/c/item_upgrades.h

@@ -26,5 +26,6 @@ uint16_t letter_to_bottle(z64_file_t *save, override_t override);
 uint16_t health_upgrade_cap(z64_file_t *save, override_t override);
 uint16_t bombchus_to_bag(z64_file_t *save, override_t override);
 uint16_t upgrade_key_model(z64_file_t *save, override_t override);
+uint16_t max_upgrade_wallet_upgrade(z64_file_t *save, override_t override);
 
 #endif

ASM/c/shop.h

@@ -0,0 +1,8 @@
+#ifndef SHOP_H
+#define SHOP_H
+
+#include <stdint.h>
+
+extern uint8_t CFG_SHOPSANITY_ENABLED;
+
+#endif

ASM/c/z64.h

@@ -1854,11 +1854,24 @@ typedef enum {
 } PauseBgPreRenderState;
 
 
+typedef enum UpgradeType {
+    /* 0x00 */ UPG_QUIVER,
+    /* 0x01 */ UPG_BOMB_BAG,
+    /* 0x02 */ UPG_STRENGTH,
+    /* 0x03 */ UPG_SCALE,
+    /* 0x04 */ UPG_WALLET,
+    /* 0x05 */ UPG_BULLET_BAG,
+    /* 0x06 */ UPG_DEKU_STICKS,
+    /* 0x07 */ UPG_DEKU_NUTS,
+    /* 0x08 */ UPG_MAX
+} UpgradeType;
 
 /* helper macros */
 #define LINK_IS_ADULT (z64_file.link_age == 0)
 #define SLOT(item) gItemSlots[item]
 #define INV_CONTENT(item) z64_file.items[SLOT(item)]
+#define AMMO(item) z64_file.ammo[SLOT(item)]
+#define CAPACITY(upg, value) gUpgradeCapacities[upg][value]
 
 /* dram addresses */
 #define z64_EnItem00Action_addr                 0x800127E0
@@ -1881,6 +1894,7 @@ typedef enum {
 #define z64_SwitchAgeEquips_addr                0x8006F804
 #define z64_UpdateItemButton_addr               0x8006FB50
 #define z64_GiveItem_addr                       0x8006FDCC
+#define z64_Inventory_ChangeUpgrade_addr        0x80081294
 #define z64_UpdateEquipment_addr                0x80079764
 #define z64_LoadRoom_addr                       0x80080A3C
 #define z64_UnloadRoom_addr                     0x80080C98
@@ -1916,6 +1930,8 @@ typedef enum {
 #define z64_link_addr                           0x801DAA30
 #define z64_state_ovl_tab_addr                  0x800F1340
 #define z64_event_state_1_addr                  0x800EF1B0
+#define gItemSlots_addr                         0x800F8F34
+#define gUpgradeCapacities_addr                 0x800F8CCC
 #define z64_LinkInvincibility_addr              0x8038E578
 #define z64_LinkDamage_addr                     0x8038E6A8
 #define z64_ObjectSpawn_addr                    0x800812F0
@@ -1991,6 +2007,8 @@ typedef void (*z64_DisplayTextbox_proc)   (z64_game_t *game, uint16_t text_id,
                                            int unknown_);
 typedef void (*z64_GiveItem_proc)         (z64_game_t *game, uint8_t item);
 
+typedef void (*z64_Inventory_ChangeUpgrade_proc)(int16_t upgrade, int16_t value);
+
 typedef void(*z64_LinkDamage_proc)        (z64_game_t *ctxt, z64_link_t *link,
                                            uint8_t damage_type, float unk_00, uint32_t unk_01,
                                            uint16_t unk_02);
@@ -2050,6 +2068,11 @@ typedef uint16_t (*z64_Audio_GetActiveSeqId_proc)(uint8_t seqId);
                                                       z64_state_ovl_tab_addr)
 #define z64_event_state_1       (*(uint32_t*)         z64_event_state_1_addr)
 
+//extern uint8_t gItemSlots[56];
+#define gItemSlots              ( (uint8_t*) gItemSlots_addr)
+
+// extern uint16_t gUpgradeCapacities[UPG_MAX][4];
+#define gUpgradeCapacities      ( (uint16_t (*)[4]) gUpgradeCapacities_addr)
 
 /* functions */
 #define z64_ActorKill               ((z64_ActorKillFunc)    z64_ActorKill_addr)
@@ -2081,6 +2104,8 @@ typedef uint16_t (*z64_Audio_GetActiveSeqId_proc)(uint8_t seqId);
                                                       z64_DisplayTextbox_addr)
 #define z64_GiveItem            ((z64_GiveItem_proc)  z64_GiveItem_addr)
 
+#define z64_Inventory_ChangeUpgrade ((z64_Inventory_ChangeUpgrade_proc) z64_Inventory_ChangeUpgrade_addr)
+
 #define z64_LinkDamage          ((z64_LinkDamage_proc)z64_LinkDamage_addr)
 #define z64_LinkInvincibility   ((z64_LinkInvincibility_proc)                 \
                                                       z64_LinkInvincibility_addr)

ASM/src/shop.asm

@@ -1,7 +1,12 @@
 .definelabel Shop_Item_Save_Offset, 0xD4 + (0x2C * 0x1C) + 0x10
 
 CFG_MASK_SHOP_HINT:
-    .word 0x00000000
+    .byte 0
+
+CFG_SHOPSANITY_ENABLED:
+    .byte 0
+
+.align 4
 
 Shop_Check_Sold_Out:
     lhu  t6, 0x1c(a0)
@@ -157,7 +162,7 @@ mask_shop_display:
     beq     a2, at, @@mask_of_truth
     nop
     ; rest of the slots are right side masks
-    lw      at, CFG_MASK_SHOP_HINT
+    lbu     at, CFG_MASK_SHOP_HINT
     bnez    at, @@mask_of_truth
     nop
     b       @@display_func

HintList.py

@@ -525,6 +525,19 @@ def tokens_required_by_settings(world: World) -> int:
     'Ocarina C left Button':                                    (["a somewhat high note"], "the Ocarina C left Button", 'item'),
     'Ocarina C right Button':                                   (["a middle note"], "the Ocarina C right Button", 'item'),
 
+    'Max Upgrade Hookshot':                                     (["Water Tenple's keepsake", "the largest Grapple Beam", "the BOINGEST! chain"], "a Max Upgrade Hookshot", 'item'),
+    'Max Upgrade Strength':                                     (["power gloves", "metal mittens", "the heavy lifty"], "a Max Upgrade Strength", 'item'),
+    'Max Upgrade Bomb Bag':                                     (["biggest explosive container", "a huge blast bag"], "a Max Upgrade Bomb Bag", 'item'),
+    'Max Upgrade Bow':                                          (["a fully archery enabler", "a very danger dart launcher"], "a Max Upgrade Bow", 'item'),
+    'Max Upgrade Slingshot':                                    (["a seed shooter", "a rubberband", "a child's catapult"], "a Max Upgrade Slingshot", 'item'),
+    'Max Upgrade Wallet':                                       (["the biggest mo' money holder", "a big gem purse", "a huge portable bank"], "a Max Upgrade Wallet", 'item'),
+    'Max Upgrade Scale':                                        (["the deepest dive", "a piece of Zora"], "a Max Upgrade Zora Scale", 'item'),
+    'Max Upgrade Nut':                                          (["even more nuts", "the largest flashbang storage"], "Max Upgrade Deku Nut Capacity", 'item'),
+    'Max Upgrade Stick':                                        (["tons of lumber rack", "even more flammable twigs"], "Max Upgrade Deku Stick Capacity", 'item'),
+    'Max Upgrade Bombchu':                                      (["tons of mice bombs", "tons of proximity mice", "tons of wall crawlers", "tons of trail blazers"], "Max Upgrade Bombchus", 'item'),
+    'Max Upgrade Magic':                                        (["ultimate mystic training", "lots of pixie dust", "the largest green rectangle"], "a Max Upgrade Magic Meter", 'item'),
+    'Max Upgrade Ocarina':                                      (["a time flute"], "a Max Upgrade Ocarina", 'item'),
+
     'ZR Frogs Ocarina Game':                                       (["an #amphibian feast# yields", "the #croaking choir's magnum opus# awards", "the #froggy finale# yields"], "the final reward from the #Frogs of Zora's River# is", ['overworld', 'sometimes']),
     'KF Links House Cow':                                          ("the #bovine bounty of a horseback hustle# gifts", "#Malon's obstacle course# leads to", 'always'),
 

ItemList.py

@@ -223,6 +223,19 @@
     'Ocarina C left Button':                           ('Item',     True,  0x0107, {'ocarina_button': True}),
     'Ocarina C right Button':                          ('Item',     True,  0x0108, {'ocarina_button': True}),
 
+    'Max Upgrade Hookshot':                             ('Item',     True,  0x0119, {'alias': ('Progressive Hookshot', 2), 'progressive': 2}),
+    'Max Upgrade Strength':                             ('Item',     True,  0x011A, {'alias': ('Progressive Strength Upgrade', 3), 'progressive': 3}),
+    'Max Upgrade Bomb Bag':                             ('Item',     True,  0x011B, {'alias': ('Bomb Bag', 3), 'progressive': 3}),
+    'Max Upgrade Bow':                                  ('Item',     True,  0x011C, {'alias': ('Bow', 3), 'progressive': 3}),
+    'Max Upgrade Slingshot':                            ('Item',     True,  0x011D, {'alias': ('Slingshot', 3), 'progressive': 3}),
+    'Max Upgrade Wallet':                               ('Item',     True,  0x011E, {'alias': ('Progressive Wallet', 3), 'progressive': 3}),
+    'Max Upgrade Scale':                                ('Item',     True,  0x011F, {'alias': ('Progressive Scale', 2), 'progressive': 2}),
+    'Max Upgrade Nut':                                  ('Item',     True,  0x0120, {'alias': ('Deku Nut Capacity', 2), 'progressive': 2}),
+    'Max Upgrade Stick':                                ('Item',     True,  0x0121, {'alias': ('Deku Stick Capacity', 2), 'progressive': 2}),
+    'Max Upgrade Bombchu':                              ('Item',     True,  0x0122, {'alias': ('Bombchus', 1), 'progressive': 1}),
+    'Max Upgrade Magic':                                ('Item',     True,  0x0123, {'alias': ('Magic Meter', 2), 'progressive': 2}),
+    'Max Upgrade Ocarina':                              ('Item',     True,  0x0124, {'alias': ('Ocarina', 2), 'progressive': 2}),
+
     # Event items otherwise generated by generic event logic
     # can be defined here to enforce their appearance in playthroughs.
     'Water Temple Clear':               ('Event',    True,  None, None),